Merge "Move emulator_x86 board to TV device partition" into main am: bd2a01419a am: 024b394048 am: 298a7bec9e

Original change: https://android-review.googlesource.com/c/device/google/atv/+/2803322

Change-Id: I06e7b6c1c88711b513801445e7d9d357c8d0e70a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/FrameworkPackageStubs/AndroidManifest.xml b/FrameworkPackageStubs/AndroidManifest.xml
index 393021b..5287716 100644
--- a/FrameworkPackageStubs/AndroidManifest.xml
+++ b/FrameworkPackageStubs/AndroidManifest.xml
@@ -658,6 +658,10 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter android:priority="-1">
+                <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter android:priority="-1">
                 <action android:name="android.settings.REQUEST_MANAGE_MEDIA" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
diff --git a/FrameworkPackageStubs/res/values-zh-rHK/strings.xml b/FrameworkPackageStubs/res/values-zh-rHK/strings.xml
index 1b3d9cd..e47e87a 100644
--- a/FrameworkPackageStubs/res/values-zh-rHK/strings.xml
+++ b/FrameworkPackageStubs/res/values-zh-rHK/strings.xml
@@ -2,6 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="1051886861071228918">"活動虛設常式"</string>
-    <string name="message_not_supported" msgid="5269947674108844893">"您沒有可以執行此操作的應用程式"</string>
+    <string name="message_not_supported" msgid="5269947674108844893">"你沒有可以執行此操作的應用程式"</string>
     <string name="stub_name" msgid="2907730040872891281">"無"</string>
 </resources>
diff --git a/MdnsOffloadManagerService/Android.bp b/MdnsOffloadManagerService/Android.bp
new file mode 100644
index 0000000..602e384
--- /dev/null
+++ b/MdnsOffloadManagerService/Android.bp
@@ -0,0 +1,31 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+prebuilt_etc {
+    name: "privapp_permissions_MdnsOffloadManagerService",
+    system_ext_specific: true,
+    sub_dir: "permissions",
+    src: "privapp-permissions-com.android.tv.mdnsoffloadmanager.xml",
+    filename_from_src: true,
+}
+
+android_app {
+    name: "MdnsOffloadManagerService",
+    srcs: [
+        "src/**/*.java",
+    ],
+    use_embedded_native_libs: true,
+    sdk_version: "system_current",
+    system_ext_specific: true,
+    dex_preopt: {
+        enabled: false,
+    },
+    static_libs: [
+        "androidx.annotation_annotation",
+        "device.google.atv.mdns_offload-aidl-V1-java",
+        "device.google.atv.mdns_offload_manager-aidl-V1-java",
+    ],
+    certificate: "platform",
+    required: ["privapp_permissions_MdnsOffloadManagerService"],
+}
diff --git a/MdnsOffloadManagerService/AndroidManifest.xml b/MdnsOffloadManagerService/AndroidManifest.xml
new file mode 100644
index 0000000..2c2feab
--- /dev/null
+++ b/MdnsOffloadManagerService/AndroidManifest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 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.
+-->
+
+<!--
+    Provides a service that is able to collect and offload mDNS service records.
+    The packets will be used to respond to mDNS queries by the network interface
+    hardware without waking up the CPU.
+ -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.tv.mdnsoffloadmanager">
+    <permission
+        android:name="com.android.tv.mdnsoffloadmanager.MDNS_OFFLOAD_SERVICE"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="com.android.tv.mdnsoffloadmanager.MDNS_OFFLOAD_SERVICE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.DEVICE_POWER" />
+
+    <application android:label="MdnsOffloadManager">
+        <service
+            android:name="com.android.tv.mdnsoffloadmanager.MdnsOffloadManagerService"
+            android:exported="true" />
+    </application>
+</manifest>
diff --git a/MdnsOffloadManagerService/privapp-permissions-com.android.tv.mdnsoffloadmanager.xml b/MdnsOffloadManagerService/privapp-permissions-com.android.tv.mdnsoffloadmanager.xml
new file mode 100644
index 0000000..c586bf9
--- /dev/null
+++ b/MdnsOffloadManagerService/privapp-permissions-com.android.tv.mdnsoffloadmanager.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 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.
+-->
+
+<permissions>
+    <privapp-permissions package="com.android.tv.mdnsoffloadmanager">
+        <permission name="android.permission.DEVICE_POWER"/>
+    </privapp-permissions>
+</permissions>
diff --git a/MdnsOffloadManagerService/res/values/config.xml b/MdnsOffloadManagerService/res/values/config.xml
new file mode 100644
index 0000000..16dd84d
--- /dev/null
+++ b/MdnsOffloadManagerService/res/values/config.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 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>
+    <!--
+    Define the component that implements device.google.atv.mdns_offload.IMdnsOffload, which
+    represents the interfaces to offload mDNS processing on network interfaces chipsets.
+    -->
+    <string name="config_mdnsOffloadVendorServiceComponent" translatable="false" />
+    <!--
+    Defines the qnames (from the mDNS queries) that must be prioritized to store on network
+    interfaces chipsets in cases where memory is smaller than the offloaded records.
+    -->
+    <string-array name="config_mdnsOffloadPriorityQnames" translatable="false" />
+</resources>
\ No newline at end of file
diff --git a/MdnsOffloadManagerService/res/values/overlayable.xml b/MdnsOffloadManagerService/res/values/overlayable.xml
new file mode 100644
index 0000000..5d0b6b0
--- /dev/null
+++ b/MdnsOffloadManagerService/res/values/overlayable.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright (C) 2023 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>
+    <overlayable name="MdnsOffloadConfiguration">
+        <policy type="product|system|vendor">
+            <item name="config_mdnsOffloadVendorServiceComponent" type="string" />
+            <item name="config_mdnsOffloadPriorityQnames" type="array" />
+        </policy>
+    </overlayable>
+</resources>
\ No newline at end of file
diff --git a/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/InterfaceOffloadManager.java b/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/InterfaceOffloadManager.java
new file mode 100644
index 0000000..8eb6993
--- /dev/null
+++ b/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/InterfaceOffloadManager.java
@@ -0,0 +1,117 @@
+package com.android.tv.mdnsoffloadmanager;
+
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@WorkerThread
+public class InterfaceOffloadManager {
+
+    private static final String TAG = InterfaceOffloadManager.class.getSimpleName();
+
+    private final String mNetworkInterface;
+    private final OffloadIntentStore mOffloadIntentStore;
+    private final OffloadWriter mOffloadWriter;
+    private final Set<Integer> mCurrentOffloadedRecordKeys = new HashSet<>();
+    private final Set<String> mCurrentPassthroughQName = new HashSet<>();
+    private boolean mIsNetworkAvailable = false;
+
+    InterfaceOffloadManager(
+            @NonNull String networkInterface,
+            @NonNull OffloadIntentStore offloadIntentStore,
+            @NonNull OffloadWriter offloadWriter) {
+        mNetworkInterface = networkInterface;
+        mOffloadIntentStore = offloadIntentStore;
+        mOffloadWriter = offloadWriter;
+    }
+
+    void onVendorServiceConnected() {
+        refreshProtocolResponses();
+        refreshPassthroughList();
+    }
+
+    void onAppIdAllowlistUpdated() {
+        refreshProtocolResponses();
+        refreshPassthroughList();
+    }
+
+    void onNetworkAvailable() {
+        String msg = "Network interface {" + mNetworkInterface + "} is connected." +
+                " Offloading all stored data.";
+        Log.d(TAG, msg);
+        mIsNetworkAvailable = true;
+        refreshProtocolResponses();
+        refreshPassthroughList();
+    }
+
+    void onNetworkLost() {
+        String msg = "Network interface {" + mNetworkInterface + "} was disconnected."
+                + " Clearing all associated data.";
+        Log.d(TAG, msg);
+        mIsNetworkAvailable = false;
+        clearProtocolResponses();
+        clearPassthroughList();
+    }
+
+    void onVendorServiceDisconnected() {
+        mCurrentOffloadedRecordKeys.clear();
+        mCurrentPassthroughQName.clear();
+    }
+
+    void refreshProtocolResponses() {
+        if (!mIsNetworkAvailable) {
+            return;
+        }
+        applyOffloadIntents(mOffloadIntentStore.getOffloadIntentsForInterface(mNetworkInterface));
+    }
+
+    void refreshPassthroughList() {
+        if (!mIsNetworkAvailable) {
+            return;
+        }
+        applyPassthroughIntents(
+                mOffloadIntentStore.getPassthroughIntentsForInterface(mNetworkInterface));
+    }
+
+    private void clearProtocolResponses() {
+        applyOffloadIntents(Collections.emptySet());
+    }
+
+    private void clearPassthroughList() {
+        applyPassthroughIntents(Collections.emptyList());
+    }
+
+    private void applyOffloadIntents(Collection<OffloadIntentStore.OffloadIntent> offloadIntents) {
+        if (!mOffloadWriter.isVendorServiceConnected()) {
+            Log.e(TAG, "Vendor service disconnected, cannot apply mDNS offload state");
+            return;
+        }
+        Collection<Integer> deleted = mOffloadWriter.deleteOffloadData(mCurrentOffloadedRecordKeys);
+        mCurrentOffloadedRecordKeys.removeAll(deleted);
+        Collection<Integer> offloaded = mOffloadWriter.writeOffloadData(
+                mNetworkInterface, offloadIntents);
+        mCurrentOffloadedRecordKeys.addAll(offloaded);
+    }
+
+    private void applyPassthroughIntents(
+            List<OffloadIntentStore.PassthroughIntent> passthroughIntents) {
+        if (!mOffloadWriter.isVendorServiceConnected()){
+            Log.e(TAG, "Vendor service disconnected, cannot apply mDNS passthrough state");
+            return;
+        }
+        Collection<String> deleted = mOffloadWriter.deletePassthroughData(
+                mNetworkInterface, mCurrentPassthroughQName);
+        mCurrentPassthroughQName.removeAll(deleted);
+        Collection<String> added = mOffloadWriter.writePassthroughData(
+                mNetworkInterface, passthroughIntents);
+        mCurrentPassthroughQName.addAll(added);
+    }
+
+}
diff --git a/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/MdnsOffloadManagerService.java b/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/MdnsOffloadManagerService.java
new file mode 100644
index 0000000..a30ff1f
--- /dev/null
+++ b/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/MdnsOffloadManagerService.java
@@ -0,0 +1,412 @@
+/*
+ * Copyright (C) 2023 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.android.tv.mdnsoffloadmanager;
+
+import android.app.Service;
+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.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.net.ConnectivityManager;
+import android.net.LinkProperties;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.NetworkRequest;
+import android.os.Binder;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.PowerManager;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import device.google.atv.mdns_offload.IMdnsOffload;
+import device.google.atv.mdns_offload.IMdnsOffloadManager;
+
+
+public class MdnsOffloadManagerService extends Service {
+
+    private static final String TAG = MdnsOffloadManagerService.class.getSimpleName();
+    private static final int VENDOR_SERVICE_COMPONENT_ID =
+            R.string.config_mdnsOffloadVendorServiceComponent;
+
+    private final ConnectivityManager.NetworkCallback mNetworkCallback =
+            new ConnectivityManagerNetworkCallback();
+    private final Map<String, InterfaceOffloadManager> mInterfaceOffloadManagers = new HashMap<>();
+    private final Injector mInjector;
+    private Handler mHandler;
+    private PriorityListManager mPriorityListManager;
+    private OffloadIntentStore mOffloadIntentStore;
+    private OffloadWriter mOffloadWriter;
+    private ConnectivityManager mConnectivityManager;
+    private PackageManager mPackageManager;
+
+    public MdnsOffloadManagerService() {
+        this(new Injector());
+    }
+
+    @VisibleForTesting
+    MdnsOffloadManagerService(@NonNull Injector injector) {
+        super();
+        injector.setContext(this);
+        mInjector = injector;
+    }
+
+    @VisibleForTesting
+    static class Injector {
+
+        private Context mContext = null;
+        private Looper mLooper = null;
+
+        void setContext(Context context) {
+            mContext = context;
+        }
+
+        synchronized Looper getLooper() {
+            if (mLooper == null) {
+                HandlerThread ht = new HandlerThread("MdnsOffloadManager");
+                ht.start();
+                mLooper = ht.getLooper();
+            }
+            return mLooper;
+        }
+
+        Resources getResources() {
+            return mContext.getResources();
+        }
+
+        ConnectivityManager getConnectivityManager() {
+            return mContext.getSystemService(ConnectivityManager.class);
+        }
+
+
+        PowerManager.LowPowerStandbyPolicy getLowPowerStandbyPolicy() {
+            return mContext.getSystemService(PowerManager.class).getLowPowerStandbyPolicy();
+        }
+
+        PackageManager getPackageManager() {
+            return mContext.getPackageManager();
+        }
+
+        boolean isInteractive() {
+            return mContext.getSystemService(PowerManager.class).isInteractive();
+        }
+
+        boolean bindService(Intent intent, ServiceConnection connection, int flags) {
+            return mContext.bindService(intent, connection, flags);
+        }
+
+        void registerReceiver(BroadcastReceiver receiver, IntentFilter filter, int flags) {
+            mContext.registerReceiver(receiver, filter, flags);
+        }
+
+        int getCallingUid() {
+            return Binder.getCallingUid();
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        mHandler = new Handler(mInjector.getLooper());
+        mPriorityListManager = new PriorityListManager(mInjector.getResources());
+        mOffloadIntentStore = new OffloadIntentStore(mPriorityListManager);
+        mOffloadWriter = new OffloadWriter();
+        mConnectivityManager = mInjector.getConnectivityManager();
+        mPackageManager = mInjector.getPackageManager();
+        bindVendorService();
+        setupScreenBroadcastReceiver();
+        setupConnectivityListener();
+        setupStandbyPolicyListener();
+    }
+
+    private void bindVendorService() {
+        String vendorServicePath = mInjector.getResources().getString(VENDOR_SERVICE_COMPONENT_ID);
+
+        if (vendorServicePath.isEmpty()) {
+            String msg = "vendorServicePath is empty. Bind cannot proceed.";
+            Log.e(TAG, msg);
+            throw new IllegalArgumentException(msg);
+        }
+        ComponentName componentName = ComponentName.unflattenFromString(vendorServicePath);
+        if (componentName == null) {
+            String msg = "componentName cannot be extracted from vendorServicePath."
+                    + " Bind cannot proceed.";
+            Log.e(TAG, msg);
+            throw new IllegalArgumentException(msg);
+        }
+
+        Log.d(TAG, "IMdnsOffloadManager is binding to: " + componentName);
+
+        Intent explicitIntent = new Intent();
+        explicitIntent.setComponent(componentName);
+        boolean bindingSuccessful = mInjector.bindService(
+                explicitIntent, mVendorServiceConnection, Context.BIND_AUTO_CREATE);
+        if (!bindingSuccessful) {
+            String msg = "Failed to bind to vendor service at {" + vendorServicePath + "}.";
+            Log.e(TAG, msg);
+            throw new IllegalStateException(msg);
+        }
+    }
+
+    private void setupScreenBroadcastReceiver() {
+        BroadcastReceiver receiver = new ScreenBroadcastReceiver();
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_SCREEN_ON);
+        filter.addAction(Intent.ACTION_SCREEN_OFF);
+        mInjector.registerReceiver(receiver, filter, 0);
+        mHandler.post(() -> mOffloadWriter.setOffloadState(!mInjector.isInteractive()));
+    }
+
+    private void setupConnectivityListener() {
+        NetworkRequest networkRequest = new NetworkRequest.Builder()
+                .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
+                .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
+                .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
+                .build();
+        mConnectivityManager.registerNetworkCallback(networkRequest, mNetworkCallback);
+    }
+
+    private void setupStandbyPolicyListener() {
+        BroadcastReceiver receiver = new LowPowerStandbyPolicyReceiver();
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(PowerManager.ACTION_LOW_POWER_STANDBY_POLICY_CHANGED);
+        mInjector.registerReceiver(receiver, filter, 0);
+        refreshAppIdAllowlist();
+    }
+
+    private void refreshAppIdAllowlist() {
+        PowerManager.LowPowerStandbyPolicy standbyPolicy = mInjector.getLowPowerStandbyPolicy();
+        Set<Integer> allowedAppIds = standbyPolicy.getExemptPackages()
+                .stream()
+                .map(pkg -> {
+                    try {
+                        return mPackageManager.getPackageUid(pkg, 0);
+                    } catch (PackageManager.NameNotFoundException e) {
+                        Log.e(TAG, "Unable to get UID of package {" + pkg + "}.", e);
+                        return null;
+                    }
+                })
+                .filter(Objects::nonNull)
+                .map(UserHandle::getAppId)
+                .collect(Collectors.toSet());
+        mHandler.post(() -> {
+            mOffloadIntentStore.setAppIdAllowlist(allowedAppIds);
+            mInterfaceOffloadManagers.values()
+                    .forEach(InterfaceOffloadManager::onAppIdAllowlistUpdated);
+        });
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mOffloadManagerBinder;
+    }
+
+    private final IMdnsOffloadManager.Stub mOffloadManagerBinder = new IMdnsOffloadManager.Stub() {
+        @Override
+        public int addProtocolResponses(@NonNull String networkInterface,
+                                        @NonNull OffloadServiceInfo serviceOffloadData,
+                                        @NonNull IBinder clientToken) {
+            Objects.requireNonNull(networkInterface);
+            Objects.requireNonNull(serviceOffloadData);
+            Objects.requireNonNull(clientToken);
+            int callerUid = mInjector.getCallingUid();
+            OffloadIntentStore.OffloadIntent offloadIntent =
+                    mOffloadIntentStore.registerOffloadIntent(
+                            networkInterface, serviceOffloadData, clientToken, callerUid);
+            try {
+                offloadIntent.mClientToken.linkToDeath(
+                        () -> removeProtocolResponses(offloadIntent.mRecordKey, clientToken), 0);
+            } catch (RemoteException e) {
+                String msg = "Error while setting a callback for linkToDeath binder" +
+                        " {" + offloadIntent.mClientToken + "} in addProtocolResponses.";
+                Log.e(TAG, msg, e);
+                return offloadIntent.mRecordKey;
+            }
+            mHandler.post(() -> {
+                getInterfaceOffloadManager(networkInterface).refreshProtocolResponses();
+            });
+            return offloadIntent.mRecordKey;
+        }
+
+        @Override
+        public void removeProtocolResponses(int recordKey, @NonNull IBinder clientToken) {
+            if (recordKey <= 0) {
+                throw new IllegalArgumentException("recordKey must be positive");
+            }
+            Objects.requireNonNull(clientToken);
+            mHandler.post(() -> {
+                OffloadIntentStore.OffloadIntent offloadIntent =
+                        mOffloadIntentStore.getAndRemoveOffloadIntent(recordKey, clientToken);
+                if (offloadIntent == null) {
+                    return;
+                }
+                getInterfaceOffloadManager(offloadIntent.mNetworkInterface)
+                        .refreshProtocolResponses();
+            });
+        }
+
+        @Override
+        public void addToPassthroughList(
+                @NonNull String networkInterface,
+                @NonNull String qname,
+                @NonNull IBinder clientToken) {
+            Objects.requireNonNull(networkInterface);
+            Objects.requireNonNull(qname);
+            Objects.requireNonNull(clientToken);
+            int callerUid = mInjector.getCallingUid();
+            mHandler.post(() -> {
+                OffloadIntentStore.PassthroughIntent ptIntent =
+                        mOffloadIntentStore.registerPassthroughIntent(
+                                networkInterface, qname, clientToken, callerUid);
+                IBinder token = ptIntent.mClientToken;
+                try {
+                    token.linkToDeath(
+                            () -> removeFromPassthroughList(
+                                    networkInterface, ptIntent.mCanonicalQName, token), 0);
+                } catch (RemoteException e) {
+                    String msg = "Error while setting a callback for linkToDeath binder {"
+                            + token + "} in addToPassthroughList.";
+                    Log.e(TAG, msg, e);
+                    return;
+                }
+                getInterfaceOffloadManager(networkInterface).refreshPassthroughList();
+            });
+        }
+
+        @Override
+        public void removeFromPassthroughList(
+                @NonNull String networkInterface,
+                @NonNull String qname,
+                @NonNull IBinder clientToken) {
+            Objects.requireNonNull(networkInterface);
+            Objects.requireNonNull(qname);
+            Objects.requireNonNull(clientToken);
+            mHandler.post(() -> {
+                boolean removed = mOffloadIntentStore.removePassthroughIntent(qname, clientToken);
+                if (removed) {
+                    getInterfaceOffloadManager(networkInterface).refreshPassthroughList();
+                }
+            });
+        }
+
+        @Override
+        public int getInterfaceVersion() {
+            return super.VERSION;
+        }
+
+        @Override
+        public String getInterfaceHash() {
+            return super.HASH;
+        }
+    };
+
+    private InterfaceOffloadManager getInterfaceOffloadManager(String networkInterface) {
+        return mInterfaceOffloadManagers.computeIfAbsent(
+                networkInterface,
+                iface -> new InterfaceOffloadManager(iface, mOffloadIntentStore, mOffloadWriter));
+    }
+
+    private final ServiceConnection mVendorServiceConnection = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName className, IBinder service) {
+            Log.i(TAG, "IMdnsOffload service bound successfully.");
+            IMdnsOffload vendorService = IMdnsOffload.Stub.asInterface(service);
+            mHandler.post(() -> {
+                mOffloadWriter.setVendorService(vendorService);
+                mOffloadWriter.resetAll();
+                mInterfaceOffloadManagers.values()
+                        .forEach(InterfaceOffloadManager::onVendorServiceConnected);
+                mOffloadWriter.applyOffloadState();
+            });
+        }
+
+        public void onServiceDisconnected(ComponentName className) {
+            Log.e(TAG, "IMdnsOffload service has unexpectedly disconnected.");
+            mHandler.post(() -> {
+                mOffloadWriter.setVendorService(null);
+                mInterfaceOffloadManagers.values()
+                        .forEach(InterfaceOffloadManager::onVendorServiceDisconnected);
+            });
+        }
+    };
+
+    private class ScreenBroadcastReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            // Note: Screen on/off here is actually historical naming for the overall interactive
+            // state of the device:
+            // https://developer.android.com/reference/android/os/PowerManager#isInteractive()
+            String action = intent.getAction();
+            mHandler.post(() -> {
+                if (Intent.ACTION_SCREEN_ON.equals(action)) {
+                    mOffloadWriter.setOffloadState(false);
+                    mOffloadWriter.retrieveAndClearMetrics(mOffloadIntentStore.getRecordKeys());
+                } else if (Intent.ACTION_SCREEN_OFF.equals(action)) {
+                    mOffloadWriter.setOffloadState(true);
+                }
+            });
+        }
+    }
+
+    private class LowPowerStandbyPolicyReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (!PowerManager.ACTION_LOW_POWER_STANDBY_POLICY_CHANGED.equals(intent.getAction())) {
+                return;
+            }
+            refreshAppIdAllowlist();
+        }
+    }
+
+    private class ConnectivityManagerNetworkCallback extends ConnectivityManager.NetworkCallback {
+        @Override
+        public void onAvailable(@NonNull Network network) {
+            LinkProperties linkProperties = mConnectivityManager.getLinkProperties(network);
+            String iface = linkProperties.getInterfaceName();
+            mHandler.post(() -> {
+                InterfaceOffloadManager offloadManager = getInterfaceOffloadManager(iface);
+                offloadManager.onNetworkAvailable();
+            });
+        }
+
+        @Override
+        public void onLost(@NonNull Network network) {
+            LinkProperties linkProperties = mConnectivityManager.getLinkProperties(network);
+            String iface = linkProperties.getInterfaceName();
+            mHandler.post(() -> {
+                InterfaceOffloadManager offloadManager = getInterfaceOffloadManager(iface);
+                offloadManager.onNetworkLost();
+            });
+        }
+    }
+}
diff --git a/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/MdnsPacketParser.java b/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/MdnsPacketParser.java
new file mode 100644
index 0000000..e40b3e6
--- /dev/null
+++ b/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/MdnsPacketParser.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright (C) 2023 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.android.tv.mdnsoffloadmanager;
+
+import androidx.annotation.NonNull;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import device.google.atv.mdns_offload.IMdnsOffload.MdnsProtocolData.MatchCriteria;
+
+/**
+ * Tool class to help read mdns data from a fully formed mDNS response packet.
+ */
+public final class MdnsPacketParser {
+
+    private static final int OFFSET_QUERIES_COUNT = 4;
+    private static final int OFFSET_ANSWERS_COUNT = 6;
+    private static final int OFFSET_AUTHORITY_COUNT = 8;
+    private static final int OFFSET_ADDITIONAL_COUNT = 10;
+    private static final int OFFSET_DATA_SECTION_START = 12;
+
+    private final byte[] mMdnsData;
+    private int mCursorIndex;
+
+    private MdnsPacketParser(@NonNull byte[] mDNSData) {
+        this.mMdnsData = mDNSData;
+    }
+
+    /**
+     * Extracts a label starting at offset and then follows RFC1035-4.1.4 The offset should start
+     * either at a data length value or at a pointer value.
+     */
+    public static String extractFullName(@NonNull byte[] array, int offset) {
+        MdnsPacketParser parser = new MdnsPacketParser(array);
+        parser.setCursor(offset);
+        StringBuilder builder = new StringBuilder();
+
+        while (!parser.isCursorOnRootLabel()) {
+            if (parser.isCursorOnPointer()) {
+                parser.setCursor(parser.pollPointerOffset());
+            } else if (parser.isCursorOnLabel()) {
+                builder.append(parser.pollLabel());
+                builder.append('.');
+            } else {
+                throw new IllegalArgumentException("mDNS response packet is badly formed.");
+            }
+        }
+        return builder.toString();
+    }
+
+    /**
+     * Finds all the RRNAMEs ans RRTYPEs in the mdns response packet provided. Expects a packet only
+     * with responses.
+     */
+    public static List<MatchCriteria> extractMatchCriteria(@NonNull byte[] mdnsResponsePacket) {
+        Objects.requireNonNull(mdnsResponsePacket);
+
+        // Parse MdnsPacket and read labels and find
+        List<MatchCriteria> criteriaList = new ArrayList<>();
+        MdnsPacketParser parser = new MdnsPacketParser(mdnsResponsePacket);
+
+        if (parser.getQueriesCount() != 0
+                || parser.getAuthorityCount() != 0
+                || parser.getAdditionalCount() != 0) {
+            throw new IllegalArgumentException(
+                    "mDNS response packet contains data that is not answers");
+        }
+        int answersToRead = parser.getAnswersCount();
+
+        parser.moveToDataSection();
+        while (answersToRead > 0) {
+            // Each record starts with the RRNAME, so the offset is correct for the criteria.
+            MatchCriteria criteria = new MatchCriteria();
+            criteria.nameOffset = parser.getCursorOffset();
+
+            /// Skip labels first
+            while (parser.isCursorOnLabel()) {
+                parser.pollLabel();
+            }
+            // We can be on a root label or on a pointer. Skip both.
+            if (parser.isCursorOnRootLabel()) {
+                parser.skipBytes(1);
+            } else if (parser.isCursorOnPointer()) {
+                parser.pollPointerOffset();
+            }
+
+            // The cursor must be on the RRTYPE.
+            criteria.type = parser.pollUint16();
+
+            // The next 6 bytes point to cache flush, rrclass, and ttl
+            parser.skipBytes(6);
+
+            // Now the index points to the data length on 2 bytes
+            int dataLength = parser.pollUint16();
+
+            // Then we can skip those data bytes.
+            parser.skipBytes(dataLength);
+
+            // Criteria is complete, it can be added.
+            criteriaList.add(criteria);
+            answersToRead--;
+        }
+        if (parser.hasContent()) {
+            // The packet is badly formed. All answers where read successfully, but data remains
+            // available.
+            throw new IllegalArgumentException(
+                    "mDNS response packet is badly formed. Too much data.");
+        }
+
+        return criteriaList;
+    }
+
+    private boolean hasContent() {
+        return mCursorIndex < mMdnsData.length;
+    }
+
+    private void setCursor(int position) {
+        if (position < 0) {
+            throw new IllegalArgumentException("Setting cursor on negative offset is not allowed.");
+        }
+        mCursorIndex = position;
+    }
+
+    private int getCursorOffset() {
+        return mCursorIndex;
+    }
+
+    private void skipBytes(int bytesToSkip) {
+        mCursorIndex += bytesToSkip;
+    }
+
+    private int getQueriesCount() {
+        return readUint16(OFFSET_QUERIES_COUNT);
+    }
+
+    private int getAnswersCount() {
+        return readUint16(OFFSET_ANSWERS_COUNT);
+    }
+
+    private int getAuthorityCount() {
+        return readUint16(OFFSET_AUTHORITY_COUNT);
+    }
+
+    private int getAdditionalCount() {
+        return readUint16(OFFSET_ADDITIONAL_COUNT);
+    }
+
+    private void moveToDataSection() {
+        mCursorIndex = OFFSET_DATA_SECTION_START;
+    }
+
+    private String pollLabel() {
+        int labelSize = readUint8(mCursorIndex);
+        mCursorIndex++;
+        if (mCursorIndex + labelSize > mMdnsData.length) {
+            throw new IllegalArgumentException(
+                    "mDNS response packet is badly formed. Not enough data.");
+        }
+        String value = new String(mMdnsData, mCursorIndex, labelSize, StandardCharsets.UTF_8);
+        mCursorIndex += labelSize;
+        return value;
+    }
+
+    private boolean isCursorOnLabel() {
+        return !isCursorOnRootLabel() && (readUint8(mCursorIndex) & 0b11000000) == 0b00000000;
+    }
+
+    private boolean isCursorOnPointer() {
+        return (readUint8(mCursorIndex) & 0b11000000) == 0b11000000;
+    }
+
+    private boolean isCursorOnRootLabel() {
+        return readUint8(mCursorIndex) == 0;
+    }
+
+    private int pollPointerOffset() {
+        int value = readUint16(mCursorIndex) & 0b0011111111111111;
+        mCursorIndex += 2;
+        return value;
+    }
+
+    private int readUint8(int offset) {
+        if (offset >= mMdnsData.length) {
+            throw new IllegalArgumentException(
+                    "mDNS response packet is badly formed. Not enough data.");
+        }
+        return mMdnsData[offset];
+    }
+
+    private int readUint16(int offset) {
+        if (offset + 1 >= mMdnsData.length) {
+            throw new IllegalArgumentException(
+                    "mDNS response packet is badly formed. Not enough data.");
+        }
+        return (mMdnsData[offset] << 8) + mMdnsData[offset + 1];
+    }
+
+    private int pollUint16() {
+        int value = readUint16(mCursorIndex);
+        mCursorIndex += 2;
+        return value;
+    }
+}
diff --git a/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/OffloadIntentStore.java b/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/OffloadIntentStore.java
new file mode 100644
index 0000000..59d2633
--- /dev/null
+++ b/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/OffloadIntentStore.java
@@ -0,0 +1,231 @@
+package com.android.tv.mdnsoffloadmanager;
+
+import android.os.IBinder;
+import android.os.UserHandle;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import device.google.atv.mdns_offload.IMdnsOffload;
+import device.google.atv.mdns_offload.IMdnsOffloadManager;
+
+/**
+ * Class to store OffloadIntents made by clients and assign record keys.
+ */
+public class OffloadIntentStore {
+
+    private static final String TAG = OffloadIntentStore.class.getSimpleName();
+
+    private final AtomicInteger mNextKey = new AtomicInteger(1);
+    private final ConcurrentMap<Integer, OffloadIntent> mOffloadIntentsByRecordKey =
+            new ConcurrentHashMap<>();
+    // Note that we need to preserve the order of passthrough intents.
+    private final List<PassthroughIntent> mPassthroughIntents = new ArrayList<>();
+
+    private final PriorityListManager mPriorityListManager;
+
+    /**
+     * Only listed packages may offload data or manage the passthrough list, requests from any other
+     * packages are dropped.
+     */
+    private final Set<Integer> mAppIdAllowlist = new HashSet<>();
+
+    OffloadIntentStore(@NonNull PriorityListManager priorityListManager) {
+        mPriorityListManager = priorityListManager;
+    }
+
+    @WorkerThread
+    void setAppIdAllowlist(Set<Integer> appIds) {
+        mAppIdAllowlist.clear();
+        mAppIdAllowlist.addAll(appIds);
+    }
+
+    /**
+     * Register the intention to offload an mDNS service. The system will do its best to offload it
+     * when possible (considering dependencies, network conditions etc.).
+     * <p>
+     * The offload intent will be associated with the caller via the clientToken, stored in the
+     * internal memory store, and be assigned a unique record key.
+     */
+    OffloadIntent registerOffloadIntent(
+            String networkInterface,
+            IMdnsOffloadManager.OffloadServiceInfo serviceInfo,
+            IBinder clientToken,
+            int callerUid) {
+        int recordKey = mNextKey.getAndIncrement();
+        IMdnsOffload.MdnsProtocolData mdnsProtocolData = convertToMdnsProtocolData(serviceInfo);
+        int priority = mPriorityListManager.getPriority(mdnsProtocolData, recordKey);
+        int appId = UserHandle.getAppId(callerUid);
+        OffloadIntent offloadIntent = new OffloadIntent(
+                networkInterface, recordKey, mdnsProtocolData, clientToken, priority, appId);
+        mOffloadIntentsByRecordKey.put(recordKey, offloadIntent);
+        return offloadIntent;
+    }
+
+    /**
+     * Retrieve all offload intents for a given interface.
+     */
+    @WorkerThread
+    Collection<OffloadIntent> getOffloadIntentsForInterface(String networkInterface) {
+        return mOffloadIntentsByRecordKey
+                .values()
+                .stream()
+                .filter(intent -> intent.mNetworkInterface.equals(networkInterface)
+                        && mAppIdAllowlist.contains(intent.mOwnerAppId))
+                .toList();
+    }
+
+    /**
+     * Retrieve an offload intent by its record key and remove from internal database.
+     * <p>
+     * Only permitted if the offload intent was registered by the same caller.
+     */
+    @WorkerThread
+    OffloadIntent getAndRemoveOffloadIntent(int recordKey, IBinder clientToken) {
+        OffloadIntent offloadIntent = mOffloadIntentsByRecordKey.get(recordKey);
+        if (offloadIntent == null) {
+            Log.e(TAG, "Failed to remove protocol responses, bad record key {"
+                    + recordKey + "}.");
+            return null;
+        }
+        if (!offloadIntent.mClientToken.equals(clientToken)) {
+            Log.e(TAG, "Failed to remove protocol messages, bad client token {"
+                    + clientToken + "}.");
+            return null;
+        }
+        mOffloadIntentsByRecordKey.remove(recordKey);
+        return offloadIntent;
+    }
+
+    @WorkerThread
+    Collection<Integer> getRecordKeys() {
+        return mOffloadIntentsByRecordKey.keySet();
+    }
+
+    /**
+     * Create a passthrough intent, representing the intention to add a DNS query name to the
+     * passthrough list. The system will do its best to configure the passthrough when possible.
+     * <p>
+     * The passthrough intent will be associated with the caller via the clientToken, stored in the
+     * internal memory store, and identified by the passthrough QNAME.
+     */
+    @WorkerThread
+    PassthroughIntent registerPassthroughIntent(
+            String networkInterface,
+            String qname,
+            IBinder clientToken,
+            int callerUid) {
+        String canonicalQName = mPriorityListManager.canonicalQName(qname);
+        int priority = mPriorityListManager.getPriority(canonicalQName, 0);
+        int appId = UserHandle.getAppId(callerUid);
+        PassthroughIntent passthroughIntent = new PassthroughIntent(
+                networkInterface, qname, canonicalQName, clientToken, priority, appId);
+        mPassthroughIntents.add(passthroughIntent);
+        return passthroughIntent;
+    }
+
+    /**
+     * Retrieve all passthrough intents for a given interface.
+     */
+    @WorkerThread
+    List<PassthroughIntent> getPassthroughIntentsForInterface(String networkInterface) {
+        return mPassthroughIntents
+                .stream()
+                .filter(intent -> intent.mNetworkInterface.equals(networkInterface)
+                        && mAppIdAllowlist.contains(intent.mOwnerAppId))
+                .toList();
+    }
+
+    /**
+     * Retrieve a passthrough intent by its QNAME remove from internal database.
+     * <p>
+     * Only permitted if the passthrough intent was registered by the same caller.
+     */
+    @WorkerThread
+    boolean removePassthroughIntent(String qname, IBinder clientToken) {
+        String canonicalQName = mPriorityListManager.canonicalQName(qname);
+        boolean removed = mPassthroughIntents.removeIf(
+                pt -> pt.mCanonicalQName.equals(canonicalQName)
+                        && pt.mClientToken.equals(clientToken));
+        if (!removed) {
+            Log.e(TAG, "Failed to remove passthrough intent, bad QNAME or client token.");
+            return false;
+        }
+        return true;
+    }
+
+    private static IMdnsOffload.MdnsProtocolData convertToMdnsProtocolData(
+            IMdnsOffloadManager.OffloadServiceInfo serviceData) {
+        IMdnsOffload.MdnsProtocolData data = new IMdnsOffload.MdnsProtocolData();
+        data.rawOffloadPacket = serviceData.rawOffloadPacket;
+        data.matchCriteriaList = MdnsPacketParser.extractMatchCriteria(
+                serviceData.rawOffloadPacket);
+        return data;
+    }
+
+    /**
+     * Class representing the intention to offload mDNS protocol data.
+     */
+    static class OffloadIntent {
+        final String mNetworkInterface;
+        final int mRecordKey;
+        final IMdnsOffload.MdnsProtocolData mProtocolData;
+        final IBinder mClientToken;
+        final int mPriority; // Lower values take precedence.
+        final int mOwnerAppId;
+
+        private OffloadIntent(
+                String networkInterface,
+                int recordKey,
+                IMdnsOffload.MdnsProtocolData protocolData,
+                IBinder clientToken,
+                int priority,
+                int ownerAppId
+        ) {
+            mNetworkInterface = networkInterface;
+            mRecordKey = recordKey;
+            mProtocolData = protocolData;
+            mClientToken = clientToken;
+            mPriority = priority;
+            mOwnerAppId = ownerAppId;
+        }
+    }
+
+    /**
+     * Class representing the intention to configure mDNS passthrough for a given query name.
+     */
+    static class PassthroughIntent {
+        final String mNetworkInterface;
+        // Preserving the original upper/lowercase format.
+        final String mOriginalQName;
+        final String mCanonicalQName;
+        final IBinder mClientToken;
+        final int mPriority;
+        final int mOwnerAppId;
+
+        PassthroughIntent(
+                String networkInterface,
+                String originalQName,
+                String canonicalQName,
+                IBinder clientToken,
+                int priority,
+                int ownerAppId) {
+            mNetworkInterface = networkInterface;
+            mOriginalQName = originalQName;
+            mCanonicalQName = canonicalQName;
+            mClientToken = clientToken;
+            mPriority = priority;
+            mOwnerAppId = ownerAppId;
+        }
+    }
+}
diff --git a/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/OffloadWriter.java b/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/OffloadWriter.java
new file mode 100644
index 0000000..21db25c
--- /dev/null
+++ b/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/OffloadWriter.java
@@ -0,0 +1,272 @@
+package com.android.tv.mdnsoffloadmanager;
+
+import static device.google.atv.mdns_offload.IMdnsOffload.PassthroughBehavior.DROP_ALL;
+import static device.google.atv.mdns_offload.IMdnsOffload.PassthroughBehavior.PASSTHROUGH_LIST;
+
+import android.os.RemoteException;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import device.google.atv.mdns_offload.IMdnsOffload;
+
+@WorkerThread
+public class OffloadWriter {
+
+    private static final String TAG = OffloadWriter.class.getSimpleName();
+    private static final int INVALID_OFFLOAD_KEY = -1;
+
+    private boolean mOffloadState = false;
+    private IMdnsOffload mVendorService;
+
+    void setVendorService(@Nullable IMdnsOffload vendorService) {
+        mVendorService = vendorService;
+    }
+
+    boolean isVendorServiceConnected() {
+        return mVendorService != null;
+    }
+
+    void resetAll() {
+        if (!isVendorServiceConnected()) {
+            Log.e(TAG, "Cannot reset vendor service, service is not connected.");
+            return;
+        }
+        try {
+            mVendorService.resetAll();
+        } catch (RemoteException e) {
+            Log.e(TAG, "Failed to reset vendor service.", e);
+        }
+    }
+
+    /**
+     * Apply the desired offload state on the vendor service. It may be necessary to refresh it,
+     * after we bind to the vendor service to set the initial state, or restore the previous state.
+     */
+    void applyOffloadState() {
+        setOffloadState(mOffloadState);
+    }
+
+    /**
+     * Set the desired offload state and propagate to the vendor service.
+     */
+    void setOffloadState(boolean enabled) {
+        if (!isVendorServiceConnected()) {
+            Log.e(TAG, "Cannot set offload state, vendor service is not connected.");
+            return;
+        }
+        try {
+            mVendorService.setOffloadState(enabled);
+        } catch (RemoteException e) {
+            Log.e(TAG, "Failed to set offload state to {" + enabled + "}.", e);
+        }
+        mOffloadState = enabled;
+    }
+
+    /**
+     * Retrieve and clear all metric counters.
+     * <p>
+     * TODO(b/270115511) do something with these metrics.
+     */
+    void retrieveAndClearMetrics(Collection<Integer> recordKeys) {
+        try {
+            mVendorService.getAndResetMissCounter();
+        } catch (RemoteException e) {
+            Log.e(TAG, "getAndResetMissCounter failure", e);
+        }
+        for (int recordKey : recordKeys) {
+            try {
+                mVendorService.getAndResetHitCounter(recordKey);
+            } catch (RemoteException e) {
+                Log.e(TAG, "getAndResetHitCounter failure for recordKey {" + recordKey + "}", e);
+            }
+        }
+    }
+
+    /**
+     * Offload a list of records. Records are prioritized by their priority value, and lower
+     * priority records may be dropped if not all fit in memory.
+     *
+     * @return The offload keys of successfully offloaded protocol responses.
+     */
+    Collection<Integer> writeOffloadData(
+            String networkInterface, Collection<OffloadIntentStore.OffloadIntent> offloadIntents) {
+        List<OffloadIntentStore.OffloadIntent> orderedOffloadIntents = offloadIntents
+                .stream()
+                .sorted(Comparator.comparingInt(offloadIntent -> offloadIntent.mPriority))
+                .toList();
+        Set<Integer> offloaded = new HashSet<>();
+        for (OffloadIntentStore.OffloadIntent offloadIntent : orderedOffloadIntents) {
+            Integer offloadKey = tryAddProtocolResponses(networkInterface, offloadIntent);
+            if (offloadKey != null) {
+                offloaded.add(offloadKey);
+            }
+        }
+        return offloaded;
+    }
+
+    /**
+     * Remove a set of protocol responses.
+     *
+     * @return The offload keys of deleted protocol responses.
+     */
+    Collection<Integer> deleteOffloadData(Set<Integer> offloadKeys) {
+        Set<Integer> deleted = new HashSet<>();
+        for (Integer offloadKey : offloadKeys) {
+            if (tryRemoveProtocolResponses(offloadKey)) {
+                deleted.add(offloadKey);
+            }
+        }
+        return deleted;
+    }
+
+    /**
+     * Add a list of entries to the passthrough list. Entries will be prioritized based on the
+     * supplied priority value, where the supplied order will be maintained for equal values. Lower
+     * priority records may be dropped if not all fit in memory.
+     *
+     * @return The set of successfully added passthrough entries.
+     */
+    Collection<String> writePassthroughData(
+            String networkInterface,
+            List<OffloadIntentStore.PassthroughIntent> ptIntents) {
+        byte passthroughMode = ptIntents.isEmpty() ? DROP_ALL : PASSTHROUGH_LIST;
+        trySetPassthroughBehavior(networkInterface, passthroughMode);
+
+        // Note that this is a stable sort, therefore the provided order will be preserved for
+        // entries that are not on the priority list.
+        List<OffloadIntentStore.PassthroughIntent> orderedPtIntents = ptIntents
+                .stream()
+                .sorted(Comparator.comparingInt(pt -> pt.mPriority))
+                .toList();
+        Set<String> added = new HashSet<>();
+        for (OffloadIntentStore.PassthroughIntent ptIntent : orderedPtIntents) {
+            if (tryAddToPassthroughList(networkInterface, ptIntent)) {
+                added.add(ptIntent.mOriginalQName);
+            }
+        }
+        return added;
+    }
+
+    /**
+     * Delete a set of entries on the passthrough list.
+     *
+     * @return The set of entries that were deleted.
+     */
+    Collection<String> deletePassthroughData(String networkInterface, Collection<String> qnames) {
+        Set<String> deleted = new HashSet<>();
+        for (String qname : qnames) {
+            if (tryRemoveFromPassthroughList(networkInterface, qname)) {
+                deleted.add(qname);
+            }
+        }
+        return deleted;
+    }
+
+    @Nullable
+    private Integer tryAddProtocolResponses(
+            String networkInterface, OffloadIntentStore.OffloadIntent offloadIntent) {
+        int offloadKey;
+        try {
+            offloadKey = mVendorService.addProtocolResponses(
+                    networkInterface, offloadIntent.mProtocolData);
+        } catch (RemoteException e) {
+            String msg = "Failed to offload mDNS protocol response for record key {" +
+                    offloadIntent.mRecordKey + "} on iface {" + networkInterface + "}";
+            Log.e(TAG, msg, e);
+            return null;
+        }
+        if (offloadKey == INVALID_OFFLOAD_KEY) {
+            Log.e(TAG, "Failed to offload mDNS protocol data, vendor service returned error.");
+            return null;
+        }
+        return offloadKey;
+    }
+
+    private boolean tryRemoveProtocolResponses(Integer offloadKey) {
+        try {
+            mVendorService.removeProtocolResponses(offloadKey);
+            return true;
+        } catch (RemoteException e) {
+            String msg = "Failed to remove offloaded mDNS protocol response for offload key {"
+                    + offloadKey + "}";
+            Log.e(TAG, msg, e);
+        }
+        return false;
+    }
+
+    private void trySetPassthroughBehavior(String networkInterface, byte passthroughMode) {
+        try {
+            mVendorService.setPassthroughBehavior(networkInterface, passthroughMode);
+        } catch (RemoteException e) {
+            String msg = "Failed to set passthrough mode {"
+                    + passthroughBehaviorToString(passthroughMode) + "}"
+                    + " on iface {" + networkInterface + "}";
+            Log.e(TAG, msg, e);
+        }
+    }
+
+    private boolean tryAddToPassthroughList(
+            String networkInterface,
+            OffloadIntentStore.PassthroughIntent ptIntent) {
+        String simpleQName = convertQNameForVendorService(ptIntent.mOriginalQName);
+        boolean addedEntry;
+        try {
+            addedEntry = mVendorService.addToPassthroughList(networkInterface, simpleQName);
+        } catch (RemoteException e) {
+            String msg = "Failed to add passthrough list entry for qname {"
+                    + ptIntent.mOriginalQName + "} on iface {" + networkInterface + "}";
+            Log.e(TAG, msg, e);
+            return false;
+        }
+        if (!addedEntry) {
+            String msg = "Failed to add passthrough list entry for qname {"
+                    + ptIntent.mOriginalQName + "} on iface {" + networkInterface + "}.";
+            Log.e(TAG, msg);
+            return false;
+        }
+        return true;
+    }
+
+    private boolean tryRemoveFromPassthroughList(String networkInterface, String qname) {
+        String simpleQName = convertQNameForVendorService(qname);
+        try {
+            mVendorService.removeFromPassthroughList(networkInterface, simpleQName);
+            return true;
+        } catch (RemoteException e) {
+            String msg = "Failed to remove passthrough for qname {" + qname + "}.";
+            Log.e(TAG, msg, e);
+        }
+        return false;
+    }
+
+    @NonNull
+    private static String convertQNameForVendorService(String qname) {
+        // We strip the trailing '.' when we provide QNames to the vendor service.
+        if (qname.endsWith(".")) {
+            return qname.substring(0, qname.length() - 1);
+        }
+        return qname;
+    }
+
+    private static String passthroughBehaviorToString(
+            @IMdnsOffload.PassthroughBehavior byte passthroughBehavior) {
+        switch (passthroughBehavior) {
+            case IMdnsOffload.PassthroughBehavior.FORWARD_ALL:
+                return "FORWARD_ALL";
+            case IMdnsOffload.PassthroughBehavior.DROP_ALL:
+                return "DROP_ALL";
+            case IMdnsOffload.PassthroughBehavior.PASSTHROUGH_LIST:
+                return "PASSTHROUGH_LIST";
+        }
+        throw new IllegalArgumentException("No such passthrough behavior " + passthroughBehavior);
+    }
+}
diff --git a/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/PriorityListManager.java b/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/PriorityListManager.java
new file mode 100644
index 0000000..dfa733f
--- /dev/null
+++ b/MdnsOffloadManagerService/src/com/android/tv/mdnsoffloadmanager/PriorityListManager.java
@@ -0,0 +1,55 @@
+package com.android.tv.mdnsoffloadmanager;
+
+import android.content.res.Resources;
+
+import androidx.annotation.NonNull;
+
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import device.google.atv.mdns_offload.IMdnsOffload;
+
+public class PriorityListManager {
+
+    public static final int PRIORITIZED_QNAMES_ID = R.array.config_mdnsOffloadPriorityQnames;
+    private final Map<String, Integer> mPriorityMap;
+
+    PriorityListManager(@NonNull Resources resources) {
+        String[] priorityList = resources.getStringArray(PRIORITIZED_QNAMES_ID);
+        // We assign negative sorting keys to qNames on the priority list to ensure they are
+        // prioritized. Priorities for all other records are assigned on a first come first served
+        // order based on their record key.
+        int priorityListSize = priorityList.length;
+        mPriorityMap = IntStream.range(0, priorityListSize)
+                .boxed()
+                .collect(Collectors.toUnmodifiableMap(
+                        index -> canonicalQName(priorityList[index]),
+                        index -> -priorityListSize + index));
+    }
+
+    String canonicalQName(String qName) {
+        String upper = qName.toUpperCase(Locale.ROOT);
+        if (upper.endsWith(".")) {
+            return upper;
+        }
+        return upper + ".";
+    }
+
+    int getPriority(String qname, int defaultPriority) {
+        return mPriorityMap.getOrDefault(canonicalQName(qname), defaultPriority);
+    }
+
+    int getPriority(IMdnsOffload.MdnsProtocolData protocolData, int recordKey) {
+        return protocolData.matchCriteriaList.stream()
+                .mapToInt(mc -> {
+                    String qname = MdnsPacketParser.extractFullName(
+                            protocolData.rawOffloadPacket, mc.nameOffset);
+                    return getPriority(qname, recordKey);
+                })
+                .min()
+                .orElse(recordKey);
+    }
+
+}
diff --git a/MdnsOffloadManagerService/tests/Android.bp b/MdnsOffloadManagerService/tests/Android.bp
new file mode 100644
index 0000000..07bbcdc
--- /dev/null
+++ b/MdnsOffloadManagerService/tests/Android.bp
@@ -0,0 +1,24 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "MdnsOffloadManagerTest",
+    srcs: ["src/**/*.java"],
+    sdk_version: "system_current",
+    libs: [
+        "android.test.runner",
+        "android.test.base",
+        "android.test.mock",
+    ],
+    static_libs: [
+        "androidx.test.rules",
+        "androidx.test.core",
+        "junit",
+        "mockito-target-minus-junit4",
+        "MdnsOffloadManagerService",
+        "frameworks-base-testutils",
+    ],
+    test_suites: ["general-tests"],
+    certificate: "platform",
+}
\ No newline at end of file
diff --git a/MdnsOffloadManagerService/tests/AndroidManifest.xml b/MdnsOffloadManagerService/tests/AndroidManifest.xml
new file mode 100644
index 0000000..2186cf4
--- /dev/null
+++ b/MdnsOffloadManagerService/tests/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.tv.mdnsoffloadmanager.test">
+
+  <application>
+      <uses-library android:name="android.test.runner" />
+      <uses-library android:name="android.test.mock" />
+  </application>
+
+  <instrumentation
+      android:name="androidx.test.runner.AndroidJUnitRunner"
+      android:label="MdnsOffloadManager sample tests"
+      android:targetPackage="com.android.tv.mdnsoffloadmanager.test" />
+</manifest>
diff --git a/MdnsOffloadManagerService/tests/src/com/android/tv/mdnsoffloadmanager/FakeMdnsOffloadService.java b/MdnsOffloadManagerService/tests/src/com/android/tv/mdnsoffloadmanager/FakeMdnsOffloadService.java
new file mode 100644
index 0000000..1370280
--- /dev/null
+++ b/MdnsOffloadManagerService/tests/src/com/android/tv/mdnsoffloadmanager/FakeMdnsOffloadService.java
@@ -0,0 +1,176 @@
+package com.android.tv.mdnsoffloadmanager;
+
+import android.os.IInterface;
+import android.os.RemoteException;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import device.google.atv.mdns_offload.IMdnsOffload;
+
+/**
+ * Lightweight test double, mimicking the behavior we expect from the real vendor service
+ * implementation. Refer to {@link IMdnsOffload} for the API specification.
+ *
+ * For testing purposes only, see go/choose-test-double#faking-definition.
+ */
+public class FakeMdnsOffloadService extends IMdnsOffload.Stub {
+
+    private static final String TAG = FakeMdnsOffloadService.class.getSimpleName();
+    private static final int MAX_QNAME_LENGTH = 255;
+
+    /**
+     * No. of records that can be held in memory, per interface. Further records will be dropped.
+     */
+    private static final int OFFLOAD_CAPACITY = 3;
+
+    /**
+     * No. of QNames in passthrough list that can be held in memory, per interface. Further entries
+     * will be dropped.
+     */
+    private static final int PASSTHROUGH_CAPACITY = 4;
+
+    static class OffloadData {
+        byte passthroughBehavior = PassthroughBehavior.DROP_ALL;
+        final List<MdnsProtocolData> offloadedRecords = new ArrayList<>();
+        final List<String> passthroughQNames = new ArrayList<>();
+    }
+
+    boolean mOffloadState = false;
+    int mNextId = 0;
+    int mMissCounter = 0;
+    final Map<String, OffloadData> mOffloadDataByInterface = new HashMap<>();
+    final Map<Integer, MdnsProtocolData> mProtocolDataById = new HashMap<>();
+    final Map<Integer, Integer> mHitCounters = new HashMap<>();
+
+    OffloadData getOffloadData(String iface) {
+        return mOffloadDataByInterface.computeIfAbsent(iface, ifc -> new OffloadData());
+    }
+
+    @Override
+    public void resetAll() throws RemoteException {
+        mNextId = 0;
+        mMissCounter = 0;
+        mProtocolDataById.clear();
+        mOffloadDataByInterface.clear();
+        mHitCounters.clear();
+    }
+
+    @Override
+    public boolean setOffloadState(boolean enabled) throws RemoteException {
+        mOffloadState = enabled;
+        return mOffloadState;
+    }
+
+    /**
+     * @see IMdnsOffload#addProtocolResponses
+     *
+     * Note that we do not deduplicate records here, since it is explicitly not part of the vendor
+     * spec.
+     */
+    @Override
+    public int addProtocolResponses(String iface, MdnsProtocolData protocolData)
+        throws RemoteException {
+        OffloadData offloadData = getOffloadData(iface);
+        if (offloadData.offloadedRecords.size() < OFFLOAD_CAPACITY) {
+            offloadData.offloadedRecords.add(protocolData);
+            int id = mNextId++;
+            mProtocolDataById.put(id, protocolData);
+            log("Added offloaded data with key %d on iface %s", id, iface);
+            return id;
+        }
+        log("Failed to add offloaded data on iface %s", iface);
+        return -1;
+    }
+
+    @Override
+    public void removeProtocolResponses(int recordKey) throws RemoteException {
+        for (OffloadData offloadData : mOffloadDataByInterface.values()) {
+            offloadData.offloadedRecords.remove(mProtocolDataById.get(recordKey));
+        }
+        MdnsProtocolData removed = mProtocolDataById.remove(recordKey);
+        if (removed != null) {
+            log("Removed offloaded record %d.", recordKey);
+        } else {
+            log("Failed to remove offloaded record %s.", recordKey);
+        }
+    }
+
+    @Override
+    public int getAndResetHitCounter(int recordKey) throws RemoteException {
+        int count = mHitCounters.getOrDefault(recordKey, 0);
+        mHitCounters.remove(recordKey);
+        return count;
+    }
+
+    @Override
+    public int getAndResetMissCounter() throws RemoteException {
+        int count = mMissCounter;
+        mMissCounter = 0;
+        return count;
+    }
+
+    @Override
+    public boolean addToPassthroughList(String iface, String qname)
+        throws RemoteException {
+        OffloadData offloadData = getOffloadData(iface);
+        if (offloadData.passthroughQNames.size() < PASSTHROUGH_CAPACITY
+                && qname.length() <= MAX_QNAME_LENGTH) {
+            offloadData.passthroughQNames.add(qname);
+            log("Added %s to PT list for iface %s", qname, iface);
+            return true;
+        }
+        log("Failed to add %s to PT list for iface %s", qname, iface);
+        return false;
+    }
+
+    @Override
+    public void removeFromPassthroughList(String iface, String qname)
+        throws RemoteException {
+        boolean removed = getOffloadData(iface).passthroughQNames.remove(qname);
+        if (removed) {
+            log("Removed %s from PT list for iface %s", qname, iface);
+        } else {
+            log("Failed to remove %s from PT list for iface %s", qname, iface);
+        }
+    }
+
+    @Override
+    public void setPassthroughBehavior(String iface, byte behavior)
+        throws RemoteException {
+        if (!List.of(
+            PassthroughBehavior.FORWARD_ALL,
+            PassthroughBehavior.DROP_ALL,
+            PassthroughBehavior.PASSTHROUGH_LIST).contains(behavior)) {
+            throw new IllegalArgumentException("Invalid passthrough behavior");
+        }
+        getOffloadData(iface).passthroughBehavior = behavior;
+        log("Set PT behavior to %d for iface %s", behavior, iface);
+    }
+
+    @Override
+    public int getInterfaceVersion() throws RemoteException {
+        return 0;
+    }
+
+    @Override
+    public String getInterfaceHash() throws RemoteException {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public IInterface queryLocalInterface(@NonNull String descriptor) {
+        return this;
+    }
+
+    private void log(String pattern, Object... args) {
+        Log.d(TAG, String.format(pattern, args));
+    }
+}
diff --git a/MdnsOffloadManagerService/tests/src/com/android/tv/mdnsoffloadmanager/MdnsOffloadManagerTest.java b/MdnsOffloadManagerService/tests/src/com/android/tv/mdnsoffloadmanager/MdnsOffloadManagerTest.java
new file mode 100644
index 0000000..0d801dd
--- /dev/null
+++ b/MdnsOffloadManagerService/tests/src/com/android/tv/mdnsoffloadmanager/MdnsOffloadManagerTest.java
@@ -0,0 +1,800 @@
+/*
+ * Copyright (C) 2023 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.android.tv.mdnsoffloadmanager;
+
+import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET;
+import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
+import static com.android.tv.mdnsoffloadmanager.TestHelpers.SERVICE_AIRPLAY;
+import static com.android.tv.mdnsoffloadmanager.TestHelpers.SERVICE_ATV;
+import static com.android.tv.mdnsoffloadmanager.TestHelpers.SERVICE_GOOGLECAST;
+import static com.android.tv.mdnsoffloadmanager.TestHelpers.SERVICE_GTV;
+import static com.android.tv.mdnsoffloadmanager.TestHelpers.makeIntent;
+import static com.android.tv.mdnsoffloadmanager.TestHelpers.makeLinkProperties;
+import static com.android.tv.mdnsoffloadmanager.TestHelpers.makeLowPowerStandbyPolicy;
+import static com.android.tv.mdnsoffloadmanager.TestHelpers.verifyOffloadedServices;
+import static com.android.tv.mdnsoffloadmanager.TestHelpers.verifyPassthroughQNames;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyByte;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.notNull;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+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.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.net.ConnectivityManager;
+import android.net.ConnectivityManager.NetworkCallback;
+import android.net.Network;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.PowerManager;
+import android.os.RemoteException;
+import android.os.test.TestLooper;
+
+import androidx.test.filters.SmallTest;
+
+import com.android.tv.mdnsoffloadmanager.MdnsOffloadManagerService.Injector;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+
+import java.util.Arrays;
+import java.util.List;
+
+import device.google.atv.mdns_offload.IMdnsOffload.MdnsProtocolData;
+import device.google.atv.mdns_offload.IMdnsOffload.MdnsProtocolData.MatchCriteria;
+import device.google.atv.mdns_offload.IMdnsOffload.PassthroughBehavior;
+import device.google.atv.mdns_offload.IMdnsOffloadManager;
+
+@SmallTest
+public class MdnsOffloadManagerTest {
+
+    private static final ComponentName VENDOR_SERVICE_COMPONENT =
+        ComponentName.unflattenFromString("test.vendor.offloadservice/.TestOffloadService");
+    private static final String[] PRIORITY_LIST = {
+        "_googlecast._tcp.local.",
+        "_some._other._svc.local."
+    };
+    private static final String IFC_0 = "imaginaryif0";
+    private static final String IFC_1 = "imaginaryif1";
+    private static final int APP_UID_0 = 1234;
+    private static final int SECONDARY_USER_APP_UID_0 = 101234;
+    private static final int APP_UID_1 = 1235;
+    private static final String APP_PACKAGE_0 = "first.app.package";
+    private static final String APP_PACKAGE_1 = "some.other.package";
+
+    @Mock Resources mResources;
+    @Mock IBinder mClientBinder0;
+    @Mock IBinder mClientBinder1;
+    @Mock ConnectivityManager mConnectivityManager;
+    @Mock Network mNetwork0;
+    @Mock Network mNetwork1;
+    @Mock PackageManager mPackageManager;
+    @Spy FakeMdnsOffloadService mVendorService = new FakeMdnsOffloadService();
+    @Captor ArgumentCaptor<NetworkCallback> mNetworkCallbackCaptor;
+    @Captor ArgumentCaptor<IBinder.DeathRecipient> mDeathRecipientCaptor;
+
+    TestLooper mTestLooper;
+    ServiceConnection mCapturedVendorServiceConnection;
+    BroadcastReceiver mCapturedScreenBroadcastReceiver;
+    BroadcastReceiver mCapturedLowPowerStandbyPolicyReceiver;
+    MdnsOffloadManagerService mOffloadManagerService;
+    IMdnsOffloadManager mOffloadManagerBinder;
+    boolean mIsInteractive;
+    int mCallingUid;
+    PowerManager.LowPowerStandbyPolicy mLowPowerStandbyPolicy;
+
+    @Before
+    public void setup() throws PackageManager.NameNotFoundException {
+        mTestLooper = new TestLooper();
+        MockitoAnnotations.initMocks(this);
+        when(mResources.getString(eq(R.string.config_mdnsOffloadVendorServiceComponent)))
+            .thenReturn(VENDOR_SERVICE_COMPONENT.flattenToShortString());
+        when(mResources.getStringArray(eq(R.array.config_mdnsOffloadPriorityQnames)))
+            .thenReturn(PRIORITY_LIST);
+        when(mPackageManager.getPackageUid(eq(APP_PACKAGE_0), anyInt())).thenReturn(APP_UID_0);
+        when(mPackageManager.getPackageUid(eq(APP_PACKAGE_1), anyInt())).thenReturn(APP_UID_1);
+        mLowPowerStandbyPolicy = makeLowPowerStandbyPolicy(APP_PACKAGE_0);
+        mCallingUid = APP_UID_0;
+        mIsInteractive = true;
+    }
+
+    private void createOffloadManager() {
+        mOffloadManagerService = new MdnsOffloadManagerService(new Injector() {
+            @Override
+            Resources getResources() {
+                return mResources;
+            }
+
+            @Override
+            synchronized Looper getLooper() {
+                return mTestLooper.getLooper();
+            }
+
+            @Override
+            boolean isInteractive() {
+                return mIsInteractive;
+            }
+
+            @Override
+            int getCallingUid() {
+                return mCallingUid;
+            }
+
+            @Override
+            ConnectivityManager getConnectivityManager() {
+                return mConnectivityManager;
+            }
+
+            @Override
+            PowerManager.LowPowerStandbyPolicy getLowPowerStandbyPolicy() {
+                return mLowPowerStandbyPolicy;
+            }
+
+            @Override
+            PackageManager getPackageManager() {
+                return mPackageManager;
+            }
+
+            @Override
+            boolean bindService(Intent intent, ServiceConnection connection, int flags) {
+                if (!VENDOR_SERVICE_COMPONENT.equals(intent.getComponent())) {
+                    fail("MDNS offload manager is expected to bind to the component provided in " +
+                            "the resources.");
+                }
+                if (flags != Context.BIND_AUTO_CREATE) {
+                    fail("MDNS offload manager is expected to set BIND_AUTO_CREATE flag when " +
+                            "binding to vendor service.");
+                }
+                mCapturedVendorServiceConnection = connection;
+                return true;
+            }
+
+            @Override
+            void registerReceiver(BroadcastReceiver receiver, IntentFilter filter, int flags) {
+                if (filter.countActions() == 2 &&
+                        filter.hasAction(Intent.ACTION_SCREEN_ON) &&
+                        filter.hasAction(Intent.ACTION_SCREEN_OFF)) {
+                    mCapturedScreenBroadcastReceiver = receiver;
+                    return;
+                } else if (filter.countActions() == 1 &&
+                        filter.hasAction(PowerManager.ACTION_LOW_POWER_STANDBY_POLICY_CHANGED)) {
+                    mCapturedLowPowerStandbyPolicyReceiver = receiver;
+                    return;
+                }
+                fail("Unexpected broadcast receiver registered.");
+            }
+        });
+
+        mOffloadManagerService.onCreate();
+        mOffloadManagerBinder = (IMdnsOffloadManager) mOffloadManagerService.onBind(null);
+        verify(mConnectivityManager).registerNetworkCallback(
+                argThat(request ->
+                        Arrays.stream(request.getTransportTypes())
+                                .boxed()
+                                .toList()
+                                .containsAll(List.of(TRANSPORT_ETHERNET, TRANSPORT_WIFI))),
+                mNetworkCallbackCaptor.capture());
+    }
+
+    private void bindVendorService() {
+        mCapturedVendorServiceConnection.onServiceConnected(
+            VENDOR_SERVICE_COMPONENT, mVendorService);
+        mTestLooper.dispatchAll();
+    }
+
+    private void unbindVendorService() {
+        mCapturedVendorServiceConnection.onServiceDisconnected(VENDOR_SERVICE_COMPONENT);
+        mTestLooper.dispatchAll();
+    }
+
+    private void registerNetwork(Network network, String networkInterface) {
+        when(mConnectivityManager.getLinkProperties(eq(network))).thenReturn(
+                makeLinkProperties(networkInterface));
+        mNetworkCallbackCaptor.getValue().onAvailable(network);
+        mTestLooper.dispatchAll();
+    }
+
+    private void unregisterNetwork(Network network) {
+        mNetworkCallbackCaptor.getValue().onLost(network);
+        mTestLooper.dispatchAll();
+    }
+
+    private void setupDefaultOffloadManager() {
+        createOffloadManager();
+        bindVendorService();
+        registerNetwork(mNetwork0, IFC_0);
+    }
+
+    @Test
+    public void whenCreated_setsListenersAndBindsService() throws RemoteException {
+        setupDefaultOffloadManager();
+
+        assertNotNull(mCapturedVendorServiceConnection);
+        assertNotNull(mCapturedScreenBroadcastReceiver);
+        verify(mConnectivityManager).registerNetworkCallback(any(), (NetworkCallback) notNull());
+        // Vendor offload is reset on binding.
+        verify(mVendorService).resetAll();
+        assertFalse(mVendorService.mOffloadState);
+        assertEquals(0, mVendorService.getOffloadData(IFC_0).offloadedRecords.size());
+    }
+
+
+    @Test
+    public void whenOffloadingRecord_propagatesToVendorService() throws RemoteException {
+        setupDefaultOffloadManager();
+
+        int recordKey = mOffloadManagerBinder.addProtocolResponses(
+                IFC_0, SERVICE_ATV, mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        assertTrue("Expected a valid record key", recordKey > 0);
+        FakeMdnsOffloadService.OffloadData offloadData = mVendorService.getOffloadData(IFC_0);
+        assertEquals(1, offloadData.offloadedRecords.size());
+        MdnsProtocolData protocolData = offloadData.offloadedRecords.get(0);
+        assertEquals(SERVICE_ATV.rawOffloadPacket, protocolData.rawOffloadPacket);
+        assertEquals(1, protocolData.matchCriteriaList.size());
+        MatchCriteria matchCriteria = protocolData.matchCriteriaList.get(0);
+        assertEquals(0x01, matchCriteria.type); // Type A response
+        assertEquals(12, matchCriteria.nameOffset);
+    }
+
+    /**
+     * Multiple records must be offloaded in the correct order, as memory for offloaded records is
+     * limited and the first records must take precedence over the subsequent ones.
+     */
+    @Test
+    public void offloadingOrderIsMaintained() throws RemoteException {
+        setupDefaultOffloadManager();
+
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_GTV, mClientBinder0);
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_AIRPLAY, mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV, SERVICE_GTV, SERVICE_AIRPLAY);
+    }
+
+    /**
+     * When removing a record, offload of the rest of the records is re-applied in the same order
+     * as before.
+     */
+    @Test
+    public void removingOffloadedRecord_maintainsOrder() throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        int gtvRecordKey = mOffloadManagerBinder.addProtocolResponses(
+                IFC_0, SERVICE_GTV, mClientBinder0);
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_AIRPLAY, mClientBinder0);
+        mTestLooper.dispatchAll();
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV, SERVICE_GTV, SERVICE_AIRPLAY);
+
+        mOffloadManagerBinder.removeProtocolResponses(gtvRecordKey, mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV, SERVICE_AIRPLAY);
+    }
+
+    @Test
+    public void removingInvalidRecordKey_doesNothing() throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_GTV, mClientBinder0);
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_AIRPLAY, mClientBinder0);
+        mTestLooper.dispatchAll();
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV, SERVICE_GTV, SERVICE_AIRPLAY);
+
+        mOffloadManagerBinder.removeProtocolResponses(1337, mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV, SERVICE_GTV, SERVICE_AIRPLAY);
+    }
+
+    @Test
+    public void removingRecordHoldingInvalidClientBinder_doesNothing() throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        int recordKey = mOffloadManagerBinder.addProtocolResponses(
+                IFC_0, SERVICE_GTV, mClientBinder0);
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_AIRPLAY, mClientBinder0);
+        mTestLooper.dispatchAll();
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV, SERVICE_GTV, SERVICE_AIRPLAY);
+
+        mOffloadManagerBinder.removeProtocolResponses(recordKey, mClientBinder1);
+        mTestLooper.dispatchAll();
+
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV, SERVICE_GTV, SERVICE_AIRPLAY);
+    }
+
+    @Test
+    public void recordsFromPriorityListAreOffloadedFirst() throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_GTV, mClientBinder0);
+        mTestLooper.dispatchAll();
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV, SERVICE_GTV);
+
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_GOOGLECAST, mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_GOOGLECAST, SERVICE_ATV, SERVICE_GTV);
+    }
+
+    @Test
+    public void whenOutOfMemoryCapacity_priorityListRecordsAreNotEvicted() throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_GTV, mClientBinder0);
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_AIRPLAY, mClientBinder0);
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_GOOGLECAST, mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        verifyOffloadedServices(
+                mVendorService, IFC_0, SERVICE_GOOGLECAST, SERVICE_ATV, SERVICE_GTV);
+    }
+
+    @Test
+    public void priorityListNamesAreCanonicalized() throws RemoteException {
+        when(mResources.getStringArray(eq(R.array.config_mdnsOffloadPriorityQnames)))
+            .thenReturn(new String[]{"_googlecast._tcp.local"}); // Trailing dot is missing.
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_GOOGLECAST, mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_GOOGLECAST, SERVICE_ATV);
+    }
+
+    @Test
+    public void addingToPassthroughList_setsPassthroughBehaviorAndPropagatesToVendorService()
+        throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "atv", mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        assertEquals(
+                PassthroughBehavior.PASSTHROUGH_LIST,
+                mVendorService.getOffloadData(IFC_0).passthroughBehavior);
+        verifyPassthroughQNames(mVendorService, IFC_0, "atv");
+    }
+
+    /**
+     * Order of passthrough QNames must be maintained, as the vendor service will drop passthrough
+     * QNames if the chip runs out of memory.
+     */
+    @Test
+    public void passthroughOrderIsMaintained() throws RemoteException {
+        setupDefaultOffloadManager();
+
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "atv", mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "airplay", mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        assertEquals(
+                PassthroughBehavior.PASSTHROUGH_LIST,
+                mVendorService.getOffloadData(IFC_0).passthroughBehavior);
+        verifyPassthroughQNames(mVendorService, IFC_0, "atv", "gtv", "airplay");
+    }
+
+    @Test
+    public void removingPassthroughQName_maintainsOrder() throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "atv", mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "airplay", mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        mOffloadManagerBinder.removeFromPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        assertEquals(
+                PassthroughBehavior.PASSTHROUGH_LIST,
+                mVendorService.getOffloadData(IFC_0).passthroughBehavior);
+        verifyPassthroughQNames(mVendorService, IFC_0, "atv", "airplay");
+    }
+
+    @Test
+    public void removingNonexistentPassthroughQName_doesNothing() throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "atv", mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "airplay", mClientBinder0);
+        mTestLooper.dispatchAll();
+        reset(mVendorService); // Forget previous calls related to passthrough.
+
+        mOffloadManagerBinder.removeFromPassthroughList(
+                IFC_0, "otherservice", mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        verify(mVendorService, never()).setPassthroughBehavior(eq(IFC_0), anyByte());
+        verify(mVendorService, never()).removeFromPassthroughList(eq(IFC_0), anyString());
+        assertEquals(
+                PassthroughBehavior.PASSTHROUGH_LIST,
+                mVendorService.getOffloadData(IFC_0).passthroughBehavior);
+        verifyPassthroughQNames(mVendorService, IFC_0, "atv", "gtv", "airplay");
+    }
+
+    @Test
+    public void removingPassthroughQNameHoldingInvalidClientBinder_doesNothing()
+        throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "atv", mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "airplay", mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        mOffloadManagerBinder.removeFromPassthroughList(IFC_0, "gtv", mClientBinder1);
+        mTestLooper.dispatchAll();
+
+        verifyPassthroughQNames(mVendorService, IFC_0, "atv", "gtv", "airplay");
+    }
+
+    @Test
+    public void removingAllEntriesFromPassthroughList_disablesPassthroughBehavior()
+        throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "atv", mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mTestLooper.dispatchAll();
+        assertEquals(
+                PassthroughBehavior.PASSTHROUGH_LIST,
+                mVendorService.getOffloadData(IFC_0).passthroughBehavior);
+
+        mOffloadManagerBinder.removeFromPassthroughList(IFC_0, "atv", mClientBinder0);
+        mOffloadManagerBinder.removeFromPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        assertEquals(
+                PassthroughBehavior.DROP_ALL,
+                mVendorService.getOffloadData(IFC_0).passthroughBehavior);
+    }
+
+    @Test
+    public void passthroughQNamesFromPriorityListTakePrecedence() throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "atv", mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mTestLooper.dispatchAll();
+        verifyPassthroughQNames(mVendorService, IFC_0, "atv", "gtv");
+
+        mOffloadManagerBinder.addToPassthroughList(
+                IFC_0, "_googlecast._tcp.local", mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        verifyPassthroughQNames(mVendorService, IFC_0, "_googlecast._tcp.local", "atv", "gtv");
+    }
+
+    /**
+     * TODO(b/271353749#comment43) Remove this requirement once vendor implementations support
+     * case-insensitive string comparisons.
+     */
+    @Test
+    public void passthroughPreservesCase() throws RemoteException {
+        setupDefaultOffloadManager();
+
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "_SERVICE012._gtv.local", mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        verifyPassthroughQNames(mVendorService, IFC_0, "_SERVICE012._gtv.local");
+    }
+
+    @Test
+    public void whenOutOfMemoryCapacity_priorityListQNamesAreNotEvicted() throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "atv", mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "another", mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "service", mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(
+                IFC_0, "_googlecast._tcp.local", mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        verifyPassthroughQNames(
+                mVendorService, IFC_0, "_googlecast._tcp.local", "atv", "gtv", "another");
+    }
+
+    @Test
+    public void whenVendorServiceBindsLate_offloadsData() throws RemoteException {
+        createOffloadManager();
+        registerNetwork(mNetwork0, IFC_0);
+        int recordKey = mOffloadManagerBinder.addProtocolResponses(
+                IFC_0, SERVICE_ATV, mClientBinder0);
+        assertTrue("Expected a valid record key", recordKey > 0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        bindVendorService();
+
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "gtv");
+    }
+
+    @Test
+    public void whenVendorServiceReconnects_restoresOffloadData() throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mTestLooper.dispatchAll();
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "gtv");
+
+        unbindVendorService();
+        mVendorService = new FakeMdnsOffloadService();
+        bindVendorService();
+
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "gtv");
+    }
+
+    @Test
+    public void whenClientDies_cleansUpOffloadData() throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_GOOGLECAST, mClientBinder1);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "airplay", mClientBinder1);
+        mTestLooper.dispatchAll();
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_GOOGLECAST, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "gtv", "airplay");
+
+        verify(mClientBinder1, atLeastOnce())
+                .linkToDeath(mDeathRecipientCaptor.capture(), eq(0));
+        mDeathRecipientCaptor.getAllValues().forEach(IBinder.DeathRecipient::binderDied);
+        mTestLooper.dispatchAll();
+
+        // Offload data owned by other clients is left untouched.
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "gtv");
+    }
+
+    @Test
+    public void whenNonInteractiveMode_enablesOffload() throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        mCapturedScreenBroadcastReceiver.onReceive(
+                mock(Context.class), makeIntent(Intent.ACTION_SCREEN_OFF));
+        mTestLooper.dispatchAll();
+
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "gtv");
+        assertTrue(mVendorService.mOffloadState);
+    }
+
+    @Test
+    public void whenInteractiveMode_disablesOffloadAndRetrievesMetrics() throws RemoteException {
+        setupDefaultOffloadManager();
+        int recordKey = mOffloadManagerBinder.addProtocolResponses(
+                IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mTestLooper.dispatchAll();
+        mCapturedScreenBroadcastReceiver.onReceive(
+                mock(Context.class), makeIntent(Intent.ACTION_SCREEN_OFF));
+        mTestLooper.dispatchAll();
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "gtv");
+        assertTrue(mVendorService.mOffloadState);
+        reset(mVendorService); // Forget previous calls to hit/miss counter methods.
+
+        mCapturedScreenBroadcastReceiver.onReceive(
+                mock(Context.class), makeIntent(Intent.ACTION_SCREEN_ON));
+        mTestLooper.dispatchAll();
+
+        assertFalse(mVendorService.mOffloadState);
+        verify(mVendorService).getAndResetHitCounter(eq(recordKey));
+        verify(mVendorService).getAndResetMissCounter();
+        // Offloaded records are untouched.
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "gtv");
+    }
+
+    @Test
+    public void whenNetworkNotAvailable_noOffloadOrPassthrough() throws RemoteException {
+        createOffloadManager();
+        bindVendorService();
+
+        int recordKey = mOffloadManagerBinder.addProtocolResponses(
+                IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "atv", mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        assertTrue("Expected a valid record key", recordKey > 0);
+        verifyOffloadedServices(mVendorService, IFC_0);
+        verifyPassthroughQNames(mVendorService, IFC_0);
+        assertEquals(
+                PassthroughBehavior.DROP_ALL,
+                mVendorService.getOffloadData(IFC_0).passthroughBehavior);
+    }
+
+    @Test
+    public void whenNetworkBecomesAvailableLate_offloadsData() throws RemoteException {
+        createOffloadManager();
+        bindVendorService();
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        registerNetwork(mNetwork0, IFC_0);
+
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "gtv");
+    }
+
+    @Test
+    public void whenNetworkLost_removesOffloadData() throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mTestLooper.dispatchAll();
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "gtv");
+
+        unregisterNetwork(mNetwork0);
+
+        verifyOffloadedServices(mVendorService, IFC_0);
+        verifyPassthroughQNames(mVendorService, IFC_0);
+        assertEquals(
+                PassthroughBehavior.DROP_ALL,
+                mVendorService.getOffloadData(IFC_0).passthroughBehavior);
+    }
+
+    @Test
+    public void whenNetworkLost_maintainsOffloadDataOnOtherInterfaces() throws RemoteException {
+        setupDefaultOffloadManager();
+        registerNetwork(mNetwork1, IFC_1);
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mOffloadManagerBinder.addProtocolResponses(IFC_1, SERVICE_GOOGLECAST, mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_1, "airplay", mClientBinder0);
+        mTestLooper.dispatchAll();
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "gtv");
+        verifyOffloadedServices(mVendorService, IFC_1, SERVICE_GOOGLECAST);
+        verifyPassthroughQNames(mVendorService, IFC_1, "airplay");
+
+        unregisterNetwork(mNetwork1);
+
+        // Offload data on IFC_0 is left untouched.
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "gtv");
+        assertEquals(
+                PassthroughBehavior.PASSTHROUGH_LIST,
+                mVendorService.getOffloadData(IFC_0).passthroughBehavior);
+        verifyOffloadedServices(mVendorService, IFC_1);
+        verifyPassthroughQNames(mVendorService, IFC_1);
+        assertEquals(
+                PassthroughBehavior.DROP_ALL,
+                mVendorService.getOffloadData(IFC_1).passthroughBehavior);
+    }
+
+    @Test
+    public void whenNetworkRecovers_restoresOffloadData() throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "gtv", mClientBinder0);
+        mTestLooper.dispatchAll();
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "gtv");
+        unregisterNetwork(mNetwork0);
+        verifyOffloadedServices(mVendorService, IFC_0);
+        verifyPassthroughQNames(mVendorService, IFC_0);
+
+        registerNetwork(mNetwork0, IFC_0);
+
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "gtv");
+        assertEquals(
+                PassthroughBehavior.PASSTHROUGH_LIST,
+                mVendorService.getOffloadData(IFC_0).passthroughBehavior);
+    }
+
+    @Test
+    public void callingPackageNotOnLowPowerExemptedList_dataNotOffloaded() throws RemoteException {
+        setupDefaultOffloadManager();
+        mCallingUid = APP_UID_1;
+
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "atv", mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        verifyOffloadedServices(mVendorService, IFC_0);
+        verifyPassthroughQNames(mVendorService, IFC_0);
+    }
+
+    @Test
+    public void packageRemovedFromLowPowerExemptedList_correspondingDataIsCleared()
+            throws RemoteException {
+        setupDefaultOffloadManager();
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "atv", mClientBinder0);
+        mTestLooper.dispatchAll();
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "atv");
+
+        mLowPowerStandbyPolicy = makeLowPowerStandbyPolicy(APP_PACKAGE_1);
+        mCapturedLowPowerStandbyPolicyReceiver.onReceive(
+                mock(Context.class),
+                makeIntent(PowerManager.ACTION_LOW_POWER_STANDBY_POLICY_CHANGED));
+        mTestLooper.dispatchAll();
+
+        verifyOffloadedServices(mVendorService, IFC_0);
+        verifyPassthroughQNames(mVendorService, IFC_0);
+    }
+
+    @Test
+    public void packageAddedToLowPowerExemptedList_dataIsOffloaded() throws RemoteException {
+        setupDefaultOffloadManager();
+        mCallingUid = APP_UID_1;
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "atv", mClientBinder0);
+        mTestLooper.dispatchAll();
+        verifyOffloadedServices(mVendorService, IFC_0);
+        verifyPassthroughQNames(mVendorService, IFC_0);
+
+        mLowPowerStandbyPolicy = makeLowPowerStandbyPolicy(APP_PACKAGE_0, APP_PACKAGE_1);
+        mCapturedLowPowerStandbyPolicyReceiver.onReceive(
+                mock(Context.class),
+                makeIntent(PowerManager.ACTION_LOW_POWER_STANDBY_POLICY_CHANGED));
+        mTestLooper.dispatchAll();
+
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "atv");
+    }
+
+    /**
+     * Ensure package allowlist is maintained by app ID, not UID (which is assigned per app & user
+     * combination).
+     */
+    @Test
+    public void secondaryUser_packageIsAllowlisted() throws RemoteException {
+        setupDefaultOffloadManager();
+        mCallingUid = SECONDARY_USER_APP_UID_0;
+
+        mOffloadManagerBinder.addProtocolResponses(IFC_0, SERVICE_ATV, mClientBinder0);
+        mOffloadManagerBinder.addToPassthroughList(IFC_0, "atv", mClientBinder0);
+        mTestLooper.dispatchAll();
+
+        verifyOffloadedServices(mVendorService, IFC_0, SERVICE_ATV);
+        verifyPassthroughQNames(mVendorService, IFC_0, "atv");
+    }
+}
\ No newline at end of file
diff --git a/MdnsOffloadManagerService/tests/src/com/android/tv/mdnsoffloadmanager/MdnsPacketParserTest.java b/MdnsOffloadManagerService/tests/src/com/android/tv/mdnsoffloadmanager/MdnsPacketParserTest.java
new file mode 100644
index 0000000..c1aeafd
--- /dev/null
+++ b/MdnsOffloadManagerService/tests/src/com/android/tv/mdnsoffloadmanager/MdnsPacketParserTest.java
@@ -0,0 +1,249 @@
+/*
+ * Copyright (C) 2023 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.android.tv.mdnsoffloadmanager;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+
+import androidx.test.filters.SmallTest;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import device.google.atv.mdns_offload.IMdnsOffload.MdnsProtocolData.MatchCriteria;
+
+@SmallTest
+public class MdnsPacketParserTest {
+
+    @Test
+    public void testExtractFullNameFromSingleLabel() {
+        byte[] array = new byte[]{'x', 'x', 'x', 3, 'a', 't', 'v', 0};
+        String fullName = MdnsPacketParser.extractFullName(array, 3);
+        assertEquals("atv.", fullName);
+    }
+
+    @Test
+    public void testExtractFullNameFromPointer() {
+        byte[] array = new byte[]{3, 'i', 's', 'o', 0, (byte) 0xC0, 0x00};
+        String fullName = MdnsPacketParser.extractFullName(array, 5);
+        assertEquals("iso.", fullName);
+    }
+
+    @Test
+    public void testExtractFullNameFromMultiLabel() {
+        byte[] array = new byte[]{'x', 'x', 'x', 3, 'a', 't', 'v', 3, 'g', 't', 'v', 0};
+        String fullName = MdnsPacketParser.extractFullName(array, 3);
+        assertEquals("atv.gtv.", fullName);
+    }
+
+    @Test
+    public void testExtractFullNameFromLabelPointer() {
+        byte[] array = new byte[]{3, 'i', 's', 'o', 0,//
+                3, 'a', 't', 'v', 3, 'g', 't', 'v', (byte) 0xC0, 0x00};
+        String fullName = MdnsPacketParser.extractFullName(array, 9);
+        assertEquals("gtv.iso.", fullName);
+    }
+
+    @Test
+    public void testExtractFullNameFromLabelDualPointerLongOffset() {
+        byte[] array = new byte[]{3, 'i', 's', 'o', 0,//
+                3, 'a', 't', 'v', 3, 'g', 't', 'v', (byte) 0xC0, 0x64};
+
+        //Add the string 4http at offset 0x64 and back to pointer 0x00
+        byte[] longArray = Arrays.copyOf(array, 120);
+        longArray[0x64] = 4;
+        longArray[0x64 + 1] = 'h';
+        longArray[0x64 + 2] = 't';
+        longArray[0x64 + 3] = 't';
+        longArray[0x64 + 4] = 'p';
+        longArray[0x64 + 5] = (byte) 0xC0;
+        longArray[0x64 + 6] = 0x00;
+
+        String fullName = MdnsPacketParser.extractFullName(longArray, 9);
+        assertEquals("gtv.http.iso.", fullName);
+    }
+
+    @Test
+    public void testExtractFullNameBadPointer() {
+        byte[] array = new byte[]{3, 'i', 's', 'o', 0, (byte) 0xC0, 0x20};
+        assertThrows(
+                "Setting cursor on negative offset is not allowed.",
+                IllegalArgumentException.class,
+                () -> MdnsPacketParser.extractFullName(array, -10)
+        );
+    }
+
+    @Test
+    public void testExtractFullNameLabelTooLong() {
+        byte[] longArray = new byte[70];
+        Arrays.fill(longArray, (byte) 'a');
+        // Labels maximum allowed size is 64 so this fall in the unknown categorie of
+        // pointer 01xxxxxx or 10xxxxxx
+        longArray[0] = 65;
+        longArray[66] = 0x00; // ther array is [65, 65 times 'a', 0x00]
+
+        assertThrows(
+                "mDNS response packet is badly formed. Not enough data.",
+                IllegalArgumentException.class,
+                () -> MdnsPacketParser.extractFullName(longArray, 0)
+        );
+    }
+
+    @Test
+    public void testExtractMatchCriteriaFailureQueryCount() {
+        //1 query, 2 answers, 0 authority, 0 additional.
+        byte[] array = new byte[]{0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0};
+        assertThrows(
+                "mDNS response packet contains data that is not answers",
+                IllegalArgumentException.class,
+                () -> MdnsPacketParser.extractMatchCriteria(array)
+        );
+    }
+
+    @Test
+    public void testExtractMatchCriteriaFailureAuthorityCount() {
+        //0 query, 2 answers, 2 authority, 0 additional.
+        byte[] array = new byte[]{0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0};
+        assertThrows(
+                "mDNS response packet contains data that is not answers",
+                IllegalArgumentException.class,
+                () -> MdnsPacketParser.extractMatchCriteria(array)
+        );
+    }
+
+    @Test
+    public void testExtractMatchCriteriaFailureAdditionalCount() {
+        //0 query, 2 answers, 0 authority, 3 additional.
+        byte[] array = new byte[]{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 3};
+        assertThrows(
+                "mDNS response packet contains data that is not answers",
+                IllegalArgumentException.class,
+                () -> MdnsPacketParser.extractMatchCriteria(array)
+        );
+    }
+
+    @Test
+    public void testExtractMatchCriteriaSuccessOneAnswerLabel() {
+        byte[] array = new byte[]{
+                0, 0, 0, 0,//Id , Flags
+                0, 0, 0, 1, 0, 0, 0, 0,// Header section. 1 answer.
+                //Data 1
+                3, 'a', 't', 'v', 0x00, //atv.
+                0x00, 0x01, //type A
+                (byte) 0x80, 0x01,//cache flush: True, class: in
+                0, 0, 0, 5,// TTL 5sec
+                0, 4, // Data with size 4
+                100, 80, 40, 20 //ip: 100.80.40.20
+        };
+
+        List<MatchCriteria> criteria = MdnsPacketParser.extractMatchCriteria(array);
+
+        assertEquals(1, criteria.size());
+
+        MatchCriteria result = criteria.get(0);
+        assertEquals(12, result.nameOffset);
+        assertEquals(1, result.type);
+    }
+
+    @Test
+    public void testExtractMatchCriteriaSuccessTwoAnswersPointers() {
+        byte[] array = new byte[]{
+                0, 0, 0, 0,//Id , Flags
+                0, 0, 0, 2, 0, 0, 0, 0,// Header section. 2 answers.
+                //Data 1
+                3, 'a', 't', 'v', 0x00, //atv.
+                0x00, 0x01, //type A
+                (byte) 0x80, 0x01,//cache flush: True, class: in
+                0, 0, 0, 5,// TTL 5sec
+                0, 4, // Data with size 4
+                100, 80, 40, 20, //ip: 100.80.40.20
+                //Data 2
+                3, 'g', 't', 'v', (byte) 0b11000000, 12, //gtv.[ptr->]atv.
+                0x00, 16, //type TXT
+                (byte) 0x80, 0x01,//cache flush: True, class: in
+                0, 0, 0, 5,// TTL 5sec
+                0, 3, // Data with size 3
+                'i', 's', 'o' // "iso"
+        };
+
+        List<MatchCriteria> criteria = MdnsPacketParser.extractMatchCriteria(array);
+
+        assertEquals(2, criteria.size());
+
+        MatchCriteria result0 = criteria.get(0);
+        assertEquals(12, result0.nameOffset);
+        assertEquals(1, result0.type);
+
+        MatchCriteria result1 = criteria.get(1);
+        assertEquals(31, result1.nameOffset);
+        assertEquals(16, result1.type);
+    }
+
+    @Test
+    public void testExtractFullName() {
+        byte[] array = new byte[]{
+            0, 0, 0, 0,//Id , Flags
+            0, 0, 0, 2, 0, 0, 0, 0,// Header section. 2 answers.
+            //Data 1
+            3, 'a', 't', 'v', 0x00, //atv.
+            0x00, 0x01, //type A
+            (byte) 0x80, 0x01,//cache flush: True, class: in
+            0, 0, 0, 5,// TTL 5sec
+            0, 4, // Data with size 4
+            100, 80, 40, 20, //ip: 100.80.40.20
+            //Data 2
+            3, 'g', 't', 'v', (byte) 0b11000000, 12, //gtv.[ptr->]atv.
+            0x00, 16, //type TXT
+            (byte) 0x80, 0x01,//cache flush: True, class: in
+            0, 0, 0, 5,// TTL 5sec
+            0, 3, // Data with size 3
+            'i', 's', 'o' // "iso"
+        };
+
+        List<MatchCriteria> criteria = MdnsPacketParser.extractMatchCriteria(array);
+        assertEquals(2, criteria.size());
+        String name0 = MdnsPacketParser.extractFullName(array, criteria.get(0).nameOffset);
+        assertEquals("atv.", name0);
+        String name1 = MdnsPacketParser.extractFullName(array, criteria.get(1).nameOffset);
+        assertEquals("gtv.atv.", name1);
+    }
+
+    @Test
+    public void testExtractMatchCriteriaFailureTooMuchData() {
+        byte[] array = new byte[]{
+                0, 0, 0, 0,//Id , Flags
+                0, 0, 0, 1, 0, 0, 0, 0,// Header section. 2 answers.
+                //Data 1
+                3, 'a', 't', 'v', 0x00, //atv.
+                0x00, 0x01, //type A
+                (byte) 0x80, 0x01,//cache flush: True, class: in
+                0, 0, 0, 5,// TTL 5sec
+                0, 4, // Data with size 4
+                100, 80, 40, 20, //ip: 100.80.40.20
+                //extra data.
+                'e','x','t','r','a'
+        };
+
+        assertThrows(
+                "mDNS response packet is badly formed. Too much data.",
+                IllegalArgumentException.class,
+                () -> MdnsPacketParser.extractMatchCriteria(array)
+        );
+    }
+
+}
\ No newline at end of file
diff --git a/MdnsOffloadManagerService/tests/src/com/android/tv/mdnsoffloadmanager/TestHelpers.java b/MdnsOffloadManagerService/tests/src/com/android/tv/mdnsoffloadmanager/TestHelpers.java
new file mode 100644
index 0000000..46960d1
--- /dev/null
+++ b/MdnsOffloadManagerService/tests/src/com/android/tv/mdnsoffloadmanager/TestHelpers.java
@@ -0,0 +1,146 @@
+package com.android.tv.mdnsoffloadmanager;
+
+import static org.junit.Assert.assertEquals;
+
+import android.content.Intent;
+import android.net.LinkProperties;
+import android.os.PowerManager;
+
+import device.google.atv.mdns_offload.IMdnsOffloadManager.OffloadServiceInfo;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class TestHelpers {
+
+    static final OffloadServiceInfo SERVICE_ATV
+        = makeOffloadServiceInfo("", "atv", "somedevice", new byte[]{
+            0, 0, 0, 0,             // Id, Flags
+            0, 0, 0, 1, 0, 0, 0, 0, // Header section, 1 answer
+
+            // Data 1:
+            3, 'a', 't', 'v', 0x00, // "atv."
+            0x00, 0x01,             // Type A
+            (byte) 0x80, 0x01,      // Cache flush: True, class: in
+            0, 0, 0, 5,             // TTL 5sec
+            0, 4,                   // Data with size 4
+            100, 80, 40, 20         // IP: 100.80.40.20
+        });
+
+    static final OffloadServiceInfo SERVICE_AIRPLAY
+        = makeOffloadServiceInfo("", "airplay", "somedevice", new byte[]{
+            0, 0, 0, 0,             // Id, Flags
+            0, 0, 0, 1, 0, 0, 0, 0, // Header section, 1 answer
+
+            // Data 1:
+            7, 'a', 'i', 'r', 'p', 'l', 'a', 'y', 0x00, // "airplay."
+            0x00, 0x01,             // Type A
+            (byte) 0x80, 0x01,      // Cache flush: True, class: in
+            0, 0, 0, 5,             // TTL 5sec
+            0, 4,                   // Data with size 4
+            100, 80, 40, 20         // IP: 100.80.40.20
+        });
+
+    static final OffloadServiceInfo SERVICE_GTV
+        = makeOffloadServiceInfo("gtv", "atv", "somedevice", new byte[]{
+            0, 0, 0, 0,             // Id, Flags
+            0, 0, 0, 2, 0, 0, 0, 0, // Header section, 2 answers
+
+            // Data 1:
+            3, 'a', 't', 'v', 0x00, // "atv."
+            0x00, 0x01,             // Type A
+            (byte) 0x80, 0x01,      // Cache flush: True, class: in
+            0, 0, 0, 5,             // TTL 5sec
+            0, 4,                   // Data with size 4
+            100, 80, 40, 20,        // IP: 100.80.40.20
+
+            // Data 2:
+            3, 'g', 't', 'v',       // "gtv."
+            (byte) 0b11000000, 12,  // [ptr->] "atv."
+            0x00, 16,               // Type TXT
+            (byte) 0x80, 0x01,      // Cache flush: True, class: in
+            0, 0, 0, 5,             // TTL 5sec
+            0, 3,                   // Data with size 3
+            'i', 's', 'o'           // "iso"
+        });
+
+    static final OffloadServiceInfo SERVICE_GOOGLECAST
+        = makeOffloadServiceInfo("_googlecast", "_tcp", "tv-abc", new byte[]{
+            0, 0, 0, 0,             // Id, Flags
+            0, 0, 0, 2, 0, 0, 0, 0, // Header section, 2 answers
+
+            // Data 1:
+            11, '_', 'g', 'o', 'o', 'g', 'l', 'e', 'c', 'a', 's', 't', // "_googlecast."
+            4, '_', 't', 'c', 'p',  // "_tcp."
+            5, 'l', 'o', 'c', 'a', 'l', 0x00,  // "local."
+            0x00, 0x0c,             // Type PTR
+            (byte) 0x80, 0x01,      // Cache flush: True, class: in
+            0, 0, 0, 5,             // TTL 5sec
+            0, 9,                   // Data with size 9
+            6, 't', 'v', '-', 'a', 'b', 'c', // "tv-abc."
+            (byte) 0b11000000, 29,  // [ptr->] "local."
+
+            // Data 2:
+            (byte) 0b11000000, 46,  // [ptr->] "tv-abc.local."
+            0x00, 0x01,             // Type A
+            (byte) 0x80, 0x01,      // Cache flush: True, class: in
+            0, 0, 0, 5,             // TTL 5sec
+            0, 4,                   // Data with size 4
+            100, 80, 40, 20,        // IP: 100.80.40.20
+        });
+
+    static OffloadServiceInfo makeOffloadServiceInfo(String serviceName, String serviceType,
+        String deviceHostName, byte[] rawOffloadPacket) {
+        OffloadServiceInfo serviceInfo = new OffloadServiceInfo();
+        serviceInfo.serviceName = serviceName;
+        serviceInfo.serviceType = serviceType;
+        serviceInfo.deviceHostName = deviceHostName;
+        serviceInfo.rawOffloadPacket = rawOffloadPacket;
+        return serviceInfo;
+    }
+
+    static LinkProperties makeLinkProperties(String interfaceName) {
+        LinkProperties linkProperties = new LinkProperties();
+        linkProperties.setInterfaceName(interfaceName);
+        return linkProperties;
+    }
+
+    static Intent makeIntent(String action) {
+        Intent intent = new Intent();
+        if (action != null) {
+            intent.setAction(action);
+        }
+        return intent;
+    }
+
+    static PowerManager.LowPowerStandbyPolicy makeLowPowerStandbyPolicy(String... exemptPackages) {
+        return new PowerManager.LowPowerStandbyPolicy(
+                "placeholder", Set.of(exemptPackages), 0, Set.of());
+    }
+
+    static void verifyOffloadedServices(
+            FakeMdnsOffloadService offloadService,
+            String networkInterface,
+            OffloadServiceInfo... expectedServices) {
+        List<byte[]> expectedPackets = Arrays.stream(expectedServices)
+                .map(service -> service.rawOffloadPacket)
+                .collect(Collectors.toList());
+        List<byte[]> offloadedPackets = offloadService
+                .getOffloadData(networkInterface)
+                .offloadedRecords
+                .stream()
+                .map(protocolData -> protocolData.rawOffloadPacket)
+                .collect(Collectors.toList());
+        assertEquals(expectedPackets, offloadedPackets);
+    }
+
+    static void verifyPassthroughQNames(
+            FakeMdnsOffloadService offloadService,
+            String networkInterface,
+            String... qNames) {
+        assertEquals(
+                List.of(qNames),
+                offloadService.getOffloadData(networkInterface).passthroughQNames);
+    }
+}
diff --git a/TvSampleLeanbackLauncher/src/main/java/com/example/sampleleanbacklauncher/apps/AppFragment.java b/TvSampleLeanbackLauncher/src/main/java/com/example/sampleleanbacklauncher/apps/AppFragment.java
index 3795625..59897d2 100644
--- a/TvSampleLeanbackLauncher/src/main/java/com/example/sampleleanbacklauncher/apps/AppFragment.java
+++ b/TvSampleLeanbackLauncher/src/main/java/com/example/sampleleanbacklauncher/apps/AppFragment.java
@@ -228,11 +228,9 @@
             mView.findViewById(R.id.frame).setContentDescription(launchItem.getLabel());
             mView.findViewById(R.id.frame).setOnClickListener(this);
 
-            int bannerVisibility = launchItem.getBanner() == null ? View.GONE: View.VISIBLE;
-            mView.findViewById(R.id.banner).setVisibility(bannerVisibility);
+            mView.findViewById(R.id.banner).setVisibility(View.VISIBLE);
 
-            int llVisibility = launchItem.getBanner() == null ? View.GONE: View.VISIBLE;
-            mView.findViewById(R.id.ll).setVisibility(llVisibility);
+            mView.findViewById(R.id.ll).setVisibility(View.VISIBLE);
 
             TextView launchItemLabel = mView.findViewById(R.id.label);
             launchItemLabel.setText(launchItem.getLabel());
diff --git a/libraries/BluetoothServices/res/values-af/strings.xml b/libraries/BluetoothServices/res/values-af/strings.xml
index 8a59e86..ea781b7 100644
--- a/libraries/BluetoothServices/res/values-af/strings.xml
+++ b/libraries/BluetoothServices/res/values-af/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"NVT"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritiek"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Laag"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Goed"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Bevestig opdatering van afstandbeheerder"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Jou afstandbeheerder sal tydens die opdatering dalk tydelik ontkoppel word."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Gaan voort"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Kanselleer"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Opdatering van afstandbeheerder"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Nuwe sagteware is beskikbaar"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Opdatering is beskikbaar"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Afstandbeheerder is op datum"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Kon nie afstandbeheerder opdateer nie"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Ons het \'n kwessie ervaar terwyl ons jou afstandbeheerder opgedateer het. Probeer weer."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Wag asseblief"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Bind jou afstandbeheerder weer saam"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Geaktiveer"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Gedeaktiveer"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Batteryvlak"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Fermware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth-adres"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Vervang asseblief battery"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Lae battery"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Gekoppelde toestelle"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Afstandbeheerders en toebehore"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Dateer jou afstandbeheerder op"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Gereed om te installeer"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"DATEER OP"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"MAAK TOE"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Afstandbeheerder se battery is pap"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Vervang battery binnekort"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Afstandbeheerder se battery is byna leeg"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Vervang battery binnekort"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Afstandbeheerder se battery is leeg"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Vervang battery om afstandbeheerder te gebruik"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Ja"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Nee"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Ontkoppel van %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Koppel aan %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Vergeet %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Hernoem jou gekoppelde toestel"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Aktiveer HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC maak dit vir jou moontlik om ander HDMI-CEC-geaktiveerde toestelle met \'n enkele afstandbeheerder te beheer en outomaties aan of af te skakel.\n\nLet wel: Maak seker HDMI-CEC is op jou TV en ander HDMI-toestelle geaktiveer. Vervaardigers het dikwels ander name vir HDMI-CEC, byvoorbeeld:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Stel afstandbeheerknoppies op"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Beheer volume, krag, invoer op TV\'s, ontvangers en klankbalke"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Batteryvlak: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Bykomstighede"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Afstandbeheer"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Gekoppel"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Voorheen gekoppel"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Bind afstandbeheerder of bykomstigheid saam"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Ontkoppel"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Koppel"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Hernoem"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Vergeet"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Gekoppel"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Ontkoppel"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Toestelbeheer"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Koppel nuwe toestel"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Voordat jy nuwe Bluetooth-toestelle koppel, maak seker hulle is in saambindmodus. Druk en hou %2$s + %3$s vir 3 sekondes om %1$s te koppel."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"\'n Android TV-afstandbeheerder"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Beskikbare toestelle"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Soek tans na toestelle …"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Fout"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Koppel tans …"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Gekoppel"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Gekanselleer"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s kon nie koppel nie"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s is gekoppel"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s is ontkoppel"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"NVT"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritiek"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Laag"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Goed"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Bevestig opdatering van afstandbeheerder"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Jou afstandbeheer sal tydens die opdatering dalk tydelik ontkoppel word."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Gaan voort"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Kanselleer"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Opdatering van afstandbeheerder"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Nuwe sagteware is beskikbaar"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Opdatering is beskikbaar"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Afstandbeheerder is op datum"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Kon nie afstandbeheer opdateer nie"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Ons het \'n kwessie ervaar terwyl ons jou afstandbeheerder opgedateer het. Probeer weer."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Wag asseblief"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Bind jou afstandbeheerder weer saam"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Geaktiveer"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Gedeaktiveer"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Batteryvlak"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Fermware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth-adres"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Vervang asseblief battery"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Battery is amper pap"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Gekoppelde toestelle"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Afstandbeheerders en bykomstighede"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Dateer jou afstandbeheerder op"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Gereed om te installeer"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"DATEER OP"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"MAAK TOE"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Afstandbeheerder se battery is pap"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Vervang battery binnekort"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Afstandbeheerder se battery is amper pap"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Vervang battery binnekort"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Afstandbeheerder se battery is heeltemal pap"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Vervang battery om afstandbeheerder te gebruik"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Ja"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Nee"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Ontkoppel van %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Koppel aan %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Vergeet %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Hernoem jou gekoppelde toestel"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Aktiveer HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC maak dit vir jou moontlik om ander HDMI-CEC-geaktiveerde toestelle met \'n enkele afstandbeheer te beheer en outomaties aan of af te skakel.\n\nLet wel: Maak seker dat HDMI-CEC op jou TV en ander HDMI-toestelle geaktiveer is. Vervaardigers het dikwels ander name vir HDMI-CEC, byvoorbeeld:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Stel afstandbeheerknoppies op"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Beheer volume, krag, invoer op TV\'s, ontvangers en klankbalke"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Batteryvlak: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Bykomstighede"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Afstandbeheer"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Gekoppel"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Voorheen gekoppel"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Bind afstandbeheerder of bykomstigheid saam"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Ontkoppel"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Koppel"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Hernoem"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Vergeet"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Gekoppel"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Ontkoppel"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Toestelbeheer"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Koppel nuwe toestel"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Voordat jy nuwe Bluetooth-toestelle koppel, moet jy seker maak hulle is in saambindmodus. Druk en hou %2$s + %3$s vir 3 sekondes om %1$s te koppel."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"’n Android TV-afstandbeheerder"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Beskikbare toestelle"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Soek tans na toestelle …"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Fout"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Koppel tans …"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Gekoppel"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Gekanselleer"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s kon nie koppel nie"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s is gekoppel"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s is ontkoppel"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-am/strings.xml b/libraries/BluetoothServices/res/values-am/strings.xml
index 300c828..2c3f8b7 100644
--- a/libraries/BluetoothServices/res/values-am/strings.xml
+++ b/libraries/BluetoothServices/res/values-am/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"የለም"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"አሳሳቢ"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"ዝቅተኛ"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"ጥሩ"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"የርቀት መቆጣጠሪያን ዝማኔ ያረጋግጡ"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"በዝማኔው ጊዜ የእርስዎ የርቀት መቆጣጠሪያ ለአጭር ጊዜ ግንኙነቱ ሊቋረጥ ይችላል።"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"ቀጥል"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"ይቅር"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"የርቀት መቆጣጠሪያ ዝማኔ"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"አዲስ ሶፍትዌር አለ"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"ማዘመኛ አለ"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"የርቀት መቆጣጠሪያ የተዘመነ ነው"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"የርቀት መቆጣጠሪያን ማዘመን አልተሳካም"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"የርቀት መቆጠጠሪያዎን እያዘመንነው ሳለ የሆነ ችግር አጋጥሞናል። እባክዎ እንደገና ይሞክሩ።"</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"እባክዎ ይጠብቁ"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"የእርስዎን የርቀት መቆጣጠሪያ እንደገና ያጣምዱ"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"ነቅቷል"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"ተሰናክሏል"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"የባትሪ ደረጃ"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"ጽኑ ትዕዛዝ"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"የብሉቱዝ አድራሻ"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"እባክዎ ባትሪ ይተኩ"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"ዝቅተኛ ባትሪ"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"የተገናኙ መሣሪያዎች"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"ርቀት መቆጣጠሪያዎች እና መለዋወጫዎች"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"የርቀት መቆጣጠሪያዎን ያዘምኑ"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"ለመጫን ዝግጁ"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"አዘምን"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"አሰናብት"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"የርቀት መቆጣጠሪያ ባትሪ ዝቅተኛ ነው"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"ባትሪ በቅርቡ ይተኩ"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"የርቀት መቆጣጠሪያ ባትሪ ከሞላ ጎደል ባዶ ነው"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"ባትሪ በቅርቡ ይተኩ"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"የርቀት መቆጣጠሪያ ባትሪ ባዶ ነው"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"የርቀት መቆጣጠሪያን ለመጠቀም ባትሪ ይተኩ"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"አዎ"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"አይ"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"ከ%1$s ጋር ያለውን ግንኙነት አቋርጥ"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"ከ%1$s ጋር ይገናኙ"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$sን እርሳ"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"የተገናኘውን መሣሪያዎን ዳግም ይሰይሙ"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CECን አንቃ"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC ሌላ በ HDMI-CEC የነቁ መሣሪያዎችን ከአንድ ነጠላ የርቀት መቆጣጠሪያ ጋር ለመቆጣጠር እና በራስሰር እንዲያበሩ/እንዲያጠፉ ያስችልዎታል።\n\nማስታወሻ፦ HDMI-CEC በእርስዎ ቴሌቪዥን ላይ እና ሌሎች HDMI መሣሪያዎች ላይ መንቃቱን ያረጋግጡ። አምራቾች ለ HDMI-CEC, ብዙውን ጊዜ የተለዩ ስሞች አሏቸው፤ ለምሳሌ፦"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG፦ SimpLink\nSony፦ BRAVIA Sync\nPhilips፦ EasyLink\nSharp፦ Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"የርቀት አዝራሮችን ያቀናብሩ"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"ድምፅን፣ ኃይልን፣ የቲቪዎች ላይ ግብዓትን፣ ተቀባዮችን እና የድምፅ አሞሌዎችን ይቆጣጠሩ"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"የባትሪ ደረጃ፦ %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"ተቀጥላዎች"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"የርቀት መቆጣጠሪያ"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"ተገናኝቷል"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"ከዚህ ቀደም የተገናኘ"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"የርቀት መቆጣጠሪያን ወይም ተቀጥላን ያጣምሩ"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"ግንኙነት አቋርጥ"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"አገናኝ"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"እንደገና ሰይም"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"እርሳ"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"ተገናኝቷል"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"ተቋርጧል"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"የመሣሪያ ቁጥጥር"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"አዲስ መሣሪያ ያገናኙ"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"የብሉቱዝ መሣሪያዎችዎን ከማገናኘትዎ በፊት በማጣመር ሁነታ ላይ መሆናቸውን ያረጋግጡ %1$sን ለማገናነት፣ %2$s + %3$s ን ለ 3 ሰከንዶች ይጫኑ እና ይያዙ።"</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"የ Android TV የርቀት መቆጣጠሪያ"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"የሚገኙ መሣሪያዎች"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"መሣሪያዎችን በመፈልግ ላይ…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"ስህተት"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"በመገናኘት ላይ…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"ተገናኝቷል"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"ቀርቷል"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s ማገናኘት አልተሳካም"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s ተገናኝቷል"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s ግንኙነቱ ተቋርጧል"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"የለም"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"አስፈላጊ"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"ዝቅተኛ"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"ጥሩ"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"የርቀት መቆጣጠሪያን ዝማኔ ያረጋግጡ"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"በዝማኔው ጊዜ የእርስዎ የርቀት መቆጣጠሪያ ለአጭር ጊዜ ግንኙነቱ ሊቋረጥ ይችላል።"</string>
+    <string name="settings_continue" msgid="5640776697820481568">"ቀጥል"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"ይቅር"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"የርቀት መቆጣጠሪያ ዝማኔ"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"አዲስ ሶፍትዌር አለ"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"ዝማኔ አለ"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"የርቀት መቆጣጠሪያ የተዘመነ ነው"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"የርቀት መቆጣጠሪያን ማዘመን አልተሳካም"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"የርቀት መቆጣጠሪያዎን በማዘመን ላይ ሳለን የሆነ ችግር አጋጥሞናል። እባክዎ እንደገና ይሞክሩ።"</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"እባክዎ ይጠብቁ"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"የእርስዎን የርቀት መቆጣጠሪያ እንደገና ያጣምሩ"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"ነቅቷል"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"ተሰናክሏል"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"የባትሪ ደረጃ"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"ጽኑ ትዕዛዝ"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"የብሉቱዝ አድራሻ"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"እባክዎ ባትሪ ይተኩ"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"ዝቅተኛ ባትሪ"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"የተገናኙ መሣሪያዎች"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"የርቀት መቆጣጠሪያዎች እና መለዋወጫዎች"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"የርቀት መቆጣጠሪያዎን ያዘምኑ"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"ለመጫን ዝግጁ"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"አዘምን"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"አሰናብት"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"የርቀት መቆጣጠሪያ ባትሪ ዝቅተኛ ነው"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"ባትሪ በቅርቡ ይተኩ"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"የርቀት መቆጣጠሪያ ባትሪ ከሞላ ጎደል ባዶ ነው"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"ባትሪ በቅርቡ ይተኩ"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"የርቀት መቆጣጠሪያ ባትሪ ባዶ ነው"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"የርቀት መቆጣጠሪያን ለመጠቀም ባትሪ ይተኩ"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"አዎ"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"አይ"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"ከ%1$s ጋር ያለውን ግንኙነት አቋርጥ"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"ከ%1$s ጋር ይገናኙ"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$sን እርሳ"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"የተገናኘውን መሣሪያዎን ዳግም ይሰይሙ"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CECን አንቃ"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC ሌላ በ HDMI-CEC የነቁ መሣሪያዎችን ከአንድ ነጠላ የርቀት መቆጣጠሪያ ጋር ለመቆጣጠር እና በራስሰር እንዲያበሩ/እንዲያጠፉ ያስችልዎታል።\n\nማስታወሻ፦ HDMI-CEC በእርስዎ ቴሌቪዥን ላይ እና ሌሎች HDMI መሣሪያዎች ላይ መንቃቱን ያረጋግጡ። አምራቾች ለ HDMI-CEC, ብዙውን ጊዜ የተለዩ ስሞች አሏቸው፤ ለምሳሌ፦"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung፦ Anynet+\nLG፦ SimpLink\nSony፦ BRAVIA Sync\nPhilips፦ EasyLink\nSharp፦ Aquos አገናኝ"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"የርቀት መቆጣጠሪያ አዝራሮችን ያዋቅሩ"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"በቲቪዎች፣ ተቀባዮች እና የድምፅ አሞሌዎች ላይ የድምፅ መጠንን፣ ኃይልን፣ ግብዓትን ይቆጣጠሩ"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"የባትሪ ደረጃ፦ %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"መለዋወጫዎች"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"የርቀት መቆጣጠሪያ"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"ተገናኝቷል"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"ከዚህ ቀደም የተገናኘ"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"የርቀት መቆጣጠሪያን ወይም ተቀጥላን ያጣምሩ"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"ግንኙነት አቋርጥ"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"አገናኝ"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"እንደገና ሰይም"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"እርሳ"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"ተገናኝቷል"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"ተቋርጧል"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"የመሣሪያ ቁጥጥር"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"አዲስ መሣሪያ ያገናኙ"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"አዲስ የብሉቱዝ መሣሪያዎችን ከማገናኘትዎ በፊት በማጣመር ሁነታ ላይ መሆናቸውን ያረጋግጡ። %1$sን ለማገናኘት፣ %2$s + %3$s ለ3 ሰከንዶች ተጭነው ይያዙ።"</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"የAndroid TV የርቀት መቆጣጠሪያ"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"የሚገኙ መሣሪያዎች"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"መሣሪያዎችን በመፈለግ ላይ…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"ስህተት"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"በማገናኘት ላይ…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"ተገናኝቷል"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"ተሰርዟል"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s ማገናኘት አልተሳካም"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s ተገናኝቷል"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s ግንኙነቱ ተቋርጧል"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-ar/strings.xml b/libraries/BluetoothServices/res/values-ar/strings.xml
index eb95f3a..f7889a3 100644
--- a/libraries/BluetoothServices/res/values-ar/strings.xml
+++ b/libraries/BluetoothServices/res/values-ar/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"لا ينطبق"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"حرج"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"منخفض"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"جيد"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"تأكيد تحديث جهاز التحكم عن بُعد"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"أثناء التحديث، قد يتم فصل جهاز التحكم عن بُعد لفترة وجيزة."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"متابعة"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"إلغاء"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"تحديث جهاز التحكم عن بُعد"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"يتوفر برنامج جديد."</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"هناك تحديث متوفّر."</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"جهاز التحكم عن بُعد محدّث."</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"تعذَّر تحديث جهاز التحكم عن بُعد."</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"لقد واجهنا مشكلة أثناء تحديث جهاز التحكم عن بُعد. يُرجى إعادة المحاولة."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"يُرجى الانتظار."</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"إقران وحدة التحكم عن بُعد مرة أخرى"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"مفعّل"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"غير مفعّل"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"مستوى شحن البطارية"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"البرامج الثابتة"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"عنوان البلوتوث"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"يُرجى استبدال البطارية."</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"طاقة البطارية منخفضة"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"الأجهزة المتصلة"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"وحدات التحكّم عن بُعد والأجهزة الملحقة"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"تحديث وحدة التحكم عن بُعد"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"جاهز للتثبيت"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"تحديث"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"تجاهل"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"طاقة بطارية وحدة التحكّم عن بُعد منخفضة"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"يُرجى استبدال البطارية قريبًا"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"أوشكت بطارية وحدة التحكّم عن بُعد على الانتهاء"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"يُرجى استبدال البطارية قريبًا"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"فرغت بطارية وحدة التحكّم عن بُعد"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"استبدل البطارية لاستخدام وحدة التحكّم عن بُعد"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"نعم"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"لا"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"إلغاء الربط بـ %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"الاتصال بـ %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"حذف بيانات %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"إعادة تسمية الجهاز المتصل"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"تفعيل HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"تسمح لك ميزة HDMI-CEC بالتحكم في الأجهزة الأخرى التي تم تفعيل ميزة HDMI-CEC عليها وتفعيلها/إيقافها تلقائيًا باستخدام وحدة تحكم واحدة عن بُعد.\n\nملاحظة: احرص على تفعيل ميزة HDMI-CEC على التلفزيون وغيره من أجهزة HDMI. وتوفر الشركات المصنِّعة ميزة HDMI-CEC غالبًا بأسماء مختلفة مثل:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"سامسونج: Anynet+\nإل جي: SimpLink\nسوني: BRAVIA Sync\nفيليبس: EasyLink\nشارب: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"إعداد أزرار وحدة التحكّم عن بُعد"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"التحكّم في مستوى الصوت وإمكانية الإيقاف أو التشغيل والإدخال في أجهزة التلفزيون وأجهزة الاستقبال ومكبّرات الصوت العمودي"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"مستوى شحن البطارية: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"الأجهزة الملحقة"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"وحدة التحكم عن بُعد"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"متصل"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"الأجهزة المتصلة سابقًا"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"إقران وحدة تحكّم عن بُعد أو جهاز ملحق"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"قطع الاتصال"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"اتصال"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"إعادة تسمية"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"حذف"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"متّصل"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"غير متّصل"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"التحكم في الجهاز"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"توصيل جهاز جديد"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"قبل توصيل أجهزة بلوتوث جديدة، تأكّد أنّها في وضع الإقران. لتوصيل %1$s، اضغط على %2$s ‏+ %3$s مع الاستمرار لمدة 3 ثوانٍ."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"وحدة التحكم في جهاز Android TV عن بُعد"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"الأجهزة المتوفِّرة"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"جارٍ البحث عن أجهزة…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"خطأ"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"جارٍ الاتصال…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"متصل"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"تم إلغاؤها."</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"تعذّر توصيل %1$s."</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"تم توصيل %1$s."</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"تم قطع اتصال %1$s."</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"لا ينطبق"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"حرج"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"منخفض"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"جيد"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"تأكيد تحديث جهاز التحكّم عن بُعد"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"أثناء عملية التحديث، قد يتم فصل جهاز التحكّم عن بُعد لفترة وجيزة."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"متابعة"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"إلغاء"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"تحديث جهاز التحكّم عن بُعد"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"يتوفر برنامج جديد."</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"يوجد تحديث."</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"جهاز التحكّم عن بُعد محدّث."</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"تعذَّر تحديث جهاز التحكم عن بُعد."</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"لقد واجهنا مشكلة أثناء تحديث جهاز التحكّم عن بُعد. يُرجى إعادة المحاولة."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"يُرجى الانتظار."</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"إقران جهاز التحكّم عن بُعد مرة أخرى"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"مفعّل"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"غير مفعّل"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"مستوى شحن البطارية"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"البرامج الثابتة"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"عنوان البلوتوث"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"يُرجى استبدال البطارية."</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"مستوى شحن البطارية منخفض"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"الأجهزة المتصلة"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"أجهزة التحكّم عن بُعد والأجهزة الملحقة"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"تحديث جهاز التحكّم عن بُعد"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"جاهز للتثبيت"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"تحديث"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"إغلاق"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"طاقة بطارية جهاز التحكّم عن بُعد منخفضة"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"يُرجى استبدال البطارية قريبًا."</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"بطارية جهاز التحكّم عن بُعد فارغة تقريبًا"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"يُرجى استبدال البطارية قريبًا."</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"بطارية جهاز التحكّم عن بُعد فارغة"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"استبدِل البطارية لاستخدام جهاز التحكّم عن بُعد."</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"نعم"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"لا"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"إلغاء الربط بـ %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"التوصيل بـ %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"حذف بيانات %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"إعادة تسمية الجهاز المتصل"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"تفعيل HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"تسمح لك ميزة HDMI-CEC بالتحكم في الأجهزة الأخرى التي تم تفعيل ميزة HDMI-CEC عليها وتفعيلها/إيقافها تلقائيًا باستخدام وحدة تحكم واحدة عن بُعد.\n\nملاحظة: احرص على تفعيل ميزة HDMI-CEC على التلفزيون وغيره من أجهزة HDMI. وتوفر الشركات المصنِّعة ميزة HDMI-CEC غالبًا بأسماء مختلفة مثل:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"إعداد أزرار جهاز التحكّم عن بُعد"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"التحكّم في مستوى الصوت وإمكانية الإيقاف أو التشغيل والإدخال في أجهزة التلفزيون وأجهزة الاستقبال ومكبّرات الصوت العمودي"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"مستوى البطارية: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"الأجهزة الملحقة"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"جهاز التحكّم عن بُعد"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"متصل"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"الأجهزة المتصلة سابقًا"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"إقران جهاز تحكّم عن بُعد أو جهاز ملحق"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"قطع الاتصال"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"توصيل"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"إعادة التسمية"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"حذف"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"متّصل"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"غير متّصل"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"التحكم في الجهاز"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"توصيل جهاز جديد"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"قبل توصيل أجهزة بلوتوث جديدة، تأكّد من أنّها في وضع الإقران. لتوصيل %1$s، اضغط على %2$s ‏+ %3$s مع الاستمرار لمدة 3 ثوانٍ."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"جهاز التحكّم بـ Android TV عن بُعد"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"الأجهزة المتاحة"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"جارٍ البحث عن أجهزة…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"خطأ"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"جارٍ التوصيل…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"متّصل"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"مُلغى"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"تعذّر توصيل %1$s."</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"تم توصيل %1$s."</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"تم فصل %1$s."</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-as/strings.xml b/libraries/BluetoothServices/res/values-as/strings.xml
index ea13233..e8c7a6f 100644
--- a/libraries/BluetoothServices/res/values-as/strings.xml
+++ b/libraries/BluetoothServices/res/values-as/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"উপলব্ধ নহয়"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"সংকটপূৰ্ণ"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"নিম্ন"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"ভাল"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"ৰিম\'ট আপডে\'ট নিশ্চিত কৰক"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"আপডে’টৰ সময়ত কিছু সময়ৰ বাবে আপোনাৰ ৰিম’টৰ সংযোগ বিচ্ছিন্ন হ’ব পাৰে।"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"অব্যাহত ৰাখক"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"বাতিল কৰক"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"ৰিম’ট আপডে’ট"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"নতুন ছফ্টৱেৰ উপলব্ধ"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"আপডে’ট উপলব্ধ"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"ৰিম’টটো আপ-টু-ডে’ট হৈ আছে"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"ৰিম’ট আপডে’ট কৰিব পৰা নগ’ল"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"আমি আপোনাৰ ৰিম’ট আপডে’ট কৰোঁতে এটা সমস্যা পাইছোঁ। অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।"</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"অনুগ্ৰহ কৰি অপেক্ষা কৰক"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"আপোনাৰ ৰিম\'ট পুনৰ পেয়াৰ কৰক"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"সক্ষম কৰা হ’ল"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"অক্ষম কৰা হ\'ল"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"বেটাৰীৰ স্তৰ"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"ফাৰ্মৱেৰ"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"ব্লুটুথৰ ঠিকনা"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"অনুগ্ৰহ কৰি বেটাৰী সলনি কৰক"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"বেটাৰী কমিছে"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"সংযোজিত ডিভাইচসমূহ"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"ৰিম’ট আৰু সহায়ক সঁজুলিসমূহ"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"আপোনাৰ ৰিম’ট আপডে’ট কৰক"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"ইনষ্টল কৰিবলৈ সাজু"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"আপডে’ট কৰক"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"অগ্ৰাহ্য কৰক"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"ৰিম’টৰ বেটাৰীৰ স্তৰ নিম্ন"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"সোনকালে বেটাৰী সলনি কৰক"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"ৰিম’টৰ বেটাৰী প্ৰায় শেষ হৈছে"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"সোনকালে বেটাৰী সলনি কৰক"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"ৰিম’টৰ বেটাৰী শেষ হৈছে"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"ৰিম’টটো ব্যৱহাৰ কৰিবলৈ বেটাৰী সলনি কৰক"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"হয়"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"নহয়"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$sৰপৰা সংযোগ বিচ্ছিন্ন কৰক"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$sৰ সৈতে সংযোগ কৰক"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$sক পাহৰি যাওক"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"আপোনাৰ সংযুক্ত ডিভাইচৰ নাম সলনি কৰক"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC সক্ষম কৰক"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"আপোনাক HDMI-CECএ অইন HDMI-CEC সক্ষম ডিভাইচ নিয়ন্ত্ৰণ আৰু স্বয়ংক্ৰিয়ভাৱে এটা একক ৰিম’ট নিয়ন্ত্ৰকৰ জৰিয়তে অন/অফ কৰিবলৈ সুবিধা দিয়ে।\n\nটোকা:আপোনাৰ TV আৰু আন HDMI ডিভাইচসমূহত HDMI-CEC সক্ষম কৰি থোৱাটো নিশ্চিত কৰক। বেলেগ বেলেগ নিৰ্মাতাই সাধাৰণতে HDMI-CECৰ কাৰণে বেলেগে বেলেগ নাম ব্যৱহাৰ কৰে, উদাহৰণস্বৰূপে:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"ৰিম’টৰ বুটামসমূহ ছেট আপ কৰক"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"টিভি, ৰিচিভাৰ আৰু ছাউণ্ডবাৰত ভলিউম, পাৱাৰ আৰু ইনপুট নিয়ন্ত্ৰণ কৰক"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"বেটাৰীৰ স্তৰ: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"আনুষংগিক সামগ্ৰী"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"ৰিম’ট কণ্ট্ৰ’ল"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"সংযোগ কৰা হ’ল"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"আগতে সংযোগ কৰা"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"ৰিম’ট অথবা সহায়ক সঁজুলি পেয়াৰ কৰক"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"সংযোগ বিচ্ছিন্ন কৰক"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"সংযোগ কৰক"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"নতুন নাম দিয়ক"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"পাহৰক"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"সংযোগ কৰা হ’ল"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"সংযোগ বিচ্ছিন্ন কৰা হ\'ল"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"ডিভাইচৰ নিয়ন্ত্ৰণ"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"নতুন ডিভাইচ সংযোগ কৰক"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"আপোনাৰ ব্লুটুথ ডিভাইচসমূহ সংযোগ কৰাৰ আগতে, পেয়াৰ কৰা ম\'ড সক্ৰিয় কৰি ৰখাটো নিশ্চিত কৰক। %1$s সংযোগ কৰিবলৈ, ৩ছেকেণ্ডৰ বাবে %2$s + %3$sক টিপি ধৰি ৰাখক।"</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"এটা Android TVৰ ৰিম\'ট"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"উপলব্ধ ডিভাইচসমূ্হ"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"ডিভাইচসমূহ বিচাৰি থকা হৈছে…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"আসোঁৱাহ"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"সংযোগ কৰি থকা হৈছে…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"সংযোগ কৰা হ’ল"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"বাতিল কৰা হ’ল"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s সংযোগ কৰিব পৰা নগ’ল"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s সংযোগ কৰা হ’ল"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s সংযোগ বিচ্ছিন্ন কৰা হ\'ল"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"উপলব্ধ নহয়"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"জটিল"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"নিম্ন"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"ভাল"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"ৰিম’ট আপডে’ট নিশ্চিত কৰক"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"আপডে’টৰ সময়ত কিছু সময়ৰ বাবে আপোনাৰ ৰিম’টৰ সংযোগ বিচ্ছিন্ন হ’ব পাৰে।"</string>
+    <string name="settings_continue" msgid="5640776697820481568">"অব্যাহত ৰাখক"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"বাতিল কৰক"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"ৰিম’টৰ আপডে’ট"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"নতুন ছফ্টৱেৰ উপলব্ধ"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"আপডে’ট উপলব্ধ"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"ৰিম’টটো আপ টু ডে’ট হৈ আছে"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"ৰিম’ট আপডে’ট কৰিব পৰা নগ’ল"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"আমি আপোনাৰ ৰিম’ট আপডে’ট কৰোঁতে এটা সমস্যা পাইছোঁ। অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।"</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"অনুগ্ৰহ কৰি অপেক্ষা কৰক"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"আপোনাৰ ৰিম’টটো পুনৰ পেয়াৰ কৰক"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"সক্ষম কৰা হ’ল"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"অক্ষম কৰা হ’ল"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"বেটাৰীৰ স্তৰ"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"ফাৰ্মৱেৰ"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"ব্লুটুথৰ ঠিকনা"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"অনুগ্ৰহ কৰি বেটাৰীটো সলনি কৰক"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"বেটাৰীৰ চাৰ্জ কমিছে"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"সংযুক্ত ডিভাইচসমূহ"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"ৰিম’ট আৰু আনুষংগিক সামগ্ৰী"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"আপোনাৰ ৰিম’টটো আপডে’ট কৰক"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"ইনষ্টল কৰিবলৈ সাজু"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"আপডে’ট কৰক"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"অগ্ৰাহ্য কৰক"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"ৰিম’টৰ বেটাৰীৰ চাৰ্জ কম আছে"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"সোনকালে বেটাৰী সলনি কৰক"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"ৰিম’টৰ বেটাৰীৰ চাৰ্জ প্ৰায় শেষ হৈছে"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"সোনকালে বেটাৰী সলনি কৰক"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"ৰিম’টৰ বেটাৰীৰ চাৰ্জ শেষ হৈছে"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"ৰিম’টটো ব্যৱহাৰ কৰিবলৈ বেটাৰী সলনি কৰক"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"হয়"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"নহয়"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$sৰ সৈতে সংযোগ বিচ্ছিন্ন কৰক"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$sৰ সৈতে সংযোগ কৰক"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$sক পাহৰি যাওক"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"আপোনাৰ সংযুক্ত ডিভাইচৰ নাম সলনি কৰক"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC সক্ষম কৰক"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"আপোনাক HDMI-CECএ অইন HDMI-CEC সক্ষম ডিভাইচ নিয়ন্ত্ৰণ আৰু স্বয়ংক্ৰিয়ভাৱে এটা একক ৰিম’ট নিয়ন্ত্ৰকৰ জৰিয়তে অন/অফ কৰিবলৈ সুবিধা দিয়ে।\n\nটোকা: আপোনাৰ টিভি আৰু আন HDMI ডিভাইচসমূহত HDMI-CEC সক্ষম কৰি থোৱাটো নিশ্চিত কৰক। বেলেগ বেলেগ নিৰ্মাতাই সাধাৰণতে HDMI-CECৰ কাৰণে বেলেগে বেলেগ নাম ব্যৱহাৰ কৰে, উদাহৰণস্বৰূপে:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"ৰিম’টৰ বুটামসমূহ ছেট আপ কৰক"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"টিভি, ৰিচিভাৰ আৰু ছাউণ্ডবাৰত ভলিউম, পাৱাৰ আৰু ইনপুট নিয়ন্ত্ৰণ কৰক"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"বেটাৰীৰ স্তৰ: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"আনুষংগিক সামগ্ৰী"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"ৰিম’ট কণ্ট্ৰ’ল"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"সংযুক্ত"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"আগতে সংযোগ কৰা"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"ৰিম’ট অথবা আনুষংগিক সামগ্ৰী পেয়াৰ কৰক"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"বিচ্ছিন্ন কৰক"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"সংযোগ কৰক"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"নতুন নাম দিয়ক"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"পাহৰি যাওক"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"সংযোগ কৰা হ’ল"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"সংযোগ বিচ্ছিন্ন কৰা হ\'ল"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"ডিভাইচ নিয়ন্ত্ৰণ"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"নতুন ডিভাইচ সংযোগ কৰক"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"আপোনাৰ ব্লুটুথ ডিভাইচসমূহ সংযোগ কৰাৰ আগতে, সেইবোৰ পেয়াৰ কৰা ম’ডটোত থকাটো নিশ্চিত কৰক। %1$s সংযোগ কৰিবলৈ, ৩ ছেকেণ্ডৰ বাবে %2$s + %3$sক টিপি ধৰি ৰাখক।"</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"এটা Android TVৰ ৰিম’ট"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"উপলব্ধ ডিভাইচ"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"ডিভাইচ বিচাৰি থকা হৈছে…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"আসোঁৱাহ"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"সংযোগ কৰি থকা হৈছে…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"সংযুক্ত আছে"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"বাতিল কৰা হৈছে"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s সংযোগ কৰিব পৰা নগ’ল"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s সংযোগ কৰা হ’ল"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$sৰ সংযোগ বিচ্ছিন্ন কৰা হ’ল"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-az/strings.xml b/libraries/BluetoothServices/res/values-az/strings.xml
index d9f57f5..20e0a8d 100644
--- a/libraries/BluetoothServices/res/values-az/strings.xml
+++ b/libraries/BluetoothServices/res/values-az/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Əlçatan deyil"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritik"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Aşağı"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Yaxşı"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Pultun güncəllənməsini təsdiq edin"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Güncəlləmə zamanı pultunuz qısa müddətə bağlantıdan ayrıla bilər."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Davam edin"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Ləğv edin"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Pultun güncəllənməsi"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Yeni proqram əlçatandır"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Güncəlləmə əlçatandır"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Pult güncəldir"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Pultu güncəlləmək alınmadı"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Pultun güncəllənməsi zamanı xəta baş verdi. Yenidən cəhd edin."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Gözləyin"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Pultu yenidən birləşdirin"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Aktiv"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Deaktiv"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Batareya səviyyəsi"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Mikroproqram"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth ünvanı"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Batareyanı yenisi ilə əvəz edin"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Batareya səviyyəsi aşağıdır"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Qoşulmuş Cihazlar"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Pult və Aksesuarlar"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Pultu güncəlləyin"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Quraşdırmağa hazırdır"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"GÜNCƏLLƏYİN"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"RƏDD EDİN"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Pultun batareyasında enerji azdır"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Batareyanı tezliklə dəyişin"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Pultun batareyası boşalmaq üzrədir"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Batareyanı tezliklə dəyişin"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Pultun batareyası boşdur"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Pultu istifadə etmək üçün batareyanı dəyişin"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Bəli"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Xeyr"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s ilə əlaqəni kəsin"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s cihazına qoşulun"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s ünvanını unudun"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Qoşulmuş cihazı yenidən adlandırın"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC xüsusiyyətini aktiv edin"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC sizə bir pult ilə HDMI-CEC dəstəkli digər cihazları idarə etmək və avtomatik aktiv/deaktiv etmək imkanı verir.\n\nQeyd: HDMI-CEC xüsusiyyətinin TV-nizdə və digər HDMI cihazlarında aktiv edildiyindən əmin olun. İstehsalçılar, adətən, HDMI-CEC xüsusiyyətinə fərqli adlar verir, məsələn:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Məsafədən idarə düymələrini ayarlayın"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"TV\'lər, qəbuledicilər və səs panellərində səsi, yandırıb-söndürməni və girişi idarə edin"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Batareya səviyyəsi: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Aksesuarlar"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Pult"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Qoşuldu"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Öncə qoşulmuş cihazlar"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Pultu və ya aksesuarı birləşdirin"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Əlaqəni kəsin"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Qoşun"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Yenidən adlandırın"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Unudun"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Qoşulub"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Ayrılıb"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Cihaza nəzarət"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Yeni cihaz qoşun"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Yeni Bluetooth cihazlarını qoşmazdan əvvəl birləşdirmə rejimində olduqlarından əmin olun. %1$s qoşmaq üçün 3 saniyəlik %2$s + %3$s basıb saxlayın."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV pultu"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Əlçatan cihazlar"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Cihazlar axtarılır…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Xəta"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Qoşulur…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Qoşuldu"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Ləğv edildi"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s qoşula bilmədi"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s qoşulub"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s əlaqəsi kəsildi"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritik"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Aşağı"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Yaxşı"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Pult güncəllənməsini təsdiq edin"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Pult güncəllənərkən qısa müddətlik ayrıla bilər."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Davam edin"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Ləğv edin"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Pult güncəllənməsi"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Yeni proqram təminatı əlçatandır"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Güncəlləmə əlçatandır"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Pult güncəldir"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Pultu güncəlləmək alınmadı"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Pult güncəllənərkən xəta oldu. Yenidən cəhd edin."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Gözləyin"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Pultu yenidən birləşdirin"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Aktiv edildi"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Disabled"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Batareya səviyyəsi"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Proqram"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth ünvanı"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Batareyanı dəyişin"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Batareya azdır"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Qoşulmuş cihazlar"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Pult və aksesuarlar"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Pultu güncəlləyin"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Quraşdırmağa hazırdır"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"GÜNCƏLLƏYİN"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"İMTİNA EDİN"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Pult batareyası azdır"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Batareyanı tezliklə dəyişdirin"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Pult batareyası boşalmaq üzrədir"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Batareyanı tezliklə dəyişdirin"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Pult batareyası boşdur"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Pult istifadə etmək üçün batareyanı dəyişdirin"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Bəli"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Xeyr"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s ünvanından ayırın"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Qoşulun: %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s ünvanını unudun"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Qoşulmuş cihazın adını dəyişin"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC-i aktiv edin"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC yalnız bir pult ilə HDMI-CEC funksiyası aktiv olan digər cihazlara nəzarət etməyə və avtomatik aktiv/deaktiv etməyə icazə verir.\n\nQeyd: HDMI-CEC funksiyasının TV və digər HDMI cihazlarında aktiv olduğuna əmin olun. İstehsalçılar adətən HDMI-CEC funksiyasına fərqli adlar verir, məsələn:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Pult düymələrini quraşdırın"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"TV, qəbuledici və səs panellərində səs, yandırıb-söndürmə və daxiletməni idarə edin"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Batareya səviyyəsi: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Aksesuarlar"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Uzaqdan idarə"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Qoşuldu"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Öncə qoşulmuş cihazlar"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Pult və ya aksesuar birləşdirin"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Bağlantını silin"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Qoşulun"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Adını dəyişin"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Unudun"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Qoşulub"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Ayrılıb"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Cihaz nəzarəti"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Yeni cihaz qoşun"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Yeni Bluetooth cihazı qoşmazdan əvvəl birləşdirmə rejimində olduğundan əmin olun. %1$s qoşmaq üçün %2$s + %3$s üzərinə 3 saniyə basıb saxlayın."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV pultu"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Əlçatan cihazlar"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Cihaz axtarılır…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Xəta"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Qoşulur…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Qoşulub"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Ləğv edildi"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s qoşulmadı"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s qoşulub"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s ayrılıb"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-b+sr+Latn/strings.xml b/libraries/BluetoothServices/res/values-b+sr+Latn/strings.xml
index c4a4e54..b181f72 100644
--- a/libraries/BluetoothServices/res/values-b+sr+Latn/strings.xml
+++ b/libraries/BluetoothServices/res/values-b+sr+Latn/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Nije dostupno"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritičan"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Nizak"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Dobar"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Potvrdite ažuriranje daljinskog upravljača"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Veza sa daljinskim upravljačem može da se nakratko prekine tokom ažuriranja."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Nastavi"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Otkaži"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Ažuriranje daljinskog upravljača"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Dostupan je nov softver"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Dostupno je ažuriranje"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Daljinski upravljač je ažuriran"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Ažuriranje daljinskog upravljača nije uspelo"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Došlo je do problema pri ažuriranju daljinskog upravljača. Probajte ponovo."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Sačekajte"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Ponovo uparite daljinski upravljač"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Omogućeno"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Onemogućeno"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Nivo baterije"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmver"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth adresa"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Zamenite bateriju"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Baterija je skoro prazna"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Povezani uređaji"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Daljinski upravljači i dodatna oprema"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Ažurirajte daljinski upravljač"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Spremno je za instalaciju"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"AŽURIRAJ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ODBACI"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Nivo napunjenosti baterije daljinskog upravljača je nizak"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Zamenite bateriju uskoro"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Baterija daljinskog upravljača je skoro prazna"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Zamenite bateriju uskoro"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Baterija daljinskog upravljača je prazna"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Zamenite bateriju da biste koristili daljinski upravljač"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Da"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Ne"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Prekini vezu sa: %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Povežite se sa uređajem %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Zaboravi: %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Preimenujte povezani uređaj"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Omogući HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC vam omogućava da kontrolišete i automatski uključujete/isključujete ostale uređaje na kojima je omogućen HDMI-CEC pomoću samo jednog daljinskog upravljača.\n\nNapomena: Uverite se da je HDMI-CEC omogućen na televizoru i drugim HDMI uređajima. Proizvođači obično imaju različite nazive za HDMI-CEC, na primer:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Podesite dugmad na daljinskom upravljaču"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Kontrolišite jačinu zvuka, napajanje i ulaz TV-a, prijemnika i saundbarova"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Nivo napunjenosti baterije: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Dodaci"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Daljinski upravljač"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Povezano"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Prethodno povezani"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Uparite daljinski upravljač ili dodatnu opremu"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Prekini vezu"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Poveži"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Preimenuj"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Zaboravi"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Povezano"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Veza je prekinuta"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Kontrola uređaja"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Povežite nov uređaj"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Pre nego što povežete nove Bluetooth uređaje, uverite se da su u režimu uparivanja. Da biste povezali uređaj %1$s, pritisnite i zadržite %2$s i %3$s tri sekunde."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"daljinski upravljač za Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Dostupni uređaji"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Traže se uređaji…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Greška"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Povezuje se…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Povezano"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Otkazano"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Povezivanje nije uspelo: %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"Povezano: %1$s"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"Prekinuta je veza: %1$s"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Nije primenjivo"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritično"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Nisko"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Dobro"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Potvrdite ažuriranje daljinskog upravljača"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Veza sa daljinskim upravljačem može da se nakratko prekine tokom ažuriranja."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Nastavi"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Otkaži"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Ažuriranje daljinskog upravljača"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Dostupan je nov softver"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Dostupno je ažuriranje"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Daljinski upravljač je ažuriran"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Ažuriranje daljinskog upravljača nije uspelo"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Došlo je do problema pri ažuriranju daljinskog upravljača. Probajte ponovo."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Sačekajte"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Ponovo uparite daljinski upravljač"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Omogućeno"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Onemogućeno"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Nivo napunjenosti baterije"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmver"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth adresa"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Zamenite bateriju"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Nizak nivo baterije"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Povezani uređaji"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Daljinski upravljači i dodatna oprema"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Ažurirajte daljinski upravljač"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Spremno je za instalaciju"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"AŽURIRAJ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ODBACI"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Nivo napunjenosti baterije daljinskog upravljača je nizak"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Zamenite bateriju uskoro"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Baterija daljinskog upravljača je skoro prazna"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Zamenite bateriju uskoro"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Baterija daljinskog upravljača je prazna"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Zamenite bateriju da biste koristili daljinski upravljač"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Da"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Ne"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Prekini vezu sa stavkom %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Povežite sa uređajem %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Zaboravi stavku %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Preimenujte povezani uređaj"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Omogući HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC vam omogućava da kontrolišete i automatski uključujete/isključujete ostale uređaje na kojima je omogućen HDMI-CEC pomoću samo jednog daljinskog upravljača.\n\nNapomena: Uverite se da je HDMI-CEC omogućen na televizoru i drugim HDMI uređajima. Proizvođači obično imaju različite nazive za HDMI-CEC, na primer:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Podesite dugmad na daljinskom upravljaču"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Kontrolišite jačinu zvuka, napajanje i ulaz TV-a, prijemnika i saundbarova"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Nivo napunjenosti baterije: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Dodaci"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Daljinski upravljač"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Povezano"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Prethodno povezani"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Uparite daljinski upravljač ili dodatnu opremu"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Prekini vezu"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Poveži"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Preimenuj"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Zaboravi"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Povezano"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Veza je prekinuta"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Kontrola uređaja"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Povežite nov uređaj"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Pre nego što povežete nove Bluetooth uređaje, uverite se da su u režimu uparivanja. Da biste povezali uređaj %1$s, pritisnite i zadržite %2$s i %3$s tri sekunde."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"daljinski upravljač za Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Dostupni uređaji"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Traže se uređaji…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Greška"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Povezuje se…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Povezano"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Otkazano"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Povezivanje nije uspelo: %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Povezano: %1$s"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Prekinuta je veza: %1$s"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-be/strings.xml b/libraries/BluetoothServices/res/values-be/strings.xml
index f7e3790..456d374 100644
--- a/libraries/BluetoothServices/res/values-be/strings.xml
+++ b/libraries/BluetoothServices/res/values-be/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Н/Д"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Крытычны"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Слабы"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Добры"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Пацвердзіць абнаўленне пульта"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Падчас абнаўлення сувязь з прыладай можа ненадоўга перарвацца."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Працягнуць"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Скасаваць"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Абнаўленне пульта"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"З\'явілася новае праграмнае забеспячэнне"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"З\'явілася абнаўленне"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Пульт абноўлены"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Не ўдалося абнавіць прыладу"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Пры абнаўленні пульта ўзнікла праблема. Паўтарыце спробу."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Пачакайце"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Спалучыць пульт яшчэ раз"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Уключана"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Выключана"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Узровень зараду акумулятара"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Убудаванае праграмнае забеспячэнне"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Адрас Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Замяніце акумулятар"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Нізкі зарад акумулятара"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Падключаныя прылады"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Тэлевізійныя пульты і аксесуары"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Абнавіць пульт"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Гатова да ўсталёўкі"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"АБНАВІЦЬ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"АДХІЛІЦЬ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Нізкі ўзровень зараду батарэйкі"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Трэба неўзабаве замяніць батарэйку"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Батарэйка ў пульце амаль разрадзілася"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Трэба неўзабаве замяніць батарэйку"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Батарэйка ў пульце разраджана"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Каб выкарыстоўваць пульт, замяніце батарэйку"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Так"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Не"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Адключыць ад прылады \"%1$s\""</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Падключыцца да %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Ігнараваць прыладу \"%1$s\""</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Перайменаваць падключаную прыладу"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Уключыць HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC дазваляе кіраваць іншымі сумяшчальнымі з HDMI-CEC прыладамі і аўтаматычна ўключаць/выключаць іх, карыстаючыся адным пультам дыстанцыйнага кіравання.\n\nЗаўвага. Праверце, ці ўключаны HDMI-CEC на вашым тэлевізары і іншых HDMI-прыладах. Вытворцы часта па-рознаму называюць HDMI-CEC, напрыклад:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Наладзіць кнопкі пульта кіравання"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Кіраванне гучнасцю, сілкаваннем, уваходнымі сігналамі на тэлевізарах, рэсіверах і гукавых панэлях"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Узровень зараду акумулятара: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Аксесуары"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Пульт дыстанцыйнага кіравання"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Падключана"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Раней падключаныя"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Спалучыць пульт або аксесуар"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Адключыць"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Падключыць"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Перайменаваць"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Ігнараваць"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Падключана"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Адключана"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Кіраванне прыладай"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Падключыць новую прыладу"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Перад падключэннем новых прылад Bluetooth пераканайцеся, што яны знаходзяцца ў рэжыме спалучэння. Каб падключыць прыладу \"%1$s\", утрымлівайце клавішы \"%2$s + %3$s\" націснутымі на працягу 3 секунд."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"пульт ад Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Даступныя прылады"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Ідзе пошук прылад…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Памылка"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Ідзе падключэнне…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Падключана"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Скасавана"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Не ўдалося падключыць прыладу \"%1$s\""</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"Падключана: %1$s"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"Адключана: %1$s"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Няма інфармацыі"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Вельмі нізкі"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Нізкі"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Даволі высокі"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Пацвердзіць абнаўленне пульта"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Падчас абнаўлення сувязь з пультам можа ненадоўга перарвацца."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Далей"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Скасаваць"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Абнаўленне пульта"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"З\'явілася новае праграмнае забеспячэнне"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"З\'явілася абнаўленне"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Пульт выкарыстоўвае апошнюю версію ПЗ"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Не ўдалося абнавіць прыладу"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Пры абнаўленні пульта ўзнікла праблема. Паўтарыце спробу."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Пачакайце"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Спалучыце пульт яшчэ раз"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Уключана"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Адключана"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Узровень зараду акумулятара"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Убудаванае праграмнае забеспячэнне"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Адрас Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Замяніце акумулятар"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Нізкі зарад акумулятара"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Падключаныя прылады"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Пульты ДК і аксесуары"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Абнавіце ПЗ пульта"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Гатова да ўсталявання"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"АБНАВІЦЬ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"АДХІЛІЦЬ"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Нізкі ўзровень зараду батарэйкі"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Трэба неўзабаве замяніць батарэйку"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Батарэйка ў пульце амаль разрадзілася"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Трэба неўзабаве замяніць батарэйку"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Батарэйка ў пульце разраджана"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Каб выкарыстоўваць пульт, замяніце батарэйку"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Так"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Не"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Адключыць ад прылады \"%1$s\""</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Падключыцца да прылады \"%1$s\""</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Забыць прыладу \"%1$s\""</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Перайменаваць падключаную прыладу"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Уключыць HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC дазваляе кіраваць іншымі сумяшчальнымі з HDMI-CEC прыладамі і аўтаматычна ўключаць/выключаць іх, карыстаючыся адным пультам аддаленага кіравання.\n\nЗаўвага. Праверце, ці ўключаны HDMI-CEC на вашым тэлевізары і іншых HDMI-прыладах. Вытворцы часта па-рознаму называюць HDMI-CEC, напрыклад:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Наладзіць кнопкі дыстанцыйнага пульта кіравання"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Кіраванне гучнасцю, сілкаваннем, уваходнымі сігналамі на тэлевізарах, рэсіверах і гукавых панэлях"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Узровень зараду акумулятара: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Аксесуары"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Пульт дыстанцыйнага кіравання"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Падключана"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Раней падключаныя"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Спалучыць пульт або аксесуар"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Адключыць"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Падключыцца"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Перайменаваць"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Забыць"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Падключана"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Адключана"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Кіраванне прыладай"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Падключыць новую прыладу"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Перад падключэннем новых прылад з Bluetooth пераканайцеся, што на іх уключаны рэжым спалучэння. Каб падключыць прыладу \"%1$s\", утрымлівайце клавішы \"%2$s + %3$s\" націснутымі на працягу 3 секунд."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"пульт Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Даступныя прылады"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Ідзе пошук прылад…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Памылка"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Падключэнне…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Падключана"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Скасавана"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Не ўдалося падключыцца да прылады \"%1$s\""</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Прылада \"%1$s\" падключана"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Прылада \"%1$s\" адключана"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-bg/strings.xml b/libraries/BluetoothServices/res/values-bg/strings.xml
index b4c86d1..c8577bc 100644
--- a/libraries/BluetoothServices/res/values-bg/strings.xml
+++ b/libraries/BluetoothServices/res/values-bg/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Няма информация"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Критичнo"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Ниско"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Добро"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Потвърждаване на актуализацията на дистанционното управление"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"По време на актуализацията връзката с дистанционното ви управление може да бъде прекратена за кратко."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Напред"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Отказ"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Актуализация на дистанционното управление"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Налице е нов софтуер"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Налице е актуализация"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Дистанционното управление е актуално"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Актуализирането на дистанционното управление не бе успешно"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Срещнахме проблем при актуализирането на дистанционното ви управление. Моля, опитайте отново."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Моля, изчакайте"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Повторно сдвояване на дистанционното ви управление"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Активирано"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Деактивирано"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Ниво на батерията"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Фърмуер"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Адрес на Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Моля, подменете батерията"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Изтощена батерия"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Свързани устройства"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Дистанционни управления и аксесоари"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Актуализиране на дистанционното ви управление"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"В готовност за инсталиране"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"АКТУАЛИЗИРАНЕ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ОТХВЪРЛЯНЕ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Батерията на дистанционното управление е изтощена"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Сменете батерията скоро"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Батерията на дистанционното управление е почти изтощена"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Сменете батерията скоро"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Батерията на дистанционното управление е изтощена"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Сменете батерията, за да използвате дистанционното управление"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Да"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Не"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Прекратяване на връзката с(ъс) %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Установяване на връзка с(ъс) %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Забравяне на %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Преименуване на свързаното ви устройство"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"CEC за HDMI"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Активиране на CEC за HDMI"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Функцията CEC за HDMI ви дава възможност да управлявате и автоматично да включвате/изключвате други поддържащи я устройства посредством едно дистанционно управление.\n\nЗабележка: CEC за HDMI трябва да е активирана на телевизора ви и другите устройства с HDMI. Производителите често имат различни имена за тази функция, като например:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link."</string>
-    <string name="settings_axel" msgid="859248404436889205">"Настройване на бутоните на дистанционното управление"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Управление на бутоните за силата на звука, включване/изключване и избор на вход на телевизори, приемници и звукови панели"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Ниво на батерията: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Аксесоари"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Дистанционно управление"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Установена е връзка"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"По-рано свързвани"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Сдвояване на дистанционно управление или аксесоар"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Прекратяване на връзката"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Свързване"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Преименуване"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Забравяне"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Установена е връзка"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Връзката е прекратена"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Управление на устройства"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Свързване на ново устройство"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Преди да свържете нови устройства с Bluetooth, уверете се, че са в режим за сдвояване. За да свържете %1$s, натиснете и задръжте %2$s + %3$s за 3 секунди."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"дистанционно управление за Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Налични устройства"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Търсят се устройства…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Грешка"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Установява се връзка…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Установена е връзка"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Анулирано"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s – свързването не бе успешно"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s – установена е връзка"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s – връзката е прекратена"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Няма информация"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Критичнo"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Ниско"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Добро"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Потвърждаване на актуализацията на дистанционното управление"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"По време на актуализацията връзката с дистанционно ви управление може да бъде прекратена за кратко."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Напред"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Отказ"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Актуализация на дистанционното управление"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Налице е нов софтуер"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Налице е актуализация"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Дистанционното управление е актуално"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Актуализирането на дистанционното управление не бе успешно"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Срещнахме проблем при актуализирането на дистанционното ви управление. Моля, опитайте отново."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Моля, изчакайте"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Повторно сдвояване на дистанционното ви управление"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Активирано"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Деактивирано"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Ниво на батерията"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Фърмуер"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Адрес на Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Моля, подменете батерията"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Изтощена батерия"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Свързани устройства"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Дистанционни управления и аксесоари"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Актуализиране на дистанционното ви управление"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"В готовност за инсталиране"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"АКТУАЛИЗИРАНЕ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ОТХВЪРЛЯНЕ"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Батерията на дистанционното управление е изтощена"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Подменете батерията скоро"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Батерията на дистанционното управление е почти изтощена"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Подменете батерията скоро"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Батерията на дистанционното управление е изтощена"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Подменете батерията, за да използвате дистанционното управление"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Да"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Не"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Прекратяване на връзката с(ъс) %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Установяване на връзка с(ъс) %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Забравяне на %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Преименуване на свързаното ви устройство"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"CEC за HDMI"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Активиране на CEC за HDMI"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"CEC за HDMI ви позволява да управлявате и автоматично да включвате/изключвате други активирани за CEC за HDMI устройства посредством едно дистанционно управление.\n\nЗабележка: Уверете се, че сте активирали CEC за HDMI на телевизора си и другите HDMI устройства. Производителите често имат различни имена за тази функция, като например:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Настройване на бутоните на дистанционното управление"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Управление на бутоните за силата на звука, включване/изключване и избор на вход на телевизори, приемници и звукови панели"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Ниво на батерията: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Аксесоари"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Дистанционно управление"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Установена е връзка"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"По-рано свързвани"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Сдвояване на дистанционно управление или аксесоар"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Прекратяване на връзката"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Свързване"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Преименуване"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Забравяне"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Установена е връзка"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Връзката е прекратена"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Контролиране на устройството"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Свързване на ново устройство"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Преди да свържете нови устройства с Bluetooth, уверете се, че са в режим за сдвояване. За да свържете %1$s, натиснете и задръжте %2$s + %3$s за 3 секунди."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"дистанционно управление за Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Налични устройства"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Търсят се устройства…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Грешка"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Свързва се…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Установена е връзка"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Анулирано"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s – свързването не бе успешно"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Установена е връзка с(ъс) %1$s"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s – връзката е прекратена"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-bn/strings.xml b/libraries/BluetoothServices/res/values-bn/strings.xml
index 2f5700c..01abffc 100644
--- a/libraries/BluetoothServices/res/values-bn/strings.xml
+++ b/libraries/BluetoothServices/res/values-bn/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"সঙ্কটপূর্ণ"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"কম"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"ভাল"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"রিমোট আপডেট কনফার্ম করুন"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"আপডেট হওয়ার সময় আপনার রিমোটটি কিছুক্ষণের জন্য ডিসকানেক্ট হতে পারে।"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"চালিয়ে যান"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"বাতিল করুন"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"রিমোটের আপডেট"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"নতুন সফ্টওয়্যার উপলভ্য"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"আপডেট পাওয়া যাবে"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"রিমোটটি আপ-টু-ডেট করা আছে"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"রিমোট আপডেট করা যায়নি"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"আপনার রিমোট আপডেট করার সময় একটা সমস্যা হয়েছে। আবার চেষ্টা করুন।"</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"অপেক্ষা করুন"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"আপনার রিমোট আবার পেয়ার করুন"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"চালু করা আছে"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"বন্ধ আছে"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"ব্যাটারির চার্জ"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"ফার্মওয়্যার"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"ব্লুটুথ অ্যাড্রেস"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"ব্যাটারি বদলান"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"ব্যাটারির চার্জ কম"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"কানেক্ট করা ডিভাইস"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"রিমোট ও অ্যাক্সেসরি"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"রিমোট আপডেট করুন"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"ইনস্টল করা যাবে"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"আপডেট করুন"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"বাতিল করুন"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"রিমোটের ব্যাটারিতে কম চার্জ আছে"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"ব্যাটারি শীঘ্রই বদলান"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"রিমোটের ব্যাটারিতে প্রায় চার্জ নেই"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"ব্যাটারি শীঘ্রই বদলান"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"রিমোটের ব্যাটারিতে কোনও চার্জ নেই"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"রিমোট ব্যবহার করতে ব্যাটারি বদলান"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"হ্যাঁ"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"না"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s থেকে ডিসকানেক্ট করুন"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s-এ কানেক্ট করুন"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s ভুলে যান"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"আপনার কানেক্ট করা ডিভাইসের নাম বদল করুন"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC চালু করুন"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC-এর মাধ্যমে আপনি অন্য HDMI-CEC চালু আছে এমন ডিভাইস একটি রিমোট কন্ট্রোল দিয়ে নিজে থেকে চালু/বন্ধ করতে পারবেন।\n\nমনে রাখবেন: আপনার টিভি এবং অন্য HDMI ডিভাইসে HDMI-CEC চালু আছে কিনা দেখে নিন। প্রস্তুতকারকরা HDMI-CEC কে বিভিন্ন নাম দিয়ে থাকেন, যেমন:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"রিমোটের বোতাম সেট-আপ করুন"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"ভলিউম, পাওয়ার, টিভির ইনপুট, রিসিভার ও সাউন্ডবার কন্ট্রোল করুন"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"ব্যাটারিতে চার্জ আছে: %1$s%%"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"অ্যাক্সেসরি"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"রিমোট কন্ট্রোল"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"কানেক্ট করা আছে"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"আগে কানেক্ট করা ছিল"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"রিমোট বা অ্যাক্সেসরি পেয়ার করুন"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"ডিসকানেক্ট করুন"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"কানেক্ট করুন"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"নাম বদলান"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"সরিয়ে দিন"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"কানেক্ট করা আছে"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"ডিসকানেক্ট হয়ে গেছে"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"ডিভাইস নিয়ন্ত্রণ"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"নতুন ডিভাইস কানেক্ট করুন"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"নতুন ব্লুটুথ ডিভাইসগুলি কানেক্ট করার আগে, সেগুলি পেয়ারিং মোডে আছে কিনা দেখে নিন। %1$s কানেক্ট করতে, %2$s + %3$s ৩ সেকেন্ডের জন্য প্রেস করে ধরে থাকুন।"</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"একটি Android TV রিমোট"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"উপলভ্য ডিভাইস"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"ডিভাইস খোঁজা হচ্ছে…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"সমস্যা"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"কানেক্ট করা হচ্ছে..."</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"কানেক্ট করা আছে"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"বাতিল করা হয়েছে"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s কানেক্ট করা যায়নি"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s কানেক্ট করা আছে"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s কানেক্ট করা নেই"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"প্রযোজ্য নয়"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"গুরুত্বপূর্ণ"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"কম"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"ভাল"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"রিমোট সংক্রান্ত আপডেট কনফার্ম করুন"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"আপডেট করার সময় আপনার রিমোট কিছুক্ষণের জন্য ডিসকানেক্ট হতে পারে।"</string>
+    <string name="settings_continue" msgid="5640776697820481568">"চালিয়ে যান"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"বাতিল করুন"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"রিমোট সংক্রান্ত আপডেট"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"নতুন সফ্টওয়্যার উপলভ্য আছে"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"আপডেট পাওয়া যাবে"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"রিমোট আপ-টু-ডেট আছে"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"রিমোট আপডেট করা যায়নি"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"আপনার রিমোট আপডেট করার সময় কোনও সমস্যা হয়েছে। আবার চেষ্টা করুন।"</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"অপেক্ষা করুন"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"আপনার রিমোট আবার পেয়ার করুন"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"চালু আছে"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"বন্ধ করা আছে"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"ব্যাটারির চার্জ"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"ফার্মওয়্যার"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"ব্লুটুথ অ্যাড্রেস"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"ব্যাটারি পাল্টান"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"ব্যাটারির চার্জ কম আছে"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"কানেক্ট করা ডিভাইস"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"রিমোট ও অ্যাক্সেসরি"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"আপনার রিমোট আপডেট করুন"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"ইনস্টল করার জন্য রেডি"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"আপডেট করুন"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"বাতিল করুন"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"রিমোটের ব্যাটারিতে কম চার্জ আছে"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"ব্যাটারি শীঘ্রই পাল্টান"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"রিমোটের ব্যাটারিতে প্রায় চার্জ নেই"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"ব্যাটারি শীঘ্রই পাল্টান"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"রিমোটের ব্যাটারিতে কোনও চার্জ নেই"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"রিমোট ব্যবহার করতে ব্যাটারি পাল্টান"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"হ্যাঁ"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"না"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s থেকে ডিসকানেক্ট করুন"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s-এ কানেক্ট করুন"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s ভুলে যান"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"আপনার কানেক্ট করা ডিভাইসের নাম দিন"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC চালু করুন"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC-এর মাধ্যমে আপনি অন্য HDMI-CEC চালু আছে এমন ডিভাইস একটি রিমোট কন্ট্রোল দিয়ে নিজে থেকে চালু/বন্ধ করতে পারবেন।\n\nদ্রষ্টব্য: আপনার টিভি এবং অন্য HDMI ডিভাইসে HDMI-CEC চালু আছে কিনা ভাল করে দেখে নিন। প্রস্তুতকারকরা HDMI-CEC কে বিভিন্ন নাম দিয়ে থাকেন, যেমন:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"রিমোটের বোতাম সেট-আপ করুন"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"ভলিউম, পাওয়ার, টিভির ইনপুট, রিসিভার ও সাউন্ডবার নিয়ন্ত্রণ করুন"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"ব্যাটারিতে চার্জ আছে: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"অ্যাক্সেসরি"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"রিমোট কন্ট্রোল"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"কানেক্ট করা আছে"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"আগে কানেক্ট করা ছিল"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"রিমোট বা অ্যাক্সেসরি পেয়ার করুন"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"ডিসকানেক্ট"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"কানেক্ট করুন"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"নাম পরিবর্তন করুন"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"ভুলে যান"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"কানেক্ট করা আছে"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"ডিসকানেক্ট হয়ে গেছে"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"ডিভাইস নিয়ন্ত্রণ"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"নতুন ডিভাইস কানেক্ট করুন"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"নতুন ব্লুটুথ ডিভাইস কানেক্ট করার আগে, সেগুলি যোগ করার মোডে আছে কিনা তা দেখে নিন। %1$s কানেক্ট করতে, %2$s + %3$s ৩ সেকেন্ডের জন্য প্রেস করে ধরে থাকুন।"</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"একটি Android TV রিমোট"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"উপলভ্য ডিভাইস"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"ডিভাইস খোঁজা হচ্ছে…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"সমস্যা"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"কানেক্ট করা হচ্ছে…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"কানেক্ট করা আছে"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"বাতিল করা হয়েছে"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s কানেক্ট করা যায়নি"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s কানেক্ট করা আছে"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s কানেক্ট করা নেই"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-bs/strings.xml b/libraries/BluetoothServices/res/values-bs/strings.xml
index 5be9648..f8a8249 100644
--- a/libraries/BluetoothServices/res/values-bs/strings.xml
+++ b/libraries/BluetoothServices/res/values-bs/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Nije primjenjivo"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritično"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Nisko"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Dobro"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Potvrdite ažuriranje daljinskog upravljanja"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Moguće je da tokom ažuriranja vaše daljinsko upravljanje nakratko izgubi vezu."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Nastavi"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Otkaži"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Ažuriranje daljinskog upravljanja"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Dostupan je novi softver"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Ažuriranje je dostupno"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Daljinsko upravljanje je ažurirano"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Ažuriranje daljinskog upravljanja nije uspjelo"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Primijetili smo problem pri ažuriranju vašeg daljinskog upravljanja. Pokušajte ponovo."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Pričekajte"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Ponovo uparite daljinski upravljač"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Omogućeno"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Onemogućeno"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Nivo napunjenosti baterije"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmver"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth adresa"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Zamijenite bateriju"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Slaba baterija"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Povezani uređaji"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Daljinski upravljači i dodaci"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Ažurirajte daljinski upravljač"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Spremno za instaliranje"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"AŽURIRAJ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ODBACI"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Baterija daljinskog upravljača je slaba"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Uskoro zamijenite bateriju"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Baterija daljinskog upravljača je skoro prazna"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Uskoro zamijenite bateriju"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Baterija daljinskog upravljača je prazna"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Zamijenite bateriju da koristite daljinski upravljač"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Da"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Ne"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Prekini povezanost s uređajem %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Povezivanje s uređajem %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Zaboravi uređaj %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Preimenujte povezani uređaj"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Omogući HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC vam omogućava kontroliranje i automatsko uključivanje/isključivanje drugih uređaja na kojima je omogućena funkcija HDMI-CEC i to pomoću jednog daljinskog upravljača.\n\nNapomena: Provjerite je li funkcija HDMI-CEC omogućena na vašem TV-u i drugim HDMI uređajima. Proizvođači često imaju različite nazive za funkciju HDMI-CEC, naprimjer:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Postavite dugmad daljinskog upravljača"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Kontrolirajte jačinu zvuka, uključivanje, ulaz na TV-ima, prijemnicima i soundbar zvučnicima"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Nivo napunjenosti baterije: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Dodaci"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Daljinski upravljač"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Povezano"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Prethodno povezano"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Uparivanje daljinskog upravljača ili dodatka"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Prekini vezu"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Poveži"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Promijeni naziv"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Zaboravi"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Povezano"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Veza je prekinuta"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Kontrola uređaja"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Poveži novi uređaj"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Prije povezivanja novih Bluetooth uređaja, provjerite je li na njima pokrenut način rada za uparivanje. Da povežete uređaj %1$s, pritisnite i držite 3 sekunde %2$s + %3$s."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"daljinski upravljač za Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Dostupni uređaji"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Traženje uređaja…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Greška"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Povezivanje…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Povezano"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Otkazano"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Povezivanje uređaja %1$s nije uspjelo"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s je povezan"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"Prekinuta je veza s uređajem %1$s"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"nije primjenjivo"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritično"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Nisko"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Dobro"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Potvrdite ažuriranje daljinskog upravljača"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Moguće je da tokom ažuriranja daljinski upravljač nakratko izgubi vezu."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Nastavi"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Otkaži"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Ažuriranje daljinskog upravljača"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Dostupan je novi softver"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Ažuriranje je dostupno"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Daljinski upravljač je ažuran"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Ažuriranje daljinskog upravljanja nije uspjelo"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Došlo je do problema prilikom ažuriranja daljinskog upravljača. Pokušajte ponovo."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Pričekajte"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Ponovo uparite daljinski upravljač"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Omogućeno"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Onemogućeno"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Nivo napunjenosti baterije"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmver"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth adresa"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Zamijenite bateriju"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Slaba baterija"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Povezani uređaji"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Daljinski upravljači i dodaci"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Ažurirajte daljinski upravljač"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Spremno za instaliranje"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"AŽURIRAJ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ODBACI"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Baterija daljinskog upravljača je slaba"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Uskoro zamijenite bateriju"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Baterija daljinskog upravljača je skoro prazna"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Uskoro zamijenite bateriju"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Baterija daljinskog upravljača je prazna"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Zamijenite bateriju da koristite daljinski upravljač"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Da"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Ne"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Prekini povezanost s uređajem %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Povezivanje s uređajem %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Zaboravi uređaj %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Preimenujte povezani uređaj"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Omogući HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC vam omogućava kontroliranje i automatsko uključivanje/isključivanje drugih uređaja na kojima je omogućena funkcija HDMI-CEC i to pomoću jednog daljinskog upravljača.\n\nNapomena: Provjerite je li funkcija HDMI-CEC omogućena na vašem TV-u i drugim HDMI uređajima. Proizvođači često imaju različite nazive za funkciju HDMI-CEC, naprimjer:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Postavite dugmad daljinskog upravljača"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Kontrolirajte jačinu zvuka, uključivanje, ulaz na TV-ima, prijemnicima i soundbar zvučnicima"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Nivo napunjenosti baterije: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Dodaci"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Daljinski upravljač"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Povezan"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Prethodno povezano"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Uparivanje daljinskog upravljača ili dodatka"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Prekini vezu"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Poveži"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Promijeni naziv"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Zaboravi"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Povezano"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Veza je prekinuta"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Kontrola uređaja"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Poveži novi uređaj"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Prije povezivanja novih Bluetooth uređaja provjerite je li na njima pokrenut način rada za uparivanje. Da povežete uređaj %1$s, pritisnite i zadržite %2$s + %3$s 3 sekunde."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"daljinski upravljač za Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Dostupni uređaji"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Traženje uređaja…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Greška"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Povezivanje…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Povezano"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Otkazano"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Povezivanje uređaja %1$s nije uspjelo"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Uređaj %1$s je povezan"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Prekinuta je veza s uređajem %1$s"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-ca/strings.xml b/libraries/BluetoothServices/res/values-ca/strings.xml
index 0369ae2..b97cacc 100644
--- a/libraries/BluetoothServices/res/values-ca/strings.xml
+++ b/libraries/BluetoothServices/res/values-ca/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/D"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Crític"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Baix"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Bo"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Confirma l\'actualització del comandament"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"És possible que el comandament es desconnecti breument durant l\'actualització."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Continua"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Cancel·la"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Actualització del comandament"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Hi ha un nou programari disponible"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Actualització a punt"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"El comandament està actualitzat"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"No s\'ha pogut actualitzar el comandament"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"S\'ha produït un error en actualitzar el comandament. Torna-ho a provar."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Espera"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Torna a vincular el comandament"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Activat"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Desactivat"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Nivell de bateria"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Microprogramari"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Adreça Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Canvia la bateria"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Bateria baixa"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Dispositius connectats"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Comandaments i accessoris"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Actualitza el teu comandament"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"A punt per instal·lar"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ACTUALITZA"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"IGNORA"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"La bateria del comandament s\'està esgotant"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Aviat hauràs de substituir la bateria"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"La bateria del comandament gairebé està esgotada"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Aviat hauràs de substituir la bateria"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"La bateria del comandament s\'ha esgotat"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Substitueix la bateria per utilitzar el comandament"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Sí"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"No"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Desconnecta del dispositiu %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Connecta\'t a %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Oblida el dispositiu %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Canvia el nom del dispositiu connectat"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Activa HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC et permet controlar i activar i desactivar automàticament els dispositius en què l\'hagis activat amb un únic comandament.\n\nNota: comprova que HDMI-CEC està activat al televisor i en altres dispositius HDMI. El nom d\'HDMI-CEC pot variar segons el fabricant, com en els casos següents:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Configura els botons del comandament"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Controla el volum, l\'engegada i l\'entrada de televisors, receptors i barres de so"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Nivell de bateria: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Accessoris"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Comandament"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Connectat"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Connectats prèviament"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Vincula un comandament o accessori"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Desconnecta"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Connecta"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Canvia el nom"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Oblida"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Connectat"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Desconnectat"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Control del dispositiu"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Connecta un dispositiu nou"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Abans de connectar més dispositius Bluetooth, assegura\'t que estiguin en mode de vinculació. Per connectar %1$s, mantén premut %2$s + %3$s durant 3 segons."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"un comandament d\'Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Dispositius disponibles"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"S\'estan cercant dispositius…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Error"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"S\'està connectant…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Connectat"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Cancel·lat"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s no s\'ha pogut connectar"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s connectat"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s desconnectat"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Crític"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Baix"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Bo"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Confirma l\'actualització del comandament"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"És possible que el comandament es desconnecti breument durant l\'actualització."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Continua"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Cancel·la"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Actualització del comandament"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Hi ha un nou programari disponible"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Actualització disponible"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"El comandament està actualitzat"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"No s\'ha pogut actualitzar el comandament"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"S\'ha produït un error en actualitzar el comandament. Torna-ho a provar."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Espera"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Torna a vincular el comandament"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Activat"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Desactivat"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Nivell de bateria"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Microprogramari"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Adreça de Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Canvia la pila"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Bateria baixa"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Dispositius connectats"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Comandaments i accessoris"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Actualitza el teu comandament"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"A punt per instal·lar"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ACTUALITZA"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"IGNORA"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"La pila del comandament s\'està esgotant"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Aviat hauràs de substituir la pila"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"La pila del comandament gairebé està esgotada"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Aviat hauràs de substituir la pila"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"La pila del comandament s\'ha esgotat"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Substitueix la pila per utilitzar el comandament"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Sí"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"No"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Desconnecta del dispositiu %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Connecta\'t a %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Oblida el dispositiu %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Canvia el nom del dispositiu connectat"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Activa HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC et permet controlar i activar i desactivar automàticament els dispositius en què l\'hagis activat amb un únic comandament.\n\nNota: Comprova que HDMI-CEC està activat al televisor i en altres dispositius HDMI. El nom d\'HDMI-CEC pot variar segons el fabricant, com en els casos següents:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Configura els botons del comandament"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Controla el volum, l\'engegada i l\'entrada de televisors, receptors i barres de so"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Nivell de bateria: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Accessoris"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Comandament"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Connectat"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Connectats prèviament"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Vincula un comandament o accessori"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Desconnecta"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Connecta"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Canvia el nom"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Oblida"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Connectat"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Desconnectat"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Control del dispositiu"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Connecta un dispositiu nou"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Abans de connectar més dispositius Bluetooth, assegura\'t que estiguin en mode de vinculació. Per connectar %1$s, mantén premut %2$s + %3$s durant 3 segons."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"un comandament d\'Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Dispositius disponibles"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"S\'estan cercant dispositius…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Error"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"S\'està connectant…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Connectat"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Cancel·lat"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s no s\'ha pogut connectar"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s s\'ha connectat"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s s\'ha desconnectat"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-cs/strings.xml b/libraries/BluetoothServices/res/values-cs/strings.xml
index ae9c180..a838e40 100644
--- a/libraries/BluetoothServices/res/values-cs/strings.xml
+++ b/libraries/BluetoothServices/res/values-cs/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"–"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritická"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Nízká"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Dobrá"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Potvrzení aktualizace dálkového ovládání"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Při aktualizaci může být dálkové ovládání krátce odpojeno."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Pokračovat"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Zrušit"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Aktualizace dálkového ovládání"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Je k dispozici nový software"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"K dispozici je aktualizace"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Dálkové ovládání je aktualizováno"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Aktualizace dálkového ovládání se nezdařila"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Při aktualizaci dálkového ovládání došlo k potížím. Zkuste to znovu."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Čekejte prosím"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Znovu spárovat dálkové ovládání"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Povoleno"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Zakázáno"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Úroveň baterie"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d %%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Adresa Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Vyměňte baterii"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Slabá baterie"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Připojená zařízení"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Dálkové ovládání a příslušenství"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Aktualizace dálkového ovládání"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Připraveno k instalaci"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"AKTUALIZOVAT"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ZAVŘÍT"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Baterie v dálkovém ovládání se brzy vybije"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Brzy vyměňte baterii"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Baterie v dálkovém ovládání je skoro vybitá"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Brzy vyměňte baterii"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Baterie v dálkovém ovládání je vybitá"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Vyměňte baterii, aby bylo možné používat dálkové ovládání"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Ano"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Ne"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Odpojit od %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Připojit k zařízení %s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Zapomenout %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Přejmenovat připojené zařízení"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Aktivovat HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC umožňuje ovládat a automaticky zapínat/vypínat jiná zařízení s podporou HDMI-CEC, a to pomocí jediného dálkového ovládání.\n\nPoznámka: Zkontrolujte, zda je v televizoru a ostatních zařízeních HDMI aktivováno HDMI-CEC. Výrobci pro technologii HDMI-CEC často používají jiný název, např.:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Nastavení vzdálených tlačítek"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Ovládání hlasitosti, vstupu a napájení televizorů, přijímačů a soundbarů"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Úroveň baterie: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Doplňky"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Dálkové ovládání"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Připojeno"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Dříve připojeno"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Spárovat dálkové ovládání nebo příslušenství"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Odpojit"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Připojit se"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Přejmenovat"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Zapomenout"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Připojeno"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Odpojeno"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Řízení zařízení"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Připojit nové zařízení"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Než připojíte nová zařízení Bluetooth, zkontrolujte, zda jsou v režimu párování. Chcete-li připojit zařízení %1$s, na tři sekundy podržte %2$s a %3$s."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"dálkové ovládání Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Dostupná zařízení"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Hledání zařízení…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Chyba"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Připojování…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Připojeno"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Zrušeno"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Zařízení %1$s se nepodařilo připojit"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"Zařízení %1$s je připojeno"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"Zařízení %1$s je odpojeno"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"–"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritická"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Nízká"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Dobré"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Potvrzení aktualizace dálkového ovládání"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Při aktualizaci může být dálkové ovládání krátce odpojeno."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Pokračovat"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Zrušit"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Aktualizace dálkového ovládání"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Je k dispozici nový software"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Dostupná aktualizace"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Dálkové ovládání je aktualizováno"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Aktualizace dálkového ovládání se nezdařila"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Při aktualizaci dálkového ovládání došlo k potížím. Zkuste to znovu."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Čekejte prosím"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Znovu spárovat dálkové ovládání"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Aktivováno"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Vypnuto"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Stav baterie"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d %%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Adresa Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Vyměňte baterii"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Slabá baterie"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Připojená zařízení"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Dálkový ovladač a příslušenství"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Aktualizace dálkového ovládání"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Připraveno k instalaci"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"AKTUALIZOVAT"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ZAVŘÍT"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Baterie v dálkovém ovládání se brzy vybije"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Brzy vyměňte baterii"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Baterie v dálkovém ovládání je skoro vybitá"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Brzy vyměňte baterii"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Baterie v dálkovém ovládání je vybitá"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Vyměňte baterii, aby bylo možné používat dálkové ovládání"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Ano"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Ne"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Odpojit od %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Připojit k zařízení %s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Zapomenout %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Přejmenovat připojené zařízení"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Aktivovat HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC umožňuje ovládat a automaticky zapínat/vypínat jiná zařízení s podporou HDMI-CEC, a to pomocí jediného dálkového ovládání.\n\nPoznámka: Zkontrolujte, zda je v televizoru a ostatních zařízeních HDMI aktivováno HDMI-CEC. Výrobci pro technologii HDMI-CEC často používají jiný název, např.:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Nastavení vzdálených tlačítek"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Ovládání hlasitosti, vstupu a napájení televizorů, přijímačů a soundbarů"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Úroveň baterie: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Doplňky"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Dálkové ovládání"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Připojeno"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Dříve připojeno"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Spárovat dálkové ovládání nebo příslušenství"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Odpojit"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Připojit"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Přejmenovat"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Zapomenout"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Připojeno"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Odpojeno"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Řízení zařízení"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Připojit nové zařízení"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Než připojíte nová zařízení Bluetooth, zkontrolujte, zda jsou v režimu párování. Pokud chcete připojit zařízení %1$s, na tři sekundy podržte %2$s a %3$s."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"dálkové ovládání Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Dostupná zařízení"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Hledání zařízení…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Chyba"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Připojování…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Připojeno"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Zrušeno"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Zařízení %1$s se nepodařilo připojit"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Zařízení %1$s je připojeno"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Zařízení %1$s je odpojeno"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-da/strings.xml b/libraries/BluetoothServices/res/values-da/strings.xml
index f5f7248..e3d28a3 100644
--- a/libraries/BluetoothServices/res/values-da/strings.xml
+++ b/libraries/BluetoothServices/res/values-da/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Ikke tilgængeligt"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritisk"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Lavt"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Godt"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Bekræft opdatering af fjernbetjening"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Forbindelsen til din fjernbetjening afbrydes muligvis i et kort øjeblik under opdateringen."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Fortsæt"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Annuller"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Opdatering til fjernbetjening"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Ny tilgængelig software"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Ny opdatering"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Fjernbetjeningen er opdateret"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Opdateringen af fjernbetjeningen mislykkedes"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Der opstod en fejl under opdateringen af din fjernbetjening. Prøv igen."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Vent"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Par din fjernbetjening igen"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Aktiveret"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Deaktiveret"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Batteriniveau"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth-adresse"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Skift batteri"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Lavt batteriniveau"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Forbundne enheder"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Fjernbetjeninger og tilbehør"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Opdater din fjernbetjening"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Klar til installation"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"OPDATER"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"LUK"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Batteriniveauet i fjernbetjeningen er lavt"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Batteriet skal snart udskiftes"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Der er næsten ikke mere batteri på fjernbetjeningen"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Batteriet skal snart udskiftes"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Der er ikke mere batteri på fjernbetjeningen"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Udskift batteriet for at bruge fjernbetjeningen"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Ja"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Nej"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Afbryd forbindelsen til %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Opret forbindelse til %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Glem %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Omdøb dine forbundne enheder"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Aktivér HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Med HDMI-CEC kan du styre og automatisk aktivere/deaktivere andre enheder med HDMI-CEC ved hjælp af en enkelt fjernbetjening.\n\nBemærk! Du skal sørge for, at HDMI-CEC er aktiveret på dit fjernsyn og dine andre HDMI-enheder. Producenter bruger ofte forskellige navne for HDMI-CEC, f.eks.:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Konfigurer knapper på fjernbetjeningen"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Styr lydstyrke, afbryderknap og indgangskilde på fjernsyn, modtagere og soundbars"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Batteriniveau: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Tilbehør"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Fjernbetjening"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Forbundet"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Tidligere forbindelser"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Par fjernbetjening eller tilbehør"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Afbryd forbindelsen"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Opret forbindelse"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Omdøb"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Glem"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Forbundet"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Afbrudt"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Enhedsstyring"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Forbind en ny enhed"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Inden du forbinder dine Bluetooth-enheder, skal du sørge for, at de er i parringstilstand Hold fingeren nede på %2$s+%3$s i tre sekunder for at forbinde %1$s."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"en Android TV-fjernbetjening"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Tilgængelige enheder"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Søger efter enheder…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Fejl"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Forbinder…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Forbundet"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Annulleret"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Der kunne ikke oprettes forbindelse til %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s er forbundet"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"Forbindelsen til %1$s blev afbrudt"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"–"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritisk"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Lav"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"God"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Bekræft opdatering af fjernbetjening"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Forbindelsen til din fjernbetjening afbrydes muligvis i et kort øjeblik under opdateringen."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Fortsæt"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Annuller"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Opdatering til fjernbetjening"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Ny tilgængelig software"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Ny opdatering"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Fjernbetjeningen er opdateret"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Fjernbetjeningen kunne ikke opdateres"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Der opstod et problem under opdateringen af din fjernbetjening. Prøv igen."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Vent"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Par din fjernbetjening igen"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Aktiveret"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Deaktiveret"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Batteriniveau"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d %%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth-adresse"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Udskift batteriet"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Lavt batteriniveau"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Forbundne enheder"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Fjernbetjeninger og tilbehør"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Opdater din fjernbetjening"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Klar til installation"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"OPDATER"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"AFVIS"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Batteriniveauet i fjernbetjeningen er lavt"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Batteriet skal snart udskiftes"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Der er næsten ikke mere batteri på fjernbetjeningen"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Batteriet skal snart udskiftes"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Der er ikke mere batteri på fjernbetjeningen"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Udskift batteriet for at bruge fjernbetjeningen"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Ja"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Nej"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Afbryd forbindelsen til %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Opret forbindelse til %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Glem %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Omdøb dine tilsluttede enheder"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Aktivér HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Med HDMI-CEC kan du styre og automatisk aktivere/deaktivere andre enheder med HDMI-CEC ved hjælp af en enkelt fjernbetjening.\n\nBemærk! Du skal sørge for, at HDMI-CEC er aktiveret på dit fjernsyn og dine andre HDMI-enheder. Producenter bruger ofte forskellige navne for HDMI-CEC, f.eks.:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Konfigurer fjernbetjeningsknapper"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Styr lydstyrke, afbryderknap og indgangskilde på fjernsyn, modtagere og soundbars"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Batteriniveau: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Tilbehør"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Fjernbetjening"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Tilsluttet"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Tidligere forbindelser"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Par fjernbetjening eller tilbehør"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Afbryd forbindelsen"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Opret forbindelse"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Omdøb"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Glem"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Forbundet"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Afbrudt"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Enhedsstyring"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Forbind ny enhed"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Inden du forbinder dine Bluetooth-enheder, skal du sørge for, at de er i parringstilstand Hold fingeren nede på %2$s+%3$s i 3 sekunder for at forbinde %1$s."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"en Android TV-fjernbetjening"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Tilgængelige enheder"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Søger efter enheder…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Fejl"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Opretter forbindelse…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Der er oprettet forbindelse"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Annulleret"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Der kunne ikke oprettes forbindelse til %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s er forbundet"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Forbindelsen til %1$s blev afbrudt"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-de/strings.xml b/libraries/BluetoothServices/res/values-de/strings.xml
index a6556ce..4e4438e 100644
--- a/libraries/BluetoothServices/res/values-de/strings.xml
+++ b/libraries/BluetoothServices/res/values-de/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Nicht verfügbar"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritisch"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Niedrig"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Gut"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Update der Fernbedienung bestätigen"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Während des Updates wird die Verbindung zu deiner Fernbedienung eventuell für kurze Zeit unterbrochen."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Fortfahren"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Abbrechen"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Update der Fernbedienung"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Neue Software verfügbar"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Update verfügbar"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Die Fernbedienung ist auf dem neuesten Stand"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Update der Fernbedienung fehlgeschlagen"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Beim Aktualisieren deiner Fernbedienung ist ein Problem aufgetreten. Versuch es bitte noch einmal."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Bitte warten"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Fernbedienung wieder koppeln"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Aktiviert"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Deaktiviert"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Akkustand"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth-Adresse"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Bitte Akku wechseln"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Niedriger Akkustand"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Verbundene Geräte"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Fernbedienungen &amp; Zubehör"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Fernbedienung aktualisieren"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Zur Installation bereit"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"AKTUALISIEREN"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"SCHLIEẞEN"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Batterie der Fernbedienung fast leer"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Batterie demnächst austauschen"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Batterie der Fernbedienung fast leer"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Batterie demnächst austauschen"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Batterie der Fernbedienung leer"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Batterie austauschen, um Fernbedienung zu verwenden"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Ja"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Nein"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Verbindung zu %1$s trennen"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Mit %1$s verbinden"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s entfernen"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Verbundenes Gerät umbenennen"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC aktivieren"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Mit HDMI-CEC kannst du andere HDMI-CEC-fähige Geräte verwalten und automatisch mit einer einzigen Fernbedienung aktivieren und deaktivieren.\n\nHinweis: Beachte, dass hierfür HDMI-CEC auf deinem Fernseher und anderen HDMI-Geräten aktiviert sein muss. Hersteller haben häufig unterschiedliche Namen für HDMI-CEC. Zum Beispiel:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Fernbedienung einrichten"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Lautstärke, Ein/Aus und Eingang auf Fernsehern, Receivern und Soundbars steuern"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Batteriestand: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Zubehör"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Fernbedienung"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Verbunden"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Zuletzt verbundene Geräte"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Fernbedienung oder Zubehör koppeln"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Verbindung trennen"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Verbinden"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Umbenennen"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Entfernen"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Verbunden"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Nicht verbunden"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Gerätesteuerung"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Neues Gerät verbinden"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Damit du neue Bluetooth-Geräte verbinden kannst, müssen sie sich im Kopplungsmodus befinden. Wenn du %1$s verbinden möchtest, musst du %2$s und %3$s 3 Sekunden lang gedrückt halten."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"eine Android TV-Fernbedienung"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Verfügbare Geräte"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Suche nach Geräten läuft…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Fehler"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Verbinden…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Verbunden"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Abgebrochen"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s konnte keine Verbindung herstellen"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s verbunden"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"Verbindung mit %1$s getrennt"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"–"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritisch"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Niedrig"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Gut"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Update der Fernbedienung bestätigen"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Während des Updates wird die Verbindung zu deiner Fernbedienung eventuell für kurze Zeit unterbrochen."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Weiter"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Abbrechen"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Update der Fernbedienung"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Neue Software verfügbar"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Update verfügbar"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Die Fernbedienung ist auf dem neuesten Stand"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Update der Fernbedienung fehlgeschlagen"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Beim Aktualisieren deiner Fernbedienung ist ein Problem aufgetreten. Bitte versuche es noch einmal."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Bitte warten"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Fernbedienung wieder koppeln"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Aktiviert"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Deaktiviert"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Akkustand"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth-Adresse"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Bitte Akku wechseln"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Akkustand niedrig"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Verbundene Geräte"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Fernbedienungen &amp; Zubehör"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Fernbedienung aktualisieren"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Zur Installation bereit"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"AKTUALISIEREN"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"SCHLIEẞEN"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Akku der Fernbedienung fast leer"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Akku demnächst austauschen"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Akku der Fernbedienung fast leer"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Akku demnächst austauschen"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Akku der Fernbedienung leer"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Akku austauschen, um Fernbedienung zu verwenden"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Ja"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Nein"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Verbindung zu %1$s trennen"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Mit %1$s verbinden"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s entfernen"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Verbundenes Gerät umbenennen"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC aktivieren"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Mit HDMI-CEC kannst du andere HDMI-CEC-fähige Geräte verwalten und automatisch mit einer einzigen Fernbedienung aktivieren/deaktivieren.\n\nHinweis: Beachte, dass hierfür HDMI-CEC auf deinem Fernseher und anderen HDMI-Geräten aktiviert sein muss. Hersteller haben häufig unterschiedliche Namen für HDMI-CEC. Zum Beispiel:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Tasten der Fernbedienung einrichten"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Lautstärke, Ein/Aus und Eingang auf Fernsehern, Receivern und Soundbars steuern"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Akkustand: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Zubehör"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Fernbedienung"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Verbunden"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Zuletzt verbundene Geräte"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Fernbedienung oder Zubehör koppeln"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Verbindung aufheben"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Verbinden"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Umbenennen"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Entfernen"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Verbunden"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Nicht verbunden"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Gerätesteuerung"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Neues Gerät verbinden"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Damit du neue Bluetooth-Geräte verbinden kannst, müssen sie sich im Kopplungsmodus befinden. Wenn du %1$s verbinden möchtest, musst du %2$s und %3$s 3 Sekunden lang gedrückt halten."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"eine Android TV-Fernbedienung"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Verfügbare Geräte"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Suche nach Geräten läuft…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Fehler"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Wird verbunden…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Verbunden"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Abgebrochen"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s konnte keine Verbindung herstellen"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s verbunden"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Verbindung mit %1$s getrennt"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-el/strings.xml b/libraries/BluetoothServices/res/values-el/strings.xml
index 1875117..f1675c5 100644
--- a/libraries/BluetoothServices/res/values-el/strings.xml
+++ b/libraries/BluetoothServices/res/values-el/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Δ/Ι"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Κρίσιμο"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Χαμηλό"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Καλό"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Επιβεβαίωση ενημέρωσης τηλεχειριστηρίου"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Κατά τη διάρκεια της ενημέρωσης, το τηλεχειριστήριό σας μπορεί να αποσυνδεθεί για μικρό χρονικό διάστημα."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Συνέχεια"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Ακύρωση"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Ενημέρωση τηλεχειριστηρίου"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Υπάρχει διαθέσιμο νέο λογισμικό"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Διαθέσιμη ενημέρωση"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Το τηλεχειριστήριο έχει ενημερωθεί"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Αποτυχία ενημέρωσης τηλεχειριστηρίου"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Παρουσιάστηκε πρόβλημα κατά την ενημέρωση του τηλεχειριστηρίου σας. Δοκιμάστε ξανά."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Περιμένετε"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Επαναλάβετε τη σύζευξη του τηλεχειριστηρίου"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Ενεργοποιήθηκε"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Απενεργοποιήθηκε"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Επίπεδο μπαταρίας"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Υλικολογισμικό"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Διεύθυνση Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Αντικαταστήστε την μπαταρία"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Χαμηλή στάθμη μπαταρίας"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Συνδεδεμένες συσκευές"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Τηλεχειριστήρια και αξεσουάρ"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Ενημερώστε το τηλεχειριστήριο"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Έτοιμο για εγκατάσταση"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ΕΝΗΜΕΡΩΣΗ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ΠΑΡΑΒΛΕΨΗ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Χαμηλή μπαταρία τηλεχειριστηρίου"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Αντικαταστήστε την μπαταρία σύντομα"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Η μπαταρία του τηλεχειριστηρίου είναι σχεδόν άδεια"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Αντικαταστήστε την μπαταρία σύντομα"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Η μπαταρία του τηλεχειριστηρίου είναι άδεια"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Αντικαταστήστε την μπαταρία για να χρησιμοποιήσετε το τηλεχειριστήριο"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Ναι"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Όχι"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Αποσύνδεση από %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Σύνδεση σε %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Διαγραφή %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Μετονομάστε τη συνδεδεμένη συσκευή σας"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Ενεργοποίηση HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Το HDMI-CEC σάς επιτρέπει να ελέγχετε και να ενεργοποιείτε/απενεργοποιείτε αυτόματα άλλες συσκευές με δυνατότητα HDMI-CEC, με ένα μόνο τηλεχειριστήριο.\n\nΣημείωση: Βεβαιωθείτε ότι το HDMI-CEC είναι ενεργοποιημένο στην τηλεόρασή σας και στις άλλες συσκευές HDMI. Οι κατασκευαστές έχουν συχνά διαφορετικές ονομασίες για το HDMI-CEC, για παράδειγμα:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Ρύθμιση κουμπιών τηλεχειριστηρίου"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Έλεγχος έντασης ήχου, έναρξης και τερματισμού λειτουργίας, πηγών εισόδου σε τηλεοράσεις, δέκτες και soundbar"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Επίπεδο μπαταρίας: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Αξεσουάρ"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Τηλεχειριστήριο"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Συνδέθηκε"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Συνδέθηκαν στο παρελθόν"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Σύζευξη τηλεχειριστηρίου ή αξεσουάρ"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Αποσύνδεση"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Σύνδεση"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Μετονομασία"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Διαγραφή"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Συνδέθηκε"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Αποσυνδέθηκε"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Έλεγχος συσκευής"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Σύνδεση νέας συσκευής"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Προτού συνδέσετε νέες συσκευές Bluetooth, βεβαιωθείτε ότι βρίσκονται σε λειτουργία σύζευξης. Για να συνδέσετε τη συσκευή %1$s, πιέστε παρατεταμένα %2$s + %3$s για 3 δευτερόλεπτα."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"ένα Τηλεχειριστήριο Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Διαθέσιμες συσκευές"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Αναζήτηση για συσκευές…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Σφάλμα"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Σύνδεση…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Συνδέθηκε"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Ακυρώθηκε"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Η συσκευή %1$s απέτυχε να συνδεθεί"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s συνδέθηκε"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s αποσυνδέθηκε"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Δ/Ι"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Κρίσιμη"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Χαμηλή"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Καλή"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Επιβεβαίωση ενημέρωσης τηλεχειριστηρίου"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Κατά τη διάρκεια της ενημέρωσης, το τηλεχειριστήριο μπορεί να αποσυνδεθεί για μικρό χρονικό διάστημα."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Συνέχεια"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Ακύρωση"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Ενημέρωση τηλεχειριστηρίου"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Υπάρχει διαθέσιμο νέο λογισμικό"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Διαθέσιμη ενημέρωση"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Το τηλεχειριστήριο είναι ενημερωμένο"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Αποτυχία ενημέρωσης τηλεχειριστηρίου"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Παρουσιάστηκε πρόβλημα κατά την ενημέρωση του τηλεχειριστηρίου σας. Δοκιμάστε ξανά."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Περιμένετε"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Επαναλάβετε τη σύζευξη του τηλεχειριστηρίου"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Ενεργοποιημένες"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Απενεργοποιημένες"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Επίπεδο μπαταρίας"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Υλικολογισμικό"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Διεύθυνση Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Αντικαταστήστε την μπαταρία"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Χαμηλή στάθμη μπαταρίας"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Συνδεδεμένες συσκευές"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Τηλεχειριστήρια και αξεσουάρ"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Ενημερώστε το τηλεχειριστήριο"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Έτοιμο για εγκατάσταση"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ΕΝΗΜΕΡΩΣΗ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ΠΑΡΑΒΛΕΨΗ"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Χαμηλή στάθμη μπαταρίας τηλεχειριστηρίου"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Αντικαταστήστε την μπαταρία σύντομα"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Η μπαταρία του τηλεχειριστηρίου είναι σχεδόν άδεια"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Αντικαταστήστε την μπαταρία σύντομα"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Η μπαταρία του τηλεχειριστηρίου είναι άδεια"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Αντικαταστήστε την μπαταρία για να χρησιμοποιήσετε το τηλεχειριστήριο"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Ναι"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Όχι"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Αποσύνδεση από %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Σύνδεση σε %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Διαγραφή %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Μετονομάστε τη συνδεδεμένη συσκευή σας"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Ενεργοποίηση HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Το HDMI-CEC σάς επιτρέπει να ελέγχετε και να ενεργοποιείτε/απενεργοποιείτε αυτόματα άλλες συσκευές με δυνατότητα HDMI-CEC, με ένα μόνο τηλεχειριστήριο.\n\nΣημείωση: Επιβεβαιώστε ότι το HDMI-CEC είναι ενεργοποιημένο στην τηλεόρασή σας και σε άλλες συσκευές HDMI. Οι κατασκευαστές έχουν συχνά διαφορετικές ονομασίες για το HDMI-CEC, για παράδειγμα:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Ρύθμιση κουμπιών τηλεχειριστηρίου"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Έλεγχος έντασης ήχου, λειτουργίας και πηγών εισόδου σε τηλεοράσεις, δέκτες και soundbar"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Επίπεδο μπαταρίας: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Αξεσουάρ"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Τηλεχειριστήριο"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Σε σύνδεση"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Συνδέθηκαν στο παρελθόν"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Σύζευξη τηλεχειριστηρίου ή αξεσουάρ"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Αποσύνδεση"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Σύνδεση"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Μετονομασία"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Διαγραφή"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Συνδέθηκε"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Αποσυνδέθηκε"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Έλεγχος συσκευής"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Σύνδεση νέας συσκευής"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Προτού συνδέσετε νέες συσκευές Bluetooth, βεβαιωθείτε ότι βρίσκονται σε λειτουργία σύζευξης. Για να συνδέσετε τη συσκευή %1$s, πιέστε παρατεταμένα %2$s + %3$s για 3 δευτερόλεπτα."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"ένα τηλεχειριστήριο Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Διαθέσιμες συσκευές"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Αναζήτηση συσκευών…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Σφάλμα"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Σύνδεση…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Συνδέθηκε"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Ακυρώθηκε"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Η συσκευή %1$s απέτυχε να συνδεθεί"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Η συσκευή %1$s συνδέθηκε"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Η συσκευή %1$s αποσυνδέθηκε"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-en-rAU/strings.xml b/libraries/BluetoothServices/res/values-en-rAU/strings.xml
index 4721c68..55973a7 100644
--- a/libraries/BluetoothServices/res/values-en-rAU/strings.xml
+++ b/libraries/BluetoothServices/res/values-en-rAU/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Critical"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Low"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Good"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Confirm remote update"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"During the update your remote may briefly disconnect."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Continue"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Cancel"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Remote update"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"New software available"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Update available"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Remote is up to date"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Remote update failed"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"We experienced an issue while updating your remote. Please try again."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Please wait"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Pair your remote again"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Enabled"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Disabled"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Battery level"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth address"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Please replace battery"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Low battery"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Connected devices"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Remotes and accessories"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Update your remote"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Ready to install"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"UPDATE"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"DISMISS"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Remote battery low"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Replace battery soon"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Remote battery almost empty"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Replace battery soon"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Remote battery empty"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Replace battery to use remote"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Yes"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"No"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Disconnect from %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Connect to %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Forget %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Rename your connected device"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Enable HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC allows you to control and automatically turn on/off other HDMI-CEC enabled devices with a single remote control.\n\nNote: Ensure that HDMI-CEC is enabled on your TV and other HDMI devices. Manufacturers often have different names for HDMI-CEC, for example:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Set up remote buttons"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Control volume, power, input on TVs, receivers and soundbars"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Battery level: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Accessories"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Remote control"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Connected"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Previously connected"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Pair remote or accessory"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Disconnect"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Connect"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Rename"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Forget"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Connected"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Disconnected"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Device control"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Connect new device"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Before connecting new Bluetooth devices, make sure that they\'re in pairing mode. To connect %1$s, press and hold %2$s + %3$s for 3 seconds."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"an Android TV remote"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Available devices"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Looking for devices…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Error"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Connecting…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Connected"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Cancelled"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s failed to connect"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s connected"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s disconnected"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Critical"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Low"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Good"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Confirm remote update"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"During the update, your remote may briefly disconnect."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Continue"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Cancel"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Remote update"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"New software available"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Update available"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Remote is up to date"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Remote update failed"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"We experienced an issue while updating your remote. Please try again."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Please wait"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Pair your remote again"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Enabled"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Disabled"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Battery level"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth address"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Please replace battery"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Low battery"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Connected devices"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Remotes and accessories"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Update your remote"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Ready to install"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"UPDATE"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"DISMISS"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Remote battery low"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Replace battery soon"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Remote battery almost empty"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Replace battery soon"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Remote battery empty"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Replace battery to use remote"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Yes"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"No"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Disconnect from %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Connect to %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Forget %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Rename your connected device"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Enable HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC allows you to control and automatically turn on/off other HDMI-CEC enabled devices with a single remote control.\n\nNote: Ensure HDMI-CEC is enabled on your TV and other HDMI devices. Manufacturers often have different names for HDMI-CEC, for example:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Set up remote buttons"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Control volume, power, input on TVs, receivers and soundbars"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Battery level: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Accessories"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Remote control"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Connected"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Previously connected"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Pair remote or accessory"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Disconnect"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Connect"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Rename"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Forget"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Connected"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Disconnected"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Device control"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Connect new device"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Before connecting new Bluetooth devices, make sure that they\'re in pairing mode. To connect %1$s, press and hold %2$s + %3$s for three seconds."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"an Android TV remote"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Available devices"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Looking for devices…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Error"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Connecting…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Connected"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Cancelled"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s failed to connect"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s connected"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s disconnected"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-en-rCA/strings.xml b/libraries/BluetoothServices/res/values-en-rCA/strings.xml
index 4721c68..9db2fe1 100644
--- a/libraries/BluetoothServices/res/values-en-rCA/strings.xml
+++ b/libraries/BluetoothServices/res/values-en-rCA/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Critical"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Low"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Good"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Confirm remote update"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"During the update your remote may briefly disconnect."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Continue"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Cancel"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Remote update"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"New software available"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Update available"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Remote is up to date"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Remote update failed"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"We experienced an issue while updating your remote. Please try again."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Please wait"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Pair your remote again"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Enabled"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Disabled"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Battery level"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth address"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Please replace battery"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Low battery"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Connected devices"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Remotes and accessories"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Update your remote"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Ready to install"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"UPDATE"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"DISMISS"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Remote battery low"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Replace battery soon"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Remote battery almost empty"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Replace battery soon"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Remote battery empty"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Replace battery to use remote"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Yes"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"No"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Disconnect from %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Connect to %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Forget %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Rename your connected device"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Enable HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC allows you to control and automatically turn on/off other HDMI-CEC enabled devices with a single remote control.\n\nNote: Ensure that HDMI-CEC is enabled on your TV and other HDMI devices. Manufacturers often have different names for HDMI-CEC, for example:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Set up remote buttons"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Control volume, power, input on TVs, receivers and soundbars"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Battery level: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Accessories"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Remote control"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Connected"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Previously connected"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Pair remote or accessory"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Disconnect"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Connect"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Rename"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Forget"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Connected"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Disconnected"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Device control"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Connect new device"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Before connecting new Bluetooth devices, make sure that they\'re in pairing mode. To connect %1$s, press and hold %2$s + %3$s for 3 seconds."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"an Android TV remote"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Available devices"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Looking for devices…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Error"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Connecting…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Connected"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Cancelled"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s failed to connect"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s connected"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s disconnected"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Critical"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Low"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Good"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Confirm remote update"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"During the update your remote may briefly disconnect."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Continue"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Cancel"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Remote update"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"New software available"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Update available"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Remote is up to date"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Remote update failed"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"We experienced an issue while updating your remote. Please try again."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Please wait"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Pair your remote again"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Enabled"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Disabled"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Battery level"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth address"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Please replace battery"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Low battery"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Connected Devices"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Remotes &amp; Accessories"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Update your remote"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Ready to install"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"UPDATE"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"DISMISS"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Remote battery low"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Replace battery soon"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Remote battery almost empty"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Replace battery soon"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Remote battery empty"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Replace battery to use remote"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Yes"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"No"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Disconnect from %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Connect to %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Forget %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Rename your connected device"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Enable HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC allows you to control and automatically turn on/off other HDMI-CEC enabled devices with a single remote control.\n\nNote: Ensure HDMI-CEC is enabled on your TV and other HDMI devices. Manufacturers often have different names for HDMI-CEC, for example:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Set up remote buttons"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Control volume, power, input on TVs, receivers and soundbars"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Battery level: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Accessories"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Remote Control"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Connected"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Previously connected"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Pair remote or accessory"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Disconnect"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Connect"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Rename"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Forget"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Connected"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Disconnected"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Device control"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Connect new device"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Before connecting new Bluetooth devices, make sure they\'re in pairing mode. To connect %1$s, press and hold %2$s + %3$s for 3 seconds."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"an Android TV remote"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Available devices"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Looking for devices…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Error"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Connecting…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Connected"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Cancelled"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s failed to connect"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s connected"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s disconnected"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-en-rGB/strings.xml b/libraries/BluetoothServices/res/values-en-rGB/strings.xml
index 4721c68..55973a7 100644
--- a/libraries/BluetoothServices/res/values-en-rGB/strings.xml
+++ b/libraries/BluetoothServices/res/values-en-rGB/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Critical"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Low"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Good"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Confirm remote update"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"During the update your remote may briefly disconnect."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Continue"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Cancel"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Remote update"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"New software available"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Update available"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Remote is up to date"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Remote update failed"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"We experienced an issue while updating your remote. Please try again."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Please wait"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Pair your remote again"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Enabled"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Disabled"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Battery level"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth address"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Please replace battery"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Low battery"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Connected devices"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Remotes and accessories"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Update your remote"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Ready to install"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"UPDATE"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"DISMISS"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Remote battery low"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Replace battery soon"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Remote battery almost empty"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Replace battery soon"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Remote battery empty"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Replace battery to use remote"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Yes"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"No"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Disconnect from %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Connect to %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Forget %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Rename your connected device"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Enable HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC allows you to control and automatically turn on/off other HDMI-CEC enabled devices with a single remote control.\n\nNote: Ensure that HDMI-CEC is enabled on your TV and other HDMI devices. Manufacturers often have different names for HDMI-CEC, for example:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Set up remote buttons"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Control volume, power, input on TVs, receivers and soundbars"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Battery level: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Accessories"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Remote control"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Connected"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Previously connected"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Pair remote or accessory"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Disconnect"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Connect"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Rename"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Forget"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Connected"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Disconnected"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Device control"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Connect new device"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Before connecting new Bluetooth devices, make sure that they\'re in pairing mode. To connect %1$s, press and hold %2$s + %3$s for 3 seconds."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"an Android TV remote"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Available devices"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Looking for devices…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Error"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Connecting…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Connected"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Cancelled"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s failed to connect"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s connected"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s disconnected"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Critical"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Low"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Good"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Confirm remote update"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"During the update, your remote may briefly disconnect."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Continue"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Cancel"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Remote update"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"New software available"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Update available"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Remote is up to date"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Remote update failed"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"We experienced an issue while updating your remote. Please try again."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Please wait"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Pair your remote again"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Enabled"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Disabled"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Battery level"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth address"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Please replace battery"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Low battery"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Connected devices"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Remotes and accessories"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Update your remote"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Ready to install"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"UPDATE"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"DISMISS"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Remote battery low"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Replace battery soon"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Remote battery almost empty"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Replace battery soon"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Remote battery empty"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Replace battery to use remote"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Yes"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"No"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Disconnect from %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Connect to %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Forget %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Rename your connected device"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Enable HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC allows you to control and automatically turn on/off other HDMI-CEC enabled devices with a single remote control.\n\nNote: Ensure HDMI-CEC is enabled on your TV and other HDMI devices. Manufacturers often have different names for HDMI-CEC, for example:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Set up remote buttons"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Control volume, power, input on TVs, receivers and soundbars"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Battery level: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Accessories"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Remote control"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Connected"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Previously connected"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Pair remote or accessory"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Disconnect"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Connect"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Rename"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Forget"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Connected"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Disconnected"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Device control"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Connect new device"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Before connecting new Bluetooth devices, make sure that they\'re in pairing mode. To connect %1$s, press and hold %2$s + %3$s for three seconds."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"an Android TV remote"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Available devices"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Looking for devices…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Error"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Connecting…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Connected"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Cancelled"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s failed to connect"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s connected"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s disconnected"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-en-rIN/strings.xml b/libraries/BluetoothServices/res/values-en-rIN/strings.xml
index 4721c68..55973a7 100644
--- a/libraries/BluetoothServices/res/values-en-rIN/strings.xml
+++ b/libraries/BluetoothServices/res/values-en-rIN/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Critical"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Low"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Good"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Confirm remote update"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"During the update your remote may briefly disconnect."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Continue"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Cancel"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Remote update"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"New software available"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Update available"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Remote is up to date"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Remote update failed"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"We experienced an issue while updating your remote. Please try again."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Please wait"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Pair your remote again"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Enabled"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Disabled"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Battery level"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth address"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Please replace battery"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Low battery"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Connected devices"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Remotes and accessories"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Update your remote"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Ready to install"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"UPDATE"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"DISMISS"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Remote battery low"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Replace battery soon"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Remote battery almost empty"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Replace battery soon"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Remote battery empty"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Replace battery to use remote"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Yes"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"No"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Disconnect from %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Connect to %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Forget %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Rename your connected device"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Enable HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC allows you to control and automatically turn on/off other HDMI-CEC enabled devices with a single remote control.\n\nNote: Ensure that HDMI-CEC is enabled on your TV and other HDMI devices. Manufacturers often have different names for HDMI-CEC, for example:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Set up remote buttons"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Control volume, power, input on TVs, receivers and soundbars"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Battery level: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Accessories"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Remote control"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Connected"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Previously connected"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Pair remote or accessory"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Disconnect"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Connect"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Rename"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Forget"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Connected"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Disconnected"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Device control"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Connect new device"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Before connecting new Bluetooth devices, make sure that they\'re in pairing mode. To connect %1$s, press and hold %2$s + %3$s for 3 seconds."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"an Android TV remote"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Available devices"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Looking for devices…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Error"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Connecting…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Connected"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Cancelled"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s failed to connect"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s connected"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s disconnected"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Critical"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Low"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Good"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Confirm remote update"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"During the update, your remote may briefly disconnect."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Continue"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Cancel"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Remote update"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"New software available"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Update available"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Remote is up to date"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Remote update failed"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"We experienced an issue while updating your remote. Please try again."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Please wait"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Pair your remote again"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Enabled"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Disabled"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Battery level"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth address"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Please replace battery"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Low battery"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Connected devices"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Remotes and accessories"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Update your remote"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Ready to install"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"UPDATE"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"DISMISS"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Remote battery low"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Replace battery soon"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Remote battery almost empty"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Replace battery soon"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Remote battery empty"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Replace battery to use remote"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Yes"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"No"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Disconnect from %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Connect to %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Forget %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Rename your connected device"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Enable HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC allows you to control and automatically turn on/off other HDMI-CEC enabled devices with a single remote control.\n\nNote: Ensure HDMI-CEC is enabled on your TV and other HDMI devices. Manufacturers often have different names for HDMI-CEC, for example:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Set up remote buttons"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Control volume, power, input on TVs, receivers and soundbars"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Battery level: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Accessories"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Remote control"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Connected"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Previously connected"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Pair remote or accessory"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Disconnect"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Connect"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Rename"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Forget"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Connected"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Disconnected"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Device control"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Connect new device"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Before connecting new Bluetooth devices, make sure that they\'re in pairing mode. To connect %1$s, press and hold %2$s + %3$s for three seconds."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"an Android TV remote"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Available devices"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Looking for devices…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Error"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Connecting…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Connected"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Cancelled"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s failed to connect"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s connected"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s disconnected"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-en-rXC/strings.xml b/libraries/BluetoothServices/res/values-en-rXC/strings.xml
index 926d080..607bef7 100644
--- a/libraries/BluetoothServices/res/values-en-rXC/strings.xml
+++ b/libraries/BluetoothServices/res/values-en-rXC/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎N/A‎‏‎‎‏‎"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎Critical‎‏‎‎‏‎"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‎Low‎‏‎‎‏‎"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎Good‎‏‎‎‏‎"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‏‏‎‏‎Confirm remote update‎‏‎‎‏‎"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‎During the update your remote may briefly disconnect.‎‏‎‎‏‎"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎Continue‎‏‎‎‏‎"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎Cancel‎‏‎‎‏‎"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‏‏‎Remote update‎‏‎‎‏‎"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎New software available‎‏‎‎‏‎"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎Update available‎‏‎‎‏‎"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎Remote is up to date‎‏‎‎‏‎"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‎Remote update failed‎‏‎‎‏‎"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‏‎‎‏‎We experienced an issue while updating your remote. Please try again.‎‏‎‎‏‎"</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎Please wait‎‏‎‎‏‎"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎Pair your remote again‎‏‎‎‏‎"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎Enabled‎‏‎‎‏‎"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎Disabled‎‏‎‎‏‎"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‎Battery level‎‏‎‎‏‎"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎%1$d%%‎‏‎‎‏‎</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‎Firmware‎‏‎‎‏‎"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎Bluetooth address‎‏‎‎‏‎"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎Please replace battery‎‏‎‎‏‎"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎Low battery‎‏‎‎‏‎"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎Connected Devices‎‏‎‎‏‎"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‎‎‏‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎Remotes &amp; Accessories‎‏‎‎‏‎"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‏‏‎Update your remote‎‏‎‎‏‎"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‎‏‏‏‎Ready to install‎‏‎‎‏‎"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎UPDATE‎‏‎‎‏‎"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‎‎‎‎‏‎DISMISS‎‏‎‎‏‎"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎Remote battery low‎‏‎‎‏‎"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎Replace battery soon‎‏‎‎‏‎"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‎‎Remote battery almost empty‎‏‎‎‏‎"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎Replace battery soon‎‏‎‎‏‎"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎Remote battery empty‎‏‎‎‏‎"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎Replace battery to use remote‎‏‎‎‏‎"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‏‏‏‎‎Yes‎‏‎‎‏‎"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎No‎‏‎‎‏‎"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‏‏‎Disconnect from %1$s‎‏‎‎‏‎"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎Connect to %1$s‎‏‎‎‏‎"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎Forget %1$s‎‏‎‎‏‎"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎Rename your connected device‎‏‎‎‏‎"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‏‏‎HDMI-CEC‎‏‎‎‏‎"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‎‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎Enable HDMI-CEC‎‏‎‎‏‎"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎HDMI-CEC allows you to control and automatically turn on/off other HDMI-CEC enabled devices with a single remote control.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Note: Ensure HDMI-CEC is enabled on your TV and other HDMI devices. Manufacturers often have different names for HDMI-CEC, for example:‎‏‎‎‏‎"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎Samsung: Anynet+‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎LG: SimpLink‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Sony: BRAVIA Sync‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Philips: EasyLink‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Sharp: Aquos Link‎‏‎‎‏‎"</string>
-    <string name="settings_axel" msgid="859248404436889205">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‎‏‎Set up remote buttons‎‏‎‎‏‎"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎Control volume, power, input on TVs, receivers and soundbars‎‏‎‎‏‎"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‎‎Battery level: %1$s‎‏‎‎‏‎"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‎Accessories‎‏‎‎‏‎"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‎‎‎‏‎Remote Control‎‏‎‎‏‎"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‎Connected‎‏‎‎‏‎"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‎Previously connected‎‏‎‎‏‎"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‏‏‏‎‏‏‎Pair remote or accessory‎‏‎‎‏‎"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎Disconnect‎‏‎‎‏‎"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎Connect‎‏‎‎‏‎"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎Rename‎‏‎‎‏‎"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎Forget‎‏‎‎‏‎"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎Connected‎‏‎‎‏‎"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎Disconnected‎‏‎‎‏‎"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎Device control‎‏‎‎‏‎"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎Connect new device‎‏‎‎‏‎"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‎‎‎‏‏‎‎Before connecting new Bluetooth devices, make sure they\'re in pairing mode. To connect %1$s, press and hold %2$s + %3$s for 3 seconds.‎‏‎‎‏‎"</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‎‎an Android TV remote‎‏‎‎‏‎"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎Available devices‎‏‎‎‏‎"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎Looking for devices…‎‏‎‎‏‎"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎Error‎‏‎‎‏‎"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎Connecting…‎‏‎‎‏‎"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎Connected‎‏‎‎‏‎"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‎‎Cancelled‎‏‎‎‏‎"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎%1$s failed to connect‎‏‎‎‏‎"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎%1$s connected‎‏‎‎‏‎"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎%1$s disconnected‎‏‎‎‏‎"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎N/A‎‏‎‎‏‎"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎Critical‎‏‎‎‏‎"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‎Low‎‏‎‎‏‎"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‎Good‎‏‎‎‏‎"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‎‎‎‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎Confirm remote update‎‏‎‎‏‎"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎During the update your remote may briefly disconnect.‎‏‎‎‏‎"</string>
+    <string name="settings_continue" msgid="5640776697820481568">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎Continue‎‏‎‎‏‎"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‏‎Cancel‎‏‎‎‏‎"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‎Remote update‎‏‎‎‏‎"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎New software available‎‏‎‎‏‎"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‎Update available‎‏‎‎‏‎"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‎Remote is up to date‎‏‎‎‏‎"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‎Remote update failed‎‏‎‎‏‎"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‎‎‎We experienced an issue while updating your remote. Please try again.‎‏‎‎‏‎"</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‏‎Please wait‎‏‎‎‏‎"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‏‎‏‎‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎Pair your remote again‎‏‎‎‏‎"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎Enabled‎‏‎‎‏‎"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎Disabled‎‏‎‎‏‎"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‏‎‎‎Battery level‎‏‎‎‏‎"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‎%1$d%%‎‏‎‎‏‎"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎Firmware‎‏‎‎‏‎"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎Bluetooth address‎‏‎‎‏‎"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎Please replace battery‎‏‎‎‏‎"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‎‎‎‏‎Low battery‎‏‎‎‏‎"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎Connected Devices‎‏‎‎‏‎"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎Remotes &amp; Accessories‎‏‎‎‏‎"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎Update your remote‎‏‎‎‏‎"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎Ready to install‎‏‎‎‏‎"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎UPDATE‎‏‎‎‏‎"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎DISMISS‎‏‎‎‏‎"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‏‎‎Remote battery low‎‏‎‎‏‎"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‎‏‎‏‎‏‎‎Replace battery soon‎‏‎‎‏‎"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎Remote battery almost empty‎‏‎‎‏‎"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‎‎Replace battery soon‎‏‎‎‏‎"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‎Remote battery empty‎‏‎‎‏‎"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎Replace battery to use remote‎‏‎‎‏‎"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎Yes‎‏‎‎‏‎"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎No‎‏‎‎‏‎"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‏‎Disconnect from %1$s‎‏‎‎‏‎"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎Connect to %1$s‎‏‎‎‏‎"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎Forget %1$s‎‏‎‎‏‎"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎Rename your connected device‎‏‎‎‏‎"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎HDMI-CEC‎‏‎‎‏‎"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎‎‏‎‎‏‎Enable HDMI-CEC‎‏‎‎‏‎"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‎HDMI-CEC allows you to control and automatically turn on/off other HDMI-CEC enabled devices with a single remote control.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Note: Ensure HDMI-CEC is enabled on your TV and other HDMI devices. Manufacturers often have different names for HDMI-CEC, for example:‎‏‎‎‏‎"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎Samsung: Anynet+‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎LG: SimpLink‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Sony: BRAVIA Sync‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Philips: EasyLink‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Sharp: Aquos Link‎‏‎‎‏‎"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎Set up remote buttons‎‏‎‎‏‎"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎‏‎‎Control volume, power, input on TVs, receivers and soundbars‎‏‎‎‏‎"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‏‎‎‎‏‎Battery level: %1$s‎‏‎‎‏‎"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎Accessories‎‏‎‎‏‎"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎Remote Control‎‏‎‎‏‎"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‎‏‎Connected‎‏‎‎‏‎"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎Previously connected‎‏‎‎‏‎"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‎‏‎‎‏‏‏‎Pair remote or accessory‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎Disconnect‎‏‎‎‏‎"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎‎‎Connect‎‏‎‎‏‎"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎Rename‎‏‎‎‏‎"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‎‏‎‎‎Forget‎‏‎‎‏‎"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‎Connected‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎Disconnected‎‏‎‎‏‎"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎Device control‎‏‎‎‏‎"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‎‏‎‏‎‎‎Connect new device‎‏‎‎‏‎"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‎‏‎Before connecting new Bluetooth devices, make sure they\'re in pairing mode. To connect %1$s, press and hold %2$s + %3$s for 3 seconds.‎‏‎‎‏‎"</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‏‎an Android TV remote‎‏‎‎‏‎"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎Available devices‎‏‎‎‏‎"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎Looking for devices…‎‏‎‎‏‎"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‏‎‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎Error‎‏‎‎‏‎"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‎Connecting…‎‏‎‎‏‎"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎Connected‎‏‎‎‏‎"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎‎‎‏‎Cancelled‎‏‎‎‏‎"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎%1$s failed to connect‎‏‎‎‏‎"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‏‎%1$s connected‎‏‎‎‏‎"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎%1$s disconnected‎‏‎‎‏‎"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-es-rUS/strings.xml b/libraries/BluetoothServices/res/values-es-rUS/strings.xml
index 7c38151..9674464 100644
--- a/libraries/BluetoothServices/res/values-es-rUS/strings.xml
+++ b/libraries/BluetoothServices/res/values-es-rUS/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Crítico"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Bajo"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Normal"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Confirmar la actualización del control remoto"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Durante la actualización, es posible que se desconecte el control remoto unos instantes."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Continuar"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Cancelar"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Actualización del control remoto"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Nuevo software disponible"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Actualización disponible"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"El control remoto está actualizado"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"No se pudo actualizar el control remoto"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Se produjo un problema al actualizar el control remoto. Vuelve a intentarlo."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Espera"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Vuelve a vincular el control remoto"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Habilitado"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Inhabilitado"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Nivel de batería"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Dirección de Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Reemplaza la batería"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Batería baja"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Dispositivos conectados"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Control remoto y accesorios"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Actualiza el control remoto"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Ya se puede instalar"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ACTUALIZAR"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"DESCARTAR"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Se están agotando las baterías del control remoto"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Pronto deberás cambiar las baterías"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Las baterías del control remoto están casi agotadas"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Pronto deberás cambiar las baterías"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Se agotaron las baterías del control remoto"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Reemplaza las baterías para poder usar el control remoto"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Sí"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"No"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Desconectar de %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Conectar a %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Olvidar %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Cambia el nombre de tu dispositivo"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Habilitar HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC te permite controlar y activar o desactivar automáticamente dispositivos compatibles con HDMI-CEC mediante un único control remoto.\n\nNota: Asegúrate de que HDMI-CEC esté habilitado en la TV y en otros dispositivos HDMI. Muchas veces, los fabricantes se refieren a HDMI-CEC de las siguientes formas:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Configurar botones de control remoto"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Controla el volumen, el encendido y la entrada en TV, receptores y barras de sonido"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Nivel de batería: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Accesorios"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Control remoto"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Conectados"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Conectados anteriormente"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Vincular control remoto o accesorio"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Desconectar"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Conectar"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Cambiar el nombre"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Olvidar"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Conectado"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Desconectado"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Control de dispositivos"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Conecta un dispositivo nuevo"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Antes de conectar nuevos dispositivos Bluetooth, asegúrate de que esté activado el modo de vinculación. Para conectar %1$s, mantén presionado %2$s y %3$s durante 3 segundos."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"un control remoto de Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Dispositivos disponibles"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Buscando dispositivos…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Error"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Conectando…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Conectado"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Cancelado"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"No se pudo conectar %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"Se conectó %1$s"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"Se desconectó %1$s"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Crítico"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Bajo"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Bueno"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Confirmar actualización del control remoto"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Durante la actualización, es posible que se desconecte el control remoto unos instantes."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Continuar"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Cancelar"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Actualización del control remoto"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Nuevo software disponible"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Actualización disponible"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"El control remoto está actualizado"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"No se pudo actualizar el control remoto"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Se produjo un problema al actualizar el control remoto. Vuelve a intentarlo."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Espera"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Vuelve a vincular el control remoto"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Habilitado"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Inhabilitado"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Nivel de la batería"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Dirección de Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Reemplaza la batería"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Batería baja"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Dispositivos conectados"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Control remoto y accesorios"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Actualiza el control remoto"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Ya se puede instalar"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ACTUALIZAR"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"DESCARTAR"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Se están agotando las baterías del control remoto"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Pronto deberás cambiar las baterías"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Las baterías del control remoto están casi agotadas"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Pronto deberás cambiar las baterías"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Se agotaron las baterías del control remoto"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Reemplaza las baterías para poder usar el control remoto"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Sí"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"No"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Desconectar de %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Conectar a %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Olvidar %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Cambia el nombre de tu dispositivo"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Habilitar HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC te permite controlar y activar/desactivar automáticamente dispositivos compatibles con HDMI-CEC con un único control remoto.\n\nNota: Asegúrate de que HDMI-CEC esté habilitado en tu TV y otros dispositivos HDMI. Con frecuencia, los fabricantes tienen diferentes nombres para HDMI-CEC, como los siguientes:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Configura botones de control remoto"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Controla el volumen, el encendido y la entrada en TVs, receptores y barras de sonido"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Nivel de batería: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Accesorios"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Control remoto"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Conectado"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Conectados anteriormente"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Vincular control remoto o accesorio"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Desconectar"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Conectar"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Cambiar nombre"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Olvidar"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Conectado"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Desconectado"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Control del dispositivo"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Conectar dispositivo nuevo"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Antes de conectar nuevos dispositivos Bluetooth, asegúrate de que tengan activado el modo de vinculación. Para conectar %1$s, mantén presionado %2$s y %3$s durante 3 segundos."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"un control remoto de Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Dispositivos disponibles"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Buscando dispositivos…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Error"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Conectando…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Conexión establecida"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Vinculación cancelada"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"No se pudo conectar %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Se conectó %1$s"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Se desconectó %1$s"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-es/strings.xml b/libraries/BluetoothServices/res/values-es/strings.xml
index ce60db3..7908b00 100644
--- a/libraries/BluetoothServices/res/values-es/strings.xml
+++ b/libraries/BluetoothServices/res/values-es/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"No disponible"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Muy bajo"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Bajo"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Alto"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Confirmar la actualización del mando"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Durante la actualización, es posible que el mando se desconecte unos instantes."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Continuar"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Cancelar"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Actualización del mando"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Hay nuevo software disponible"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Hay una actualización disponible"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"El mando está actualizado"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"No se ha podido actualizar el mando"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"No hemos podido actualizar el mando. Vuelve a intentarlo."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Espera"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Vuelve a emparejar el mando"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Habilitado"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Inhabilitado"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Nivel de batería"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d %%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Dirección de Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Cambia la batería"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Batería baja"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Dispositivos conectados"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Mandos y accesorios"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Actualizar el mando"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Ya se puede instalar"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ACTUALIZAR"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"CERRAR"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Se le están acabando las pilas al mando"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Cambia pronto las pilas"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"El mando casi no tiene pilas"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Cambia pronto las pilas"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Se le han acabado las pilas al mando"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Cambia las pilas para usar el mando"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Sí"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"No"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Desconectar de %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Conectarse a %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Olvidar %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Cambiar el nombre del dispositivo"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI‑CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Habilitar HDMI‑CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC te permite controlar y activar o desactivar automáticamente otros dispositivos HDMI-CEC habilitados con un solo mando.\n\nNota: HDMI-CEC debe estar habilitado en tu TV y en otros dispositivos HDMI. En función del fabricante, HDMI-CEC puede aparecer denominado de otras formas, como:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Configurar botones del mando"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Controlar el volumen, el encendido y la fuente de entrada de televisiones, receptores AV y barras de sonido"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Nivel de batería: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Accesorios"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Mando"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Conectado"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Conectados anteriormente"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Emparejar mando o accesorio"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Desconectar"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Conectar"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Cambiar nombre"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Olvidar"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Conectado"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Desconectado"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Control del dispositivo"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Conectar nuevo dispositivo"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Antes de conectar nuevos dispositivos Bluetooth, comprueba que tienen activado el modo de vinculación. Para conectar %1$s, mantén pulsado %2$s y %3$s durante tres segundos."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"un mando de Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Dispositivos disponibles"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Buscando dispositivos…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Error"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Conectando…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Conectado"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Cancelado"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s no se ha podido conectar"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s se ha conectado"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s se ha desconectado"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"No disponible"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Crítico"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Bajo"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Bueno"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Confirmar la actualización del mando"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Durante la actualización, es posible que el mando se desconecte unos instantes."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Continuar"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Cancelar"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Actualización del mando"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Hay nuevo software disponible"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Actualización disponible"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"El mando está actualizado"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"No se ha podido actualizar el mando"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"No hemos podido actualizar el mando. Inténtalo de nuevo."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Un momento..."</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Vuelve a emparejar el mando"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Habilitado"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Inhabilitado"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Nivel de batería"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Dirección de Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Cambia la batería"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Batería baja"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Dispositivos conectados"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Mandos y accesorios"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Actualiza el mando"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Ya se puede instalar"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ACTUALIZAR"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"CERRAR"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Se le están acabando las pilas al mando"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Cambia pronto las pilas"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"El mando casi no tiene pilas"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Cambia pronto las pilas"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Se le han acabado las pilas al mando"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Cambia las pilas para usar el mando"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Sí"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"No"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Desconectar de %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Conectarse a %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Olvidar %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Cambiar el nombre del dispositivo"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI‑CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Habilitar HDMI‑CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC te permite controlar y activar o desactivar automáticamente otros dispositivos HDMI-CEC habilitados con un solo mando.\n\nNota: HDMI-CEC debe estar habilitado en tu TV y otros dispositivos HDMI. Los fabricantes suelen usar diferentes nombres para HDMI-CEC, como:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Configurar botones del mando"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Controlar el volumen, el encendido y la fuente de entrada de televisiones, receptores AV y barras de sonido"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Nivel de batería: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Accesorios"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Mando"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Conectado"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Conectado anteriormente"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Emparejar mando o accesorio"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Desconectar"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Conectar"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Cambiar nombre"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Olvidar"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Conectado"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Desconectado"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Control del dispositivo"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Conectar dispositivo nuevo"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Antes de conectar nuevos dispositivos Bluetooth, comprueba que tienen activado el modo Emparejamiento. Para conectar %1$s, mantén pulsado %2$s y %3$s durante 3 segundos."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"un mando de Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Dispositivos disponibles"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Buscando dispositivos…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Error"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Conectando…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Conectado"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Cancelado"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s no se ha podido conectar"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s conectado"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s desconectado"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-et/strings.xml b/libraries/BluetoothServices/res/values-et/strings.xml
index 377a831..54c7d01 100644
--- a/libraries/BluetoothServices/res/values-et/strings.xml
+++ b/libraries/BluetoothServices/res/values-et/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"–"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kriitiline"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Halb"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Hea"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Kinnitage puldi värskendamine"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Värskendamise ajal võib ühendus puldiga hetkeks katkeda."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Jätka"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Tühista"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Puldi värskendus"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Saadaval on uus tarkvara"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Värskendus on saadaval"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Pult on ajakohane"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Puldi värskendamine ebaõnnestus"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Teie puldi värskendamisel tekkis probleem. Proovige uuesti."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Oodake"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Siduge oma pult uuesti"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Lubatud"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Keelatud"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Aku tase"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Püsivara"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetoothi aadress"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Vahetage aku"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Aku hakkab tühjaks saama"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Ühendatud seadmed"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Kaugjuhtimisseadmed ja tarvikud"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Puldi värskendamine"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Installimiseks valmis"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"VÄRSKENDA"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"LOOBU"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Puldi patarei hakkab tühjaks saama"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Vahetage varsti patarei"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Puldi patarei on peaaegu tühi"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Vahetage varsti patarei"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Puldi patarei on tühi"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Puldi kasutamiseks vahetage patarei"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Jah"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Ei"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Katkesta ühendus seadmega %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Ühendamine: %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Unusta seade %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Muutke oma ühendatud seadme nime"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Luba HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC võimaldab teil ühe kaugjuhtimispuldiga juhtida ja automaatselt sisse või välja lülitada teisi HDMI-CEC-toega seadmeid.\n\nMärkus. Veenduge, et HDMI-CEC oleks teie teleris ja teistes HDMI-seadmetes lubatud. Tootjatel on HDMI-CEC jaoks tihti teistsugused nimed. Näited."</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Puldi nuppude seadistamine"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Helitugevuse, toite ja sisendi juhtimine telerites, vastuvõtjates ning heliribades"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Aku tase: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Tarvikud"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Kaugjuhtimispult"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Ühendatud"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Eelnevalt ühendatud"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Puldi või tarviku sidumine"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Katkesta ühendus"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Ühenda"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Nimeta ümber"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Unusta"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Ühendatud"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Pole ühendatud"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Seadme juhtimine"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Uue seadme ühendamine"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Enne uute Bluetooth-seadmete ühendamist veenduge, et need oleksid sidumisrežiimis. Seadme %1$s ühendamiseks vajutage ja hoidke kolm sekundit all nuppe %2$s + %3$s."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV pult"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Saadaolevad seadmed"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Seadmete otsimine …"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Viga"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Ühendamine …"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Ühendatud"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Tühistatud"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Seadme %1$s ühendamine ebaõnnestus"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s on ühendatud"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s pole ühendatud"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Puudub"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kriitiline"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Madal"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Hea"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Kinnitage kaugjuhtimispuldi värskendamine"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Värskendamise ajal võib ühendus kaugjuhtimispuldiga hetkeks katkeda."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Jätka"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Tühistage"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Kaugjuhtimispuldi värskendus"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Saadaval on uus tarkvara"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Värskendus on saadaval"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Kaugjuhtimispult on ajakohane"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Puldi värskendamine ebaõnnestus"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Teie kaugjuhtimispuldi värskendamisel tekkis probleem. Proovige uuesti."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Oodake"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Siduge oma kaugjuhtimispult uuesti"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Lubatud"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Keelatud"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Aku tase"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Püsivara"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetoothi aadress"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Vahetage aku"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Akutase on madal"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Ühendatud seadmed"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Kaugjuhtimispuldid ja lisatarvikud"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Värskendage kaugjuhtimispulti"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Installimiseks valmis"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"VÄRSKENDAGE"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"LOOBUGE"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Kaugjuhtimispuldi aku hakkab tühjaks saama"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Vahetage varsti aku"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Kaugjuhtimispuldi aku on peaaegu tühi"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Vahetage varsti aku"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Kaugjuhtimispuldi aku on tühi"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Kaugjuhtimispuldi kasutamiseks vahetage aku"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Jah"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Ei"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Katkesta ühendus seadmega %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Ühendage seadmega %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Unusta seade %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Muutke oma ühendatud seadme nime"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Luba HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC võimaldab teil ühe juhtimispuldiga juhtida ja automaatselt sisse või välja lülitada teisi HDMI-CEC-toega seadmeid.\n\nMärkus. Veenduge, et HDMI-CEC oleks lubatud teie teleris ja muudes HDMI-seadmetes. Tootjatel on HDMI-CEC jaoks tihti teistsugused nimed, näiteks:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Kaugjuhtimispuldi nuppude seadistamine"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Helitugevuse, toite ja sisendi juhtimine telerites, vastuvõtjates ning heliribades"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Aku tase: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Tarvikud"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Kaugjuhtimispult"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Ühendatud"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Eelnevalt ühendatud"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Kaugjuhtimispuldi või lisaseadme sidumine"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Katkesta ühendus"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Ühendage"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Muutke nime"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Unusta"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Ühendatud"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Pole ühendatud"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Seadme juhtimine"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Ühendage uus seade"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Enne uute Bluetooth-seadmete ühendamist veenduge, et need oleksid sidumisrežiimis. Seadme %1$s ühendamiseks vajutage ja hoidke kolm sekundit all nuppe %2$s + %3$s."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV kaugjuhtimispult"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Saadaolevad seadmed"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Seadmete otsimine …"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Viga"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Ühendamine …"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Ühendatud"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Tühistatud"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Seadme %1$s ühendamine ebaõnnestus"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s on ühendatud"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s pole ühendatud"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-eu/strings.xml b/libraries/BluetoothServices/res/values-eu/strings.xml
index d0c586e..9dcb887 100644
--- a/libraries/BluetoothServices/res/values-eu/strings.xml
+++ b/libraries/BluetoothServices/res/values-eu/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"E.a."</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"oso gutxi"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"gutxi"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"nahikoa"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Berretsi urruneko kontrolagailua eguneratu nahi duzula"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Baliteke urruneko kontrolagailua une batez deskonektatzea eguneratze-prozesuak dirauen bitartean."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Egin aurrera"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Utzi"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Urruneko kontrolagailuaren eguneratzea"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Software berria dago erabilgarri"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Eguneratze bat dago erabilgarri"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Eguneratuta dago urruneko kontrolagailua"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Ezin izan da eguneratu urruneko kontrolagailua"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Arazo bat izan dugu urruneko kontrolagailua eguneratzean. Saiatu berriro."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Itxaron, mesedez"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Parekatu urruneko kontrolagailua berriro"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Gaituta"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Desgaituta"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Bateria-maila"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmwarea"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth bidez konektatzeko helbidea"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Aldatu pila"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Bateria gutxi"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Konektatutako gailuak"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Urruneko kontrolagailuak eta osagarriak"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Eguneratu urruneko kontrolagailua"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Instalatzeko prest"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"EGUNERATU"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"BAZTERTU"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Urruneko kontrolagailuaren pila agortzen ari da"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Aldatu pila lehenbailehen"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Urruneko kontrolagailuaren pila ia agortuta dago"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Aldatu pila lehenbailehen"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Urruneko kontrolagailuaren pila agortu da"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Aldatu pila urruneko kontrolagailua erabiltzeko"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Bai"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Ez"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Deskonektatu %1$s gailutik"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Konektatu %1$s gailura"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Ahaztu %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Aldatu konektatutako gailuaren izena"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Gaitu HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC eginbideari esker, hura gaituta daukaten beste gailu batzuk kontrolatu, eta automatikoki aktibatu eta desaktibatzeko aukera duzu, den-dena urruneko kontrolagailu bakarra erabilita.\n\nOharra: ziurtatu HDMI-CEC gaituta daukazula telebistan eta bestelako HDMI gailuetan. Fabrikatzaile batzuek beste nolabait izendatu ohi dute HDMI-CEC, adibidez:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Konfiguratu urruneko kontrolagailuaren botoiak"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Kontrolatu telebista, hargailu eta soinu-barren bolumena, etengailua eta sarrera."</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Bateriaren karga: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Osagarriak"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Urruneko kontrolagailua"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Konektatuta"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Aurretik konektatutakoak"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Parekatu urruneko kontrolagailu edo osagarri bat"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Deskonektatu"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Konektatu"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Aldatu izena"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Ahaztu"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Konektatuta"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Deskonektatuta"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Gailuaren kontrola"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Konektatu gailu berri bat"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Bluetooth bidezko gailu berriak parekatu aurretik, ziurtatu parekatze moduan daudela %1$s konektatzeko, eduki sakatuta %2$s eta %3$s hiru segundoz."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV-ren urruneko kontrolagailu bat"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Gailu erabilgarriak"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Gailuak bilatzen…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Errorea"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Konektatzen…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Konektatuta"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Bertan behera utzita"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Ezin izan da konektatu %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s konektatuta dago"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s deskonektatuta dago"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"E.a."</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Oso baxua"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Baxua"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Altua"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Berretsi urruneko kontrolagailua eguneratu nahi duzula"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Baliteke urruneko kontrolagailua une batez deskonektatzea eguneratze-prozesuak dirauen bitartean."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Egin aurrera"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Utzi"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Urruneko kontrolagailuaren eguneratzea"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Software berria dago"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Eguneratu egin daiteke"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Eguneratuta dago urruneko kontrolagailua"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Ezin izan da eguneratu urruneko kontrolagailua"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Arazo bat izan dugu urruneko kontrolagailua eguneratzean. Saiatu berriro."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Itxaron, mesedez"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Parekatu urruneko kontrolagailua berriro"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Gaitu da"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Desgaitu da"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Bateria-maila"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmwarea"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth bidez konektatzeko helbidea"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Aldatu pila"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Bateria gutxi"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Konektatutako gailuak"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Urruneko kontrolagailuak eta osagarriak"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Eguneratu urruneko kontrolagailua"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Instalatzeko prest"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"EGUNERATU"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"BAZTERTU"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Urruneko kontrolagailuaren pila agortzen ari da"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Aldatu pila laster"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Urruneko kontrolagailuaren pila ia agortuta dago"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Aldatu pila laster"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Urruneko kontrolagailuaren pila agortuta dago"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Aldatu pila urruneko kontrolagailua erabiltzeko"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Bai"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Ez"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Deskonektatu da %1$s gailutik"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Konektatu %1$s gailura"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Ahaztu %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Aldatu konektatutako gailuaren izena"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Gaitu HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC eginbideari esker, hura gaituta daukaten beste gailu batzuk kontrolatzeko eta automatikoki aktibatu eta desaktibatzeko aukera duzu, den-dena urruneko kontrolagailu bakarra erabilita.\n\nOharra: ziurtatu HDMI-CEC gaituta daukazula telebistan eta bestelako HDMI gailuetan. Fabrikatzaile batzuek beste nolabait izendatu ohi dute HDMI-CEC, adibidez:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Konfiguratu urruneko kontrolagailuaren botoiak"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Kontrolatu telebista, hargailu eta soinu-barren bolumena, etengailua eta sarrera"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Pilaren maila: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Osagarriak"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Urruneko kontrolagailua"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Konektatu da"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Aurretik konektatutakoak"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Parekatu urruneko kontrolagailu edo osagarri bat"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Deskonektatu"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Konektatu"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Aldatu izena"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Ahaztu"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Konektatuta"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Deskonektatuta"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Gailuaren kontrola"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Konektatu beste gailu bat"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Bluetooth bidezko beste gailurik konektatu aurretik, ziurtatu parekatzeko moduan daudela. %1$s konektatzeko, eduki sakatuta %2$s eta %3$s hiru segundoz."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV-ren urruneko kontrolagailu bat"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Gailu erabilgarriak"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Gailuak bilatzen…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Errorea"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Konektatzen…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Konektatuta"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Bertan behera utzita"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Ezin izan da konektatu %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Konektatu da %1$s"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Deskonektatu da %1$s"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-fa/strings.xml b/libraries/BluetoothServices/res/values-fa/strings.xml
index 8243ba4..67c3ed8 100644
--- a/libraries/BluetoothServices/res/values-fa/strings.xml
+++ b/libraries/BluetoothServices/res/values-fa/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"نامشخص"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"مهم"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"کم"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"خوب"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"به‌روزرسانی کنترل از راه دور را تأیید کنید"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"درحین به‌روزرسانی، ممکن است ارتباط کنترل از راه دور شما برای مدت کوتاهی قطع شود."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"ادامه"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"لغو"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"به‌روزرسانی از راه دور"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"نرم‌افزار جدید در دسترس است"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"به‌روزرسانی موجود است"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"کنترل از راه دور به‌روز است"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"کنترل از راه دور به‌روزرسانی نشد"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"درحین به‌روزرسانی کنترل از راه دور با مشکلی مواجه شدیم. لطفاً دوباره امتحان کنید."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"لطفاً منتظر بمانید"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"کنترل از راه دور را مرتبط کنید"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"فعال"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"غیرفعال"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"میزان شارژ باتری"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"سفت‌افزار"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"نشانی بلوتوث"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"لطفاً باتری را تعویض کنید"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"باتری ضعیف است"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"دستگاه‌های متصل"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"کنترل ازراه‌دور و لوازم جانبی"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"به‌روزرسانی کنترل از راه دور"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"آماده نصب"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"به‌روزرسانی"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"رد کردن"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"باتری کنترل ازراه‌دور ضعیف است"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"باتری را فوراً تعویض کنید"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"باتری کنترل ازراه‌دور تقریباً خالی است"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"باتری را فوراً تعویض کنید"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"باتری کنترل ازراه‌دور خالی است"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"برای استفاده از کنترل ازراه‌دور، باتری را تعویض کنید"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"بله"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"نه"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"قطع اتصال از %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"اتصال به %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"فراموش کردن %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"نام دستگاه متصل‌شده را تغییر دهید"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"فعال کردن HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC به شما اجازه می‌دهد دیگر دستگاه‌های دارای قابلیت HDMI-CEC را تنها با یک کنترل از راه دور کنترل و به‌طور خودکار روشن/خاموش کنید.\n\nنکته: مطمئن شوید HDMI-CEC در تلویزیون و سایر دستگاه‌های HDMI فعال باشد. سازندگان اغلب نام‌های مختلفی برای HDMI-CEC دارند، برای مثال:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"راه‌اندازی دکمه‌های ازراه‌دور"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"میزان صدا، ورودی، و روشن/خاموش شدن تلویزیون‌ها، گیرنده‌ها، و بلندگوهای ستونی را کنترل کنید"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"میزان شارژ باتری: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"لوازم جانبی"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"کنترل ازراه‌دور"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"متصل"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"قبلاً متصل‌شده"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"مرتبط کردن کنترل ازراه‌دور یا لوازم جانبی"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"قطع ارتباط"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"اتصال"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"تغییر نام"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"فراموش کردن"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"متصل"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"قطع اتصال"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"کنترل دستگاه"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"اتصال دستگاه جدید"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"قبل از متصل کردن دستگاه‌های بلوتوث جدید، مطمئن شوید در حالت مرتبط‌سازی هستند برای اتصال %1$s‏، %2$s،‏ و %3$s را به‌مدت ۳ ثانیه فشار دهید و نگه‌دارید."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"کنترل از راه دور Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"دستگاه‌های در دسترس"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"درحال جستجوی دستگاه‌ها…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"خطا"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"درحال برقراری اتصال…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"متصل"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"لغو شد"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s متصل نشد"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s متصل شد"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"اتصال %1$s قطع شد"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"موجود نیست"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"بحرانی"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"کم"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"خوب"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"به‌روزرسانی کنترل ازراه‌دور را تأیید کنید"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"درحین به‌روزرسانی، ممکن است ارتباط کنترل ازراه‌دور برای مدت کوتاهی قطع شود."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"ادامه"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"لغو"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"به‌روزرسانی کنترل ازراه‌دور"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"نرم‌افزار جدید دردسترس است"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"به‌روزرسانی دردسترس است"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"کنترل ازراه‌دور به‌روز است"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"کنترل از راه دور به‌روزرسانی نشد"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"درحین به‌روزرسانی کنترل ازراه‌دور با مشکلی مواجه شدیم. لطفاً دوباره امتحان کنید."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"لطفاً منتظر بمانید"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"کنترل ازراه‌دور را دوباره مرتبط کنید"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"فعال"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"غیرفعال"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"میزان شارژ باتری"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"سفت‌افزار"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"نشانی بلوتوث"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"لطفاً باتری را تعویض کنید"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"باتری ضعیف است"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"دستگاه‌های متصل"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"کنترل ازراه‌دور و لوازم جانبی"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"به‌روزرسانی کنترل ازراه‌دور"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"آماده نصب"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"به‌روزرسانی"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"بستن"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"باتری کنترل ازراه‌دور ضعیف است"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"باتری را فوراً تعویض کنید"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"باتری کنترل ازراه‌دور تقریباً خالی است"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"باتری را فوراً تعویض کنید"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"باتری کنترل ازراه‌دور خالی است"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"برای استفاده از کنترل ازراه‌دور، باتری را تعویض کنید"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"بله"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"نه"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"قطع اتصال از %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"اتصال به %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"فراموش کردن %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"نام دستگاه متصل‌شده‌تان را تغییر دهید"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"فعال کردن HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC به شما اجازه می‌دهد سایر دستگاه‌های دارای قابلیت HDMI-CEC را تنها با یک کنترل ازراه‌دور کنترل و به‌طور خودکار روشن/خاموش کنید.\n\nتوجه: مطمئن شوید HDMI-CEC در تلویزیون و سایر دستگاه‌های HDMI فعال باشد. سازندگان اغلب نام‌های مختلفی برای HDMI-CEC دارند، برای مثال:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"راه‌اندازی دکمه‌های کنترل ازراه‌دور"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"میزان صدا، ورودی، و روشن/خاموش شدن تلویزیون‌ها، گیرنده‌ها، و بلندگوهای ستونی را کنترل کنید"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"میزان شارژ باتری: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"لوازم جانبی"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"کنترل ازراه‌دور"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"متصل"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"قبلاً متصل‌شده"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"جفت کردن کنترل ازراه‌دور یا وسیله جانبی"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"قطع ارتباط"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"اتصال"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"تغییر نام"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"فراموش کردن"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"متصل"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"متصل نیست"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"کنترل دستگاه"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"اتصال دستگاه جدید"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"قبل‌از متصل کردن دستگاه‌های بلوتوث جدید، مطمئن شوید آن‌ها در حالت مرتبط‌سازی باشند. برای اینکه %1$s را متصل کنید، %2$s،‏ و %3$s را به‌مدت ۳ ثانیه فشار دهید و نگه‌دارید."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"کنترل ازراه‌دور Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"دستگاه‌های موجود"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"درحال جستجوی دستگاه‌ها…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"خطا"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"درحال اتصال…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"متصل"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"لغو شد"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s متصل نشد"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s متصل شد"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"اتصال %1$s قطع شد"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-fi/strings.xml b/libraries/BluetoothServices/res/values-fi/strings.xml
index a06542e..b7f6910 100644
--- a/libraries/BluetoothServices/res/values-fi/strings.xml
+++ b/libraries/BluetoothServices/res/values-fi/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"–"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kriittinen"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Vähäinen"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Hyvä"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Vahvista kaukosäätimen päivitys"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Kaukosäädin voi menettää yhteyden hetkeksi päivityksen aikana."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Jatka"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Peru"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Kaukosäätimen päivitys"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Uusi ohjelmisto saatavilla"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Päivitys saatavilla"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Kaukosäädin on päivitetty"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Kaukosäätimen päivitys epäonnistui"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Kaukosäätimen päivityksessä ilmeni ongelma. Yritä uudelleen."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Odota hetki"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Yhdistä kaukosäädin uudelleen"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Päällä"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Ei käytössä"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Akun varaustaso"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d %%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Laiteohjelmisto"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth-osoite"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Vaihda akku"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Akku lähes tyhjä"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Yhdistetyt laitteet"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Etälaitteet ja lisävarusteet"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Päivitä kaukosäädin"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Valmis asennukseen"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"PÄIVITÄ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"OHITA"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Kaukosäätimen paristo vähissä"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Vaihda paristo pian"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Kaukosäätimen paristo melkein tyhjä"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Vaihda paristo pian"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Kaukosäätimen paristo tyhjä"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Vaihda paristo, jotta voit käyttää kaukosäädintä"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Kyllä"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Ei"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Irrota laite ja %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Yhdistä: %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Unohda %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Nimeä yhdistetty laite uudelleen"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Ota käyttöön HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC:n avulla voit ohjata muita HDMI-CEC-yhteensopivia laitteita ja käynnistää tai sammuttaa niitä yhdellä kaukosäätimellä.\n\nHuom. Varmista, että HDMI-CEC on käytössä televisiossasi ja muissa HDMI-laitteissa. Valmistajilla on usein eri nimiä HDMI-CEC:lle, esimerkiksi:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Valitse kaukosäätimen painikkeet"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Ohjaa äänenvoimakkuutta, virtaa, TV:n tuloja, viritinvahvistimia ja soundbar-kaiuttimia"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Akun varaustaso: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Lisälaitteet"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Kaukosäädin"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Yhdistetty"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Aiemmin yhdistetyt"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Muodosta laitepari kaukosäätimestä tai lisävarusteesta"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Katkaise yhteys"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Yhdistä"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Nimeä uudelleen"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Unohda"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Yhdistetty"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Yhteys katkaistu"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Laitehallinta"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Yhdistä uusi laite"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Varmista ennen uusien Bluetooth-laitteiden yhdistämistä, että laitteet ovat parinmuodostustilassa. Yhdistä %1$s pitämällä %2$s ja %3$s painettuna kolmen sekunnin ajan."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV:n kaukosäädin"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Saatavilla olevat laitteet"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Etsitään laitteita…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Virhe"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Yhdistetään…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Yhdistetty"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Peruttu"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Yhdistäminen epäonnistui: %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s yhdistetty"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s irrotettu"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"–"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kriittinen"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Matala"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Hyvä"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Vahvista kaukosäätimen päivitys"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Kaukosäädin voi menettää yhteyden hetkeksi päivityksen aikana."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Jatka"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Peru"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Kaukosäätimen päivitys"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Uusi ohjelmisto saatavilla"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Päivitys saatavilla"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Kaukosäädin on päivitetty"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Kaukosäätimen päivitys epäonnistui"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Kaukosäätimen päivityksessä ilmeni ongelma. Yritä uudelleen."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Odota"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Yhdistä kaukosäädin uudelleen"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Päällä"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Ei käytössä"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Akun varaustaso"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d %%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Laiteohjelmisto"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth-osoite"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Vaihda paristo"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Virta vähissä"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Yhdistetyt laitteet"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Etälaitteet ja lisävarusteet"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Päivitä kaukosäädin"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Valmis asennukseen"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"PÄIVITÄ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"OHITA"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Kaukosäätimen paristo vähissä"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Vaihda paristo pian"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Kaukosäätimen paristo melkein tyhjä"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Vaihda paristo pian"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Kaukosäätimen paristo tyhjä"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Vaihda paristo, jotta voit käyttää kaukosäädintä"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Kyllä"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Ei"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Irrota laite ja %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Yhdistä %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Unohda %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Nimeä yhdistetty laite uudelleen"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Ota käyttöön HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC:n avulla voit ohjata muita HDMI-CEC-yhteensopivia laitteita ja käynnistää ja sammuttaa niitä yhdellä kaukosäätimellä.\n\nHuom. Varmista, että HDMI-CEC on käytössä televisiossasi ja muissa HDMI-laitteissa. Valmistajilla on usein eri nimiä HDMI-CEC:lle, esimerkiksi:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Valitse kaukosäätimen painikkeet"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Ohjaa äänenvoimakkuutta, virtaa, TV:n tuloja, vastaanottimia ja soundbar-kaiuttimia"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Akun varaustaso: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Lisävarusteet"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Kaukosäädin"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Yhdistetty"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Aiemmin liitetyt"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Muodosta laitepari kaukosäätimestä tai lisävarusteesta"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Katkaise yhteys"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Yhdistä"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Nimeä uudelleen"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Unohda"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Yhdistetty"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Yhteys katkaistu"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Laitehallinta"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Yhdistä uusi laite"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Varmista ennen uusien Bluetooth-laitteiden yhdistämistä, että laitteet ovat parinmuodostustilassa. Yhdistä %1$s pitämällä %2$s ja %3$s painettuna kolmen sekunnin ajan."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV ‑kaukosäädin"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Saatavilla olevat laitteet"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Haetaan laitteita…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Virhe"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Yhdistetään…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Yhdistetty"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Peruutettu"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Yhdistäminen epäonnistui: %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s yhdistetty"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Yhteys katkaistu: %1$s"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-fr-rCA/strings.xml b/libraries/BluetoothServices/res/values-fr-rCA/strings.xml
index 5d98c0b..dc26dc3 100644
--- a/libraries/BluetoothServices/res/values-fr-rCA/strings.xml
+++ b/libraries/BluetoothServices/res/values-fr-rCA/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Sans objet"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Critique"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Faible"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Bon"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Confirmez la mise à jour de la télécommande"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Pendant la mise à jour, il se peut que votre télécommande se déconnecte brièvement."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Continuer"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Annuler"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Mise à jour de la télécommande"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Une mise à jour logicielle est proposée"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Mise à jour proposée"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"La télécommande est à jour"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Échec de la mise à jour de la télécommande"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Une erreur s\'est produite durant la mise à jour de votre télécommande. Veuillez réessayer."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Veuillez patienter"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Associez votre télécommande de nouveau"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Activé"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Désactivé"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Niveau de charge de la pile"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d %%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Micrologiciel"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Adresse Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Veuillez remplacer la pile"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Pile faible"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Appareils connectés"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Télécommande et accessoires"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Mettre à jour votre télécommande"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Prêt pour l\'installation"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"METTRE À JOUR"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"IGNORER"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"La pile de la télécommande est faible"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Remplacez la pile bientôt"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"La pile de la télécommande est presque vide"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Remplacez la pile bientôt"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"La pile de la télécommande est vide"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Remplacez la pile pour utiliser la télécommande"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Oui"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Non"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Déconnexion de %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Connexion à %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Oublier %1$s?"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Renommez votre appareil connecté"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Activer le HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Le HDMI-CEC vous permet de commander et d\'allumer/d\'éteindre d\'autres appareils compatibles HDMI-CEC à l\'aide d\'une seule télécommande.\n\nRemarque : Assurez-vous que le HDMI-CEC est activé sur votre téléviseur et vos autres appareils HDMI. Les fabricants utilisent souvent un nom différent pour la technologie HDMI-CEC. Par exemple :"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung : Anynet+\nLG : SimpLink\nSony : BRAVIA Sync\nPhilips : EasyLink\nSharp : Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Configurer les boutons de la télécommande"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Contrôlez le volume, l\'alimentation, les entrées sur les téléviseurs, les récepteurs et les barres de son"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Niveau de charge de la pile : %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Accessoires"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Télécommande"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Connecté"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Connecté précédemment"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Associez la télécommande ou l\'accessoire"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Déconnecter"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Connecter"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Renommer"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Supprimer"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Connecté"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Déconnecté"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Contrôle de l\'appareil"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Connecter un nouvel appareil"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Avant d\'associer de nouveaux appareils Bluetooth, assurez-vous qu\'ils sont en mode d\'association. Pour connecter %1$s, maintenez enfoncés les boutons %2$s et %3$s pendant trois secondes."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"une télécommande Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Appareils accessibles"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Recherche d\'appareils en cours…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Erreur"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Connexion en cours…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Connecté"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Annulé"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Échec de connexion de %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s connecté"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s déconnecté"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"s. o."</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Critique"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Faible"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Bon"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Confirmez la mise à jour de la télécommande"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Pendant la mise à jour, il se peut que votre télécommande se déconnecte brièvement."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Continuer"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Annuler"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Mise à jour de la télécommande"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Une mise à jour logicielle est proposée"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Une mise à jour est offerte"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"La télécommande est à jour"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Échec de la mise à jour de la télécommande"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Une erreur s\'est produite durant la mise à jour de votre télécommande. Veuillez réessayer."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Veuillez patienter"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Associez votre télécommande de nouveau"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Activé"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Désactivé"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Niveau de charge de la pile"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Micrologiciel"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Adresse Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Veuillez remplacer la pile"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Niveau de pile faible"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Appareils connectés"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Télécommandes et accessoires"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Mettre à jour votre télécommande"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Prêt pour l\'installation"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"METTRE À JOUR"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"IGNORER"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"La pile de la télécommande est faible"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Remplacez la pile bientôt"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"La pile de la télécommande est presque vide"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Remplacez la pile bientôt"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"La pile de la télécommande est vide"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Remplacez la pile pour utiliser la télécommande"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Oui"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Non"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Déconnexion de %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Connecter à %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Oublier %1$s?"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Renommez votre appareil connecté"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Activer le HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Le HDMI-CEC vous permet de commander et d\'allumer/d\'éteindre d\'autres appareils compatibles HDMI-CEC à l\'aide d\'une simple télécommande.\n\nRemarque : Assurez-vous que le HDMI-CEC est activé sur votre téléviseur et vos autres appareils HDMI. Les fabricants utilisent souvent un nom différent pour la technologie HDMI-CEC. Par exemple :"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung : Anynet+\nLG : SimpLink\nSony : BRAVIA Sync\nPhilips : EasyLink\nSharp : Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Configurer les boutons de la télécommande"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Contrôlez le volume, l\'alimentation, les entrées sur les téléviseurs, les récepteurs et les barres de son"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Niveau de charge de la pile : %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Accessoires"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Télécommande"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Connecté"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Connecté précédemment"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Associer la télécommande ou l\'accessoire"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Dissocier"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Se connecter"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Renommer"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Oublier"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Connecté"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Déconnecté"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Contrôle de l\'appareil"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Connecter un nouvel appareil"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Avant d\'associer de nouveaux appareils Bluetooth, assurez-vous qu\'ils sont en mode d\'association. Pour connecter %1$s, maintenez enfoncés les boutons %2$s et %3$s pendant trois secondes."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"une télécommande Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Appareils détectés"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Recherche d’appareils en cours…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Erreur"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Connexion en cours…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Connectés"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Annulée"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Échec de connexion de %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Appareil connecté : %1$s"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Appareil déconnecté : %1$s"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-fr/strings.xml b/libraries/BluetoothServices/res/values-fr/strings.xml
index 11b4638..f3205fa 100644
--- a/libraries/BluetoothServices/res/values-fr/strings.xml
+++ b/libraries/BluetoothServices/res/values-fr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Critique"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Faible"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Bon"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Confirmer la mise à jour de la télécommande"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Pendant la mise à jour, votre télécommande peut se déconnecter brièvement."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Continuer"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Annuler"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Mise à jour de la télécommande"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Nouveau logiciel disponible"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Mise à jour disponible"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"La télécommande est à jour"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Échec de la mise à jour de la télécommande"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Nous avons rencontré un problème pendant la mise à jour de votre télécommande. Veuillez réessayer."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Veuillez patienter"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Associer à nouveau votre télécommande"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Activé"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Désactivé"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Niveau de la batterie"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d %%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Micrologiciel"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Adresse Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Veuillez remplacer la batterie"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Batterie faible"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Appareils connectés"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Télécommandes et accessoires"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Mettre à jour votre télécommande"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Prêt pour l\'installation"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"METTRE À JOUR"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"FERMER"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"La pile de la télécommande est faible"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Remplacez bientôt la pile"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"La pile de la télécommande est presque vide"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Remplacez bientôt la pile"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"La pile de la télécommande est vide"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Remplacez la pile pour utiliser la télécommande"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Oui"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Non"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Déconnecter de %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Se connecter à %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Supprimer %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Renommer votre appareil connecté"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Activer le HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Le HDMI-CEC vous permet de contrôler et d\'allumer ou d\'éteindre automatiquement d\'autres appareils sur lequel il est activé à l\'aide d\'une télécommande unique.\n\nRemarque : Assurez-vous que le HDMI-CEC est activé sur votre téléviseur et sur d\'autres appareils HDMI. Les fabricants utilisent souvent d\'autres termes pour faire référence au HDMI-CEC, comme l\'illustrent les exemples ci-dessous :"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung : Anynet+\nLG : SimpLink\nSony : BRAVIA Sync\nPhilips : EasyLink\nSharp : Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Configurer la télécommande"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Contrôlez le volume, l\'alimentation et le mode d\'entrée sur vos téléviseurs, vos récepteurs et vos barres de son"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Niveau de la batterie : %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Accessoires"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Télécommande"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Connecté"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Associé précédemment"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Associer une télécommande ou un accessoire"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Déconnecter"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Connecter"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Renommer"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Supprimer"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Connecté"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Déconnecté"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Contrôle des appareils"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Associer un nouvel appareil"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Avant d\'associer vos appareils Bluetooth, assurez-vous qu\'ils sont en mode d\'association. Pour associer %1$s, appuyez sur %2$s+%3$s pendant trois secondes."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"une télécommande Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Appareils disponibles"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Recherche d\'appareils…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Erreur"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Association…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Associé"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Annulé"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Échec de l\'association à %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s connecté"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s déconnecté"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Non disponible"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Critique"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Faible"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Bon"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Confirmer la mise à jour de la télécommande"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Pendant la mise à jour, votre télécommande peut se déconnecter brièvement."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Continuer"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Annuler"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Mise à jour de la télécommande"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Nouveau logiciel disponible"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Mise à jour disponible"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"La télécommande est à jour"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Échec de la mise à jour de la télécommande"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Nous avons rencontré un problème pendant la mise à jour de votre télécommande. Veuillez réessayer."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Veuillez patienter"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Associer de nouveau votre télécommande"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Activé"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Désactivé"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Niveau de la batterie"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d %%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Micrologiciel"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Adresse Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Veuillez remplacer la batterie"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Batterie faible"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Appareils connectés"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Télécommandes et accessoires"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Mettre à jour votre télécommande"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Prêt pour l\'installation"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"METTRE À JOUR"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"IGNORER"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"La batterie de la télécommande est faible"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Remplacez bientôt la batterie"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"La batterie de la télécommande est presque vide"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Remplacez bientôt la batterie"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"La batterie de la télécommande est vide"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Remplacez la batterie pour utiliser la télécommande"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Oui"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Non"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Déconnecter de %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Connecter à %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Supprimer %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Renommer votre appareil connecté"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Activer le HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Le HDMI-CEC vous permet de contrôler et d\'allumer ou d\'éteindre automatiquement d\'autres appareils sur lequel il est activé à l\'aide d\'une télécommande unique.\n\nRemarque : Assurez-vous que le HDMI-CEC est activé sur votre téléviseur et sur d\'autres appareils HDMI. Les fabricants utilisent souvent d\'autres termes pour faire référence au HDMI-CEC, par exemple :"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung : Anynet+\nLG : SimpLink\nSony : BRAVIA Sync\nPhilips : EasyLink\nSharp : Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Configurer les boutons de la télécommande"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Contrôlez le volume, l\'alimentation et le mode d\'entrée sur vos téléviseurs, vos récepteurs et vos barres de son"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Niveau de la batterie : %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Accessoires"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Télécommande"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Connecté"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Connecté précédemment"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Associer une télécommande ou un accessoire"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Dissocier"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Connecter"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Renommer"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Supprimer"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Connecté"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Déconnecté"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Contrôle de l\'appareil"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Connecter un nouvel appareil"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Avant de connecter des appareils Bluetooth, assurez-vous qu\'ils sont en mode association. Pour connecter %1$s, appuyez sur %2$s+%3$s pendant trois secondes."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"une télécommande Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Appareils disponibles"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Recherche d\'appareils…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Erreur"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Connexion…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Connecté"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Annulé"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Échec de la connexion de %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s connecté"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s déconnecté"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-gl/strings.xml b/libraries/BluetoothServices/res/values-gl/strings.xml
index bb43d23..f1ab208 100644
--- a/libraries/BluetoothServices/res/values-gl/strings.xml
+++ b/libraries/BluetoothServices/res/values-gl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Non dispoñible"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Mínimo"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Baixo"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Bo"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Confirma a actualización do mando a distancia"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Durante a actualización, o mando a distancia pode desconectarse un intre."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Continuar"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Cancelar"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Actualización do mando a distancia"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Hai software novo dispoñible"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Hai dispoñible unha actualización"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"O mando a distancia está actualizado"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Produciuse un erro na actualización do mando a distancia"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Produciuse un problema ao actualizar o mando a distancia. Téntao de novo."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Agarda"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Vincula o mando a distancia outra vez"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Activado"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Desactivado"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Nivel de batería"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d %%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Enderezo Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Cambia a batería"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Pouca batería"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Dispositivos conectados"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Mandos a distancia e accesorios"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Actualiza o mando a distancia"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Listo para instalar"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ACTUALIZAR"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"IGNORAR"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Queda pouca batería remota"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Substitúe a batería axiña"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"A batería remota case está esgotada"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Substitúe a batería axiña"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"A batería remota está esgotada"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Substitúe a batería pola remota"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Si"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Non"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Desconectar de %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Conectar a: %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Esquecer %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Cambia o nome do dispositivo conectado"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Activar HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC permíteche controlar e activar ou desactivar manualmente dispositivos habilitados con HDMI-CEC a través dun único mando a distancia.\n\nNota: Asegúrate de que a función HDMI-CEC estea activada na televisión e nos outros dispositivos HDMI. Os fabricantes adoitan chamarlle á función HDMI-CEC de diferentes formas, por exemplo:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Configurar botóns do mando a distancia"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Controla o volume, o acendido e a entrada nos receptores, barras de son e televisións"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Nivel de batería: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Accesorios"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Mando a distancia"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Conectado"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Dispositivos conectados previamente"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Vincular mando a distancia ou accesorio"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Desconectar"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Conectar"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Cambiar nome"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Esquecer"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Conectado"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Desconectado"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Control do dispositivo"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Conectar un novo dispositivo"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Antes de conectar dispositivos Bluetooth novos, comproba que estean no modo de vinculación. Para conectar %1$s, mantén premido %2$s e %3$s durante 3 segundos."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"un mando a distancia de Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Dispositivos dispoñibles"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Buscando dispositivos…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Produciuse un erro"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Conectando…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Conectado"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Cancelouse a vinculación"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Non se puido conectar: %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"Conectado: %1$s"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"Desconectado: %1$s"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/D"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Mínimo"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Baixo"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Bo"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Confirma a actualización do mando a distancia"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Durante a actualización, é posible que o mando a distancia se desconecte un intre."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Continuar"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Cancelar"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Actualización do mando a distancia"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Hai software novo dispoñible"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Hai dispoñible unha actualización"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"O mando a distancia está actualizado"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Produciuse un erro na actualización do mando a distancia"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Produciuse un problema ao actualizar o mando a distancia. Téntao de novo."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Agarda"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Vincula o mando a distancia outra vez"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Activado"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Desactivado"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Nivel de batería"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Enderezo Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Cambia a batería"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Queda pouca batería"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Dispositivos conectados"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Mandos a distancia e accesorios"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Actualiza o mando a distancia"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Todo listo para a instalación"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ACTUALIZAR"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"IGNORAR"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Queda pouca batería no mando a distancia"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Cambia a batería axiña"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"A batería do mando a distancia case está esgotada"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Cambia a batería axiña"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"A batería do mando a distancia está esgotada"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Cambia a batería para usar o mando a distancia"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Si"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Non"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Desconectar de %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Conectar a este dispositivo: %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Esquecer %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Cambia o nome do dispositivo conectado"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Activar HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC permíteche controlar e activar/desactivar automaticamente outros dispositivos con HDMI-CEC a través dun mando a distancia.\n\nNota: HDMI-CEC debe estar activado no televisor e noutros dispositivos HDMI. Os fabricantes adoitan utilizar diferentes nomes para HDMI-CEC, por exemplo:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Configurar botóns do mando a distancia"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Controla o volume, o acendido e a entrada nos receptores, barras de son e televisións"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Nivel de batería: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Accesorios"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Mando a distancia"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Conectado"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Dispositivos conectados previamente"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Vincular mando a distancia ou accesorio"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Desconectar"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Conectar"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Cambiar nome"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Esquecer"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Conectado"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Desconectado"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Control do dispositivo"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Conectar dispositivo novo"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Antes de conectar dispositivos Bluetooth novos, comproba que estean no modo de vinculación. Para conectar %1$s, mantén premido %2$s e %3$s durante 3 segundos."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"un mando a distancia de Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Dispositivos dispoñibles"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Buscando dispositivos…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Produciuse un erro"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Conectando…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Estableceuse a conexión"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Cancelouse"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Non se puido conectar este dispositivo: %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Conectouse este dispositivo: %1$s"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Desconectouse este dispositivo: %1$s"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-gu/strings.xml b/libraries/BluetoothServices/res/values-gu/strings.xml
index 683fbf4..35bce4b 100644
--- a/libraries/BluetoothServices/res/values-gu/strings.xml
+++ b/libraries/BluetoothServices/res/values-gu/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"લાગુ નથી"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"ગંભીર"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"ઓછું"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"સારું"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"રિમોટ અપડેટ કન્ફર્મ કરો"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"અપડેટ દરમ્યાન તમારું રિમોટ થોડીવાર માટે ડિસ્કનેક્ટ થઈ શકે છે."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"આગળ વધો"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"રદ કરો"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"રિમોટ અપડેટ"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"નવું સૉફ્ટવેર ઉપલબ્ધ છે"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"અપડેટ ઉપલબ્ધ છે"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"રિમોટ અપ ટૂ ડેટ છે"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"રિમોટ અપડેટ કરવાનું નિષ્ફળ થયું"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"તમારું રિમોટ અપડેટ કરતી વખતે અમને સમસ્યા આવી હતી. કૃપા કરી ફરી પ્રયાસ કરો."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"કૃપા કરીને રાહ જુઓ"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"તમારા રિમોટનું ફરીથી જોડાણ કરો"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"ચાલુ છે"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"બંધ છે"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"બૅટરીનું લેવલ"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"ફર્મવેયર"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"બ્લૂટૂથ ઍડ્રેસ"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"કૃપા કરી બૅટરી બદલો"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"ઓછી બૅટરી"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"કનેક્ટ કરેલાં ડિવાઇસ"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"રિમોટ અને ઍક્સેસરી"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"તમારું રિમોટ અપડેટ કરો"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"ઇન્સ્ટૉલ કરવા માટે તૈયાર છે"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"અપડેટ કરો"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"છોડી દો"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"રિમોટની બૅટરી ઓછી છે"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"જલ્દી બૅટરી બદલો"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"રિમોટની બૅટરી લગભગ પૂરી થઈ ગઈ છે"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"જલ્દી બૅટરી બદલો"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"રિમોટની બૅટરી પૂરી થઈ ગઈ છે"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"રિમોટનો ઉપયોગ કરવા માટે બૅટરી બદલો"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"હા"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"ના"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$sમાંથી ડિસ્કનેક્ટ કરો"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$sની સાથે કનેક્ટ કરો"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$sને ભૂલી જાઓ"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"તમારા કનેક્ટેડ ડિવાઇસનું નામ બદલો"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC ચાલુ કરો"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC તમને અન્ય HDMI-CEC ચાલુ કરેલા ડિવાઇસને એક જ રિમોટ કન્ટ્રોલ વડે નિયંત્રિત અને ઑટોમૅટિક રીતે ચાલુ/બંધ કરવા દે છે.\n\nનોંધ: HDMI-CEC તમારા ટીવી અને અન્ય HDMI ડિવાઇસ પર ચાલુ કરેલું હોવાની ખાતરી કરો. ઘણી વખત નિર્માતાઓ HDMI-CEC માટે અલગ-અલગ નામ ધરાવતા હોય છે, ઉદાહરણ તરીકે:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"રિમોટ બટનનું સેટઅપ કરો"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"ટીવી, રિસીવર અને સાઉન્ડબાર પર વૉલ્યૂમ, પાવર અને ઇનપુટનું નિયંત્રણ કરો"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"બૅટરીનું લેવલ: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"ઍક્સેસરી"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"રિમોટ કન્ટ્રોલ"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"કનેક્ટ કર્યું"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"પહેલાં કનેક્ટ કરેલા"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"રિમોટ અથવા ઍક્સેસરી જોડો"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"ડિસ્કનેક્ટ કરો"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"કનેક્ટ કરો"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"નામ બદલો"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"ભૂલી જાઓ"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"કનેક્ટ કરેલું"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"ડિસ્કનેક્ટ કર્યું"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"ડિવાઇસ નિયંત્રણ"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"નવા ડિવાઇસ સાથે કનેક્ટ કરો"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"તમારા નવા બ્લૂટૂથ ડિવાઇસને કનેક્ટ કરતા પહેલાં, તે જોડાણ કરવાના મોડમાં હોવાની ખાતરી કરો. %1$s કનેક્ટ કરવા માટે, %2$s + %3$sને 3 સેકન્ડ સુધી દબાવી રાખો."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV રિમોટ"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"ઉપલબ્ધ ડિવાઇસ"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"ડિવાઇસ શોધી રહ્યાં છીએ…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"ભૂલ"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"કનેક્ટ કરી રહ્યાં છીએ…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"કનેક્ટ કર્યું"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"રદ કર્યું"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s કનેક્ટ કરવામાં નિષ્ફળ થયું"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s કનેક્ટ કર્યું"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s ડિસ્કનેક્ટ કર્યું"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"ઘણું ઓછું લેવલ"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"ઓછું લેવલ"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"પર્યાપ્ત લેવલ"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"રિમોટ અપડેટ કન્ફર્મ કરો"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"અપડેટ દરમિયાન તમારું રિમોટ થોડીવાર માટે ડિસ્કનેક્ટ થઈ શકે છે."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"આગળ વધો"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"રદ કરો"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"રિમોટ અપડેટ"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"નવું સૉફ્ટવેર ઉપલબ્ધ છે"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"અપડેટ ઉપલબ્ધ છે"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"રિમોટ અપ ટૂ ડેટ છે"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"રિમોટ અપડેટ કરવાનું નિષ્ફળ થયું"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"તમારું રિમોટ અપડેટ કરતી વખતે અમને કોઈ સમસ્યા આવી હતી. કૃપા કરીને ફરી પ્રયાસ કરો."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"કૃપા કરીને રાહ જુઓ"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"તમારા રિમોટનું ફરીથી જોડાણ કરો"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"ચાલુ છે"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"બંધ છે"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"બૅટરીનું લેવલ"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"ફર્મવેયર"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"બ્લૂટૂથ ઍડ્રેસ"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"કૃપા કરી બૅટરી બદલો"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"બૅટરીનું ઓછું લેવલ"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"કનેક્ટેડ ડિવાઇસ"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"રિમોટ અને ઍક્સેસરી"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"તમારું રિમોટ અપડેટ કરો"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"ઇન્સ્ટૉલ કરવા માટે તૈયાર છે"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"અપડેટ કરો"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"છોડી દો"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"રિમોટની બૅટરીનું લેવલ ઓછું છે"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"ટૂંક સમયમાં બૅટરી બદલો"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"રિમોટની બૅટરી લગભગ પૂરી થઈ ગઈ છે"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"ટૂંક સમયમાં બૅટરી બદલો"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"રિમોટની બૅટરી પૂરી થઈ ગઈ છે"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"રિમોટનો ઉપયોગ કરવા માટે બૅટરી બદલો"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"હા"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"ના"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$sથી ડિસ્કનેક્ટ કરો"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$sની સાથે કનેક્ટ કરો"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$sને ભૂલી જાઓ"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"તમારા કનેક્ટેડ ડિવાઇસનું નામ બદલો"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC ચાલુ કરો"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC તમને બીજા HDMI-CEC  ચાલુ કરેલા ડિવાઇસને એક જ રિમોટ કન્ટ્રોલ વડે નિયંત્રિત અને ચાલુ/બંધ કરવા દે છે. \n\n નોંધ: HDMI-CEC તમારા ટીવી અને બીજા HDMI ડિવાઇસ પર ચાલુ  હોવાની ખાતરી કરો. ઘણી વખત ઉત્પાદકો HDMI-CEC માટે અલગ ધરાવતા હોય છે, ઉદાહરણ તરીકે:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA \nPhilips સિંક કરો: EasyLink\nSharp: Aquos લિંક"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"રિમોટ બટનનું સેટઅપ કરો"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"ટીવી, રિસીવર અને સાઉન્ડબાર પર વૉલ્યૂમ, પાવર અને ઇનપુટને નિયંત્રિત કરો"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"બૅટરીનું લેવલ: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"ઍક્સેસરી"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"રિમોટ કન્ટ્રોલ"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"કનેક્ટેડ"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"પહેલાં કનેક્ટ કરેલા"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"રિમોટ અથવા ઍક્સેસરીનું જોડાણ બનાવો"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"ડિસ્કનેક્ટ કરો"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"કનેક્ટ કરો"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"નામ બદલો"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"ભૂલી જાઓ"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"કનેક્ટ કરેલું"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"ડિસ્કનેક્ટ કર્યું"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"ડિવાઇસ નિયંત્રણ"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"નવું ડિવાઇસ કનેક્ટ કરો"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"તમારા નવા બ્લૂટૂથ ડિવાઇસને કનેક્ટ કરતા પહેલાં, તે જોડાણ કરવાના મોડમાં હોવાની ખાતરી કરો. %1$s કનેક્ટ કરવા માટે, %2$s + %3$sને 3 સેકન્ડ સુધી દબાવી રાખો."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV રિમોટ"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"ઉપલબ્ધ ડિવાઇસ"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"ડિવાઇસ શોધી રહ્યાં છીએ…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"ભૂલ"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"કનેક્ટ કરી રહ્યાં છીએ…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"કનેક્ટેડ"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"રદ કર્યું"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s કનેક્ટ કરવામાં નિષ્ફળ થયું"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s કનેક્ટેડ છે"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s ડિસ્કનેક્ટ કરેલું છે"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-hi/strings.xml b/libraries/BluetoothServices/res/values-hi/strings.xml
index aefa990..92ffa88 100644
--- a/libraries/BluetoothServices/res/values-hi/strings.xml
+++ b/libraries/BluetoothServices/res/values-hi/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"बैटरी नहीं है"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"बैटरी बहुत कम है"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"बैटरी कम है"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"बैटरी ठीक-ठाक चार्ज है"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"रिमोड के अपडेट की पुष्टि करें"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"अपडेट के दौरान आपका रिमोट कुछ देर के लिए डिसकनेक्ट हो सकता है."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"जारी रखें"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"रद्द करें"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"रिमोट अपडेट"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"नया सॉफ़्टवेयर उपलब्ध है"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"अपडेट उपलब्ध है"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"रिमोट अप टू डेट है"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"रिमोट अपडेट नहीं किया जा सका"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"आपका रिमोट अपडेट करते समय कोई गड़बड़ी हुई थी. कृपया फिर से कोशिश करें."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"कृपया इंतज़ार करें"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"अपने रिमोट को फिर से जोड़ें"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"चालू है"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"बंद है"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"कितनी बैटरी बची है"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"फ़र्मवेयर"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"ब्लूटूथ का पता"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"कृपया बैटरी बदलें"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"बैटरी कम है"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"जुड़े हुए डिवाइस"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"रिमोट और ऐक्सेसरी"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"अपना रिमोट अपडेट करें"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"इंस्टॉल करने के लिए तैयार है"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"अपडेट करें"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"खारिज करें"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"रिमोट की बैटरी कम हो गई है"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"बैटरी जल्दी बदलें"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"रिमोट की बैटरी करीब-करीब खत्म हो गई है"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"बैटरी जल्दी बदलें"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"रिमोट की बैटरी खत्म हो गई है"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"रिमोट इस्तेमाल करने के लिए बैटरी बदलें"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"हां"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"नहीं"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s से डिसकनेक्ट करें"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s से कनेक्ट करें"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s की जानकारी हटाएं"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"कनेक्ट किए गए अपने डिवाइस का नाम बदलें"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC चालू करें"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC की सुविधा से आप उन डिवाइस को एक रिमोट कंट्रोल से नियंत्रित और अपने-आप चालू/बंद कर सकते हैं जिन पर यह सुविधा काम करती है.\n\nध्यान दें: अपने टीवी और दूसरे HDMI डिवाइस पर HDMI-CEC चालू करना याद रखें. अलग-अलग निर्माताओं के लिए अक्सर HDMI-CEC के अलग-अलग नाम होते हैं, जैसे:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"रिमोट के बटन सेट अप करें"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"आवाज़, पावर बटन, और इनपुट के विकल्पों को टीवी, AV रिसीवर, और साउंडबार पर कंट्रोल करें"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"इतनी बैटरी बची है: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"ऐक्सेसरी"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"रिमोट कंट्रोल"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"जुड़ा है"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"पहले कनेक्ट किए गए डिवाइस"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"रिमाेट या ऐक्सेसरी जोड़ें"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"डिसकनेक्ट करें"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"जोड़ें"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"नाम बदलें"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"जानकारी हटाएं"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"कनेक्ट हो गया"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"डिसकनेक्ट हो गया"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"डिवाइस का नियंत्रण"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"नया डिवाइस जोड़ें"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"ब्लूटूथ वाले नए डिवाइस जोड़ने से पहले, पक्का करें कि दोनों डिवाइस पर \'दूसरे डिवाइस से जोड़ें\' मोड चालू हो %1$s से जुड़ने के लिए, तीन सेकंड तक %2$s + %3$s को दबाकर रखें."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"एक Android TV रिमोट"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"उपलब्ध डिवाइस"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"डिवाइस खोजे जा रहे हैं…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"गड़बड़ी"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"कनेक्ट हो रहा है…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"जुड़ा है"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"रद्द किया गया"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s को कनेक्ट नहीं किया जा सका"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s कनेक्ट किया गया"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s डिसकनेक्ट किया गया"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"जानकारी नहीं है"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"बहुत कम"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"कम"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"काफ़ी"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"रिमोड के अपडेट की पुष्टि करें"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"अपडेट के दौरान, आपका रिमोट कुछ समय के लिए डिसकनेक्ट हो सकता है."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"जारी रखें"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"रद्द करें"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"रिमोट अपडेट"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"नया सॉफ़्टवेयर उपलब्ध है"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"अपडेट मौजूद है"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"रिमोट अप-टू-डेट है"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"रिमोट अपडेट नहीं किया जा सका"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"रिमोट को अपडेट करते समय कोई गड़बड़ी हुई. कृपया फिर से कोशिश करें."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"कृपया इंतज़ार करें"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"अपने रिमोट को फिर से जोड़ें"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"चालू है"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"बंद है"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"कितनी बैटरी बची है"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"फ़र्मवेयर"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"ब्लूटूथ का पता"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"कृपया बैटरी बदलें"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"बैटरी कम है"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"कनेक्ट किए गए डिवाइस"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"रिमोट और ऐक्सेसरी"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"अपना रिमोट अपडेट करें"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"इंस्टॉल करने के लिए तैयार है"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"अपडेट करें"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"खारिज करें"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"रिमोट की बैटरी कम हो गई है"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"बैटरी जल्दी बदलें"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"रिमोट की बैटरी करीब-करीब खत्म हो गई है"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"बैटरी जल्दी बदलें"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"रिमोट की बैटरी खत्म हो गई है"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"रिमोट का इस्तेमाल करने के लिए बैटरी बदलें"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"हां"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"नहीं"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s से डिसकनेक्ट करें"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s से कनेक्ट करें"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s की जानकारी हटाएं"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"अपने कनेक्ट किए गए डिवाइस का नाम बदलें"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC चालू करें"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC की सुविधा से आप उन डिवाइस को एक रिमोट कंट्रोल से नियंत्रित और अपने आप चालू/बंद कर सकते हैं, जिन पर यह सुविधा काम करती है.\n\nनोट: अपने टीवी और दूसरे HDMI डिवाइस पर HDMI-CEC चालू करना याद रखें. अलग-अलग निर्माताओं के लिए अक्सर HDMI-CEC के अलग-अलग नाम होते हैं, जैसे:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"रिमोट के बटन सेट अप करें"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"आवाज़, पावर बटन, और इनपुट के विकल्पों को टीवी, AV रिसीवर, और साउंडबार पर कंट्रोल करें"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"बैटरी लेवल: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"ऐक्सेसरी"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"रिमोट कंट्रोल"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"कनेक्ट है"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"पहले कनेक्ट किए गए डिवाइस"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"रिमाेट या ऐक्सेसरी जोड़ें"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"डिसकनेक्ट करें"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"कनेक्ट करें"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"नाम बदलें"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"जानकारी हटाएं"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"कनेक्ट हो गया"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"डिसकनेक्ट हो गया"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"डिवाइस कंट्रोल"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"नया डिवाइस कनेक्ट करें"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"ब्लूटूथ वाले नए डिवाइस कनेक्ट करने से पहले, पक्का करें कि दोनों डिवाइसों पर \'दूसरे डिवाइस से जोड़ने वाला मोड\' चालू हो. %1$s से कनेक्ट करने के लिए, %2$s + %3$s को तीन सेकंड तक दबाकर रखें."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"एक Android TV रिमोट"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"मौजूद डिवाइस"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"डिवाइसों को खोजा जा रहा है…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"गड़बड़ी"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"कनेक्ट हो रहा है…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"कनेक्ट है"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"रद्द किया गया"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s को कनेक्ट नहीं किया जा सका"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s को कनेक्ट किया गया"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s को डिसकनेक्ट किया गया"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-hr/strings.xml b/libraries/BluetoothServices/res/values-hr/strings.xml
index b17d593..af74f69 100644
--- a/libraries/BluetoothServices/res/values-hr/strings.xml
+++ b/libraries/BluetoothServices/res/values-hr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"nije dostupna"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"kritična"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"niska"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"dobra"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Potvrdite ažuriranje daljinskog upravljača"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Tijekom ažuriranja možda će se nakratko prekinuti veza s daljinskim upravljačem."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Nastavi"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Odustani"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Ažuriranje daljinskog upravljača"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Dostupan je novi softver"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Dostupno je ažuriranje"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Daljinski je upravljač ažuran"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Ažuriranje daljinskog upravljača nije uspjelo"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Pojavio se problem prilikom ažuriranja daljinskog upravljača. Pokušajte ponovo."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Pričekajte"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Ponovo uparite daljinski upravljač"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Omogućeno"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Onemogućeno"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Razina baterije"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Oprema"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth adresa"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Zamijenite bateriju"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Slaba baterija"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Povezani uređaji"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Daljinski upravljači i dodaci"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Ažurirajte daljinski upravljač"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Spremno za instalaciju"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"AŽURIRAJ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ODBACI"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Baterija daljinskog upravljača je slaba"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Uskoro zamijenite bateriju"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Baterija daljinskog upravljača gotovo je prazna"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Uskoro zamijenite bateriju"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Baterija daljinskog upravljača je prazna"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Zamijenite bateriju da biste koristili daljinski upravljač"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Da"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Ne"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Prekini vezu: %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Povežite se s uređajem %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Zaboravi: %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Preimenujte povezani uređaj"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Omogući HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC vam omogućuje da samo jednim daljinskim upravljačem upravljate drugim uređajima omogućenim za HDMI-CEC i automatski ih uključujete i isključujete.\n\nNapomena: provjerite je li HDMI-CEC omogućen na vašem televizoru i drugim HDMI uređajima. Proizvođači često imaju različite nazive za HDMI-CEC, na primjer:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Postavite gumbe na daljinskom upravljaču"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Upravljanje glasnoćom, uključivanjem, isključivanjem, ulazom na televizorima, prijemnicima i soundbarovima"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Razina napunjenosti baterije: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Dodaci"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Daljinski upravljač"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Povezano"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Prethodno povezano"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Uparivanje daljinskog upravljača ili dodatka"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Prekini vezu"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Poveži"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Preimenuj"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Zaboravi"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Povezano"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Nije povezano"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Kontrola uređaja"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Povezivanje novog uređaja"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Prije povezivanja novih Bluetooth uređaja provjerite jesu li u načinu uparivanja. Da biste povezali %1$s, pritisnite i zadržite %2$s + %3$s tri sekunde."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"daljinski upravljač za Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Dostupni uređaji"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Traženje uređaja…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Pogreška"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Povezivanje…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Povezano"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Otkazano"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Povezivanje nije uspjelo: %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"Povezano: %1$s"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"Prekinuta veza: %1$s"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Nije primjenjivo"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritičan"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Nizak"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Dobar"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Potvrdite ažuriranje daljinskog upravljača"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Tijekom ažuriranja možda će se nakratko prekinuti veza s daljinskim upravljačem."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Nastavi"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Odustani"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Ažuriranje daljinskog upravljača"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Dostupan je novi softver"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Dostupno je ažuriranje"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Daljinski upravljač je ažuran"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Ažuriranje daljinskog upravljača nije uspjelo"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Pojavio se problem prilikom ažuriranja daljinskog upravljača. Pokušajte ponovo."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Pričekajte"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Ponovo uparite daljinski upravljač"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Omogućeno"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Onemogućeno"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Razina napunjenosti baterije"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Oprema"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth adresa"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Zamijenite bateriju"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Slaba baterija"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Povezani uređaji"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Daljinski upravljači i dodaci"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Ažurirajte daljinski upravljač"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Spremno za instalaciju"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"AŽURIRAJ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ODBACI"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Baterija daljinskog upravljača je slaba"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Uskoro zamijenite bateriju"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Baterija daljinskog upravljača gotovo je prazna"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Uskoro zamijenite bateriju"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Baterija daljinskog upravljača je prazna"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Zamijenite bateriju da biste koristili daljinski upravljač"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Da"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Ne"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Prekini vezu: %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Povežite se s uređajem %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Zaboravi: %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Promijenite naziv povezanog uređaja"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Omogući HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC vam omogućuje da samo jednim daljinskim upravljačem upravljate drugim uređajima omogućenima za HDMI-CEC i automatski ih uključujete i isključujete.\n\nNapomena: Provjerite je li HDMI-CEC omogućen na vašem televizoru i drugim HDMI uređajima. Proizvođači često imaju različite nazive za HDMI-CEC, na primjer:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Postavite gumbe na daljinskom upravljaču"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Upravljanje glasnoćom, uključivanjem, isključivanjem, ulazom na televizorima, prijemnicima i soundbarovima"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Razina napunjenosti baterije: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Dodaci"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Daljinsko upravljanje"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Povezan"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Prethodno povezano"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Uparivanje daljinskog upravljača ili dodatka"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Prekini vezu"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Poveži"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Preimenuj"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Zaboravi"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Povezano"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Nije povezano"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Kontrola uređaja"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Povežite novi uređaj"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Prije povezivanja novih Bluetooth uređaja provjerite jesu li u načinu uparivanja. Da biste povezali %1$s, pritisnite i zadržite %2$s + %3$s tri sekunde."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"daljinski upravljač za Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Dostupni uređaji"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Traženje uređaja…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Pogreška"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Povezivanje…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Povezano"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Otkazano"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Povezivanje nije uspjelo: %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Povezano: %1$s"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Prekinuta veza: %1$s"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-hu/strings.xml b/libraries/BluetoothServices/res/values-hu/strings.xml
index 84870fc..cc5ccf1 100644
--- a/libraries/BluetoothServices/res/values-hu/strings.xml
+++ b/libraries/BluetoothServices/res/values-hu/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"–"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritikus"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Alacsony"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Jó"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Távvezérlő frissítésének megerősítése"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"A frissítés közben a rendszer rövid időre bonthatja a távvezérlő kapcsolatát."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Tovább"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Mégse"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Távvezérlő frissítése"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Új szoftver áll rendelkezésre"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Rendelkezésre áll frissítés"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"A távvezérlő naprakész"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Nem sikerült a távvezérlő frissítése"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"A távvezérlő frissítése közben problémába ütköztünk. Próbálja újra."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Kis türelmet"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Párosítsa újra a távvezérlőt"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Engedélyezve"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Letiltva"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Akkumulátorszint"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth-cím"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Cseréljen elemet"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Alacsony töltöttség"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Csatlakoztatott eszközök"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Távirányítók és tartozékok"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Távvezérlő frissítése"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Készen áll a telepítésre"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"FRISSÍTÉS"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ELVETÉS"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"A távirányítóban lévő elem töltöttsége alacsony"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Hamarosan elemet kell cserélni"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"A távirányítóban lévő elem majdnem lemerült"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Hamarosan elemet kell cserélni"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"A távirányítóban lévő elem lemerült"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"A távirányító használatához cserélje ki az elemet"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Igen"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Nem"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Leválasztás innen: %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Csatlakozás a következőhöz: %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s elfelejtése"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"A csatlakoztatott eszköz átnevezése"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC engedélyezése"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"A HDMI-CEC lehetővé teszi a többi HDMI-CEC-kompatibilis eszköz vezérlését és automatikus ki-/bekapcsolását egyetlen távvezérlő használatával.\n\nMegjegyzés: Győződjön meg arról, hogy a tévén és a többi HDMI-eszközön is engedélyezve van a HDMI-CEC. A különböző gyártók gyakran máshogy hívják a HDMI-CEC funkciót. Például:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Távirányító gombjainak beállítása"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Hangerő, bekapcsológomb és bemenet kezelése tévén, vevőeszközön és hangprojektoron"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Akkumulátorszint: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Tartozékok"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Távirányító"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Csatlakozva"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Korábban csatlakoztatva"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Távirányító vagy tartozék párosítása"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Leválasztás"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Csatlakozás"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Átnevezés"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Elfelejtés"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Csatlakozva"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Leválasztva"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Eszközvezérlés"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Új eszköz csatlakoztatása"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Új Bluetooth-eszközök csatlakoztatása előtt győződjön meg arról, hogy az eszközök párosítási módban vannak. A(z) %1$s csatlakoztatásához tartsa nyomva a(z) %2$s és a(z) %3$s gombot három másodpercig."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV-távvezérlő"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Rendelkezésre álló eszközök"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Eszközök keresése…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Hiba"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Csatlakozás…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Csatlakozva"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Megszakítva"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Nem sikerült csatlakoztatni a következőt: %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s csatlakoztatva"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s leválasztva"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"–"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritikus"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Alacsony"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Jó"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Távirányító frissítésének megerősítése"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"A frissítés közben a rendszer rövid időre bonthatja a távirányító kapcsolatát."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Tovább"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Mégse"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Távirányító frissítése"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Új szoftver áll rendelkezésre"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Van új frissítés"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"A távirányító naprakész"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Nem sikerült a távvezérlő frissítése"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"A távirányító frissítése közben problémába ütköztünk. Próbálkozzon újra."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Kérjük, várjon"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Párosítsa újra a távirányítót"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Engedélyezve"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Letiltva"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Akkumulátorszint"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth-cím"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Cseréljen elemet"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Alacsony töltöttség"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Csatlakoztatott eszközök"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Távirányítók és tartozékok"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Távirányító frissítése"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Készen áll a telepítésre"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"FRISSÍTÉS"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ELVETÉS"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"A távirányítóban lévő elem töltöttsége alacsony"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Hamarosan elemet kell cserélni"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"A távirányítóban lévő elem majdnem lemerült"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Hamarosan elemet kell cserélni"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"A távirányítóban lévő elem lemerült"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"A távirányító használatához cserélje ki az elemet"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Igen"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Nem"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Leválasztás innen: %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Csatlakozás a következőhöz: %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s elfelejtése"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"A csatlakoztatott eszköz átnevezése"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC engedélyezése"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"A HDMI-CEC lehetővé teszi a többi HDMI-CEC-kompatibilis eszköz vezérlését és automatikus ki-/bekapcsolását egyetlen távvezérlő használatával.\n\nMegjegyzés: Győződjön meg arról, hogy a tévén és a többi HDMI-eszközön is engedélyezve van a HDMI-CEC. A különböző gyártók gyakran máshogy hívják a HDMI-CEC funkciót. Például:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Távirányító gombjainak beállítása"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Hangerő, bekapcsológomb és bemenet kezelése tévén, vevőeszközön és hangprojektoron"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Elem töltöttségi szintje: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Tartozékok"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Távirányító"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Csatlakozva"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Korábban csatlakoztatva"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Távirányító vagy tartozék párosítása"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Leválasztás"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Csatlakozás"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Átnevezés"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Elfelejtés"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Csatlakozva"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Leválasztva"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Eszközvezérlés"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Új eszköz csatlakoztatása"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Új Bluetooth-eszközök csatlakoztatása előtt győződjön meg arról, hogy az eszközök párosítási módban vannak. A(z) %1$s csatlakoztatásához tartsa nyomva a(z) %2$s és a(z) %3$s gombot három másodpercig."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV-távirányító"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Rendelkezésre álló eszközök"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Eszközök keresése…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Hiba"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Csatlakozás…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Csatlakozva"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Törölve"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Nem sikerült csatlakoztatni a következőt: %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s csatlakoztatva"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s leválasztva"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-hy/strings.xml b/libraries/BluetoothServices/res/values-hy/strings.xml
index 3ef3611..1072b69 100644
--- a/libraries/BluetoothServices/res/values-hy/strings.xml
+++ b/libraries/BluetoothServices/res/values-hy/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Նշված չէ"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Կրիտիկական"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Սպառվում է"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Բավարար"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Հաստատեք հեռակառավարման վահանակի թարմացումը"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Թարմացման ընթացքում կապը սարքի հետ կարող է կարճ ժամանակով ընդհատվել:"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Շարունակել"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Չեղարկել"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Հեռակառավարման վահանակի թարմացում"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Հասանելի է նոր ծրագրակազմ"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Հասանելի է նոր տարբերակը"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Հեռակառավարման վահանակը թարմացված է"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Չհաջողվեց թարմացնել հեռակառավարման վահանակը"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Չհաջողվեց թարմացնել հեռակառավարման վահանակը: Նորից փորձեք։"</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Սպասեք"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Նորից զուգակցեք հեռակառավարման վահանակը"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Միացված է"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Անջատված է"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Մարտկոցի մակարդակը"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Ներկառուցված ծրագրաշար"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth-ի հասցե"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Փոխեք մարտկոցը"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Մարտկոցի լիցքը սպառվում է"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Միացված սարքեր"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Հեռակառավարման վահանակներ և լրասարքեր"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Թարմացրեք հեռակառավարման վահանակը"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Պատրաստ է տեղադրման"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ԹԱՐՄԱՑՆԵԼ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ՓԱԿԵԼ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Հեռակառավարման վահանակի մարտկոցի լիցքը քիչ է"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Փոխարինեք մարտկոցը"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Հեռակառավարման վահանակի մարտկոցը գրեթե նստած է"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Փոխարինեք մարտկոցը"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Հեռակառավարման վահանակի մարտկոցը նստած է"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Հեռակառավարման վահանակն օգտագործելու համար փոխարինեք մարտկոցը"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Այո"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Ոչ"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Անջատել %1$s սարքից"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Միացում %1$s սարքին"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Հեռացնել %1$s սարքը"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Վերանվանել միացված սարքը"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Միացնել HDMI-CEC հաղորդակարգը"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Սարքերը, որոնք համատեղելի են HDMI-CEC հաղորդակարգի հետ, հնարավոր է կառավարել և ավտոմատ միացնել/անջատել մեկ հեռակառավարման վահանակի միջոցով։\n\nՀամոզվեք, որ HDMI-CEC հաղորդակարգը միացված է ձեր հեռուստացույցում և մյուս HDMI սարքերում։ Տարբեր արտադրողներ HDMI-CEC հաղորդակարգի համար տարբեր անվանումներ են օգտագործում, օրինակ՝"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung՝ Anynet+\nLG՝ SimpLink\nSony՝ BRAVIA Sync\nPhilips՝ EasyLink\nSharp՝ Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Կարգավորել հեռակառավարման վահանակի կոճակները"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Միացրեք/անջատեք հեռուստացույցը, ընդունիչները և բարձրախոս-վահանակները, ինչպես նաև կառավարեք դրանց ձայնի ուժգնությունն ու մուտքի աղբյուրները"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Մարտկոցի լիցքը՝ %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Աքսեսուարներ"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Հեռակառավարման վահանակ"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Միացված է"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Նախկինում միացված սարքեր"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Զուգակցել հեռակառավարման վահանակը և լրասարքը"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Անջատել"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Միացնել"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Վերանվանել"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Հեռացնել"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Միացված է"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Անջատված է"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Սարքերի կառավարում"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Միացնել նոր սարք"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Նախքան նոր Bluetooth սարքերը միացնելը, համոզվեք, որ դրանք զուգակցման ռեժիմում են։ %1$s սարքը միացնելու համար սեղմեք %2$s + %3$s և 3 վայրկյան պահեք։"</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV-ի հեռակառավարում"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Հասանելի սարքեր"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Սարքերի որոնում…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Սխալ առաջացավ"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Միանում է…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Միացված է"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Չեղարկված է"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s․ չհաջողվեց միանալ"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s սարքը միացված է"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s սարքն անջատված է"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Կիրառելի չէ"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Կրիտիկական"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Ցածր"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Լավ"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Հաստատեք հեռակառավարման վահանակի թարմացումը"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Թարմացման ընթացքում կապը հեռակառավարման վահանակի հետ կարող է կարճ ժամանակով ընդհատվել։"</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Շարունակել"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Չեղարկել"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Հեռակառավարման վահանակի թարմացում"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Հասանելի է նոր ծրագրակազմ"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Հասանելի է նոր տարբերակը"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Հեռակառավարման վահանակը թարմացված է"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Չհաջողվեց թարմացնել ծրագրաշարը"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Չհաջողվեց թարմացնել հեռակառավարման վահանակը: Նորից փորձեք։"</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Սպասեք"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Նորից զուգակցեք հեռակառավարման վահանակը"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Միացված է"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Անջատված է"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Մարտկոցի լիցք"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Ներկառուցված ծրագիր"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth հասցե"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Փոխեք մարտկոցը"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Մարտկոցի լիցքը քիչ է"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Միացված սարքեր"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Հեռակառավարման վահանակներ և լրասարքեր"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Թարմացրեք հեռակառավարիչը"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Պատրաստ է տեղադրման"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ԹԱՐՄԱՑՆԵԼ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ՓԱԿԵԼ"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Հեռակառավարման վահանակի մարտկոցի լիցքը քիչ է"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Փոխարինեք մարտկոցը"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Հեռակառավարման վահանակի մարտկոցը գրեթե նստած է"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Փոխարինեք մարտկոցը"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Հեռակառավարման վահանակի մարտկոցը նստած է"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Հեռակառավարման վահանակն օգտագործելու համար փոխարինեք մարտկոցը"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Այո"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Ոչ"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Անջատել %1$s սարքից"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Միացնել %1$s սարքին"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Չհիշել %1$s սարքը"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Վերանվանել միացված սարքը"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Միացնել HDMI-CEC-ը"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Սարքերը, որոնք համատեղելի են HDMI-CEC հաղորդակարգի հետ, հնարավոր է կառավարել և ավտոմատ միացնել/անջատել մեկ հեռակառավարիչի միջոցով։\n\nՆշում. Համոզվեք, որ հաղորդակարգը միացված է հեռուստացույցում և մյուս HDMI սարքերում։ Տարբեր արտադրողներ HDMI-CEC հաղորդակարգի համար տարբեր անվանումներ են օգտագործում, օրինակ՝"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung-ը՝ Anynet+\nLG-ն՝ SimpLink\nSony-ն՝ BRAVIA Sync\nPhilips-ը՝ EasyLink\nSharp-ը՝ Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Հեռակառավարման վահանակի կոճակների կարգավորում"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Միացրեք/անջատեք հեռուստացույցը, ընդունիչները և բարձրախոս-վահանակները, ինչպես նաև կառավարեք դրանց ձայնի ուժգնությունն ու մուտքի աղբյուրները"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Մարտկոցի լիցքը՝ %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Լրասարքեր"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Հեռակառավարման վահանակ"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Միացված է"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Նախկինում միացված սարքեր"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Զուգակցել հեռակառավարման վահանակը և լրասարքը"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Անջատել"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Միացնել"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Վերանվանել"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Չհիշել"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Միացված է"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Անջատված է"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Սարքերի կառավարում"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Միացնել նոր սարք"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Նախքան նոր Bluetooth սարքեր միացնելը համոզվեք, որ դրանք զուգակցման ռեժիմում են։ %1$s սարքը միացնելու համար սեղմեք %2$s + %3$s և 3 վայրկյան պահեք։"</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV-ի հեռակառավարում"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Հասանելի սարքեր"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Սարքերի որոնում…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Սխալ"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Միացում…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Միացված է"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Չեղարկվել է"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s․ չհաջողվեց միացնել"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s սարքը միացված է"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s սարքն անջատված է"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-in/strings.xml b/libraries/BluetoothServices/res/values-in/strings.xml
index cd511a5..3371c80 100644
--- a/libraries/BluetoothServices/res/values-in/strings.xml
+++ b/libraries/BluetoothServices/res/values-in/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"T/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritis"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Rendah"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Baik"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Konfirmasi update remote"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Selama proses update, sambungan remote Anda mungkin terputus sebentar."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Lanjutkan"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Batal"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Update remote"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Software baru tersedia"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Update tersedia"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Remote telah diupdate"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Update remote gagal"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Kami mengalami masalah selagi mengupdate remote Anda. Coba lagi."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Harap tunggu"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Sambungkan remote kembali"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Diaktifkan"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Dinonaktifkan"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Tingkat daya baterai"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Alamat bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Harap ganti baterai"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Daya baterai lemah"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Perangkat yang Terhubung"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Remote &amp; Aksesori"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Update remote Anda"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Siap diinstal"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"UPDATE"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"TUTUP"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Daya baterai remote lemah"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Segera ganti baterai"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Daya baterai remote hampir habis"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Segera ganti baterai"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Daya baterai remote habis"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Ganti baterai untuk menggunakan remote"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Ya"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Tidak"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Putuskan sambungan dari %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Terhubung ke %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Lupakan %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Ganti nama perangkat Anda yang terhubung"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Aktifkan HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC memungkinkan Anda mengontrol dan secara otomatis mengaktifkan/menonaktifkan perangkat lain yang berkemampuan HDMI-CEC dengan remote kontrol tunggal.\n\nCatatan: Pastikan HDMI-CEC telah diaktifkan di TV dan perangkat HDMI lainnya. Produsen sering memiliki nama berbeda untuk HDMI-CEC, misalnya:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Siapkan tombol remote"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Mengontrol volume, daya, input di TV, penerima, dan soundbar"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Level daya baterai: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Aksesori"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Remote Control"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Terhubung"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Perangkat yang terhubung sebelumnya"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Sambungkan remote atau aksesori"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Putuskan koneksi"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Sambungkan"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Ganti nama"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Lupakan"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Terhubung"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Terputus"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Kontrol perangkat"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Sambungkan perangkat baru"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Sebelum menyambungkan perangkat Bluetooth baru, pastikan perangkat dalam mode penyambungan. Untuk menyambungkan %1$s, tekan dan tahan %2$s + %3$s selama 3 detik."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Remote Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Perangkat yang tersedia"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Mencari perangkat…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Error"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Menyambungkan…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Terhubung"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Dibatalkan"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s gagal disambungkan"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s terhubung"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s terputus"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"T/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritis"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Rendah"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Baik"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Konfirmasi update remote"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Selama proses update, koneksi remote Anda mungkin terputus sebentar."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Lanjutkan"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Batalkan"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Update remote"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Software baru tersedia"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Ada update"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Remote telah diupdate"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Update remote gagal"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Kami mengalami masalah saat mengupdate remote Anda. Coba lagi."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Harap tunggu"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Sambungkan remote kembali"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Diaktifkan"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Dinonaktifkan"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Tingkat daya baterai"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Alamat Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Ganti baterai"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Baterai lemah"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Perangkat Terhubung"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Remote &amp; Aksesori"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Update remote Anda"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Siap diinstal"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"UPDATE"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"TUTUP"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Daya baterai remote lemah"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Segera ganti baterai"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Daya baterai remote hampir habis"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Segera ganti baterai"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Daya baterai remote habis"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Ganti baterai untuk menggunakan remote"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Ya"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Tidak"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Putuskan hubungan dari %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Hubungkan ke %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Lupakan %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Ganti nama perangkat Anda yang terhubung"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Aktifkan HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC memungkinkan Anda mengontrol dan secara otomatis mengaktifkan/menonaktifkan perangkat lain yang memiliki HDMI-CEC aktif dengan satu remote kontrol.\n\nCatatan: Pastikan HDMI-CEC diaktifkan di TV Anda dan perangkat HDMI lainnya. Produsen biasanya memberikan nama yang berbeda untuk HDMI-CEC, misalnya:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Siapkan tombol remote"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Mengontrol volume, daya, input di TV, penerima, dan soundbar"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Tingkat daya baterai: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Aksesori"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Remote Control"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Terhubung"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Perangkat yang terhubung sebelumnya"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Sambungkan remote atau aksesori"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Putuskan koneksi"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Hubungkan"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Ganti nama"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Lupakan"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Terhubung"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Terputus"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Kontrol perangkat"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Hubungkan perangkat baru"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Sebelum menghubungkan perangkat Bluetooth baru, pastikan perangkat dalam mode penyambungan. Untuk menghubungkan %1$s, tekan dan tahan %2$s + %3$s selama 3 detik."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Remote Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Perangkat yang tersedia"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Mencari perangkat…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Error"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Menghubungkan…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Terhubung"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Dibatalkan"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s gagal dihubungkan"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s terhubung"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s terputus"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-is/strings.xml b/libraries/BluetoothServices/res/values-is/strings.xml
index c580022..790b6ed 100644
--- a/libraries/BluetoothServices/res/values-is/strings.xml
+++ b/libraries/BluetoothServices/res/values-is/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Ekki tiltækt"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Mikilvægt"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Lág"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Gott"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Staðfestu uppfærslu fjarstýringar"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Meðan á uppfærslunni stendur getur fjarstýringin aftengst í stutta stund."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Áfram"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Hætta við"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Uppfærsla á fjarstýringu"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Nýr hugbúnaður í boði"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Uppfærsla í boði"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Fjarstýringin er uppfærð"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Uppfærsla á fjarstýringu mistókst"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Vandamál kom upp þegar verið var að uppfæra fjarstýringuna. Reyndu aftur."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Augnablik"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Paraðu fjarstýringuna aftur"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Kveikt"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Slökkt"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Staða rafhlöðu"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Fastbúnaður"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth-vistfang"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Skiptu um rafhlöðu"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Rafhlaða að tæmast"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Tengd tæki"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Fjarstýringar og fylgihlutir"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Uppfærðu fjarstýringuna"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Tilbúið til uppsetningar"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"UPPFÆRA"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"LOKA"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Rafhlaða fjarstýringar er að tæmast"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Skiptu um rafhlöðu fljótlega"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Rafhlaða fjarstýringar er næstum því tóm"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Skiptu um rafhlöðu fljótlega"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Rafhlaða fjarstýringar er tóm"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Skiptu um rafhlöðu til að nota fjarstýringuna"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Já"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Nei"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Aftengja %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Tengja við %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Gleyma %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Endurnefndu tengda tækið"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Kveikja á HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC gerir þér kleift að nota eina fjarstýringu til að stjórna, kveikja og slökkva á öðrum tækjum sem eru með kveikt á HDMI-CEC.\n\nMundu að ganga úr skugga um að kveikt sé á HDMI-CEC í sjónvarpinu og öðrum HDMI-tækjum. Framleiðendur nota oft annað heiti fyrir HDMI-CEC, til dæmis:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Setja upp hnappa fyrir fjarstýringu"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Stjórnaðu hljóðstyrk, afli, sjónvarpsinntaki, mögnurum og soundbar-tækjum"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Staða rafhlöðu: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Fylgihlutir"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Fjarstýring"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Tengt"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Áður tengt"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Para fjarstýringu eða fylgihlut"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Aftengja"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Tengja"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Endurnefna"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Gleyma"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Tengt"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Aftengt"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Tækisstjórnun"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Tengja nýtt tæki"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Áður en þú tengir ný Bluetooth-tæki skaltu tryggja að þau séu í pörunarstillingu. Til að tengja %1$s skaltu halda inni %2$s + %3$s í 3 sekúndur."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"fjarstýring Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Tæki í boði"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Leitar að tækjum…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Villa"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Tengist…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Tengt"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Hætt við"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Ekki tókst að tengja %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s tengt"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s aftengt"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Á ekki við"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Mjög lítil"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Lítil"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Góð"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Staðfestu uppfærslu fjarstýringar"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Meðan á uppfærslunni stendur getur fjarstýringin aftengst í stutta stund."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Áfram"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Hætta við"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Uppfærsla á fjarstýringu"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Nýr hugbúnaður í boði"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Uppfærsla í boði"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Fjarstýringin er uppfærð"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Uppfærsla á fjarstýringu mistókst"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Vandamál kom upp þegar verið var að uppfæra fjarstýringuna. Reyndu aftur."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Augnablik"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Paraðu fjarstýringuna aftur"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Virkt"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Óvirkt"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Staða rafhlöðu"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Fastbúnaður"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth-vistfang"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Skiptu um rafhlöðu"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Rafhlaða að tæmast"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Tengd tæki"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Fjarstýringar og fylgihlutir"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Uppfærðu fjarstýringuna"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Tilbúið til uppsetningar"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"UPPFÆRA"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"HUNSA"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Rafhlaða fjarstýringar er að tæmast"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Skiptu um rafhlöðu fljótlega"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Rafhlaða fjarstýringar er næstum því tóm"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Skiptu um rafhlöðu fljótlega"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Rafhlaða fjarstýringar er tóm"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Skiptu um rafhlöðu til að nota fjarstýringuna"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Já"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Nei"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Aftengst frá %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Tengja við %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Gleyma %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Endurefndu tengda tækið þitt"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Virkja HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC gerir þér kleift að stjórna og kveikja og slökkva sjálfkrafa á öðrum HDMI-CEC tækjum með einni fjarstýringu.\n\nAthugaðu: Gakktu úr skugga um að HDMI-CEC sé virkt í sjónvarpinu þínu og í öðrum HDMI-tækjum. Framleiðendur nota oft annað heiti fyrir HDMI-CEC, til dæmis:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Setja upp hnappa fyrir fjarstýringu"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Stjórnaðu hljóðstyrk, afli, sjónvarpsinntaki, mögnurum og hljóðstöngum"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Staða rafhlöðu: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Fylgihlutir"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Fjarstýring"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Tengt"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Áður tengt"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Para fjarstýringu eða fylgihlut"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Aftengja"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Tengja"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Endurnefna"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Gleyma"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Tengt"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Aftengt"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Tækisstjórnun"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Tengja nýtt tæki"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Áður en þú tengir ný Bluetooth-tæki skaltu tryggja að þau séu í pörunarstillingu. Til að tengja %1$s skaltu halda inni %2$s + %3$s í 3 sekúndur."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"fjarstýring Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Tæki í boði"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Leitar að tækjum…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Villa"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Tengist…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Tengt"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Hætt við"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Ekki tókst að tengja %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s tengt"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s aftengt"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-it/strings.xml b/libraries/BluetoothServices/res/values-it/strings.xml
index 76b0fc8..10164a9 100644
--- a/libraries/BluetoothServices/res/values-it/strings.xml
+++ b/libraries/BluetoothServices/res/values-it/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/D"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Critico"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Basso"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Buono"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Conferma l\'aggiornamento del telecomando"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Durante l\'aggiornamento il telecomando potrebbe disconnettersi temporaneamente."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Continua"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Annulla"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Aggiornamento del telecomando"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Nuovo software disponibile"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Aggiornamento disponibile"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Il telecomando è aggiornato"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Aggiornamento del telecomando non riuscito"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Si è verificato un problema durante l\'aggiornamento del telecomando. Riprova."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Attendi"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Accoppia di nuovo il telecomando"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Attivato"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Disattivato"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Livello batteria"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Indirizzo Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Sostituisci la batteria"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Batteria in esaurimento"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Dispositivi connessi"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Telecomandi e accessori"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Aggiorna il telecomando"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Pronto per l\'installazione"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"AGGIORNA"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"IGNORA"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Batteria del telecomando in esaurimento"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Sostituisci la batteria appena possibile"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Batteria del telecomando quasi scarica"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Sostituisci la batteria appena possibile"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Batteria del telecomando scarica"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Sostituisci la batteria per usare il telecomando"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Sì"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"No"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Disconnetti da %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Connetti a %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Elimina %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Rinomina il dispositivo connesso"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Attiva HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"La tecnologia HDMI-CEC ti consente di controllare e attivare/disattivare automaticamente con un singolo telecomando i dispositivi su cui è abilitata.\n\nNota: assicurati che la tecnologia HDMI-CEC sia abilitata sulla tua TV e sugli altri dispositivi HDMI. Spesso i produttori utilizzano nomi diversi per HDMI-CEC, ad esempio:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Configura tasti telecomando"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Controlla volume, accensione/spegnimento e ingresso su TV, ricevitori e soundbar"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Livello batteria: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Accessori"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Telecomando"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Connessi"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Connessi in precedenza"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Accoppia il telecomando o l\'accessorio"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Disconnetti"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Connetti"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Rinomina"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Elimina"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Connesso"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Disconnesso"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Controllo dispositivi"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Connetti nuovo dispositivo"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Prima di connettere nuovi dispositivi Bluetooth, assicurati che siano in modalità di accoppiamento. Per connettere %1$s, tieni premuti %2$s + %3$s per tre secondi."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"un telecomando Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Dispositivi disponibili"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Ricerca di dispositivi…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Errore"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Connessione…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Connesso"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Annullato"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Impossibile connettere %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s connesso"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s disconnesso"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Critico"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Basso"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Buono"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Conferma l\'aggiornamento del telecomando"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Durante l\'aggiornamento il telecomando potrebbe disconnettersi temporaneamente."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Continua"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Annulla"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Aggiornamento del telecomando"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Nuovo software disponibile"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Aggiornamento disponibile"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Il telecomando è aggiornato"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Aggiornamento del telecomando non riuscito"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Si è verificato un problema durante l\'aggiornamento del telecomando. Riprova."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Attendi"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Accoppia di nuovo il telecomando"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Attivata"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Disattivata"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Livello batteria"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Indirizzo Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Sostituisci la batteria"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Batteria in esaurimento"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Dispositivi connessi"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Telecomandi e accessori"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Aggiorna il telecomando"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Pronto per l\'installazione"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"AGGIORNA"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"IGNORA"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Batteria del telecomando in esaurimento"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Sostituisci la batteria appena possibile"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Batteria del telecomando quasi scarica"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Sostituisci la batteria appena possibile"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Batteria del telecomando scarica"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Sostituisci la batteria per usare il telecomando"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Sì"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"No"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Disconnetti da %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Connetti a %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Elimina %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Rinomina il dispositivo connesso"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Attiva HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC ti consente di controllare e attivare/disattivare automaticamente con un singolo telecomando i dispositivi su cui è abilitato.\n\nNota: assicurati che HDMI-CEC sia abilitato sulla tua TV e sugli altri dispositivi HDMI. Spesso i produttori utilizzano nomi diversi per HDMI-CEC, ad esempio:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Configura tasti telecomando"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Controlla volume, accensione/spegnimento e ingresso su TV, ricevitori e soundbar"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Livello batteria: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Accessori"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Telecomando"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Connessi"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Connessi in precedenza"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Accoppia il telecomando o l\'accessorio"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Scollega"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Connetti"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Rinomina"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Elimina"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Connesso"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Disconnesso"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Controllo dispositivo"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Connetti nuovo dispositivo"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Prima di connettere nuovi dispositivi Bluetooth, assicurati che siano in modalità di accoppiamento. Per connettere %1$s, tieni premuti %2$s + %3$s per 3 secondi."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"un Android TV Remote"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Dispositivi disponibili"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Ricerca di dispositivi in corso…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Errore"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Connessione in corso…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Connessione riuscita"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Annullata"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Impossibile connettere %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Dispositivo %1$s connesso"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Dispositivo %1$s disconnesso"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-iw/strings.xml b/libraries/BluetoothServices/res/values-iw/strings.xml
index 64219fe..91c651f 100644
--- a/libraries/BluetoothServices/res/values-iw/strings.xml
+++ b/libraries/BluetoothServices/res/values-iw/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"לא זמינה"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"קריטית"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"נמוכה"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"טובה"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"אישור לעדכון השלט רחוק"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"במהלך העדכון, ייתכן שהשלט הרחוק יתנתק לזמן קצר."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"המשך"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"ביטול"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"עדכון שלט רחוק"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"תוכנה חדשה זמינה"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"יש עדכון זמין"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"השלט הרחוק מעודכן"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"עדכון השלט הרחוק נכשל"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"נתקלנו בבעיה בעדכון השלט הרחוק. יש לנסות שוב."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"יש להמתין"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"יש להתאים שוב את השלט רחוק"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"מופעל"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"מושבת"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"רמת הטעינה של הסוללה"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"קושחה"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"כתובת Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"עליך להחליף את הסוללה"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"הסוללה חלשה"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"מכשירים מחוברים"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"מכשירי שלט רחוק ואביזרים"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"עדכון השלט רחוק"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"אפשר להתחיל בהתקנה"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"עדכון"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"סגירה"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"סוללת השלט חלשה"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"כדאי להחליף את הסוללה בקרוב"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"סוללת השלט כמעט מרוקנת"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"כדאי להחליף את הסוללה בקרוב"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"סוללת השלט ריקה"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"יש להחליף את הסוללה כדי להשתמש בשלט"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"כן"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"לא"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"התנתקות מ-%1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"חיבור אל %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"לשכוח את %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"שינוי שם למכשיר המחובר"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"הפעלת HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"בעזרת HDMI-CEC אפשר לשלוט, וגם להפעיל ולכבות באופן אוטומטי, מכשירים אחרים שמופעלת בהם התכונה HDMI-CEC, באמצעות שלט רחוק אחד.\n\nהערה: יש לוודא שהתכונה HDMI-CEC מופעלת בטלוויזיה ובמכשירי HDMI אחרים. ל-HDMI-CEC יש שמות שונים אצל יצרנים שונים, לדוגמה:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"הגדרת הלחצנים בשלט הרחוק"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"שליטה בעוצמת הקול, בהפעלה, בקלט של טלוויזיות, ברסיברים ובמקרני קול."</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"רמת הטעינה של הסוללה: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"אביזרים"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"שלט רחוק"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"מחובר"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"מכשירים שחוברו בעבר"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"התאמת השלט הרחוק או האביזר"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"ניתוק"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"חיבור"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"שינוי שם"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"אפשר לשכוח"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"מחובר"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"מנותק"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"בקרת מכשיר"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"חיבור של מכשיר חדש"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"לפני חיבור של מכשירי Bluetooth חדשים, יש לוודא שהם במצב התאמה. כדי לחבר את %1$s, יש ללחוץ לחיצה ארוכה על %2$s + %3$s למשך 3 שניות."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"שלט רחוק ל-Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"מכשירים זמינים"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"האפליקציה מחפשת מכשירים…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"שגיאה"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"ההתחברות מתבצעת…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"מחובר"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"בוטל"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"הניסיון לחבר את %1$s נכשל"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s מחובר"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s מנותק"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"לא רלוונטי"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"קריטית"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"חלשה"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"טובה"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"אישור לעדכון השלט רחוק"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"במהלך העדכון, ייתכן שהשלט הרחוק יתנתק לזמן קצר."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"המשך"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"ביטול"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"עדכון שלט רחוק"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"תוכנה חדשה זמינה"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"עדכון זמין"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"השלט הרחוק מעודכן"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"עדכון השלט הרחוק נכשל"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"נתקלנו בבעיה בעדכון השלט הרחוק. אפשר לנסות שוב."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"יש להמתין"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"יש להתאים שוב את השלט רחוק"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"מופעל"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"מושבת"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"רמת הטעינה של הסוללה"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"‎%1$d%%‎"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"קושחה"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"כתובת Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"עליך להחליף את הסוללה"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"הסוללה חלשה"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"מכשירים מחוברים"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"מכשירי שלט רחוק ואביזרים"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"עדכון השלט רחוק"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"אפשר להתחיל בהתקנה"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"עדכון"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"סגירה"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"סוללת השלט חלשה"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"כדאי להחליף את הסוללה בקרוב"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"סוללת השלט כמעט מרוקנת"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"כדאי להחליף את הסוללה בקרוב"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"סוללת השלט ריקה"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"יש להחליף את הסוללה כדי להשתמש בשלט"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"כן"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"לא"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"התנתקות מ-%1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"חיבור אל %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"לשכוח את %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"שינוי שם למכשיר המחובר"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"הפעלת HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"בעזרת HDMI-CEC אפשר לשלוט, וגם להפעיל ולכבות באופן אוטומטי, מכשירים אחרים שמופעלת בהם התכונה HDMI-CEC, באמצעות שלט רחוק אחד.\n\nהערה: יש לוודא שהתכונה HDMI-CEC מופעלת בטלוויזיה ובמכשירי HDMI אחרים. ל-HDMI-CEC יש שמות שונים אצל יצרנים שונים, לדוגמה:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung:‎ Anynet+\nLG:‎ SimpLink\nSony:‎ BRAVIA Sync\nPhilips:‎ EasyLink\nSharp:‎ Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"הגדרת הלחצנים בשלט הרחוק"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"שליטה בעוצמת הקול, בהפעלה, בקלט של טלוויזיות, ברסיברים ובמקרני קול"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"רמת הטעינה של הסוללה: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"אביזרים"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"שלט רחוק"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"מחובר"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"מכשירים שחוברו בעבר"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"התאמת השלט הרחוק או האביזר"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"ניתוק"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"התחברות"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"שינוי השם"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"לשכוח את המכשיר"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"מחובר"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"מנותק"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"בקרת מכשיר"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"חיבור של מכשיר חדש"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"לפני חיבור של מכשירי Bluetooth חדשים, יש לוודא שהם במצב התאמה. כדי לחבר את %1$s, צריך ללחוץ לחיצה ארוכה על %2$s ועל %3$s למשך 3 שניות."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"שלט רחוק ל-Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"מכשירים זמינים"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"מתבצע חיפוש מכשירים…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"שגיאה"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"בתהליך התחברות…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"ההתאמה בוצעה"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"בוטלה"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"הניסיון לחבר את %1$s נכשל"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s מחובר"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s מנותק"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-ja/strings.xml b/libraries/BluetoothServices/res/values-ja/strings.xml
index 21d5958..1fc12dc 100644
--- a/libraries/BluetoothServices/res/values-ja/strings.xml
+++ b/libraries/BluetoothServices/res/values-ja/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"該当なし"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"残りわずか"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"低"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"良好"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"リモコンのアップデートをご確認ください"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"更新中、リモコンの接続は短時間解除されます。"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"次へ"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"キャンセル"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"リモコンのアップデート"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"新しいソフトウェアを利用できます"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"アップデートを利用できます"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"リモコンは最新の状態です"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"リモコンを更新できませんでした"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"リモコンの更新中にエラーが発生しました。もう一度お試しください。"</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"お待ちください"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"リモコンともう一度ペア設定してください"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"有効"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"無効"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"電池残量"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"ファームウェア"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth アドレス"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"電池を交換してください"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"電池残量が低下しています"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"接続済みのデバイス"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"リモコンとアクセサリ"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"リモコンの更新"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"インストールの準備完了"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"更新"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"閉じる"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"リモコンの電池残量が低下しています"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"電池の交換がまもなく必要になります"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"リモコンの電池残量がほぼありません"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"電池の交換がまもなく必要になります"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"リモコンの電池残量がありません"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"リモコンを使うには電池を交換してください"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"はい"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"いいえ"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s との接続を解除"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s に接続"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s を削除"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"接続済みのデバイスの名前を変更"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC を有効にする"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC を利用すると、1 台のリモコンでの他の HDMI-CEC 対応デバイスの操作や電源の自動オン / オフが可能になります。\n\n注: テレビや他の HDMI デバイスで HDMI-CEC が有効になっていることをご確認ください。一般に、HDMI-CEC の名称は、下記のようにメーカーによって異なります。"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nソニー: ブラビアリンク\nPhilips: EasyLink\nシャープ: AQUOS ファミリンク"</string>
-    <string name="settings_axel" msgid="859248404436889205">"リモコンボタンのセットアップ"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"テレビ、レシーバー、サウンドバーの音量、電源の操作や、入力の切り替えを行えます"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"電池残量: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"アクセサリ"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"リモコン"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"接続済み"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"以前に接続"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"リモコンやアクセサリのペア設定"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"接続を解除"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"接続"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"名前を変更"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"削除"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"接続完了"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"接続を解除しました"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"デバイス制御"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"新しいデバイスへの接続"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"新しい Bluetooth デバイスを接続する前に、デバイスがペアリング モードになっていることをご確認ください。%1$s を接続するには、%2$s + %3$s を 3 秒ほど長押ししてください。"</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV リモコン"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"使用可能なデバイス"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"デバイスを検出しています…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"エラー"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"接続しています…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"接続済み"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"キャンセル済み"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s に接続できませんでした"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s に接続しました"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s との接続を解除しました"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"なし"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"危機的"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"低"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"良好"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"リモコンのアップデートをご確認ください"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"更新中、リモコンの接続は短時間解除されます。"</string>
+    <string name="settings_continue" msgid="5640776697820481568">"続行"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"キャンセル"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"リモコンのアップデート"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"新しいソフトウェアを利用できます"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"アップデートを利用できます"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"リモコンは最新の状態です"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"リモコンを更新できませんでした"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"リモコンの更新中にエラーが発生しました。もう一度お試しください。"</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"お待ちください"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"リモコンともう一度ペア設定してください"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"有効"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"無効"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"電池残量"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"ファームウェア"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth アドレス"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"電池を交換してください"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"バッテリー残量: 少"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"接続済みのデバイス"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"リモコンとアクセサリ"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"リモコンの更新"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"インストールの準備完了"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"更新"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"閉じる"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"リモコンの電池残量が低下しています"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"電池の交換がまもなく必要になります"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"リモコンの電池残量がほぼありません"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"電池の交換がまもなく必要になります"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"リモコンの電池残量がありません"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"リモコンを使うには電池を交換してください"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"はい"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"いいえ"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s との接続を解除"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s に接続"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s を削除"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"接続済みのデバイスの名前を変更"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC を有効にする"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC を利用すると、1 台のリモコンによる他の HDMI-CEC 対応デバイスの操作や電源の自動オン / オフが可能になります。\n\n注: テレビや他の HDMI デバイスで HDMI-CEC が有効になっていることをご確認ください。HDMI-CEC の呼び名は、下記のようにメーカーで異なることがあります。"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nソニー: ブラビアリンク\nフィリップス: EasyLink\nシャープ: Aquos ファミリンク"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"リモコンボタンのセットアップ"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"テレビ、レシーバー、サウンドバーの音量、電源の操作や、入力の切り替えを行えます"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"電池残量: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"アクセサリ"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"リモコン"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"接続済み"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"以前に接続"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"リモコンやアクセサリのペア設定"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"接続を解除"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"接続"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"名前を変更"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"削除"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"接続完了"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"接続を解除しました"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"デバイス制御"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"新しいデバイスを接続"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"新しい Bluetooth デバイスを接続する前に、デバイスがペア設定モードになっていることをご確認ください。%1$s を接続するには、%2$s + %3$s を 3 秒ほど長押ししてください。"</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV リモコン"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"使用可能なデバイス"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"デバイスの検出中…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"エラー"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"接続中…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"接続しました"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"キャンセルしました"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s に接続できませんでした"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s に接続しました"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s との接続を解除しました"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-ka/strings.xml b/libraries/BluetoothServices/res/values-ka/strings.xml
index 96e12eb..05042ec 100644
--- a/libraries/BluetoothServices/res/values-ka/strings.xml
+++ b/libraries/BluetoothServices/res/values-ka/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"არ მიესადაგება"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"კრიტიკული"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"დაბალი"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"კარგი"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"დაადასტურეთ პულტის განახლება"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"განახლების მსვლელობისას დისტანციურ პულტთან კავშირი შეიძლება დროებით გაწყდეს."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"გაგრძელება"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"გაუქმება"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"პულტის განახლება"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"ხელმისაწვდომია ახალი პროგრამული უზრუნველყოფა"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"ხელმისაწვდომია განახლება"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"პულტი განახლებულია"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"დისტანციური პულტის განახლება ვერ მოხერხდა"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"თქვენი პულტის განახლებისას სირთულე შეგვექმნა. გთხოვთ ცადეთ ხელახლა."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"გთხოვთ, მოითმინოთ"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"ხელახლა დააწყვილეთ თქვენი პულტი"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"ჩართული"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"გათიშული"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"ბატარეის დონე"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"ჩაშენებული პროგრამული უზრუნველყოფა"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth მისამართი"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"გთხოვთ გამოცვალეთ ბატარეა"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"ბატარეის მუხტი დაბალია"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"დაკავშირებული მოწყობილობები"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"დისტანციური პულტი და აქსესუარები"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"განაახლეთ თქვენი დისტანციური პულტი"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"მზადაა ინსტალაციისთვის"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"განახლება"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"დახურვა"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"დისტანციური პულტის ბატარეა იცლება"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"მალე შეცვალეთ ბატარეა"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"დისტანციური პულტის ბატარეა თითქმის დაცლილია"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"მალე შეცვალეთ ბატარეა"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"დისტანციური პულტის ბატარეა დაცლილია"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"დისტანციური პულტით სარგებლობისთვის შეცვალეთ ბატარეა"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"დიახ"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"არა"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s-თან კავშირი გაწყვეტილია"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"დაკავშირება %1$s-თან"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s-ის დავიწყება"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"დაკავშირებული მოწყობილობის გადარქმევა"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC-ის ჩართვა"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC საშუალებას გაძლევთ, ერთი პულტის მეშვეობით მართოთ და ავტომატურად ჩართოთ/გამორთოთ HDMI-CEC-ის მხარდაჭერის მქონე სხვა მოწყობილობები.\n\nშენიშვნა: დარწმუნდით, რომ თქვენს ტელევიზორზე და სხვა HDMI მოწყობილობებზე ჩართულია HDMI-CEC. მწარმოებლები HDMI-CEC-ს ხშირად სხვადასხვა სახელით მოიხსენიებენ, მაგალითად:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"დისტანციური მართვის ღილაკების დაყენება"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"ტელევიზორებზე, მიმღებებსა და ხმოვან პანელებზე ხმის, ელკვების და შეყვანის მართვა"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"ბატარეის დონე: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"აქსესუარები"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"დისტანციური მართვა"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"დაკავშირებულია"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"ადრე დაკავშირებული"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"დისტანციური პულტის ან აქსესუარების დაწყვილება"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"გათიშვა"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"დაკავშირება"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"გადარქმევა"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"დავიწყება"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"დაკავშირებულია"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"კავშირი გაწყვეტილია"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"მოწყობილობის მართვა"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"ახალ მოწყობილობასთან დაკავშირება"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"თქვენს ახალ Bluetooth მოწყობილობებთან დაკავშირებამდე დარწმუნდით, რომ ისინი დაწყვილების რეჟიმშია. %1$s-თან დასაკავშირებლად დააჭირეთ და გეჭიროთ %2$s + %3$s 3 წამით."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android ტელევიზორის დისტანციური პულტი"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"ხელმისაწვდომი მოწყობილობები"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"მიმდინარეობს მოწყობილობების ძიება..."</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"შეცდომა"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"უკავშირდება…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"დაკავშირებულია"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"გაუქმებულია"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s ვერ უკავშირდება"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s დაკავშირებულია"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s კავშირი გაწყვეტილია"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"არ მიესადაგება"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"კრიტიკული"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"დაბალი"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"კარგი"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"დაადასტურეთ დისტანციური მართვის პულტის განახლება"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"განახლების მიმდინარეობისას დისტანციური მართვის პულტთან კავშირი შეიძლება დროებით გაწყდეს."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"გაგრძელება"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"გაუქმება"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"დისტანციური მართვის პულტის განახლება"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"ახალი პროგრამული უზრუნველყოფა ხელმისაწვდომია"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"ხელმისაწვდომია განახლება"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"დისტანციური მართვის პულტი განახლებულია"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"დისტანციური პულტის განახლება ვერ მოხერხდა"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"თქვენი დისტანციური მართვის პულტის განახლებისას წარმოიქმნა პრობლემა. ცადეთ ხელახლა."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"გთხოვთ, მოითმინოთ"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"ხელახლა დააწყვილეთ თქვენი დისტანციური მართვის პულტი"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"ჩართული"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"გათიშული"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"ბატარეის დონე"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"ჩაშენებული პროგრამული უზრუნველყოფა"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth მისამართი"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"გთხოვთ, გამოცვალოთ ბატარეა"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"ბატარეა სუსტადაა დამუხტული"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"დაკავშირებული მოწყობილობები"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"დისტანციური მართვის პულტები და აქსესუარები"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"თქვენი დისტანციური მართვის პულტის განახლება"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"მზადაა ინსტალაციისთვის"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"განახლება"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"დახურვა"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"დისტანციური მართვის პულტის ბატარეა იცლება"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"მალე შეცვალეთ ბატარეა"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"დისტანციური მართვის პულტის ბატარეა თითქმის დაცლილია"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"მალე შეცვალეთ ბატარეა"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"დისტანციური მართვის პულტის ბატარეა დაცლილია"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"დისტანციური მართვის პულტით სარგებლობისთვის შეცვალეთ ბატარეა"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"დიახ"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"არა"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s-თან კავშირი გაწყვეტილია"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"დაკავშირება %1$s-თან"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s-ის დავიწყება"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"დაკავშირებული მოწყობილობის გადარქმევა"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC-ის ჩართვა"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC საშუალებას გაძლევთ, ერთი პულტის მეშვეობით მართოთ და ავტომატურად ჩართოთ/გამორთოთ HDMI-CEC-ის მხარდაჭერის მქონე სხვა მოწყობილობები.\n\nშენიშვნა: დარწმუნდით, რომ თქვენს ტელევიზორზე და სხვა HDMI მოწყობილობებზე ჩართულია HDMI-CEC. მწარმოებლები HDMI-CEC-ს ხშირად სხვადასხვა სახელით მოიხსენიებენ, მაგალითად:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"დისტანციური მართვის პულტის ღილაკების დაყენება"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"ტელევიზორებზე, მიმღებებსა და ხმოვან პანელებზე ხმის, ელკვებისა და შემავალი სიგნალის მართვა"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"ბატარეის დონე: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"აქსესუარები"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"დისტანციური მართვა"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"დაკავშირებული"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"ადრე დაკავშირებული"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"დისტანციური მართვის პულტის ან აქსესუარის დაწყვილება"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"გათიშვა"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"დაკავშირება"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"გადარქმევა"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"დავიწყება"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"დაკავშირებულია"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"კავშირი გაწყვეტილია"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"მოწყობილობის მართვა"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"ახალ მოწყობილობასთან დაკავშირება"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"თქვენს ახალ Bluetooth მოწყობილობებთან დაკავშირებამდე დარწმუნდით, რომ ისინი დაწყვილების რეჟიმშია. %1$s-თან დასაკავშირებლად 3 წამით დააჭირეთ %2$s + %3$s ღილაკებს."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV პულტი"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"ხელმისაწვდომი მოწყობილობები"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"მიმდინარეობს მოწყობილობების ძიება…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"შეცდომა"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"მიმდინარეობს დაკავშირება…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"დაკავშირდა"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"გაუქმდა"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s ვერ უკავშირდება"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s დაკავშირებულია"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s-ის კავშირი გაწყვეტილია"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-kk/strings.xml b/libraries/BluetoothServices/res/values-kk/strings.xml
index e71a900..55e1e9e 100644
--- a/libraries/BluetoothServices/res/values-kk/strings.xml
+++ b/libraries/BluetoothServices/res/values-kk/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Жоқ"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Өте аз"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Аз"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Жақсы"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Пульттің жаңартылуын растаңыз."</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Жаңарту кезінде пульт қысқа уақытқа ажыратылуы мүмкін."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Жалғастыру"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Бас тарту"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Пультті жаңарту"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Жаңа бағдарламалық құрал қолжетімді."</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Жаңартылған нұсқа қолжетімді."</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Пульт жаңартылған."</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Пульт жаңартылмады."</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Пультті жаңарту кезінде қате шықты. Қайталап көріңіз."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Күте тұрыңыз."</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Пультті қайта жұптау"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Қосулы"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Өшірулі"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Батарея деңгейі"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Микробағдарлама"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth мекенжайы"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Батареяны ауыстырыңыз."</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Батарея қуаты төмен."</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Байланыстырылған құрылғылар"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Пульттер және аксессуарлар"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Пультті жаңартыңыз"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Орнатуға дайын."</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ЖАҢАРТУ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ЖАБУ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Пульт батареясының заряды азайды"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Батареяны тезірек ауыстырыңыз."</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Пульт батареясы отыруға жақын"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Батареяны тезірек ауыстырыңыз."</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Пульт батареясы отырып қалды."</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Пультті қолдану үшін батареяны ауыстырыңыз."</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Иә"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Жоқ"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s құрылғысынан ажырату"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s құрылғысына жалғау"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s құрылғысын ұмыту"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Байланыстырылған құрылғының атын өзгерту"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC функциясын қосу"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC бір пультпен басқа HDMI-CEC қосулы құрылғыларды басқаруға және автоматты қосуға/өшіруге мүмкіндік береді.\n\nЕскертпе: HDMI-CEC функциясы теледидарыңызда және басқа HDMI құрылғыларында қосулы екеніне көз жеткізіңіз. Өндірушілер HDMI-CEC үшін түрлі атауларды пайдаланады, мысалы:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Пульт түймелерін реттеу"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Теледидардағы, қабылдағыштардағы және саундбарлардағы дыбыс деңгейін, қуатты, кіріс сигналының көздерін басқару"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Батарея деңгейі: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Аксессуарлар"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Қашықтан басқару пульті"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Байланыстырылды"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Бұрын байланыстырылған"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Пультті немесе аксессуарды жұптау"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Ажырату"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Байланыстыру"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Атын өзгерту"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Ұмыту"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Қосулы"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Ажыратулы"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Құрылғыны басқару"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Жаңа құрылғыны байланыстыру"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Жаңа Bluetooth құрылғыларын байланыстырмас бұрын, олардың жұптау режимінде екеніне көз жеткізіңіз. %1$s құрылғысын байланыстыру үшін %2$s + %3$s пернелерін 3 секунд басып тұрыңыз."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV пульті"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Қолжетімді құрылғылар"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Құрылғылар ізделуде…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Қате"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Байланыстырылуда…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Байланыстырылды"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Жойылған"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s байланыстырылмады."</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s байланыстырылды."</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s ажыратылды."</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Қолданылмайды"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Өте аз"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Төмен"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Жақсы"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Пульттің жаңартылуын растаңыз."</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Жаңарту кезінде пульт қысқа уақытқа ажыратылуы мүмкін."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Жалғастыру"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Бас тарту"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Пультті жаңарту"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Жаңа бағдарламалық құрал қолжетімді."</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Жаңартылған нұсқа шықты"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Пульт жаңартылған."</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Пульт жаңартылмады"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Пультті жаңарту кезінде қате шықты. Қайталап көріңіз."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Күтіңіз"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Пультті қайта жұптау"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Қосулы"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Өшірулі"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Батарея деңгейі"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Микробағдарлама"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth мекенжайы"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Батареяны ауыстырыңыз."</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Батарея заряды аз."</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Жалғанған құрылғылар"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Пульттер және жабдықтар"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Пультті жаңартыңыз."</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Орнатуға дайын"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"Жаңарту"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"Қабылдамау"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Пульт батареясының заряды азайды."</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Батареяны тезірек ауыстырыңыз."</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Пульт батареясы отыруға жақын."</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Батареяны тезірек ауыстырыңыз."</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Пульт батареясы отырып қалды."</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Пультті қолдану үшін батареяны ауыстырыңыз."</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Иә"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Жоқ"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s құрылғысынан ажырату"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s құрылғысына жалғау"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s құрылғысын ұмыту"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Жалғанған құрылғының атын өзгерту"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC функциясын қосу"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC протоколы басқа HDMI-CEC қосылған құрылғыларды бір пультпен басқаруға және автоматты түрде қосуға/өшіруге мүмкіндік береді.\n\nЕскертпе: HDMI-CEC протоколының теледидарда және басқа HDMI құрылғыларында қосулы екенін тексеріңіз. Өндірушілер HDMI-CEC үшін түрлі атауларды пайдаланады, мысалы:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Пульт түймелерін реттеу"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Теледидардағы, қабылдағыштардағы және саундбарлардағы дыбыс деңгейін, қуатты, кіріс сигналының көздерін басқару"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Батарея деңгейі: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Жабдықтар"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Қашықтан басқару пульті"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Жалғанған"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Бұрын жалғанған"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Пультті не жабдықты жұптау"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Ажырату"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Жалғау"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Атын өзгерту"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Ұмыту"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Қосулы"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Ажыратулы"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Құрылғыны басқару"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Жаңа құрылғы жалғау"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Жаңа Bluetooth құрылғыларын жалғамас бұрын, олардың жұптау режимінде екеніне көз жеткізіңіз. %1$s құрылғысын жалғау үшін %2$s + %3$s пернелерін 3 секунд басып тұрыңыз."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV пульті"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Қолжетімді құрылғылар"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Құрылғылар ізделіп жатыр…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Қате"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Жалғанып жатыр…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Жалғанды."</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Бас тартылды"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s жалғанбады."</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s жалғанды."</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s ажыратылды."</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-km/strings.xml b/libraries/BluetoothServices/res/values-km/strings.xml
index 997ad9b..3a11fe6 100644
--- a/libraries/BluetoothServices/res/values-km/strings.xml
+++ b/libraries/BluetoothServices/res/values-km/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"ធ្ងន់ធ្ងរ"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"ទាប"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"ល្អ"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"បញ្ជាក់អំពី​ការដំឡើងកំណែ​ឧបករណ៍​បញ្ជា​ពីចម្ងាយ"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"ឧបករណ៍​បញ្ជា​ពីចម្ងាយ​របស់អ្នក​អាចនឹងផ្ដាច់​មួយភ្លែត អំឡុងពេល​ដំឡើងកំណែ។"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"បន្ត"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"បោះបង់"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"ការដំឡើងកំណែ​ឧបករណ៍បញ្ជា​ពីចម្ងាយ"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"មាន​កម្មវិធី​ថ្មី"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"មាន​កំណែថ្មី"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"ឧបករណ៍បញ្ជា​ពី​ចម្ងាយមាន​កំណែថ្មីហើយ"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"ការដំឡើង​កំណែ​ឧបករណ៍​បញ្ជាពីចម្ងាយ​មិនបាន​សម្រេចទេ"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"យើង​បានជួប​នឹងបញ្ហា ខណៈពេល​ដំឡើងកំណែ​ឧបករណ៍បញ្ជា​ពីចម្ងាយ​របស់អ្នក។ សូមព្យាយាម​ម្ដងទៀត។"</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"សូមរង់ចាំ"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"ផ្គូផ្គង​ឧបករណ៍​បញ្ជាពីចម្ងាយ​របស់អ្នក​ម្ដងទៀត"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"បានបើក"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"បានបិទ"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"កម្រិតថ្ម"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"កម្មវិធីបង្កប់"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"អាសយដ្ឋាន​ប៊្លូធូស"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"សូម​ប្ដូរថ្ម"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"ជិតអស់ថ្ម​ហើយ"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"ឧបករណ៍ដែលបានភ្ជាប់"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"ឧបករណ៍បញ្ជាពីចម្ងាយ និង​គ្រឿងបន្ថែម"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"ដំឡើងកំណែ​ឧបករណ៍​បញ្ជា​ពីចម្ងាយ​របស់អ្នក"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"អាច​ដំឡើង​បានហើយ"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ដំឡើងកំណែ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ច្រានចោល"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"ថាមពលថ្ម​ពីចម្ងាយ​ជិតអស់ហើយ"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"ប្ដូរ​ថ្ម​ឆាប់ៗនេះ"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"ថាមពលថ្ម​ពីចម្ងាយ​ជិតអស់ហើយ"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"ប្ដូរ​ថ្ម​ឆាប់ៗនេះ"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"ថាមពលថ្ម​ពីចម្ងាយ​អស់ហើយ"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"ប្ដូរ​ថ្ម ដើម្បី​ប្រើ​ពីចម្ងាយ"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"បាទ/ចាស"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"ទេ"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"ផ្ដាច់ចេញពី %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"ភ្ជាប់ទៅ %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"បំភ្លេច %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"ប្ដូរ​ឈ្មោះ​ឧបករណ៍​របស់អ្នក​ដែលបានភ្ជាប់"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"បើក HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC អនុញ្ញាតឱ្យ​អ្នកគ្រប់គ្រង និងបើក/បិទ​ឧបករណ៍​ដែលអាចប្រើ HDMI-CEC ផ្សេងទៀត​ដោយស្វ័យប្រវត្តិ​តាមរយៈ​ឧបករណ៍បញ្ជា​ពីចម្ងាយតែមួយ។\n\nចំណាំ៖ ត្រូវប្រាកដថាបានបើក HDMI-CEC ​នៅលើទូរទស្សន៍ និងឧបករណ៍ HDMI ផ្សេងទៀត​របស់អ្នក។ ជាទូទៅ ក្រុមហ៊ុន​ផលិតឧបករណ៍ដាក់ឈ្មោះខុសៗ​គ្នាឱ្យ​ HDMI-CEC ឧទាហរណ៍៖"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung៖ Anynet+\nLG៖ SimpLink\nSony៖ BRAVIA Sync\nPhilips៖ EasyLink\nSharp៖ Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"រៀបចំ​ប៊ូតុងឧបករណ៍​បញ្ជា​ពី​ចម្ងាយ"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"គ្រប់គ្រងកម្រិតសំឡេង ថាមពល ប្រភពបញ្ចូលនៅលើទូរទស្សន៍ ឧបករណ៍ចាប់សំឡេងនិងរូបភាព និងរបារ​សំឡេង"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"កម្រិតថ្ម៖ %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"គ្រឿងបន្ថែម"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"ឧបករណ៍​បញ្ជា​ពី​ចម្ងាយ"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"បានភ្ជាប់"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"បាន​ភ្ជាប់​ពីមុន​"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"ផ្គូផ្គងឧបករណ៍បញ្ជាពីចម្ងាយ ឬគ្រឿងបន្ថែម"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"ផ្ដាច់"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"ភ្ជាប់"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"ប្ដូរ​ឈ្មោះ"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"បំភ្លេច"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"បានភ្ជាប់"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"បាន​ដាច់"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"ការ​គ្រប់គ្រងឧបករណ៍"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"ភ្ជាប់​ឧបករណ៍ថ្មី"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"មុនពេល​ភ្ជាប់ឧបករណ៍​ប៊្លូធូសថ្មី សូមប្រាកដថា​ឧបករណ៍ទាំងនោះ​ស្ថិតក្នុង​មុខងារ​ផ្គូផ្គង។ ដើម្បីភ្ជាប់ %1$s សូមចុច %2$s + %3$s ឱ្យជាប់​រយៈពេល 3 វិនាទី។"</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"ឧបករណ៍បញ្ជា Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"ឧបករណ៍​ដែល​អាច​ប្រើបាន"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"កំពុងស្វែងរក​ឧបករណ៍…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"បញ្ហា"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"កំពុង​ភ្ជាប់…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"បានភ្ជាប់"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"បានបោះបង់"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s មិនអាច​ភ្ជាប់​បានទេ"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"បានភ្ជាប់ %1$s"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"បានផ្ដាច់ %1$s"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"គ្មាន"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"ធ្ងន់ធ្ងរ"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"ទាប"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"ល្អ"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"បញ្ជាក់អំពី​ការដំឡើងកំណែ​ឧបករណ៍​បញ្ជា​ពីចម្ងាយ"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"ឧបករណ៍​បញ្ជា​ពីចម្ងាយ​របស់អ្នក​អាចនឹងផ្ដាច់​មួយភ្លែត អំឡុងពេល​ដំឡើងកំណែ។"</string>
+    <string name="settings_continue" msgid="5640776697820481568">"បន្ត"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"បោះបង់"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"ការដំឡើងកំណែ​ឧបករណ៍បញ្ជា​ពីចម្ងាយ"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"មាន​កម្មវិធី​ថ្មី"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"មាន​កំណែថ្មី"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"ឧបករណ៍បញ្ជា​ពី​ចម្ងាយមាន​កំណែថ្មីហើយ"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"មិន​អាច​ដំឡើងជំនាន់​ឧបករណ៍​​បញ្ជា​ពី​ចម្ងាយ​បានទេ"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"យើង​បានជួបបញ្ហា ខណៈពេល​កំពុងដំឡើងកំណែ​ឧបករណ៍បញ្ជា​ពីចម្ងាយ​របស់អ្នក។ សូមព្យាយាមម្ដងទៀត។"</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"សូមរង់ចាំ"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"ផ្គូផ្គង​ឧបករណ៍​បញ្ជាពីចម្ងាយ​របស់អ្នក​ម្ដងទៀត"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"បាន​បើក"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"បាន​បិទ"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"កម្រិតថ្ម"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"កម្មវិធីបង្កប់"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"អាសយដ្ឋាន​ប៊្លូធូស"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"សូម​ប្ដូរថ្ម"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"ថ្មសល់តិច"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"ឧបករណ៍ដែលបានភ្ជាប់"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"ឧបករណ៍បញ្ជាពីចម្ងាយ និងឧបករណ៍​បន្ទាប់បន្សំ"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"ដំឡើងកំណែ​ឧបករណ៍​បញ្ជា​ពីចម្ងាយ​របស់អ្នក"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"អាច​ដំឡើង​បានហើយ"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ដំឡើងកំណែ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ច្រានចោល"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"ថ្មរបស់​ឧបករណ៍បញ្ជាពីចម្ងាយ​ជិតអស់ហើយ"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"ប្ដូរ​ថ្ម​ឆាប់ៗនេះ"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"ថ្មរបស់ឧបករណ៍​បញ្ជាពីចម្ងាយ​ជិតអស់ហើយ"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"ប្ដូរ​ថ្ម​ឆាប់ៗនេះ"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"ថ្មរបស់ឧបករណ៍បញ្ជា​ពីចម្ងាយ​អស់ហើយ"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"ប្ដូរថ្ម ដើម្បីប្រើ​ឧបករណ៍បញ្ជាពីចម្ងាយ"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"បាទ/ចាស"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"ទេ"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"ផ្ដាច់ចេញពី %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"ភ្ជាប់ទៅ %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"បំភ្លេច %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"ប្ដូរ​ឈ្មោះ​ឧបករណ៍ដែលបានភ្ជាប់របស់អ្នក"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"បើក HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC អនុញ្ញាតឱ្យ​អ្នក​គ្រប់គ្រង​ និងបើក/បិទ​ឧបករណ៍​ដែល​អាច​ប្រើ HDMI-CEC ផ្សេង​ទៀត​ដោយស្វ័យប្រវត្តិ​តាមរយៈឧបករណ៍​​បញ្ជា​ពី​ចម្ងាយតែមួយ។\n\nចំណាំ៖ សូមប្រាកដ​ថា HDMI-CEC បានបើក​នៅលើ​ទូរទស្សន៍​ និងឧបករណ៍ HDMI ផ្សេងទៀត​របស់អ្នក។ ជាទូទៅ ក្រុមហ៊ុន​ផលិតឧបករណ៍ដាក់ឈ្មោះខុសៗ​គ្នាឱ្យ​ HDMI-CEC ឧទាហរណ៍៖"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung៖ Anynet+\nLG៖ SimpLink\nSony៖ BRAVIA Sync\nPhilips៖ EasyLink\nSharp៖ Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"រៀបចំ​ប៊ូតុងឧបករណ៍​បញ្ជា​ពី​ចម្ងាយ"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"គ្រប់គ្រងកម្រិតសំឡេង ថាមពល ប្រភពបញ្ចូលនៅលើទូរទស្សន៍ ឧបករណ៍ចាប់សំឡេងនិងរូបភាព និងរបារ​សំឡេង"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"កម្រិតថ្ម៖ %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"ឧបករណ៍​បន្ទាប់បន្សំ"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"ឧបករណ៍​បញ្ជា​ពី​ចម្ងាយ"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"បានភ្ជាប់"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"បាន​ភ្ជាប់​ពីមុន​"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"ផ្គូផ្គងឧបករណ៍បញ្ជាពីចម្ងាយ ឬឧបករណ៍​បន្ទាប់បន្សំ"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"ផ្ដាច់"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"ភ្ជាប់"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"ប្ដូរ​ឈ្មោះ"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"បំភ្លេច"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"បានភ្ជាប់"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"បាន​ដាច់"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"ការ​គ្រប់គ្រងឧបករណ៍"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"ភ្ជាប់​ឧបករណ៍ថ្មី"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"មុនពេល​ភ្ជាប់ឧបករណ៍​ប៊្លូធូសថ្មី សូមប្រាកដថា​ឧបករណ៍ទាំងនោះ​ស្ថិតក្នុង​មុខងារ​ផ្គូផ្គង។ ដើម្បីភ្ជាប់ %1$s សូមចុច %2$s + %3$s ឱ្យជាប់​រយៈពេល 3 វិនាទី។"</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"ឧបករណ៍បញ្ជា Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"ឧបករណ៍​ដែល​អាច​ប្រើបាន"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"កំពុង​ស្វែងរក​ឧបករណ៍…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"បញ្ហា"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"កំពុងភ្ជាប់…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"បានភ្ជាប់"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"បានបោះបង់"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s មិនអាច​ភ្ជាប់​បានទេ"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"បានភ្ជាប់ %1$s"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"បានផ្ដាច់ %1$s"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-kn/strings.xml b/libraries/BluetoothServices/res/values-kn/strings.xml
index 9a6ad80..d716346 100644
--- a/libraries/BluetoothServices/res/values-kn/strings.xml
+++ b/libraries/BluetoothServices/res/values-kn/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"ಗಂಭೀರ"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"ಕಡಿಮೆ"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"ಉತ್ತಮ"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"ರಿಮೋಟ್ ಅಪ್‌ಡೇಟ್‌‌ ಅನ್ನು ದೃಢೀಕರಿಸಿ"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"ಅಪ್‌ಡೇಟ್‌ ಮಾಡುವ ಸಮಯದಲ್ಲಿ ನಿಮ್ಮ ರಿಮೋಟ್ ತಾತ್ಕಾಲಿಕವಾಗಿ ಕನೆಕ್ಷನ್ ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"ಮುಂದುವರಿಯಿರಿ"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"ರದ್ದುಗೊಳಿಸಿ"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"ರಿಮೋಟ್ ಅಪ್‌ಡೇಟ್‌"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"ಹೊಸ ಸಾಫ್ಟ್‌ವೇರ್ ಲಭ್ಯವಿದೆ"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"ಅಪ್‌ಡೇಟ್‌‌ ಲಭ್ಯವಿದೆ"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"ರಿಮೋಟ್ ಅಪ್ ಟು ಡೇಟ್ ಆಗಿದೆ"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"ರಿಮೋಟ್ ಅಪ್‌ಡೇಟ್‌ ವಿಫಲವಾಗಿದೆ"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"ನಿಮ್ಮ ರಿಮೋಟ್ ಅನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡುವಾಗ ನಮಗೆ ತೊಂದರೆ ಉಂಟಾಗಿದೆ. ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"ನಿರೀಕ್ಷಿಸಿ"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"ನಿಮ್ಮ ರಿಮೋಟ್ ಅನ್ನು ಮತ್ತೆ ಜೋಡಿಸಿ"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"ಬ್ಯಾಟರಿ ಮಟ್ಟ"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"ಫರ್ಮ್‌ವೇರ್"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"ಬ್ಲೂಟೂತ್ ವಿಳಾಸ"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"ಬ್ಯಾಟರಿ ಬದಲಿಸಿ"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"ಕಡಿಮೆ ಬ್ಯಾಟರಿ"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"ಸಂಪರ್ಕಗೊಂಡಿರುವ ಸಾಧನಗಳು"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"ರಿಮೋಟ್‌ಗಳು ಮತ್ತು ಪರಿಕರಗಳು"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"ನಿಮ್ಮ ರಿಮೋಟ್‌ ಅನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಿ"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲು ಸಿದ್ಧವಾಗಿದೆ"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ಅಪ್‌ಡೇಟ್‌"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ವಜಾಗೊಳಿಸಿ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"ರಿಮೋಟ್ ಬ್ಯಾಟರಿ ಕಡಿಮೆಯಾಗಿದೆ"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"ಬ್ಯಾಟರಿಯನ್ನು ಶೀಘ್ರದಲ್ಲೇ ಬದಲಾಯಿಸಿ"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"ರಿಮೋಟ್ ಬ್ಯಾಟರಿ ಬಹುತೇಕ ಖಾಲಿಯಾಗಿದೆ"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"ಬ್ಯಾಟರಿಯನ್ನು ಶೀಘ್ರದಲ್ಲೇ ಬದಲಾಯಿಸಿ"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"ರಿಮೋಟ್ ಬ್ಯಾಟರಿ ಖಾಲಿಯಾಗಿದೆ"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"ರಿಮೋಟ್ ಬಳಸಲು ಬ್ಯಾಟರಿಯನ್ನು ಬದಲಾಯಿಸಿ"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"ಹೌದು"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"ಇಲ್ಲ"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s ನಿಂದ ಕನೆಕ್ಷನ್ ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s ಮರೆಯಿರಿ"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"ಕನೆಕ್ಟ್ ಆಗಿರುವ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಹೆಸರಿಸಿ"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC, ಒಂದೇ ರಿಮೋಟ್ ನಿಯಂತ್ರಣ ಬಳಸಿಕೊಂಡು ಇತರ HDMI-CEC ಸಕ್ರಿಯಗೊಳಿಸಿದ ಸಾಧನಗಳನ್ನು ನಿಯಂತ್ರಿಸಲು ಮತ್ತು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್/ಆಫ್ ಮಾಡಲು ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ.\n\nಸೂಚನೆ: ನಿಮ್ಮ ಟಿವಿ ಮತ್ತು ಇತರ HDMI ಸಾಧನಗಳಲ್ಲಿ HDMI-CEC ಸಕ್ರಿಯವಾಗಿರುವುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ತಯಾರಕರು ಸಾಮಾನ್ಯವಾಗಿ HDMI-CEC ಗಾಗಿ ವಿವಿಧ ಹೆಸರುಗಳನ್ನು ಹೊಂದಿರುತ್ತಾರೆ, ಉದಾಹರಣೆಗೆ:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"ರಿಮೋಟ್ ಬಟನ್‌ಗಳನ್ನು ಸೆಟಪ್ ಮಾಡಿ"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"ಟಿವಿಗಳು, ರಿಸೀವರ್‌ಗಳು ಮತ್ತು ಸೌಂಡ್‌ಬಾರ್‌ಗಳಲ್ಲಿ ವಾಲ್ಯೂಮ್, ಪವರ್ ಹಾಗೂ ಇನ್‌ಪುಟ್ ಅನ್ನು ನಿಯಂತ್ರಿಸಿ"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"ಬ್ಯಾಟರಿ ಮಟ್ಟ: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"ಪರಿಕರಗಳು"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"ರಿಮೋಟ್ ನಿಯಂತ್ರಣ"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"ಹಿಂದೆ ಕನೆಕ್ಟ್ ಮಾಡಲಾಗಿರುವುದು"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"ರಿಮೋಟ್ ಅಥವಾ ಪರಿಕರದಿಂದ ಜೋಡಿಸಿ"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"ಕನೆಕ್ಷನ್ ರದ್ದುಗೊಳಿಸುವಿಕೆ"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"ಸಂಪರ್ಕಿಸಿ"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"ಮರುಹೆಸರಿಸು"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"ಮರೆಯಿರಿ"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"ಡಿಸ್‌ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"ಸಾಧನದ ನಿಯಂತ್ರಣ"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"ಹೊಸ ಸಾಧನವನ್ನು ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"ಹೊಸ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳನ್ನು ಕನೆಕ್ಟ್ ಮಾಡುವ ಮೊದಲು, ಅವು ಜೋಡಣೆ ಮೋಡ್‌ನಲ್ಲಿವೆಯೇ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. %1$s ಅನ್ನು ಕನೆಕ್ಟ್ ಮಾಡಲು, 3 ಸೆಕೆಂಡ್‌ಗಳ ಕಾಲ %2$s + %3$s ಅನ್ನು ಒತ್ತಿರಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV ರಿಮೋಟ್"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"ಲಭ್ಯವಿರುವ ಸಾಧನಗಳು"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"ಸಾಧನಗಳನ್ನು ಹುಡುಕಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"ದೋಷ"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"ಕನೆಕ್ಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"ರದ್ದುಮಾಡಲಾಗಿದೆ"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s ಅನ್ನು ಕನೆಕ್ಟ್ ಮಾಡಲು ವಿಫಲವಾಗಿದೆ"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s ಅನ್ನು ಕನೆಕ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s ಕನೆಕ್ಷನ್ ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"ಅನ್ವಯವಾಗುವುದಿಲ್ಲ"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"ಗಂಭೀರ"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"ಕಡಿಮೆ"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"ಉತ್ತಮ"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"ರಿಮೋಟ್ ಅಪ್‌ಡೇಟ್ ಅನ್ನು ದೃಢೀಕರಿಸಿ"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"ಅಪ್‌ಡೇಟ್ ಮಾಡುವ ಸಮಯದಲ್ಲಿ ನಿಮ್ಮ ರಿಮೋಟ್ ಸ್ವಲ್ಪ ಸಮಯ ಡಿಸ್‌ಕನೆಕ್ಟ್ ಆಗಬಹುದು."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"ಮುಂದುವರಿಸಿ"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"ರದ್ದುಗೊಳಿಸಿ"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"ರಿಮೋಟ್ ಅಪ್‌ಡೇಟ್"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"ಹೊಸ ಸಾಫ್ಟ್‌ವೇರ್ ಲಭ್ಯವಿದೆ"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"ಅಪ್‌ಡೇಟ್‌‌ ಲಭ್ಯವಿದೆ"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"ರಿಮೋಟ್ ಅಪ್ ಟು ಡೇಟ್ ಆಗಿದೆ"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"ರಿಮೋಟ್ ಅಪ್‌ಡೇಟ್‌ ವಿಫಲವಾಗಿದೆ"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"ನಿಮ್ಮ ರಿಮೋಟ್ ಅನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡುವಾಗ ನಮಗೆ ತೊಂದರೆ ಉಂಟಾಗಿದೆ. ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"ನಿರೀಕ್ಷಿಸಿ"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"ನಿಮ್ಮ ರಿಮೋಟ್ ಅನ್ನು ಪುನಃ ಜೋಡಿಸಿ"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"ಸಕ್ರಿಯಗೊಂಡಿದೆ"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"ನಿಷ್ಕ್ರಿಯಗೊಂಡಿದೆ"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"ಬ್ಯಾಟರಿ ಮಟ್ಟ"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"ಫರ್ಮ್‌ವೇರ್"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"ಬ್ಲೂಟೂತ್ ವಿಳಾಸ"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"ಬ್ಯಾಟರಿಯನ್ನು ಬದಲಿಸಿ"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"ಬ್ಯಾಟರಿ ಕಡಿಮೆಯಿದೆ"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"ಕನೆಕ್ಟ್ ಮಾಡಿರುವ ಸಾಧನಗಳು"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"ರಿಮೋಟ್‌ಗಳು ಮತ್ತು ಪರಿಕರಗಳು"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"ನಿಮ್ಮ ರಿಮೋಟ್‌ ಅನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡಿ"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲು ಸಿದ್ಧವಾಗಿದೆ"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ಅಪ್‌ಡೇಟ್ ಮಾಡಿ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ವಜಾಗೊಳಿಸಿ"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"ರಿಮೋಟ್ ಬ್ಯಾಟರಿ ಕಡಿಮೆಯಾಗಿದೆ"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"ಬ್ಯಾಟರಿಯನ್ನು ಶೀಘ್ರದಲ್ಲೇ ಬದಲಾಯಿಸಿ"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"ರಿಮೋಟ್ ಬ್ಯಾಟರಿ ಬಹುತೇಕ ಖಾಲಿಯಾಗಿದೆ"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"ಬ್ಯಾಟರಿಯನ್ನು ಶೀಘ್ರದಲ್ಲೇ ಬದಲಾಯಿಸಿ"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"ರಿಮೋಟ್ ಬ್ಯಾಟರಿ ಖಾಲಿಯಾಗಿದೆ"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"ರಿಮೋಟ್ ಬಳಸಲು ಬ್ಯಾಟರಿಯನ್ನು ಬದಲಾಯಿಸಿ"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"ಹೌದು"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"ಇಲ್ಲ"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s ನಿಂದ ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಿ"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s ಮರೆಯಿರಿ"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"ಸಂಪರ್ಕಗೊಂಡಿರುವ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಹೆಸರಿಸಿ"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC, ಒಂದೇ ರಿಮೋಟ್ ನಿಯಂತ್ರಣ ಬಳಸಿಕೊಂಡು ಇತರ HDMI-CEC ಸಕ್ರಿಯಗೊಳಿಸಿದ ಸಾಧನಗಳನ್ನು ನಿಯಂತ್ರಿಸಲು ಮತ್ತು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್/ಆಫ್ ಮಾಡಲು ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ.\n\nಸೂಚನೆ: ನಿಮ್ಮ ಟಿವಿ ಮತ್ತು ಇತರ HDMI ಸಾಧನಗಳಲ್ಲಿ HDMI-CEC ಸಕ್ರಿಯವಾಗಿರುವುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ತಯಾರಕರು ಸಾಮಾನ್ಯವಾಗಿ HDMI-CEC ಗಾಗಿ ವಿವಿಧ ಹೆಸರುಗಳನ್ನು ಹೊಂದಿರುತ್ತಾರೆ, ಉದಾಹರಣೆಗೆ:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"ರಿಮೋಟ್ ಬಟನ್‌ಗಳನ್ನು ಸೆಟಪ್ ಮಾಡಿ"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"ಟಿವಿಗಳು, ರಿಸೀವರ್‌ಗಳು ಮತ್ತು ಸೌಂಡ್‌ಬಾರ್‌ಗಳಲ್ಲಿ ವಾಲ್ಯೂಮ್, ಪವರ್, ಇನ್‌ಪುಟ್ ಅನ್ನು ನಿಯಂತ್ರಿಸಿ"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"ಬ್ಯಾಟರಿ ಮಟ್ಟ: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"ಪರಿಕರಗಳು"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"ರಿಮೋಟ್ ನಿಯಂತ್ರಣ"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"ಈ ಹಿಂದೆ ಸಂಪರ್ಕಗೊಂಡಿರುವುದು"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"ರಿಮೋಟ್ ಅಥವಾ ಪರಿಕರವನ್ನು ಜೋಡಿಸಿ"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಿ"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"ಮರುಹೆಸರಿಸಿ"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"ಮರೆಯಿರಿ"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"ಡಿಸ್‌ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"ಸಾಧನದ ನಿಯಂತ್ರಣ"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"ಹೊಸ ಸಾಧನವನ್ನು ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"ಹೊಸ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳನ್ನು ಕನೆಕ್ಟ್ ಮಾಡುವ ಮೊದಲು, ಅವು ಜೋಡಿಸುವಿಕೆ ಮೋಡ್‌ನಲ್ಲಿವೆಯೇ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. %1$s ಅನ್ನು ಕನೆಕ್ಟ್ ಮಾಡಲು, 3 ಸೆಕೆಂಡ್‌ಗಳ ಕಾಲ %2$s + %3$s ಅನ್ನು ಒತ್ತಿ ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV ರಿಮೋಟ್"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"ಲಭ್ಯವಿರುವ ಸಾಧನಗಳು"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"ಸಾಧನಗಳಿಗಾಗಿ ಹುಡುಕಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"ದೋಷ"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"ಕನೆಕ್ಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s ಅನ್ನು ಕನೆಕ್ಟ್ ಮಾಡಲು ವಿಫಲವಾಗಿದೆ"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s ಅನ್ನು ಕನೆಕ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s ಅನ್ನು ಡಿಸ್‌ಕನೆಕ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-ko/strings.xml b/libraries/BluetoothServices/res/values-ko/strings.xml
index 8b4c8bf..aa975fa 100644
--- a/libraries/BluetoothServices/res/values-ko/strings.xml
+++ b/libraries/BluetoothServices/res/values-ko/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"배터리 없음"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"매우 낮음"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"낮음"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"좋음"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"리모컨 업데이트 확인"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"업데이트하는 동안 리모컨 연결이 잠시 해제될 수 있습니다."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"계속"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"취소"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"리모컨 업데이트"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"새 소프트웨어 사용 가능"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"업데이트 있음"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"리모컨이 최신 버전임"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"리모컨 업데이트 실패"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"리모컨을 업데이트하는 중에 문제가 발생했습니다. 다시 시도해 주세요."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"잠시 기다려 주세요."</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"리모컨 다시 페어링"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"사용 설정됨"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"사용 안함"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"배터리 수준"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"펌웨어"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"블루투스 주소"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"배터리 교체 필요"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"배터리 전원 부족"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"연결된 기기"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"리모컨 및 액세서리"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"리모컨 업데이트"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"설치 준비 완료"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"업데이트"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"닫기"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"리모컨 배터리 부족"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"빨리 배터리를 교체해 주세요."</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"리모컨 배터리 거의 소진"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"빨리 배터리를 교체해 주세요."</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"리모컨 배터리 소진"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"리모컨을 사용하려면 배터리를 교체하세요."</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"예"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"아니요"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s에서 연결 해제"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s에 연결"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s 저장 안함"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"연결된 기기 이름 변경"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC 사용"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC를 사용하면 단일 리모컨을 통해 HDMI-CEC가 사용 설정된 다른 기기를 제어하고 자동으로 사용/사용 중지할 수 있습니다.\n\n참고: HDMI-CEC가 TV 및 다른 HDMI 기기에서 사용 설정되어 있는지 확인하세요. 제조업체에서 HDMI-CEC에 다른 이름을 사용하는 경우도 있습니다. 예:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"삼성: Anynet+\nLG: SimpLink\n소니: BRAVIA Sync\n필립스: EasyLink\n샤프: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"리모컨 버튼 설정"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"TV, 수신기 및 사운드바의 볼륨, 전원, 입력을 제어합니다."</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"배터리 수준: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"액세서리"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"리모컨"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"연결됨"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"이전에 연결됨"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"리모컨 또는 액세서리 페어링"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"연결 해제"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"연결"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"이름 변경"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"저장 안함"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"연결됨"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"연결 끊김"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"기기 제어"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"새 기기 연결"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"새 블루투스 기기를 연결하기 전에 페어링 모드인지 확인하세요. %1$s을(를) 연결하려면 %2$s + %3$s을(를) 3초간 길게 누릅니다."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV 리모컨"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"사용 가능한 기기"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"기기 검색 중…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"오류"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"연결 중…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"연결됨"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"취소됨"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s 연결 실패"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s 연결됨"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s 연결 해제됨"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"해당 사항 없음"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"매우 부족"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"부족"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"양호"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"리모컨 업데이트 확인"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"업데이트하는 동안 리모컨 연결이 잠시 해제될 수 있습니다."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"계속"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"취소"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"리모컨 업데이트"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"새 소프트웨어 사용 가능"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"업데이트 가능"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"리모컨이 최신 버전임"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"리모컨을 업데이트하지 못했습니다."</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"리모컨을 업데이트하는 중에 문제가 발생했습니다. 다시 시도해 주세요."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"잠시 기다려 주세요"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"리모컨 다시 페어링"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"사용"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"사용 안함"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"배터리 수준"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"펌웨어"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"블루투스 주소"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"배터리 교체 필요"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"배터리 전원 부족"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"연결된 기기"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"리모컨 및 액세서리"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"리모컨 업데이트"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"설치 준비 완료"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"업데이트"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"닫기"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"리모컨 배터리 부족"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"곧 배터리 교체 필요"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"리모컨 배터리 거의 소진"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"곧 배터리 교체 필요"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"리모컨 배터리 소진"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"리모컨을 사용하려면 배터리 교체 필요"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"예"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"아니요"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s에서 연결 해제"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s에 연결"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s 삭제"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"연결된 기기에서 이름 변경"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC 사용"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC를 사용하면 다른 단일 리모컨과 사용 설정된 HDMI-CEC 기기를 자동으로 사용/사용 중지할 수 있습니다.\n\n참고: HDMI-CEC가 TV 및 다른 HDMI 기기에서 사용 설정되었는지 확인하세요. 제조업체에서 HDMI-CEC에 다른 이름을 사용하는 경우도 있습니다. 예:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"삼성: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"리모컨 버튼 설정"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"TV, 수신기 및 사운드바의 볼륨, 전원, 입력을 제어합니다."</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"배터리 잔량: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"액세서리"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"리모컨"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"연결됨"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"이전에 연결됨"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"리모컨 또는 액세서리 페어링"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"연결 해제"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"연결"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"이름 바꾸기"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"삭제"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"연결됨"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"연결 끊김"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"기기 제어"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"새 기기 연결"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"새 블루투스 기기를 연결하기 전에 페어링 모드인지 확인하세요. %1$s을(를) 연결하려면 %2$s + %3$s을(를) 3초간 길게 누릅니다."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV 리모컨"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"사용 가능한 기기"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"기기 검색 중…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"오류"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"연결 중…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"연결됨"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"취소됨"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s 연결 실패"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s 연결됨"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s 연결 해제됨"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-ky/strings.xml b/libraries/BluetoothServices/res/values-ky/strings.xml
index de9a6f1..46971ec 100644
--- a/libraries/BluetoothServices/res/values-ky/strings.xml
+++ b/libraries/BluetoothServices/res/values-ky/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Жок"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Өтө төмөн"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Төмөн"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Жакшы"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Пультту жаңыртууну ырастоо"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Жаңыртуу учурунда алыстан башкарылган түзмөгүңүз бир саамга ажыратылышы мүмкүн."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Улантуу"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Жокко чыгаруу"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Пультту жаңыртуу"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Жаңы программа чыкты"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Жаңы версия бар"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Алыстан башкаруу куралы жаңыртылган"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Пульт жаңыртылбай койду"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Пультуңузду жаңыртууда маселеге кабылдык. Кайталап көрүңүз."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Күтө туруңуз"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Пультуңузду кайрадан жупташтырыңыз"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Иштетилген"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Өчүрүлгөн"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Батареянын деңгээли"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Орнотулган программа"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth дареги"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Батареяны алмаштырыңыз"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Батареянын кубаты аз"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Байланышкан түзмөктөр"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Пульттар жана Көмөкчү жабдыктар"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Пультту жаңыртуу"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Орнотууга даяр"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ЖАҢЫРТУУ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ЖАБУУ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Пульттун батареясынын кубаты аз"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Бир аздан кийин батареяны алмашытырыңыз"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Пульттун батареясынын кубаты аз калды"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Бир аздан кийин батареяны алмашытырыңыз"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Пульттун батареясы отуруп калды"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Пультту колдонуу үчүн батареяны алмаштырыңыз"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Ооба"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Жок"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s түзмөгүнөн ажыратуу"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s түзмөгүнө туташуу"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s түзмөгүн унутуу"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Туташкан түзмөгүңүздүн аталышын өзгөртүү"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC функциясын иштетүү"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC функциясы бир гана алыстан башкаруу куралынын жардамы менен, HDMI-CEC аркылуу иштетилген башка түзмөктөрдү көзөмөлдөөгө жана автоматтык түрдө күйгүзүп/өчүрүүгө мүмкүнчүлүк берет.\n\nЭскертүү: HDMI-CEC функциясы сыналгыңызда жана башка HDMI түзмөктөрүндө иштетилгенин текшериңиз. Өндүрүүчүлөр HDMI-CEC функциясын көп учурларда башкача атап коюшу мүмкүн, мисалы:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Пульттун баскычтарын жөндөө"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Сыналгыларда, ресиверлерде жана үн такталарында үндүн катуулугун, күйгүзүү/өчүрүүнү жана киргизүүнү башкаруу"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Батареянын деңгээли: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Аксессуарлар"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Пульт"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Туташкан"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Буга чейин туташкан түзмөктөр"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Пультту же көмөкчү жабдыкты жупташтыруу"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Ажыратуу"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Туташуу"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Аталышын өзгөртүү"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Унутулсун"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Туташты"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Ажыратылды"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Түзмөктү башкаруу"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Жаңы түзмөктү туташтыруу"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Жаңы Bluetooth түзмөктөрүн жупташтыруудан мурун, алардын жупташтыруу режиминде экенин текшериңиз. %1$s менен туташтыруу үчүн, %2$s + %3$s баскычтарын 3 секундка коё бербей басып туруңуз."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV пульту"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Жеткиликтүү түзмөктөр"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Түзмөктөр изделүүдө…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Ката"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Туташууда…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Туташкан"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Жокко чыгарылды"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s туташпай койду"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s туташты"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s ажыратылды"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Маалымат жок"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Кескин"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Төмөн"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Жакшы"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Пультту жаңыртууну ырастоо"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Жаңыртуу учурунда пультуңуз бир саамга ажыратылышы мүмкүн."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Улантуу"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Жокко чыгаруу"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Пультту жаңыртуу"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Жаңы программа чыкты"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Жаңы версия бар"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Пульт жаңыртылды"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Алыстан башкарылган түзмөк жаңыртылбай калды"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Пультуңузду жаңыртууда маселе чыкты. Кайталап көрүңүз."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Күтө туруңуз"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Пультуңузду кайрадан жупташтырыңыз"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Иштетилген"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Өчүрүлгөн"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Батареянын деңгээли"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Орнотулган программа"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth дареги"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Батареяны алмаштырыңыз"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Батарея аз калды"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Туташкан түзмөктөр"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Пульттар жана көмөкчү жабдыктар"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Пультту жаңыртыңыз"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Орнотууга даяр"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ЖАҢЫРТУУ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ЖАБУУ"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Пульттун батареясынын кубаты аз"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Бир аздан кийин батареяны алмаштырыңыз"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Пульттун батареясынын кубаты аз калды"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Бир аздан кийин батареяны алмаштырыңыз"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Пульттун батареясы отуруп калды"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Пультту колдонуу үчүн батареяны алмаштырыңыз"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Ооба"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Жок"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s түзмөгүнөн ажыратуу"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s түзмөгүнө туташуу"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s түзмөгүн унутуу"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Туташкан түзмөгүңүздүн аталышын өзгөртүү"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC функциясын иштетүү"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC функциясы бир гана алыстан башкаруу куралынын жардамы менен, HDMI-CEC аркылуу иштетилген башка түзмөктөрдү көзөмөлдөөгө жана автоматтык түрдө күйгүзүп/өчүрүүгө мүмкүнчүлүк берет.\n\nЭскертүү: HDMI-CEC функциясы сыналгыңызда жана башка HDMI түзмөктөрүндө иштетилгенин текшериңиз. Өндүрүүчүлөр HDMI-CEC функциясын көп учурларда башкача атап коюшу мүмкүн, мисалы:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Пульттун баскычтарын тууралоо"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Сыналгыларда, ресиверлерде жана үн такталарында үндүн катуулугун, күйгүзүү/өчүрүүнү жана киргизүүнү башкаруу"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Батареянын деңгээли: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Көмөкчү жабдыктар"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Пульт"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Туташкан"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Буга чейин туташкан түзмөктөр"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Пультту же көмөкчү жабдыкты жупташтыруу"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Ажыратуу"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Туташтыруу"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Аталышын өзгөртүү"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Унутуу"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Туташты"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Ажыратылды"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Түзмөктү башкаруу"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Жаңы түзмөктү туташтыруу"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Жаңы Bluetooth түзмөктөрүн туташтыруудан мурун алардын жупташтыруу режиминде экенин текшериңиз. %1$s менен туташтыруу үчүн %2$s + %3$s баскычтарын 3 секундка коё бербей басып туруңуз."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV пульту"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Жеткиликтүү түзмөктөр"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Түзмөктөр изделүүдө…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Ката"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Туташууда…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Туташты"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Жокко чыгарылды"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s туташпай койду"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s туташты"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s ажыратылды"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-lo/strings.xml b/libraries/BluetoothServices/res/values-lo/strings.xml
index 2125e44..c858c68 100644
--- a/libraries/BluetoothServices/res/values-lo/strings.xml
+++ b/libraries/BluetoothServices/res/values-lo/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"ບໍ່ມີ"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"ຮຸນແຮງ"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"ຕ່ຳ"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"ດີ"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"ຢືນຢັນການອັບເດດຣີໂໝດ"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"ໃນລະຫວ່າງການອັບໂຫລດ ຣີໂໝດຂອງທ່ານອາດຕັດການເຊື່ອມຕໍ່ເປັນເວລາສັ້ນໆ."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"ສືບຕໍ່"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"ຍົກເລີກ"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"ອັບເດດຣີໂໝດ"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"ມີຊອບແວໃໝ່"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"ມີອັບເດດໃໝ່"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"ອັບເດດຣີໂໝດແລ້ວ"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"ອັບເດດຣີໂໝດບໍ່ສຳເລັດ"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"ພວກເຮົາພົບບັນຫາໃນການອັບເດດຣີໂໝດຂອງທ່ານ. ກະລຸນາລອງໃໝ່."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"ກະລຸນາລໍຖ້າ"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"ກະລຸນາຈັບຄູ່ຣີໂໝດຂອງທ່ານອີກເທື່ອໜຶ່ງ"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"ເປີດນຳໃຊ້ແລ້ວ"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"ປິດການນຳໃຊ້ແລ້ວ"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"ລະດັບແບັດເຕີຣີ"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"ເຟີມແວ"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"ທີ່ຢູ່ Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"ກະລຸນາປ່ຽນແບັດເຕີຣີ"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"ແບັດເຕີຣີເຫລືອໜ້ອຍ"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"ອຸປະກອນທີ່ເຊື່ອມຕໍ່ແລ້ວ"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"ຣີໂໝດ ແລະ ອຸປະກອນເສີມ"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"ອັບເດດຣີໂໝດຂອງທ່ານ"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"ພ້ອມຕິດຕັ້ງແລ້ວ"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ອັບເດດ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ປິດໄວ້"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"ແບັດເຕີຣີຣີໂໝດເຫຼືອໜ້ອຍ"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"ກະລຸນາປ່ຽນແບັດເຕີຣີໂດຍໄວ"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"ແບັດເຕີຣີຣີໂໝດໃກ້ໝົດແລ້ວ"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"ກະລຸນາປ່ຽນແບັດເຕີຣີໂດຍໄວ"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"ແບັດເຕີຣີຣີໂໝດໝົດແລ້ວ"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"ກະລຸນາປ່ຽນແບັດເຕີຣີເພື່ອໃຊ້ຣີໂໝດ"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"ແມ່ນແລ້ວ"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"ບໍ່ແມ່ນ"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"ຕັດການເຊື່ອມຕໍ່ຈາກ %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"ເຊື່ອມຕໍ່ຫາ %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"ລືມ %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"ປ່ຽນຊື່ອຸປະກອນທີ່ເຊື່ອມຕໍ່ແລ້ວຂອງທ່ານ"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"ເປີດໃຊ້ HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC ຈະເຮັດໃຫ້ທ່ານສາມາດຄວບຄຸມ ແລະ ເປີດ/ປິດ ອຸປະກອນທີ່ໃຊ້ HDMI-CEC ອື່ນໆໄດ້ດ້ວຍການຄວບຄຸມຣີໂໝດດຽວ.\n\nໝາຍເຫດ: ກະລຸນາກວດສອບວວ່າທ່ານເປີດໃຊ້ HDMI-CEC ຢູ່ໂທລະທັດ ແລະ ອຸປະກອນ HDMI ອື່ນໆຂອງທ່ານແລ້ວ. ຜູ້ພັດທະນາມັກຈະຕັ້ງຊື່ທີ່ແຕກຕ່າງກັນໄປສຳລັບ HDMI-CEC, ຕົວຢ່າງ:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"ຕັ້ງຄ່າປຸ່ມຣີໂໝດ"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"ຄວບຄຸມລະດັບສຽງ, ການເປີດປິດ, ອິນພຸດຢູ່ໂທລະທັດ ແລະ ລຳໂພງຊາວບາ"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"ລະດັບແບັດເຕີຣີ: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"ອຸປະກອນເສີມ"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"ຣີໂໝດຄວບຄຸມ"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"ເຊື່ອມຕໍ່ກ່ອນໜ້ານີ້"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"ຈັບຄູ່ຣີໂໝດ ຫຼື ອຸປະກອນເສີມ"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"ຕັດເຊື່ອມຕໍ່"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"ເຊື່ອມຕໍ່"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"ປ່ຽນຊື່"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"ລືມ"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"ຕັດການເຊື່ອມຕໍ່ແລ້ວ"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"ການ​ຄວບ​ຄຸມ​ອຸ​ປະ​ກອນ"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"ເຊື່ອມຕໍ່ອຸປະກອນໃໝ່"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"ກ່ອນການເຊື່ອມຕໍ່ອຸປະກອນ Bluetooth ໃໝ່, ກະລຸນາກວດສອບວ່າພວກມັນຢູ່ໃນໂໝດຈັບຄູ່ແລ້ວຫຼືຍັງ. ເພື່ອເຊື່ອມຕໍ່ %1$s, ໃຫ້ກົດ %2$s + %3$s ຄ້າງໄວ້ 3 ວິນາທີ."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"ແລະ ຣີໂໝດ Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"ອຸປະກອນທີ່ໃຊ້ໄດ້"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"ກຳລັງຊອກຫາອຸປະກອນ…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"ຜິດພາດ"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"ກຳລັງເຊື່ອມຕໍ່…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"ຍົກເລີກແລ້ວ"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"ເຊື່ອມຕໍ່ %1$s ບໍ່ສຳເລັດ"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"ເຊື່ອມຕໍ່ %1$s ແລ້ວ"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"ຕັດການເຊື່ອມຕໍ່ %1$s ແລ້ວ"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"ບໍ່ມີຂໍ້ມູນ"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"ວິກິດ"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"ຕ່ຳ"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"ດີ"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"ຢືນຢັນການອັບເດດຣີໂໝດ"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"ຣີໂໝດຂອງທ່ານອາດຕັດການເຊື່ອມຕໍ່ເປັນໄລຍະເວລາສັ້ນໆໃນລະຫວ່າງການອັບເດດ."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"ສືບຕໍ່"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"ຍົກເລີກ"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"ການອັບເດດຣີໂໝດ"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"ມີຊອບແວມາໃໝ່"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"ມີອັບເດດໃໝ່"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"ຣີໂໝດອັບເດດແລ້ວ"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"ອັບເດດຣີໂໝດບໍ່ສຳເລັດ"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"ພວກເຮົາພົບບັນຫາໃນຂະນະອັບເດດຣີໂໝດຂອງທ່ານ. ກະລຸນາລອງໃໝ່."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"ກະລຸນາລໍຖ້າ"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"ຈັບຄູ່ຣີໂໝດຂອງທ່ານອີກຄັ້ງ"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"ເປີດໃຊ້ແລ້ວ"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"ປິດນຳໃຊ້ແລ້ວ"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"ລະດັບແບັດເຕີຣີ"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"ເຟີມແວ"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"ທີ່ຢູ່ Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"ກະລຸນາປ່ຽນແບັດເຕີຣີ"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"ແບັດເຕີຣີເຫຼືອໜ້ອຍ"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"ອຸປະກອນທີ່ເຊື່ອມຕໍ່ແລ້ວ"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"ຣີໂໝດ ແລະ ອຸປະກອນເສີມ"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"ອັບເດດຣີໂໝດຂອງທ່ານ"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"ພ້ອມຕິດຕັ້ງ"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ອັບເດດ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ປິດໄວ້"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"ແບັດເຕີຣີຣີໂໝດເຫຼືອໜ້ອຍ"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"ກະລຸນາປ່ຽນແບັດເຕີຣີໂດຍໄວ"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"ແບັດເຕີຣີຣີໂໝດໃກ້ໝົດແລ້ວ"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"ກະລຸນາປ່ຽນແບັດເຕີຣີໂດຍໄວ"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"ແບັດເຕີຣີຣີໂໝດໝົດແລ້ວ"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"ກະລຸນາປ່ຽນແບັດເຕີຣີເພື່ອໃຊ້ຣີໂໝດ"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"ຕົກລົງ"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"ບໍ່"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"ຕັດການເຊື່ອມຕໍ່ຈາກ %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"ເຊື່ອມຕໍ່ກັບ %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"ລືມ %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"ປ່ຽນຊື່ອຸປະກອນທີ່ເຊື່ອມຕໍ່ແລ້ວຂອງທ່ານ"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"ເປີດໃຊ້ HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC ຈະເຮັດໃຫ້ທ່ານສາມາດຄວບຄຸມ ແລະ ເປີດ/ປິດ ອຸປະກອນທີ່ມີ HDMI-CEC ອື່ນໆໄດ້ໂດຍອັດຕະໂນມັດດ້ວຍການໃຊ້ຣີໂໝດອັນດຽວ.\n\nໝາຍເຫດ: ກະລຸນາກວດສອບວ່າມີການເປີດໃຊ້ HDMI-CEC ຢູ່ໂທລະທັດ ແລະ ອຸປະກອນ HDMI ອື່ນໆຂອງທ່ານແລ້ວ. ຜູ້ພັດທະນາມັກຈະຕັ້ງຊື່ທີ່ແຕກຕ່າງກັນໄປສຳລັບ HDMI-CEC, ຕົວຢ່າງ:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"ຕັ້ງຄ່າປຸ່ມຣີໂໝດ"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"ຄວບຄຸມລະດັບສຽງ, ການເປີດປິດ, ອິນພຸດຢູ່ໂທລະທັດ, ຕົວຮັບສັນຍານ ແລະ ລຳໂພງຊາວບາ"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"ລະດັບແບັດເຕີຣີ: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"ອຸປະກອນເສີມ"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"ຣີໂໝດຄວບຄຸມ"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"ເຊື່ອມຕໍ່ກ່ອນໜ້ານີ້"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"ຈັບຄູ່ຣີໂໝດ ຫຼື ອຸປະກອນເສີມ"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"ຕັດເຊື່ອມຕໍ່"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"ເຊື່ອມຕໍ່"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"ປ່ຽນຊື່"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"ລືມ"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"ຕັດການເຊື່ອມຕໍ່ແລ້ວ"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"ການ​ຄວບ​ຄຸມ​ອຸ​ປະ​ກອນ"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"ເຊື່ອມຕໍ່ອຸປະກອນໃໝ່"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"ກ່ອນເຊື່ອມຕໍ່ອຸປະກອນ Bluetooth ໃໝ່, ໃຫ້ກວດສອບວ່າອຸປະກອນຢູ່ໃນໂໝດການຈັບຄູ່. ເພື່ອເຊື່ອມຕໍ່ %1$s, ໃຫ້ກົດ %2$s + %3$s ຄ້າງໄວ້ 3 ວິນາທີ."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"ຣີໂໝດ Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"ອຸປະກອນທີ່ໃຊ້ໄດ້"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"ກຳລັງຊອກຫາອຸປະກອນ…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"ຜິດພາດ"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"ກຳລັງເຊື່ອມຕໍ່…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"ຍົກເລີກແລ້ວ"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"ເຊື່ອມຕໍ່ %1$s ບໍ່ສຳເລັດ"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"ເຊື່ອມຕໍ່ %1$s ແລ້ວ"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"ຕັດການເຊື່ອມຕໍ່ %1$s ແລ້ວ"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-lt/strings.xml b/libraries/BluetoothServices/res/values-lt/strings.xml
index d772ce4..b7c377f 100644
--- a/libraries/BluetoothServices/res/values-lt/strings.xml
+++ b/libraries/BluetoothServices/res/values-lt/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Nepasiekiama"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritinis"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Mažas"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Geras"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Patvirtinti nuotolinio valdymo pultelio atnaujinimą"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Atnaujinant nuotolinio valdymo pultelį, jis gali būti laikinai atjungtas."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Tęsti"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Atšaukti"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Nuotolinio valdymo pultelio atnaujinimas"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Pasiekiama nauja programinė įranga"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Pasiekiamas naujinys"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Nuotolinio valdymo pultelis atnaujintas"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Nepavyko atnaujinti nuotolinio valdymo pultelio"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Atnaujinant nuotolinio valdymo pultelį kilo problema. Bandykite dar kartą."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Palaukite"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Susiekite nuotolinio valdymo pultelį dar kartą"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Įgalinta"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Išjungta"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Akumuliatoriaus energijos lygis"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d %%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Programinė aparatinė įranga"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"„Bluetooth“ adresas"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Pakeiskite akumuliatorių"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Senka akumuliatorius"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Prijungti įrenginiai"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Nuotolinis valdymas ir priedai"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Atnaujinkite nuotolinio valdymo pultelį"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Paruošta įdiegti"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ATNAUJINTI"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ATSISAKYTI"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Senka nuotolinio valdymo pultelio akumuliatorius"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Netrukus turėsite pakeisti akumuliatorių"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Nuotolinio valdymo pultelio akumuliatorius beveik išseko"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Netrukus turėsite pakeisti akumuliatorių"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Nuotolinio valdymo pultelio akumuliatorius išseko"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Pakeiskite akumuliatorių, kad galėtumėte naudoti nuotolinio valdymo pultelį"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Taip"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Ne"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Atsijungti nuo įrenginio „%1$s“"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Prisijungti prie „%1$s“ įrenginio"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Pamiršti įrenginį „%1$s“"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Pervardyti prijungtą įrenginį"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Įgalinti HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Naudodami HDMI-CEC galite valdyti ir automatiškai įjungti bei išjungti kitus įrenginius, kuriuose įgalinta HDMI-CEC, vienu nuotolinio valdymo pulteliu.\n\nPastaba: įsitikinkite, kad HDMI-CEC yra įgalinta jūsų TV ir kituose HDMI įrenginiuose. Gamintojai dažnai HDMI-CEC vadina skirtingai, pavyzdžiui:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"„Samsung“: „Anynet+“\nLG: „SimpLink“\n„Sony“: „BRAVIA Sync“\n„Philips“: „EasyLink“\n„Sharp“: „Aquos Link“"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Nuotolinio valdymo pultelio mygtukų nustatymas"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Valdykite TV, imtuvų ir garso kolonėlių garsumą, maitinimą bei įvestį"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Akumuliatoriaus energijos lygis: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Priedai"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Nuotolinio valdymo pultelis"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Prijungta"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Anksčiau susieti"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Susieti nuotolinio valdymo pultą ar priedą"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Atsijungti"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Prijungti"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Pervadinti"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Pamiršti"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Susieta"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Atjungta"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Įrenginio valdymas"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Prijungti naują įrenginį"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Prieš prijungdami naujus „Bluetooth“ įrenginius įsitikinkite, kad juose įjungtas susiejimo režimas. Kad prijungtumėte „%1$s“, paspauskite ir 3 sekundes palaikykite %2$s ir %3$s."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"„Android TV“ nuotolinio valdymo pultelis"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Pasiekiami įrenginiai"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Ieškoma įrenginių…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Klaida"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Prisijungiama…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Prijungta"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Atšaukta"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Nepavyko prijungti „%1$s“"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"„%1$s“ prijungtas"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"„%1$s“ atjungtas"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Netaikoma"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritinis"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Senka"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Geras"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Patvirtinti nuotolinio valdymo pultelio atnaujinimą"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Atnaujinant nuotolinio valdymo pultelį, jis gali būti laikinai atjungtas."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Tęsti"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Atšaukti"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Nuotolinio valdymo pultelio atnaujinimas"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Pasiekiama nauja programinė įranga"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Yra naujinys"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Nuotolinio valdymo pultelis atnaujintas"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Nepavyko atnaujinti nuotolinio valdymo pultelio"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Atnaujinant nuotolinio valdymo pultelį kilo problema. Bandykite dar kartą."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Palaukite"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Susiekite nuotolinio valdymo pultelį dar kartą"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Įgalinta"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Išjungta"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Akumuliatoriaus energijos lygis"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d %%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Programinė aparatinė įranga"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"„Bluetooth“ adresas"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Pakeiskite akumuliatorių"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Senka akumuliatorius"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Prijungti įrenginiai"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Nuotolinis valdymas ir priedai"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Nuotolinio valdymo pultelio atnaujinimas"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Paruošta įdiegti"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ATNAUJINTI"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ATSISAKYTI"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Senka nuotolinio valdymo pultelio akumuliatorius"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Netrukus turėsite pakeisti akumuliatorių"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Nuotolinio valdymo pultelio akumuliatorius beveik išseko"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Netrukus turėsite pakeisti akumuliatorių"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Nuotolinio valdymo pultelio akumuliatorius išseko"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Pakeiskite akumuliatorių, kad galėtumėte naudoti nuotolinio valdymo pultelį"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Taip"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Ne"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Atsijungti nuo įrenginio „%1$s“"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Prisijungti prie „%1$s“ įrenginio"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Pamiršti įrenginį „%1$s“"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Pervardyti prijungtą įrenginį"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Įgalinti HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Naudodami HDMI-CEC galite valdyti ir automatiškai įjungti / išjungti kitus įrenginius, kuriuose įgalinta HDMI-CEC, vienu nuotolinio valdymo pulteliu.\n\nPastaba: įsitikinkite, kad HDMI-CEC yra įgalinta jūsų TV ir kituose HDMI įrenginiuose. Gamintojai dažnai HDMI-CEC pavadina skirtingais pavadinimais, pavyzdžiui:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"„Samsung“: „Anynet+“\nLG: „SimpLink“\n„Sony“: „BRAVIA Sync“\n„Philips“: „EasyLink“\n„Sharp“: „Aquos Link“"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Nuotolinio valdymo pultelio mygtukų nustatymas"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Valdykite TV, imtuvų ir garso kolonėlių garsumą, maitinimą bei įvestį"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Akumuliatoriaus energijos lygis: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Priedai"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Nuotolinio valdymo pultelis"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Prijungta"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Anksčiau susieti"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Susieti nuotolinio valdymo pultelį ar priedą"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Atsijungti"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Susieti"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Pervardyti"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Pamiršti"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Susieta"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Atjungta"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Įrenginio valdymas"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Prijungti naują įrenginį"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Prieš prijungdami naujus „Bluetooth“ įrenginius įsitikinkite, kad juose įjungtas susiejimo režimas. Kad prijungtumėte „%1$s“, paspauskite ir tris sekundes palaikykite %2$s ir %3$s."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"„Android TV“ nuotolinio valdymo pultelis"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Pasiekiami įrenginiai"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Ieškoma įrenginių…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Klaida"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Prisijungiama…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Prijungta"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Atšaukta"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Nepavyko prijungti „%1$s“"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"„%1$s“ įrenginys prijungtas"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"„%1$s“ įrenginys atjungtas"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-lv/strings.xml b/libraries/BluetoothServices/res/values-lv/strings.xml
index 05ae537..9d5ebd3 100644
--- a/libraries/BluetoothServices/res/values-lv/strings.xml
+++ b/libraries/BluetoothServices/res/values-lv/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Neattiecas"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritisks"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Zems"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Labs"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Apstipriniet tālvadības ierīces atjaunināšanu"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Atjaunināšanas laikā tālvadības ierīces savienojums uz īsu brīdi var tikt pārtraukts."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Turpināt"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Atcelt"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Tālvadības ierīces atjauninājums"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Pieejama jauna programmatūra"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Ir pieejams atjauninājums"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Tālvadības ierīce ir atjaunināta"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Neizdevās atjaunināt tālvadības ierīci"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Atjauninot jūsu tālvadības ierīci, radās problēma. Mēģiniet vēlreiz."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Lūdzu, uzgaidiet"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Vēlreiz savienojiet tālvadības ierīci pārī"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Iespējots"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Atspējota"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Akumulatora uzlādes līmenis"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Aparātprogrammatūra"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth adrese"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Lūdzu, nomainiet akumulatoru"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Zems akumulatora uzlādes līmenis"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Pievienotās ierīces"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Tālvadības ierīces un piederumi"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Tālvadības ierīces atjaunināšana"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Gatava instalēšanai"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ATJAUNINĀT"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"NORAIDĪT"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Zems tālvadības ierīces baterijas uzlādes līmenis"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Drīzumā jānomaina baterija."</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Tālvadības ierīces baterijas līmenis ir gandrīz tukšs"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Drīzumā jānomaina baterija."</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Tālvadības ierīces baterijas līmenis ir tukšs"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Nomainiet bateriju, lai varētu izmantot tālvadības ierīci."</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Jā"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Nē"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Atvienot no ierīces %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Izveidot savienojumu ar: %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Aizmirst: %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Pievienotās ierīces pārdēvēšana"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Iespējot funkciju HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC ļauj kontrolēt un automātiski ieslēgt/izslēgt citas ierīces ar iespējotu HDMI-CEC, izmantojot vienu tālvadības ierīci.\n\nPiezīme. Noteikti iespējojiet HDMI-CEC savā televizorā un citās HDMI ierīcēs. Ražotāji bieži izmanto atšķirīgus HDMI-CEC nosaukumus (skatiet tālāk sniegtos piemērus)."</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Iestatīt tālvadības pogas"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Kontrolējiet skaļumu, ieslēgšanu un izslēgšanu, kā arī televizora, uztvērēju un skaņas joslu ieejas avotus"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Akumulatora uzlādes līmenis: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Piederumi"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Tālvadības ierīce"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Savienojums izveidots"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Ierīces, ar kurām savienojums tika izveidots iepriekš"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Savienot pārī tālvadības ierīci vai piederumu"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Pārtraukt savienojumu"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Izveidot savienojumu"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Pārdēvēt"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Aizmirst"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Izveidots savienojums"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Savienojums pārtraukts"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Ierīces vadība"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Savienojuma izveide ar jaunu ierīci"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Pirms jaunu Bluetooth ierīču pievienošanas pārbaudiet, vai tajās ir ieslēgts režīms savienošanai pārī. Lai izveidotu savienojumu ar %1$s, nospiediet un 3 sekundes turiet nospiestu taustiņu kombināciju %2$s + %3$s."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV tālvadības ierīce"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Pieejamās ierīces"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Notiek ierīču meklēšana…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Kļūda"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Notiek savienojuma izveide…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Savienojums izveidots"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Atcelts"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Ierīcē %1$s neizdevās izveidot savienojumu"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s — savienojums ir izveidots"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s — savienojums ir pārtraukts"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Nav pieejams"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritisks"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Zems"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Labs"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Apstipriniet tālvadības ierīces atjaunināšanu."</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Atjaunināšanas laikā tālvadības ierīces savienojums uz īsu brīdi var tikt pārtraukts."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Turpināt"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Atcelt"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Tālvadības ierīces atjauninājums"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Pieejama jauna programmatūra"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Ir pieejams atjauninājums"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Tālvadības ierīce ir atjaunināta"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Neizdevās atjaunināt tālvadības ierīci"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Atjauninot jūsu tālvadības ierīci, radās problēma. Lūdzu, mēģiniet vēlreiz."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Lūdzu, uzgaidiet!"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Vēlreiz savienojiet tālvadības ierīci pārī"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Iespējots"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Atspējots"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Akumulatora uzlādes līmenis"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Aparātprogrammatūra"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth adrese"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Lūdzu, nomainiet akumulatoru."</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Zems akumulatora uzlādes līmenis"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Pievienotās ierīces"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Tālvadības ierīces un piederumi"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Tālvadības ierīces atjaunināšana"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Gatavs instalēšanai"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ATJAUNINĀT"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"NERĀDĪT"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Zems tālvadības ierīces akumulatora uzlādes līmenis"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Drīzumā jānomaina akumulators."</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Tālvadības ierīces akumulatora uzlādes līmenis ir gandrīz tukšs"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Drīzumā jānomaina akumulators."</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Tālvadības ierīces akumulatora uzlādes līmenis ir tukšs"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Nomainiet akumulatoru, lai varētu izmantot tālvadības ierīci."</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Jā"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Nē"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Atvienot no: %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Izveidot savienojumu ar ierīci (%1$s)"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Aizmirst: %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Pievienotās ierīces pārdēvēšana"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Iespējot HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC ļauj jums kontrolēt un automātiski ieslēgt/izslēgt citas ierīces ar iespējotu HDMI-CEC, izmantojot vienu tālvadības ierīci.\n\nPiezīme. Noteikti iespējojiet HDMI-CEC savā televizorā un citās HDMI ierīcēs. Ražotāji bieži izmanto atšķirīgus HDMI-CEC nosaukumus (skatiet tālāk piemērus)."</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Tālvadības ierīces pogu iestatīšana"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Kontrolējiet skaļumu, ieslēgšanu un izslēgšanu, kā arī televizoru, uztvērēju un skaņas joslu ieejas avotus."</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Akumulatora uzlādes līmenis: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Aksesuāri"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Tālvadības ierīce"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Pievienotās"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Ierīces, ar kurām savienojums tika izveidots iepriekš"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Savienot pārī tālvadības ierīci vai piederumu"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Pārtraukt savienojumu"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Izveidot savienojumu"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Pārdēvēt"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Aizmirst"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Izveidots savienojums"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Savienojums pārtraukts"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Ierīces vadība"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Savienojuma izveide ar jaunu ierīci"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Pirms jaunu Bluetooth ierīču pievienošanas pārbaudiet, vai tajās ir ieslēgts režīms savienošanai pārī. Lai izveidotu savienojumu ar ierīci (%1$s), nospiediet un 3 sekundes turiet nospiestu taustiņu kombināciju %2$s+%3$s."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV tālvadības ierīce"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Pieejamās ierīces"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Notiek ierīču meklēšana…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Kļūda"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Notiek savienojuma izveide…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Savienojums izveidots"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Atcelta"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Ierīcē (%1$s) neizdevās izveidot savienojumu."</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Savienojums ar ierīci (%1$s) ir izveidots."</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Savienojums ar ierīci (%1$s) ir pārtraukts."</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-mk/strings.xml b/libraries/BluetoothServices/res/values-mk/strings.xml
index e6ab7cb..6cefebb 100644
--- a/libraries/BluetoothServices/res/values-mk/strings.xml
+++ b/libraries/BluetoothServices/res/values-mk/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Недостапно"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Критично"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Ниско"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Добро"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Потврдете го ажурирањето на далечинскиот управувач"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Во текот на ажурирањето, вашиот далечински управувач можеби накратко ќе се исклучи."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Продолжи"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Откажи"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Ажурирање на далечинскиот управувач"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Достапен е нов софтвер"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Достапно е ажурирање"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Далечинскиот управувач е ажуриран"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Ажурирањето на далечинскиот управувач не успеа"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Наидовме на проблем при ажурирањето на далечинскиот управувач. Пробајте пак."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Почекајте"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Повторно спарете го далечинскиот управувач"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Овозможено"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Оневозможено"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Ниво на батерија"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d %%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Фирмвер"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Адреса на Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Заменете ја батеријата"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Слаба батерија"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Поврзани уреди"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Далечински и додатоци"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Ажурирајте го далечинскиот управувач"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Спремно за инсталирање"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"АЖУРИРАЈ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ОТФРЛИ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Батеријата на далечинскиот управувач е слаба"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Заменете ја батеријата наскоро"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Батеријата на далечинскиот управувач е речиси празна"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Заменете ја батеријата наскоро"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Батеријата на далечинскиот управувач е празна"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Заменете ја батеријата за да го користите далечинскиот управувач"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Да"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Не"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Прекинете ја врската со %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Поврзете се со уредот %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Заборави %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Преименувајте го поврзаниот уред"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Овозможете HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC ви овозможува да контролирате и автоматски да вклучувате/исклучувате други уреди што поддржуваат HDMI-CEC со еден далечински управувач.\n\nЗабелешка: проверете дали е овозможен HDMI-CEC на телевизорот и на другите HDMI-уреди. Производителите честопати имаат различни имиња за HDMI-CEC, на пример:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Поставете копчиња на далечинскиот управувач"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Контролирајте ги јачината на звукот и вклучувањето, како и влезот на телевизорите, приемниците и звучниците"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Ниво на батерија: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Додатоци"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Далечински управувач"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Поврзано"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Претходно поврзани"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Спарете далечински или додатоци"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Прекини врска"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Поврзи"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Преименувај"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Заборави"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Поврзано"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Не е поврзано"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Контрола на уреди"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Поврзете нов уред"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Пред да поврзете нови уреди со Bluetooth, проверете дали се во режим на спарување За да го поврзете %1$s, допрете и задржете %2$s + %3$s за 3 секунди."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"далечински управувач за Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Достапни уреди"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Се бараат уреди…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Грешка"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Се поврзува…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Поврзано"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Откажано"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s не успеа да се поврзе"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s е поврзан"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s не е поврзан"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Недостапно"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Критично"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Ниско"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Добро"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Потврдете го ажурирањето на далечинскиот управувач"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Во текот на ажурирањето, вашиот далечински управувач можеби накратко ќе се исклучи."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Продолжи"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Откажи"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Ажурирање на далечинскиот управувач"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Достапен е нов софтвер"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Достапно е ажурирање"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Далечинскиот управувач е ажуриран"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Ажурирањето на далечинскиот управувач не успеа"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Наидовме на проблем при ажурирањето на далечинскиот управувач. Обидете се повторно."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Почекајте"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Повторно спарете го далечинскиот управувач"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Овозможен"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Оневозможено"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Ниво на батерија"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d %%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Фирмвер"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Адреса на Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Заменете ја батеријата"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Слаба батерија"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Поврзани уреди"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Далечински управувачи и додатоци"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Ажурирајте го далечинскиот управувач"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Подготвено за инсталирање"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"АЖУРИРАЈ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ОТФРЛИ"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Батеријата на далечинскиот управувач е слаба"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Заменете ја батеријата наскоро"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Батеријата на далечинскиот управувач е речиси празна"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Заменете ја батеријата наскоро"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Батеријата на далечинскиот управувач е празна"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Заменете ја батеријата за да го користите далечинскиот управувач"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Да"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Не"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Прекини ја врската со %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Поврзете се со уредот %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Заборави го %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Преименувајте го поврзаниот уред"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Овозможи HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC ви овозможува да контролирате и автоматски да вклучувате/исклучувате други уреди што поддржуваат HDMI-CEC со еден далечински управувач.\n\nЗабелешка: Проверете дали е овозможен HDMI-CEC на телевизорот и на другите HDMI-уреди. Производителите честопати имаат различни имиња за HDMI-CEC, на пример:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Поставете копчиња на далечинскиот управувач"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Контролирајте ги јачината на звукот, вклучувањето, влезот на телевизорите, приемниците и звучниците"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Ниво на батерија: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Додатоци"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Далечински управувач"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Поврзан"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Претходно поврзани"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Спарете го далечинскиот управувач или додатокот"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Прекини врска"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Поврзи"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Преименувај"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Заборави"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Поврзано"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Не е поврзано"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Контрола на уреди"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Поврзете нов уред"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Пред да поврзете нови уреди со Bluetooth, проверете дали се во режим на спарување За да го поврзете %1$s, допрете и задржете %2$s + %3$s 3 секунди."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"далечински управувач за Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Достапни уреди"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Се бараат уреди…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Грешка"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Се поврзува…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Поврзано"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Откажанo"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s не можеше да се поврзе"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Уредот %1$s е поврзан"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Уредот %1$s не е поврзан"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-ml/strings.xml b/libraries/BluetoothServices/res/values-ml/strings.xml
index 8c12afe..dd50c31 100644
--- a/libraries/BluetoothServices/res/values-ml/strings.xml
+++ b/libraries/BluetoothServices/res/values-ml/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"നിർണ്ണായകം"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"കുറഞ്ഞത്"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"നല്ലത്"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"റിമോട്ട് അപ്‌ഡേറ്റ് സ്ഥിരീകരിക്കുക"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"അപ്‌ഡേറ്റ് ചെയ്യുന്ന സമയത്ത്, നിങ്ങളുടെ റിമോട്ട് അൽപ്പസമയത്തേക്ക് വിച്ഛേദിക്കപ്പെട്ടേക്കാം."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"തുടരുക"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"റദ്ദാക്കുക"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"റിമോട്ട് അപ്‌ഡേറ്റ്"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"പുതിയ സോഫ്റ്റ്‌വെയർ ലഭ്യമാണ്"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"അപ്‌ഡേറ്റ് ലഭ്യമാണ്"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"റിമോട്ട് അപ് ടു ഡേറ്റ് ആണ്"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"റിമോട്ട് അപ്ഡേറ്റ് ചെയ്യാനായില്ല"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"നിങ്ങളുടെ റിമോട്ട് അപ്‌ഡേറ്റ് ചെയ്യുമ്പോൾ ഒരു പ്രശ്‌നം നേരിട്ടു. വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"കാത്തിരിക്കുക"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"റിമോട്ട് വീണ്ടും ജോഡിയാക്കുക"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"പ്രവർത്തനക്ഷമമാക്കി"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"പ്രവർത്തനരഹിതമാക്കി"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"ബാറ്ററി നില"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"ഫേംവെയർ"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth വിലാസം"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"ബാറ്ററി മാറ്റി മറ്റൊന്നു വയ്ക്കുക"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"ബാറ്ററി ചാർജ് കുറവാണ്"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"കണക്‌റ്റ് ചെയ്‌തിരിക്കുന്ന ഉപകരണങ്ങൾ"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"റിമോട്ടുകളും ആക്‌സസറികളും"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"നിങ്ങളുടെ റിമോട്ട് അപ്‌ഡേറ്റ് ചെയ്യുക"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"ഇൻസ്‌റ്റാൾ ചെയ്യാൻ തയ്യാറാണ്"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"അപ്‌ഡേറ്റ് ചെയ്യുക"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"നിരസിക്കുക"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"വിദൂര ബാറ്ററിയിൽ ചാർജ് കുറവാണ്"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"ബാറ്ററി മാറ്റി ഉടനെ മറ്റൊന്ന് വയ്ക്കുക"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"വിദൂര ബാറ്ററിയുടെ ചാർജ് ഏതാണ്ട് തീർന്നു"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"ബാറ്ററി മാറ്റി ഉടനെ മറ്റൊന്ന് വയ്ക്കുക"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"വിദൂര ബാറ്ററിയിൽ ചാർജ് തീർന്നു"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"വിദൂരമായി ഉപയോഗിക്കാൻ ബാറ്ററി മാറ്റി ഉടനെ മറ്റൊന്ന് വയ്ക്കുക"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"ഉവ്വ്"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"വേണ്ട"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s എന്നതിൽ നിന്ന് വിച്ഛേദിക്കുക"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s എന്നതിലേക്ക് കണക്‌റ്റ് ചെയ്യുക"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s മറക്കുക"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"കണക്റ്റ് ചെയ്‌തിരിക്കുന്ന ഉപകരണത്തിന്റെ പേര് മാറ്റുക"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC പ്രവർത്തനക്ഷമമാക്കുക"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC പ്രവര്‍ത്തനക്ഷമമാക്കിയ മറ്റ് ഉപകരണങ്ങള്‍ ഒരു റിമോട്ട് കണ്‍ട്രോള്‍ ഉപയോഗിച്ച് നിയന്ത്രിക്കാനും സ്വയമേവ ഓണാക്കാനും/ഓഫാക്കാനും HDMI-CEC നിങ്ങളെ അനുവദിക്കുന്നു.\n\nശ്രദ്ധിക്കുക: നിങ്ങളുടെ TV-യിലും മറ്റ് HDMI ഉപകരണങ്ങളിലും HDMI-CEC പ്രവർത്തനക്ഷമമാക്കിയിട്ടുണ്ടെന്ന് ഉറപ്പാക്കുക. HDMI-CEC-ക്ക് നിർമ്മാതാക്കൾ പലപ്പോഴും വ്യത്യസ്ത പേരുകൾ നൽകാറുണ്ട്, ഉദാഹരണത്തിന്:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"റിമോട്ട് ബട്ടണുകൾ സജ്ജീകരിക്കുക"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"ശബ്‌ദം, പവർ, ടിവികളിലെ ഇൻപുട്ട്, റിസീവറുകൾ, സൗണ്ട് ബാറുകൾ എന്നിവ നിയന്ത്രിക്കുക"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"ബാറ്ററി നില: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"ആക്‌സസറികൾ"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"റിമോട്ട് കൺട്രോൾ"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"കണക്റ്റ് ചെയ്തു"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"മുമ്പ് കണക്‌റ്റ് ചെയ്‌തവ"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"റിമോട്ടോ ആക്‌സസറിയോ ജോടിയാക്കുക"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"വിച്ഛേദിക്കുക"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"കണക്റ്റ് ചെയ്യുക"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"പേര് മാറ്റുക"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"മറക്കുക"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"കണക്റ്റ് ചെയ്തു"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"വിച്ഛേദിച്ചു"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"ഉപകരണ നിയന്ത്രണം"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"പുതിയ ഉപകരണം കണക്റ്റ് ചെയ്യുക"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"പുതിയ Bluetooth ഉപകരണങ്ങൾ കണക്റ്റ് ചെയ്യുന്നതിന് മുമ്പ് അവ ജോഡിയാക്കൽ മോഡിലാണെന്ന് ഉറപ്പാക്കുക. %1$s കണക്റ്റ് ചെയ്യുന്നതിന്, %2$s + %3$s എന്നത് 3 സെക്കൻഡ് അമർത്തിപ്പിടിക്കുക."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV റിമോട്ട്"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"ലഭ്യമായ ഉപകരണങ്ങൾ"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"ഉപകരണങ്ങൾ തിരയുന്നു…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"പിശക്"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"കണക്‌റ്റ് ചെയ്യുന്നു…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"കണക്റ്റ് ചെയ്തു"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"റദ്ദാക്കി"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s എന്നതിന് കണക്റ്റ് ചെയ്യാനായില്ല"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s കണക്റ്റ് ചെയ്തു"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s വിച്ഛേദിച്ചു"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"ബാറ്ററി നില ക്രിട്ടിക്കലാണ്"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"ബാറ്ററി നില കുറവാണ്"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"ബാറ്ററി നില മികച്ചതാണ്"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"റിമോട്ട് അപ്‌ഡേറ്റ് സ്ഥിരീകരിക്കുക"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"അപ്‌ഡേറ്റ് ചെയ്യുന്ന സമയത്ത്, നിങ്ങളുടെ റിമോട്ട് കുറച്ച് സമയത്തേക്ക് വിച്‌ഛേദിക്കപ്പെടാം."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"തുടരുക"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"റദ്ദാക്കുക"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"റിമോട്ട് അപ്‌ഡേറ്റ്"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"പുതിയ സോഫ്റ്റ്‌വെയർ ലഭ്യമാണ്"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"അപ്‌ഡേറ്റ് ലഭ്യമാണ്"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"റിമോട്ട് അപ് ടു ഡേറ്റ് ആണ്"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"റിമോട്ട് അപ്ഡേറ്റ് ചെയ്യാനായില്ല"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"നിങ്ങളുടെ റിമോട്ട് അപ്‌ഡേറ്റ് ചെയ്യുമ്പോൾ ഒരു പ്രശ്‌നം നേരിട്ടു. വീണ്ടും ശ്രമിക്കുക."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"കാത്തിരിക്കുക"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"റിമോട്ട് വീണ്ടും ജോടിയാക്കുക"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"പ്രവർത്തനക്ഷമമാക്കി"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"പ്രവർത്തനരഹിതമാക്കി"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"ബാറ്ററി നില"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"ഫേംവെയര്‍"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth വിലാസം"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"ബാറ്ററി മാറ്റി മറ്റൊന്നു വയ്ക്കുക"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"ബാറ്ററി ചാർജ് കുറവാണ്"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"കണക്‌റ്റ് ചെയ്‌ത ഉപകരണങ്ങൾ"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"റിമോട്ടുകളും ആക്‌സസറികളും"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"നിങ്ങളുടെ റിമോട്ട് അപ്‌ഡേറ്റ് ചെയ്യുക"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"ഇൻസ്‌റ്റാൾ ചെയ്യാൻ തയ്യാറാണ്"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"അപ്‌ഡേറ്റ് ചെയ്യുക"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ഡിസ്‌മിസ് ചെയ്യുക"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"റിമോട്ട് ബാറ്ററിയിൽ ചാർജ് കുറവാണ്"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"ബാറ്ററി മാറ്റി ഉടനെ മറ്റൊന്ന് വയ്ക്കുക"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"റിമോട്ട് ബാറ്ററി ഏതാണ്ട് തീർന്നു"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"ബാറ്ററി മാറ്റി ഉടനെ മറ്റൊന്ന് വയ്ക്കുക"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"റിമോട്ട് ബാറ്ററി തീർന്നു"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"റിമോട്ട് ഉപയോഗിക്കാൻ ബാറ്ററി മാറ്റി മറ്റൊന്ന് വയ്ക്കുക"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"ഉവ്വ്"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"ഇല്ല"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s എന്നതിൽ നിന്ന് വിച്ഛേദിക്കുക"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s എന്നതിലേക്ക് കണക്‌റ്റ് ചെയ്യുക"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s മറന്നു"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"കണക്റ്റ് ചെയ്‌ത ഉപകരണത്തിന്റെ പേര് മാറ്റുക"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC പ്രവര്‍ത്തനക്ഷമമാക്കിയ മറ്റ് ഉപകരണങ്ങള്‍ ഒരു റിമോട്ട് കണ്‍ട്രോള്‍ ഉപയോഗിച്ച് നിയന്ത്രിക്കാനും സ്വയമേവ ഓണാക്കാനും/ഓഫാക്കാനും HDMI-CEC നിങ്ങളെ അനുവദിക്കുന്നു. \n\nകുറിപ്പ്: നിങ്ങളുടെ ടിവിയിലും മറ്റ് HDMI ഉപകരണങ്ങളിലും HDMI-CEC പ്രവര്‍ത്തനക്ഷമമാക്കിയിട്ടുണ്ടെന്ന് ഉറപ്പാക്കുക. HDMI-CEC-ക്ക് നിര്‍മ്മാതാക്കള്‍ പലപ്പോഴും വ്യത്യസ്‌ത പേരുകള്‍ നല്‍കാറുണ്ട്, ഉദാഹരണത്തിന്:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"റിമോട്ട് ബട്ടണുകൾ സജ്ജീകരിക്കുക"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"ശബ്‌ദം, പവർ, ടിവികളിലെ ഇൻപുട്ട്, റിസീവറുകൾ, സൗണ്ട് ബാറുകൾ എന്നിവ നിയന്ത്രിക്കുക"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"ബാറ്ററി നില: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"ആക്‌സസറികൾ"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"റിമോട്ട് കൺട്രോൾ"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"കണക്‌റ്റ് ചെയ്‌തു"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"മുമ്പ് കണക്‌റ്റ് ചെയ്‌തവ"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"റിമോട്ടോ ആക്‌സസറിയോ ജോടിയാക്കുക"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"വിച്ഛേദിക്കുക"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"കണക്‌റ്റ് ചെയ്യുക"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"പേര് മാറ്റുക"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"മറന്നു"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"കണക്റ്റ് ചെയ്തു"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"വിച്ഛേദിച്ചു"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"ഉപകരണ നിയന്ത്രണം"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"പുതിയ ഉപകരണം കണക്റ്റ് ചെയ്യുക"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"പുതിയ Bluetooth ഉപകരണങ്ങൾ കണക്റ്റ് ചെയ്യുന്നതിന് മുമ്പ്, അവ ജോടിയാക്കൽ മോഡിലാണെന്ന് ഉറപ്പാക്കുക. %1$s കണക്റ്റ് ചെയ്യാൻ, %2$s + %3$s എന്നത് 3 സെക്കൻഡ് അമർത്തിപ്പിടിക്കുക."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV റിമോട്ട്"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"ലഭ്യമായ ഉപകരണങ്ങൾ"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"ഉപകരണങ്ങൾ തിരയുന്നു…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"പിശക്"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"കണക്റ്റ് ചെയ്യുന്നു…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"കണക്‌റ്റ് ചെയ്‌തു"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"റദ്ദാക്കി"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s കണക്റ്റ് ചെയ്യാനായില്ല"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s കണക്റ്റ് ചെയ്തു"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s വിച്ഛേദിച്ചു"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-mn/strings.xml b/libraries/BluetoothServices/res/values-mn/strings.xml
index 5ffa8ff..8583d18 100644
--- a/libraries/BluetoothServices/res/values-mn/strings.xml
+++ b/libraries/BluetoothServices/res/values-mn/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Боломжгүй"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Эгзэгтэй"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Бага"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Сайн"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Удирдлагын шинэчлэлтийг баталгаажуулах"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Шинэчлэлтийн үеэр таны удирдлага хэсэг хугацаанд салж болзошгүй."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Үргэлжлүүлэх"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Цуцлах"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Удирдлагын шинэчлэлт"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Шинэ программ хангамж боломжтой байна"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Шинэчлэх боломжтой"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Удирдлагыг шинэчилсэн байна"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Удирдлагыг шинэчилж чадсангүй"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Бид таны удирдлагыг шинэчлэх явцад асуудалтай тулгарлаа. Дахин оролдоно уу."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Түр хүлээнэ үү"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Удирдлагаа дахин хослуулна уу"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Идэвхжүүлсэн"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Идэвхгүй болгосон"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Батарейн түвшин"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Жижиг программ"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth хаяг"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Батарейг солино уу"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Батарейн цэнэг бага байна"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Холбогдсон төхөөрөмжүүд"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Удирдлага, дагалдах хэрэгслүүд"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Удирдлагаа шинэчлэх"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Суулгахад бэлэн"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ШИНЭЧЛЭХ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ҮЛ ХЭРЭГСЭХ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Алсын удирдлагын батарейн цэнэг бага байна"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Батарейг удахгүй солино уу"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Алсын удирдлагын батарейн цэнэг бараг дуусаж байна"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Батарейг удахгүй солино уу"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Алсын удирдлагын батарейн цэнэг дууссан"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Алсын удирдлагыг ашиглахын тулд батарейг солино уу"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Тийм"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Үгүй"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s-с салгах"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s-д холбогдох"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s-г мартах"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Холбогдсон төхөөрөмжийнхөө нэрийг өөрчлөх"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC-г идэвхжүүлэх"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC нь танд HDMI-CEC-г идэвхжүүлсэн бусад төхөөрөмжийг нэг алсын удирдлагаар хянаж, автоматаар асаах/унтраах боломжийг олгодог.\n\nСанамж: ТВ болон бусад HDMI төхөөрөмж дээрээ HDMI-CEC-г идэвхжүүлсэн эсэхээ шалгана уу. Үйлдвэрлэгчид ихэвчлэн HDMI-CEC-г өөр өөр нэрлэдэг, жишээлбэл:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Удирдлагын товчлуурыг тохируулах"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"ТВ, хүлээн авагч болон дууны самбар дээрх дууны түвшин, асаах/унтраах, оролтыг удирдах"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Батарейн түвшин: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Гоёл чимэглэл"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Алсын удирдлага"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Холбогдсон"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Өмнө нь холбогдсон"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Удирдлага эсвэл дагалдах хэрэгслийг хослуулах"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Салгах"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Холбох"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Нэр өөрчлөх"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Мартах"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Холбогдсон"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Салсан"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Төхөөрөмжийн хяналт"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Шинэ төхөөрөмж холбох"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Шинэ Bluetooth төхөөрөмжүүдийг холбохоос өмнө хослуулах горимд байгаа эсэхийг нь шалгана уу. %1$s-г холбохын тулд %2$s + %3$s-г 3 секундийн турш дарна уу."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV удирдлага"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Боломжтой байгаа төхөөрөмжүүд"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Төхөөрөмжүүдийг хайж байна…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Алдаа"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Холбогдож байна…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Холбогдсон"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Цуцлагдсан"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s холбогдож чадсангүй"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s холбогдсон"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s салгагдсан"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Ноцтой"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Бага"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Сайн"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Удирдлагын шинэчлэлтийг баталгаажуулах"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Шинэчлэлтийн үеэр таны алсын удирдлага түр салж магадгүй."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Үргэлжлүүлэх"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Цуцлах"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Алсын удирдлагын шинэчлэлт"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Шинэ программ хангамж боломжтой байна"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Шинэчлэх боломжтой"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Алсын удирдлага хамгийн шинэ байна"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Удирдлагыг шинэчилж чадсангүй"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Таны алсын удирдлагыг шинэчлэх явцад асуудал тулгарлаа. Дахин оролдоно уу."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Түр хүлээнэ үү"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Алсын удирдлагаа дахин хослуулна уу"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Идэвхжүүлсэн"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Идэвхгүй болгосон"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Батарейн түвшин"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Жижиг программ"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth хаяг"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Батарейг солино уу"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Батарей бага байна"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Холбогдсон төхөөрөмжүүд"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Алсын удирдлага, дагалдах хэрэгслүүд"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Алсын удирдлагаа шинэчилнэ үү"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Суулгахад бэлэн"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ШИНЭЧЛЭХ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ХААХ"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Алсын удирдлагын батарейн цэнэг бага байна"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Батарейг удахгүй солино уу"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Алсын удирдлагын батарейн цэнэг бараг дуусаж байна"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Батарейг удахгүй солино уу"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Алсын удирдлагын батарейн цэнэг дууссан"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Алсын удирдлагыг ашиглахын тулд батарейг солино уу"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Тийм"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Үгүй"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s-с салгах"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s-д холбогдох"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s-г мартах"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Холбогдсон төхөөрөмжийнхөө нэрийг өөрчлөх"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC-г идэвхжүүлэх"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Та HDMI-CEC-г ашиглан бусад HDMI-CEC-г идэвхжүүлсэн төхөөрөмжийг нэг алсын удирдлагаар хянаж, автоматаар асаах/унтраах боломжтой.\n\nСанамж: HDMI-CEC-г ТВ болон бусад HDMI төхөөрөмждөө идэвхжүүлсэн эсэхээ шалгана уу. Үйлдвэрлэгчид ихэвчлэн HDMI-CEC-н өөр өөр нэртэй байдаг бөгөөд жишээлбэл:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Алсын удирдлагын товчлуурыг тохируулах"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"ТВ, хүлээн авагч болон дууны самбаруудын дууны түвшин, тэжээл, оролтыг хянана уу"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Батарейн түвшин: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Дагалдах хэрэгслүүд"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Алсын удирдлага"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Холбогдсон"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Өмнө нь холбогдсон"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Алсын удирдлага эсвэл дагалдах хэрэгслийг хослуулна уу"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Салгах"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Холбогдох"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Нэр өөрчлөх"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Мартах"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Холбогдсон"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Салсан"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Төхөөрөмжийн хяналт"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Шинэ төхөөрөмж холбох"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Шинэ Bluetooth төхөөрөмжүүд холбохоосоо өмнө тэдгээр нь хослуулах горимд байгаа эсэхийг шалгана уу. %1$s-г холбохын тулд %2$s + %3$s-г 3 секундийн турш удаан дарна уу."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV удирдлага"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Боломжтой төхөөрөмжүүд"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Төхөөрөмжүүдийг хайж байна…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Алдаа"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Холбогдож байна…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Холбогдсон"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Цуцалсан"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s холбогдож чадсангүй"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s холбогдсон"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s салсан"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-mr/strings.xml b/libraries/BluetoothServices/res/values-mr/strings.xml
index 17a2202..356e8cc 100644
--- a/libraries/BluetoothServices/res/values-mr/strings.xml
+++ b/libraries/BluetoothServices/res/values-mr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"गंभीर"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"कमी"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"चांगला"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"रिमोट अपडेटची खात्री करा"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"अपडेट दरम्यान कदाचित तुमचा रिमोट काही वेळेसाठी डिस्कनेक्ट होऊ शकतो."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"पुढे सुरू ठेवा"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"रद्द करा"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"रिमोट अपडेट"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"नवीन सॉफ्‍टवेअर उपलब्ध आहे"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"अपडेट उपलब्ध आहे"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"रिमोट अप टू डेट आहे"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"रिमोट अपडेट करता आले नाही"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"तुमचा रिमोट अपडेट करताना आम्हाला समस्या आली. कृपया पुन्हा प्रयत्न करा."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"कृपया प्रतीक्षा करा"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"तुमचा रिमोट पुन्हा पेअर करा"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"सुरू केले"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"बंद केलेले"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"बॅटरीची पातळी"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"फर्मवेयर"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"ब्लूटूथ ॲड्रेस"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"कृपया बॅटरी बदला"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"कमी बॅटरी"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"कनेक्‍ट केलेली डिव्‍हाइस"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Remotes &amp; Accessories"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"तुमचा रिमोट अपडेट करा"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"इंस्टॉल करण्यासाठी तयार"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"अपडेट करा"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"डिसमिस करा"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"रिमोटची बॅटरी कमी आहे"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"बॅटरी लवकर बदला"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"रिमोटची बॅटरी जवळजवळ रिकामी आहे"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"बॅटरी लवकर बदला"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"रिमोटची बॅटरी रिकामी आहे"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"रिमोट वापरण्यासाठी बॅटरी बदला"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"होय"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"नाही"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s वरून डिस्कनेक्ट करा"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s शी कनेक्ट करा"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s विसरा"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"कनेक्‍ट केलेल्या डिव्‍हाइसचे नाव बदला"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC सुरू करा"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC तुम्हाला एकच रिमोट कंट्रोल वापरून HDMI-CEC सुरू असलेली डिव्हाइस नियंत्रित करण्याची आणि आपोआप सुरू/बंद करण्याची अनुमती देते.\n\nटीप: तुमच्या टीव्ही आणि इतर HDMI डिव्हाइसवर HDMI-CEC सुरू केले असल्याची खात्री करा. उत्पादक नेहमी HDMI-CEC साठी विविध नावे देतात, उदाहरणार्थ:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"रिमोटची बटणे सेट करा"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"टीव्ही, रीसीव्हर आणि साउंडबारवरील व्हॉल्यूम, पॉवर, इनपुट नियंत्रित करा"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"बॅटरी पातळी: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"अ‍ॅक्सेसरी"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"रिमोट कंट्रोल"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"कनेक्ट केलेले"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"याआधी कनेक्ट केलेले"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"रिमोट किंवा ॲक्सेसरी पेअर करा"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"‍डिस्कनेक्ट करा"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"कनेक्ट करा"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"नाव बदला"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"विसरा"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"कनेक्ट केलेले आहे"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"डिस्कनेक्ट केलेले आहे"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"डिव्हाइसचे नियंत्रण"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"नवीन डिव्हाइस कनेक्ट करा"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"नवीन ब्लूटूथ डिव्हाइस कनेक्ट करण्यापूर्वी ते पेअरिंग मोडमध्ये असल्याची खात्री करा. %1$s कनेक्ट करण्यासाठी, %2$s + %3$s तीन सेकंदांपर्यंत दाबा आणि धरून ठेवा."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"एक Android टीव्ही रिमोट"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"उपलब्ध असलेली डिव्हाइस"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"डिव्हाइस शोधत आहे…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"एरर"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"कनेक्ट करत आहे…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"कनेक्ट केलेले"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"रद्द केले"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s जोडता आले नाही"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s कनेक्ट केलेले"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s डिस्कनेक्ट केलेले"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"महत्त्वाचे"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"कमी"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"चांगले"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"रिमोटचे अपडेट कंफर्म करा"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"अपडेटच्या दरम्यान तुमचा रिमोट काही वेळेसाठी डिस्कनेक्ट होऊ शकतो."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"पुढे सुरू ठेवा"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"रद्द करा"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"रिमोटशी संबंधित अपडेट"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"नवीन सॉफ्‍टवेअर उपलब्ध आहे"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"अपडेट उपलब्ध आहे"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"रिमोट अप टू डेट आहे"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"रिमोट अपडेट करता आले नाही"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"तुमचा रिमोट अपडेट करताना आम्हाला समस्या आली. कृपया पुन्हा प्रयत्न करा."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"कृपया प्रतीक्षा करा"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"तुमचा रिमोट पुन्हा पेअर करा"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"सुरू केले"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"बंद आहे"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"बॅटरी पातळी"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"फर्मवेयर"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"ब्लूटूथ ॲड्रेस"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"कृपया बॅटरी बदला"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"बॅटरी कमी आहे"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"कनेक्‍ट केलेली डिव्‍हाइस"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"रिमोट आणि ॲक्सेसरी"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"तुमचा रिमोट अपडेट करा"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"इंस्टॉल करण्यासाठी तयार आहे"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"अपडेट करा"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"डिसमिस करा"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"रिमोटची बॅटरी कमी आहे"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"बॅटरी लवकर बदला"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"रिमोटची बॅटरी जवळपास संपली आहे"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"बॅटरी लवकर बदला"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"रिमोटची बॅटरी संपली आहे"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"रिमोट वापरण्यासाठी बॅटरी बदला"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"होय"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"नाही"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s पासून डिस्कनेक्ट करा"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s शी कनेक्ट करा"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s विसरा"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"कनेक्‍ट केलेल्या डिव्‍हाइसचे नाव बदला"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC सुरू करा"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC तुम्हाला एकच रिमोट कंट्रोल वापरून HDMI-CEC सुरू केलेली डिव्हाइस नियंत्रित करण्याची आणि आपोआप सुरू/बंद करण्याची अनुमती देते.\n\nटीप: तुमचा टीव्ही आणि इतर HDMI डिव्हाइसवर HDMI-CEC सुरू केले असल्याची खात्री करा. उत्पादक नेहमी HDMI-CEC साठी विविध नावे देतात, उदाहरणार्थ:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"रिमोटची बटणे सेट करा"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"टीव्ही, रीसीव्हर आणि साउंडबारवरील व्हॉल्यूम, पॉवर, इनपुट नियंत्रित करा"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"बॅटरीची पातळी: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"अ‍ॅक्सेसरी"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"रिमोट कंट्रोल"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"कनेक्ट केलेले"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"याआधी कनेक्ट केलेले"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"रिमोट किंवा ॲक्सेसरी पेअर करा"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"डिस्कनेक्ट करा"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"कनेक्ट करा"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"नाव बदला"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"विसरा"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"कनेक्ट केलेले आहे"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"डिस्कनेक्ट केलेले आहे"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"डिव्हाइस नियंत्रण"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"नवीन डिव्हाइस कनेक्ट करा"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"नवीन ब्लूटूथ डिव्हाइस कनेक्ट करण्यापूर्वी, ती पेअरींग मोडमध्ये असल्याची खात्री करा. %1$s कनेक्ट करण्यासाठी, %2$s + %3$s तीन सेकंदांपर्यंत प्रेस करून धरून ठेवा."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android टीव्ही रिमोट"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"उपलब्ध असलेली डिव्हाइस"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"डिव्हाइस शोधत आहे…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"एरर"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"कनेक्ट करत आहे…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"कनेक्ट केलेले"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"रद्द केले"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s कनेक्ट करता आले नाही"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s कनेक्ट केले"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s डिस्कनेक्ट केले"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-ms/strings.xml b/libraries/BluetoothServices/res/values-ms/strings.xml
index 6efcb5f..271044e 100644
--- a/libraries/BluetoothServices/res/values-ms/strings.xml
+++ b/libraries/BluetoothServices/res/values-ms/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"T/B"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritikal"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Rendah"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Baik"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Sahkan kemas kini alat kawalan jauh"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Semasa kemas kini, alat kawalan jauh anda mungkin terputus sambungan seketika."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Teruskan"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Batal"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Kemas kini alat kawalan jauh"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Perisian baharu tersedia"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Kemas kini tersedia"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Alat kawalan jauh adalah terkini"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Gagal mengemas kini alat kawalan jauh"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Kami menghadapi kesulitan semasa mengemas kini alat kawalan jauh anda. Sila cuba lagi."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Sila tunggu"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Gandingkan alat kawalan jauh anda semula"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Didayakan"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Dilumpuhkan"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Aras bateri"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Perisian tegar"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Alamat Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Sila gantikan bateri"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Bateri lemah"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Peranti Disambungkan"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Alat Kawalan Jauh &amp; Aksesori"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Kemas kini alat kawalan jauh anda"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Sedia untuk dipasang"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"KEMAS KINI"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"KETEPIKAN"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Bateri kawalan jauh lemah"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Gantikan bateri secepat mungkin"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Bateri kawalan jauh hampir kosong"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Gantikan bateri secepat mungkin"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Bateri kawalan jauh kosong"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Gantikan bateri untuk menggunakan kawalan jauh"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Ya"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Tidak"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Putuskan sambungan daripada %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Sambung ke %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Lupakan %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Namakan semula peranti anda yang disambungkan"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Dayakan HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC membenarkan anda mengawal dan menghidupkan/mematikan peranti berdaya HDMI-CEC yang lain secara automatik menggunakan alat kawalan jauh tunggal.\n\nNota: Pastikan HDMI-CEC didayakan pada TV dan peranti HDMI anda yang lain. Pengilang sering mempunyai nama yang berbeza untuk HDMI-CEC, contohnya:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Sediakan butang jauh"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Kawal kelantangan, kuasa, input pada TV, penerima dan bar bunyi"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Aras bateri: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Aksesori"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Alat Kawalan Jauh"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Disambungkan"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Disambungkan sebelum ini"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Gandingkan alat kawalan jauh atau aksesori"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Putuskan sambungan"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Sambung"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Namakan semula"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Lupakan"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Disambungkan"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Diputuskan sambungan"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Kawalan peranti"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Sambungkan peranti baharu"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Sebelum menghubungkan peranti Bluetooth yang baharu, pastikan peranti itu dalam mod gandingan. Untuk menyambung %1$s, tekan dan tahan %2$s + %3$s selama 3 saat."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"alat kawalan jauh Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Peranti yang tersedia"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Mencari peranti…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Ralat"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Menyambung…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Disambungkan"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Dibatalkan"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s gagal menyambung"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s disambungkan"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s diputuskan sambungan"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"T/B"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritikal"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Rendah"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Baik"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Sahkan kemaskinian alat kawalan jauh"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Semasa kemaskinian, alat kawalan jauh anda mungkin terputus sambungan seketika."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Teruskan"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Batal"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Kemaskinian alat kawalan jauh"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Perisian baharu tersedia"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Kemas kini tersedia"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Alat kawalan jauh adalah yang terkini"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Gagal mengemas kini alat kawalan jauh"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Kami menghadapi kesulitan semasa mengemaskinikan alat kawalan jauh anda. Sila cuba lagi."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Sila tunggu"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Gandingkan alat kawalan jauh anda semula"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Didayakan"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Dilumpuhkan"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Aras bateri"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Perisian tegar"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Alamat Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Sila gantikan bateri"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Bateri lemah"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Peranti Tersambung"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Alat Kawalan Jauh &amp; Aksesori"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Kemas kinikan alat kawalan jauh anda"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Sedia untuk dipasang"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"KEMAS KINIKAN"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"KETEPIKAN"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Bateri kawalan jauh lemah"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Gantikan bateri secepat mungkin"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Bateri kawalan jauh hampir kosong"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Gantikan bateri secepat mungkin"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Bateri kawalan jauh kosong"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Gantikan bateri untuk menggunakan kawalan jauh"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Ya"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Tidak"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Putuskan sambungan daripada %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Sambung kepada %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Lupakan %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Namakan semula peranti anda yang dihubungkan"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Dayakan HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC membenarkan anda mengawal dan menghidupkan/mematikan peranti berdaya HDMI-CEC lain secara automatik menggunakan alat kawalan jauh tunggal.\n\nNota: Pastikan HDMI-CEC didayakan pada TV dan peranti HDMI anda yang lain. Pengilang sering mempunyai nama yang berbeza untuk HDMI-CEC, contohnya:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Sediakan butang alat kawalan jauh"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Kawal kelantangan, kuasa, input pada TV, penerima dan bar bunyi"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Paras kuasa bateri: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Aksesori"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Alat Kawalan Jauh"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Dihubungkan"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Dihubungkan sebelum ini"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Gandingkan alat kawalan jauh atau aksesori"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Putuskan sambungan"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Sambung"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Namakan semula"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Lupakan"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Disambungkan"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Diputuskan sambungan"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Kawalan peranti"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Sambungkan peranti baharu"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Sebelum menyambung peranti Bluetooth yang baharu, pastikan peranti itu dalam mod penggandingan. Untuk menyambung %1$s, tekan dan tahan %2$s + %3$s selama 3 saat."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"alat kawalan jauh Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Peranti yang tersedia"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Mencari peranti…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Ralat"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Menyambung…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Disambungkan"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Dibatalkan"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s gagal menyambung"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s disambungkan"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s diputuskan sambungan"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-my/strings.xml b/libraries/BluetoothServices/res/values-my/strings.xml
index 077cf17..4025336 100644
--- a/libraries/BluetoothServices/res/values-my/strings.xml
+++ b/libraries/BluetoothServices/res/values-my/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"အရေးကြီး"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"နည်း"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"ကောင်း"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"အဝေးထိန်းစနစ် အပ်ဒိတ်ကို အတည်ပြုပါ"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"အပ်ဒိတ်လုပ်နေစဉ်အတွင်း သင့်အဝေးထိန်းစနစ်ကို ခဏချိတ်ဆက်မှုရပ်ထားနိုင်သည်။"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"ဆက်ရန်"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"ပယ်ရန်"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"အဝေးထိန်းစနစ် အပ်ဒိတ်"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"ဆော့ဖ်ဝဲသစ် ရနိုင်ပါသည်"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"အပ်ဒိတ် ရနိုင်သည်"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"အဝေးထိန်းစနစ် အပ်ဒိတ်လုပ်ပြီးပါပြီ"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"အဝေးထိန်းစနစ် အပ်ဒိတ်လုပ်၍ မရပါ"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"သင့်အဝေးထိန်းစနစ်ကို အပ်ဒိတ်လုပ်နေစဉ် ပြဿနာတစ်ခု ဖြစ်ပေါ်ခဲ့သည်။ ထပ်စမ်းကြည့်ပါ။"</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"ခဏစောင့်ပါ"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"သင့် အဝေးထိန်းခလုတ်ကို ထပ်မံ တွဲချိတ်ပါ"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"ဖွင့်ထားသည်"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"ပိတ်ထားသည်"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"ဘက်ထရီအား"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"ဖာမ်းဝဲ"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"ဘလူးတုသ်လိပ်စာ"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"ဘက်ထရီ လဲလှယ်ပေးပါ"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"ဘက်ထရီ အားနည်းနေသည်"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"ချိတ်ဆက်ထားသော စက်များ"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"အဝေးထိန်းခလုတ်နှင့် ဆက်စပ်ပစ္စည်းများ"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"သင်၏အဝေးထိန်းခလုတ်ကို အပ်ဒိတ်လုပ်ပါ"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"ထည့်ရန် အသင့်ဖြစ်ပါပြီ"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ပြောင်းပါ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ပယ်ရန်"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"အဝေးထိန်းခလုတ် ဘက်ထရီ အားနည်းနေသည်"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"ဘက်ထရီကို မကြာမီ လဲပါ"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"အဝေးထိန်းခလုတ် ဘက်ထရီ အားကုန်တော့မည်"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"ဘက်ထရီကို မကြာမီ လဲပါ"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"အဝေးထိန်းခလုတ် ဘက်ထရီ အားကုန်သွားသည်"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"အဝေးထိန်းခလုတ်ကို သုံးရန် ဘက်ထရီ လဲပါ"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Yes"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"No"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s မှ ချိတ်ဆက်မှုဖြုတ်ရန်"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s သို့ ချိတ်ဆက်ပါ"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s ကို မေ့ပစ်ရန်"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"သင်ချိတ်ဆက်ထားသော စက်ကို အမည်ပြောင်းရန်"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC ဖွင့်ရန်"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC ဖြင့် အခြား HDMI-CEC ဖွင့်ထားသည့် စက်ပစ္စည်းများအား အဝေးထိန်းခလုတ်တစ်ခုတည်းနှင့် ထိန်းချုပ်ပြီး အလိုအလျောက် ဖွင့်နိုင်/ပိတ်နိုင်သည်။ \n\nမှတ်ချက်- သင်၏ တီဗီနှင့် အခြား HDMI စက်ပစ္စည်းများတွင် HDMI-CEC ဖွင့်ထားပါ။ ကုန်ထုတ်လုပ်သူများတွင် HDMI-CEC အတွက် အမည်များ ကွဲပြားခြားနားသည်၊ ဥပမာ-"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung− Anynet+\nLG: SimpLink\nSony− BRAVIA စင့်ခ်လုပ်ခြင်း\nPhilips− EasyLink\nSharp− Aquos လင့်ခ်"</string>
-    <string name="settings_axel" msgid="859248404436889205">"အဝေးထိန်း ခလုတ်များကို စနစ်ထည့်သွင်းခြင်း"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"TV များ၊ လက်ခံစက်များနှင့် အသံဘားများတွင် အသံအတိုးအကျယ်၊ အဖွင့်အပိတ်၊ အဝင်တို့ကို ထိန်းချုပ်ပါ"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"ဘက်ထရီအား- %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"ဆက်စပ်ပစ္စည်းများ"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"အဝေးထိန်းခလုတ်"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"ချိတ်ဆက်ထားသည်"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"ယခင်က ချိတ်ဆက်ထားသော"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"အဝေးထိန်းခလုတ် သို့မဟုတ် ဆက်စပ်ပစ္စည်းနှင့် အတူတွဲပါ"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"ချိတ်ဆက်မှုဖြုတ်ရန်"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"ချိတ်ဆက်ရန်"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"အမည်ပြောင်းရန်"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"မေ့ပစ်ရန်"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"ချိတ်ဆက်ထားသည်"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"ချိတ်ဆက်မထားပါ"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"စက်ပစ္စည်း ထိန်းချုပ်မှု"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"စက်အသစ် ချိတ်ဆက်ရန်"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"ဘလူးတုသ် စက်အသစ်များကို မချိတ်ဆက်မီ၊ ၎င်းတို့အနေဖြင့် ချိတ်တွဲရေးမုဒ်တွင် ရှိနေကြောင်း သေချာပါစေ။ ချိတ်ဆက်ရန် %1$s၊ %2$s + %3$s ကို ၃ စက္ကန့် နှိပ်ထားပါ။"</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV အဝေးထိန်းခလုတ်"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"ရနိုင်သော စက်များ"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"စက်များကို ရှာနေသည်…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"အမှား"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"ချိတ်ဆက်နေသည်"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"ချိတ်ဆက်ထားသည်"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"ပယ်ဖျက်ထားသည်"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s ချိတ်ဆက် မရခဲ့ပါ"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s ကို ချိတ်ဆက်ထားသည်"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s ချိတ်ဆက်မထားပါ"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"မရနိုင်ပါ"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"အားကုန်ခါနီးဖြစ်သည်"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"အားနည်းသည်"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"ကောင်းသည်"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"အဝေးထိန်းခလုတ် အပ်ဒိတ်ကို အတည်ပြုရန်"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"အပ်ဒိတ်လုပ်နေစဉ်အတွင်း သင့်အဝေးထိန်းခလုတ်ကို ချိတ်ဆက်မှုခဏရပ်ထားနိုင်သည်။"</string>
+    <string name="settings_continue" msgid="5640776697820481568">"ရှေ့ဆက်ရန်"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"မလုပ်တော့"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"အဝေးထိန်းခလုတ် အပ်ဒိတ်"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"ဆော့ဖ်ဝဲအသစ် ရနိုင်ပါသည်"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"အပ်ဒိတ် ရနိုင်သည်"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"အဝေးထိန်းခလုတ် အပ်ဒိတ်ဖြစ်နေသည်"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"အဝေးထိန်းစနစ် အပ်ဒိတ်လုပ်၍ မရပါ"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"သင့်အဝေးထိန်းခလုတ်ကို အပ်ဒိတ်လုပ်နေစဉ် ပြဿနာဖြစ်သွားသည်။ ထပ်စမ်းကြည့်ပါ။"</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"ခဏစောင့်ပါ"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"သင့်အဝေးထိန်းခလုတ်ကို ထပ်မံတွဲချိတ်ရန်"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"ဖွင့်ထားသည်"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"ပိတ်ထားသည်"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"ဘက်ထရီအား"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"ဖာမ်းဝဲ"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"ဘလူးတုသ် လိပ်စာ"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"ဘက်ထရီ လဲပေးပါ"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"ဘက်ထရီ အားနည်းနေသည်"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"ချိတ်ဆက်ထားသောစက်များ"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"အဝေးထိန်းခလုတ်နှင့် ဆက်စပ်ပစ္စည်းများ"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"သင်၏အဝေးထိန်းခလုတ်ကို အပ်ဒိတ်လုပ်ပါ"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"ထည့်သွင်းရန် အသင့်ဖြစ်ပါပြီ"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"အပ်ဒိတ်လုပ်ရန်"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ပယ်ရန်"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"အဝေးထိန်းခလုတ် ဘက်ထရီ အားနည်းနေသည်"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"ဘက်ထရီကို မကြာမီ လဲပါ"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"အဝေးထိန်းခလုတ် ဘက်ထရီ အားကုန်တော့မည်"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"ဘက်ထရီကို မကြာမီ လဲပါ"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"အဝေးထိန်းခလုတ် ဘက်ထရီ အားကုန်သွားသည်"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"အဝေးထိန်းခလုတ်ကို သုံးရန် ဘက်ထရီ လဲပါ"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Yes"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"No"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s မှ ချိတ်ဆက်မှုဖြုတ်ရန်"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s သို့ ချိတ်ဆက်ရန်"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s ကို မေ့ပစ်ရန်"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"သင်ချိတ်ဆက်ထားသော စက်ကို အမည်ပြောင်းရန်"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC ဖွင့်ရန်"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC ဖြင့် အခြား HDMI-CEC ဖွင့်ထားသည့် စက်ပစ္စည်းများအား အဝေးထိန်းခလုတ်တစ်ခုတည်းနှင့် ထိန်းချုပ်ပြီး အလိုအလျောက် ဖွင့်နိုင်/ပိတ်နိုင်သည်။ \n\nမှတ်ချက်- သင်၏ တီဗီနှင့် အခြား HDMI စက်ပစ္စည်းများတွင် HDMI-CEC ဖွင့်ထားပါ။ ကုန်ထုတ်လုပ်သူများတွင် HDMI-CEC အတွက် အမည်များ ကွဲပြားခြားနားသည်၊ ဥပမာ-"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"အဝေးထိန်း ခလုတ်များကို စနစ်ထည့်သွင်းရန်"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"TV၊ ရုပ်သံဖမ်းစက်နှင့် အသံဘားများတွင် အသံအတိုးအကျယ်၊ အဖွင့်အပိတ်၊ အဝင်တို့ကို ထိန်းချုပ်နိုင်သည်"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"ဘက်ထရီအား- %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"ဆက်စပ်ပစ္စည်းများ"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"အဝေးထိန်းခလုတ်"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"ချိတ်ဆက်ထားသည်"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"ယခင်က ချိတ်ဆက်ထားသည်များ"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"အဝေးထိန်းခလုတ် (သို့) ဆက်စပ်ပစ္စည်းနှင့် တွဲချိတ်ရန်"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"ချိတ်ဆက်မှု ဖြုတ်ရန်"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"ချိတ်ဆက်ရန်"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"အမည်ပြောင်းရန်"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"မေ့ပစ်ရန်"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"ချိတ်ဆက်ထားသည်"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"ချိတ်ဆက်မထားပါ"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"စက်ပစ္စည်း ထိန်းချုပ်မှု"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"စက်အသစ် ချိတ်ဆက်ရန်"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"ဘလူးတုသ်သုံးစက်အသစ်များကို မချိတ်ဆက်မီ ၎င်းတို့အနေဖြင့် တွဲချိတ်ခြင်းမုဒ်တွင် ရှိနေကြောင်း သေချာပါစေ။ %1$s ကို ချိတ်ဆက်ရန် %2$s + %3$s ကို ၃ စက္ကန့် နှိပ်ထားပါ။"</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV အဝေးထိန်း"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"ရနိုင်သည့်စက်များ"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"စက်များကို ရှာနေသည်…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"အမှား"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"ချိတ်ဆက်နေသည်…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"ချိတ်ဆက်ထားသည်"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"ပယ်ဖျက်ထားသည်"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s ကို ချိတ်ဆက်၍မရပါ"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s ကို ချိတ်ဆက်ထားသည်"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s ကို ချိတ်ဆက်မထားပါ"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-nb/strings.xml b/libraries/BluetoothServices/res/values-nb/strings.xml
index e551556..723e559 100644
--- a/libraries/BluetoothServices/res/values-nb/strings.xml
+++ b/libraries/BluetoothServices/res/values-nb/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Ikke aktuelt"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritisk"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Lav"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Bra"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Bekreft oppdatering av fjernkontrollen"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Fjernkontrollen kan kobles fra en kort stund i løpet av oppdateringen."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Fortsett"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Avbryt"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Oppdatering av fjernkontroll"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Ny programvare er tilgjengelig"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"En oppdatering er tilgjengelig"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Fjernkontrollen er oppdatert"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Oppdateringen av fjernkontrollen mislyktes"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Det oppsto et problem under oppdateringen av fjernkontrollen din. Prøv igjen."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Vent litt"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Koble til fjernkontrollen din igjen"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Slått på"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Slått av"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Batterinivå"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d %%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Fastvare"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth-adresse"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Bytt ut batteriet"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Lavt batterinivå"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Tilkoblede enheter"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Fjernkontroller og tilbehør"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Oppdater fjernkontrollen din"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Klar til å installere"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"OPPDATER"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"AVVIS"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Fjernkontrollen har lite batteri"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Bytt batteri snart"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Fjernkontrollen har lite batteri"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Bytt batteri snart"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Fjernkontrollen har tomt batteri"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Bytt batteri for å bruke fjernkontrollen"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Ja"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Nei"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Koble fra %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Koble til %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Glem %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Endre navn på den tilkoblede enheten din"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Slå på HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Med HDMI-CEC kan du kontrollere og automatisk slå på/av andre HDMI-CEC-aktiverte enheter med én enkelt fjernkontroll.\n\nMerk: Sjekk at HDMI-CEC er slått på for TV-en din og andre HDMI-enheter. Produsenter har ofte forskjellige navn for HDMI-CEC, for eksempel:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Konfigurer fjernkontrollknapper"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Kontrollér volum, av/på-knappen og innenheter på TV-er, mottakere og lydplanker"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Batterinivå: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Tilbehør"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Fjernkontroll"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Tilkoblet"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Tidligere tilkoblet"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Koble til en fjernkontroll eller tilbehør"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Koble fra"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Koble til"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Gi nytt navn"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Glem"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Tilkoblet"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Frakoblet"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Enhetskontroll"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Koble til en ny enhet"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Før du kobler sammen nye Bluetooth-enheter, må du sjekke at de er i sammenkoblingsmodus. For å koble sammen %1$s, trykk og hold inne %2$s og %3$s i tre sekunder."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"en Android TV-fjernkontroll"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Tilgjengelige enheter"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Ser etter enheter …"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Feil"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Kobler til …"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Tilkoblet"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Kansellert"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s kunne ikke koble til"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s er koblet til"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s er frakoblet"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Ikke aktuelt"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritisk"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Lavt"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Bra"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Bekreft oppdateringen av fjernkontrollen"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Fjernkontrollen kan kobles fra en kort stund i løpet av oppdateringen."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Fortsett"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Avbryt"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Oppdatering av fjernkontrollen"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Ny programvare er tilgjengelig"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Kan oppdateres"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Fjernkontrollen er oppdatert"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Oppdateringen av fjernkontrollen mislyktes"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Det oppsto et problem under oppdateringen av fjernkontrollen. Prøv igjen."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Vent litt"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Koble til fjernkontrollen igjen"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Slått på"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Slått av"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Batterinivå"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d %%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Fastvare"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth-adresse"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Bytt ut batteriet"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Lavt batterinivå"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Tilkoblede enheter"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Fjernkontroller og tilbehør"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Oppdater fjernkontrollen"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Klar til å installere"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"OPPDATER"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"LUKK"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Fjernkontrollen har lite batteri"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Du bør bytte ut batteriet snart"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Fjernkontrollen har svært lite batteri igjen"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Du bør bytte ut batteriet snart"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Fjernkontrollen har tomt batteri"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Du må bytte ut batteriet for å bruke fjernkontrollen"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Ja"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Nei"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Koble fra %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Koble til %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Glem %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Endre navn på den tilkoblede enheten din"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Slå på HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Med HDMI-CEC kan du kontrollere og automatisk slå andre HDMI-CEC-aktiverte enheter av/på med én enkelt fjernkontroll.\n\nMerk: Sjekk at HDMI-CEC er slått på for TV-en din og andre HDMI-enheter. Produsenter har ofte forskjellige navn for HDMI-CEC, for eksempel:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Konfigurer fjernkontrollknapper"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Kontroller volumet og innenheter på TV-er, mottakere og lydplanker, og slå dem av og på"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Batterinivå: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Tilbehør"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Fjernkontroll"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Tilkoblet"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Tidligere tilkoblet"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Koble til en fjernkontroll eller tilbehør"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Koble fra"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Koble til"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Gi nytt navn"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Glem"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Tilkoblet"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Frakoblet"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Enhetskontroll"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Koble til en ny enhet"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Før du kobler til nye Bluetooth-enheter, må du sjekke at de er i tilkoblingsmodus. For å koble til %1$s, trykk og hold på %2$s og %3$s i 3 sekunder."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"en Android TV-fjernkontroll"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Tilgjengelige enheter"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Ser etter enheter …"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Feil"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Kobler til …"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Tilkoblet"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Avbrutt"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s kunne ikke kobles til"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s er koblet til"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s er koblet fra"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-ne/strings.xml b/libraries/BluetoothServices/res/values-ne/strings.xml
index da40802..6341884 100644
--- a/libraries/BluetoothServices/res/values-ne/strings.xml
+++ b/libraries/BluetoothServices/res/values-ne/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"उपलब्ध छैन"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"अत्यन्तै न्यून"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"न्यून"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"राम्रो"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"रिमोट अद्यावधिक भएको पुष्टि गर्नुहोस्"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"अद्यावधिक गर्दा तपाईंको रिमोट केही बेरमा विच्छेद हुन सक्छ।"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"जारी राख्नुहोस्"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"रद्द गर्नुहोस्"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"रिमोट अद्यावधिक"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"नयाँ सफ्टवेयर उपलब्ध छ"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"अद्यावधिक उपलब्ध छ"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"रिमोट अद्यावधिक छ"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"रिमोट अद्यावधिक गर्न सकिएन"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"हामीले तपाईंको रिमोट अद्यावधिक गर्दा कुनै समस्याको सामना गऱ्यौँ। कृपया फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"कृपया प्रतीक्षा गर्नुहोस्"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"आफ्नो रिमोटलाई फेरि जोडा बनाउनुहोस्"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"सक्षम पारियो"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"असक्षम पारियो"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"ब्याट्रीको स्तर"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"फर्मवेयर"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"ब्लुटुथ एड्रेस"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"कृपया ब्याट्री प्रतिस्थापन गर्नुहोस्"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"ब्याट्री कम छ"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"कनेक्ट गरिएका डिभाइस"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"रिमोट तथा सहायक उपकरणहरू"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"आफ्नो रिमोट अपडेट गर्नुहोस्"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"स्थापना गर्न तयार"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"अपडेट गर्नुहोस्"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"हटाउनुहोस्"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"रिमोटको ब्याट्री लो छ"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"ब्याट्री चाँडै फेर्नुहोस्"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"रिमोटको ब्याट्री सकिनै लागेको छ"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"ब्याट्री चाँडै फेर्नुहोस्"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"रिमोटको ब्याट्री सकिएको छ"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"रिमोट प्रयोग गर्न त्यसको ब्याट्री फेर्नुहोस्"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"हो"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"होइन"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s बाट जडान विच्छेद गर्नुहोस्"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s मा कनेक्ट गर्नुहोस्"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s लाई बिर्सनुहोस्"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"तपाईंका जडित डिभाइसको नाम बदल्नुहोस्"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC सक्षम पार्नुहोस्"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC ले तपाईंलाई एकल दूरवर्ती नियन्त्रणमार्फत HDMI-CEC सक्षम पारिएका अन्य डिभाइसहरू नियन्त्रण गर्ने र स्वतः सक्रिय गर्ने/निष्क्रिय पार्ने अनुमति दिन्छ।\n\nटिपोट:आफ्नो टिभी र अन्य HDMI यन्त्रहरूमा HDMI-CEC सक्षम पारिएको छ भन्ने कुरा सुनिश्चित गर्नुहोस्। HDMI-CEC मा निर्माताहरूका नामहरू उदाहरणमा दिए जस्तै प्रायः फरक हुन्छन्:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA सिंक\nPhilips: EasyLink\nSharp: Aquos लिंक"</string>
-    <string name="settings_axel" msgid="859248404436889205">"रिमोटका बटनहरू सेटअप गर्नुहोस्"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"टिभी, रिसिभर र साउन्डबारको भोल्युम, पावर र इनपुट नियन्त्रण गर्नुहोस्"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"ब्याट्रीको स्तर: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"सहायक उपकरणहरू"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"रिमोट कन्ट्रोल"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"जोडियो"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"यसअघि कनेक्ट गरिएका"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"रिमोट वा सहायक उपकरणको जोडा बनाउनुहोस्"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"विच्छेद गर्नुहोस्"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"कनेक्ट गर्नुहोस्"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"नाम बदल्नुहोस्"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"बिर्सनुहोस्"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"कनेक्ट गरिएको छ"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"डिस्कनेक्ट भयो"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"यन्त्रको नियन्त्रण"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"नयाँ यन्त्र कनेक्ट गर्नुहोस्"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"तपाईंका ब्लुटुथ यन्त्रहरू जडान गर्नुअघि, तिनीहरू जोडा बनाउने मोडमा छन् भन्ने सुनिश्चित गर्नुहोस्। %1$s मा जडान गर्न %2$s + %3$s लाई ३ सेकेन्ड थिचिराख्नुहोस्।"</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android टिभी को एउटा रिमोट"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"उपलब्ध डिभाइस"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"यन्त्रहरू खोज्दै…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"त्रुटि"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"जडान हुँदै…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"जोडियो"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"रद्द गरियो"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s जडान गर्न असफल भयो"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s जडान भयो"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s को जडान विच्छेद गरियो"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"छैन"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"अत्यन्तै कम छ"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"कम छ"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"पर्याप्त छ"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"रिमोट अपडेट भएको कार्य पुष्टि गर्नुहोस्"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"अपडेट गर्ने क्रममा तपाईंको रिमोट केही बेरमा डिस्कनेक्ट हुन सक्छ।"</string>
+    <string name="settings_continue" msgid="5640776697820481568">"जारी राख्नुहोस्"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"रद्द गर्नुहोस्"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"रिमोट अपडेट"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"नयाँ सफ्टवेयर उपलब्ध छ"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"अद्यावधिक उपलब्ध छ"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"रिमोट अप टु डेट छ"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"रिमोट अद्यावधिक गर्न सकिएन"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"हामीले तपाईंको रिमोट अपडेट गर्दा कुनै समस्याको आयो। कृपया फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"कृपया पर्खनुहोस्"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"आफ्नो रिमोटलाई फेरि कनेक्ट गर्नुहोस्"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"सक्षम पारियो"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"असक्षम पारियो"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"ब्याट्रीको स्तर"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"फर्मवेयर"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"ब्लुटुथ एड्रेस"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"कृपया ब्याट्री बदल्नुहोस्"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"ब्याट्री कम छ"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"कनेक्ट भएका डिभाइसहरू"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"रिमोट तथा सहायक उपकरणहरू"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"आफ्नो रिमोट अपडेट गर्नुहोस्"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"इन्स्टल गर्दा हुन्छ"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"अपडेट गर्नुहोस्"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"खारेज गर्नुहोस्"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"रिमोटको ब्याट्री कम छ"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"चाँडै ब्याट्री बदल्नुहोस्"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"रिमोटको ब्याट्री सकिनै लागेको छ"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"चाँडै ब्याट्री बदल्नुहोस्"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"रिमोटको ब्याट्री सकिएको छ"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"रिमोट प्रयोग गर्न त्यसको ब्याट्री बदल्नुहोस्"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"छ"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"छैन"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s बाट जडान विच्छेद गर्नुहोस्"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s मा कनेक्ट गर्नुहोस्"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s लाई बिर्सनुहोस्"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"तपाईंको जडित यन्त्रको पुनः नामाकरण गर्नुहोस्‌"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC सक्षम गर्नुहोस्"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC ले तपाईंलाई एकल दूरवर्ती नियन्त्रणमार्फत HDMI-CEC सक्षम पारिएका अन्य डिभाइसहरू नियन्त्रण गर्ने र स्वतः सक्रिय गर्ने/निष्क्रिय पार्ने अनुमति दिन्छ।\n\nटिपोट: आफ्ना टिभी र अन्य HDMI यन्त्रहरूमा HDMI-CEC सक्षम पारिएको छ भन्ने कुरा सुनिश्चित गर्नुहोस्। HDMI-CEC मा निर्माताहरूको नाम उदारणमा दिए जस्तै प्रायः फरक फरक हुन्छन्:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"रिमोटका बटनहरू सेटअप गर्नुहोस्"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"टिभी, रिसिभर र साउन्डबारको भोल्युम, पावर र इनपुट नियन्त्रण गर्नुहोस्"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"ब्याट्रीको स्तर: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"सहायक सामग्रीहरू"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"रिमोट कन्ट्रोल"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"जोडिएको"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"यसअघि कनेक्ट गरिएका डिभाइस"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"रिमोट वा सहायक उपकरणसँग कनेक्ट गर्नुहोस्"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"विच्छेद गर्नुहोस्"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"कनेक्ट गर्नुहोस्"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"नाम बदल्नुहोस्"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"बिर्सनुहोस्"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"कनेक्ट गरिएको छ"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"डिस्कनेक्ट भयो"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"यन्त्रको नियन्त्रण"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"नयाँ डिभाइस कनेक्ट गर्नुहोस्"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"तपाईंका ब्लुटुथ डिभाइसहरू कनेक्ट गर्नुअघि तिनीहरू कनेक्ट गर्ने मोडमा छन् भन्ने सुनिश्चित गर्नुहोस्। %1$s मा जडान गर्न %2$s + %3$s लाई ३ सेकेन्ड थिचिराख्नुहोस्।"</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV रिमोट"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"उपलब्ध डिभाइसहरू"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"डिभाइसहरू खोजिँदै छ…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"त्रुटि"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"कनेक्ट गरिँदै छ…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"कनेक्ट गरियो"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"रद्द गरियो"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s जडान गर्न सकिएन"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s कनेक्ट गरिएको छ"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s डिस्कनेक्ट गरिएको छ"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-nl/strings.xml b/libraries/BluetoothServices/res/values-nl/strings.xml
index 055609a..c25f8e7 100644
--- a/libraries/BluetoothServices/res/values-nl/strings.xml
+++ b/libraries/BluetoothServices/res/values-nl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N.v.t."</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritiek"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Laag"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Goed"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Update van afstandsbediening bevestigen"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Tijdens de update kan de verbinding met je afstandsbediening tijdelijk worden verbroken."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Doorgaan"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Annuleren"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Update voor afstandsbediening"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Nieuwe software beschikbaar"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Update beschikbaar"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Afstandsbediening is up-to-date"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Kan afstandsbediening niet updaten"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Er is een probleem opgetreden bij het updaten van je afstandsbediening. Probeer het opnieuw."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Even geduld"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Je afstandsbediening opnieuw koppelen"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Ingeschakeld"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Uitgeschakeld"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Batterijniveau"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth-adres"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Vervang de batterij"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Batterij bijna leeg"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Verbonden apparaten"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Afstandsbedieningen en accessoires"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Je afstandsbediening updaten"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Klaar voor installatie"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"UPDATEN"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"SLUITEN"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Batterij van afstandsbediening is bijna leeg"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Vervang de batterij binnenkort"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Batterij van afstandsbediening is zo goed als leeg"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Vervang de batterij binnenkort"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Batterij van afstandsbediening is leeg"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Vervang de batterij om de afstandsbediening te gebruiken"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Ja"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Nee"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Verbinding verbreken met %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Verbinden met %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s vergeten"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Apparaatnaam wijzigen"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC aanzetten"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Via HDMI-CEC kun je andere apparaten met HDMI-CEC-functionaliteit bedienen en automatisch in-/uitschakelen met één afstandsbediening.\n\nOpmerking: Zorg ervoor dat HDMI-CEC is ingeschakeld op je tv en andere HDMI-apparaten. Fabrikanten hebben vaak verschillende namen voor HDMI-CEC, zoals:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Afstandsbedieningsknoppen instellen"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Volume bedienen, aan- en uitzetten en invoer selecteren op tv\'s, ontvangers en soundbars"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Batterijniveau: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Accessoires"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Afstandsbediening"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Verbonden"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Eerder verbonden"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Afstandsbediening of accessoire koppelen"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Verbinding verbreken"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Verbinding maken"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Naam wijzigen"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Vergeten"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Verbonden"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Verbinding verbroken"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Apparaatbeheer"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Nieuw apparaat verbinden"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Voordat je nieuwe bluetooth-apparaten verbindt, zorg je ervoor dat ze in de koppelingsstand staan. Als je %1$s wilt verbinden, houd je %2$s + %3$s 3 seconden ingedrukt."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"een Android TV-afstandsbediening"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Beschikbare apparaten"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Apparaten zoeken…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Fout"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Verbinden…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Verbonden"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Geannuleerd"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s kan geen verbinding maken"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s verbonden"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"Verbinding met %1$s verbroken"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Niet beschikbaar"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritiek"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Laag"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Goed"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Update van afstandsbediening bevestigen"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Tijdens de update kan de verbinding met je afstandsbediening tijdelijk worden verbroken."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Doorgaan"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Annuleren"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Update voor afstandsbediening"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Nieuwe software beschikbaar"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Update beschikbaar"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Afstandsbediening is up-to-date"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Kan afstandsbediening niet updaten"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Er is iets misgegaan bij het updaten van je afstandsbediening. Probeer het opnieuw."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Een ogenblik geduld"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Je afstandsbediening opnieuw koppelen"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Aangezet"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Uitgezet"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Batterijniveau"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth-adres"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Vervang de batterij"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Batterij bijna leeg"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Verbonden apparaten"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Afstandsbedieningen en accessoires"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Je afstandsbediening updaten"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Klaar voor installatie"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"UPDATEN"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"SLUITEN"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Batterij van afstandsbediening is bijna leeg"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Vervang binnenkort de batterij"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Batterij van afstandsbediening is zo goed als leeg"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Vervang binnenkort de batterij"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Batterij van afstandsbediening is leeg"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Vervang de batterij om de afstandsbediening te gebruiken"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Ja"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Nee"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Verbinding verbreken met %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Verbinden met %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s vergeten"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Apparaatnaam wijzigen"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC aanzetten"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Via HDMI-CEC kun je andere apparaten met HDMI-CEC-functionaliteit bedienen en automatisch aan-/uitzetten met één afstandsbediening.\n\nOpmerking: Zorg ervoor dat HDMI-CEC aanstaat op je tv en andere HDMI-apparaten. Fabrikanten hebben vaak verschillende namen voor HDMI-CEC, zoals:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Afstandsbedieningsknoppen instellen"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Volume bedienen, aan- en uitzetten en invoer selecteren op tv\'s, ontvangers en soundbars"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Batterijniveau: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Accessoires"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Afstandsbediening"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Verbonden"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Eerder verbonden"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Afstandsbediening of accessoire koppelen"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Verbinding verbreken"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Koppelen"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Naam wijzigen"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Vergeten"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Verbonden"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Verbinding verbroken"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Apparaatbeheer"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Verbinden met nieuw apparaat"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Zorg dat nieuwe bluetooth-apparaten in de koppelingsmodus staan voordat je ze verbindt. Als je %1$s wilt verbinden, houd je %2$s + %3$s 3 seconden ingedrukt."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"een Android TV-afstandsbediening"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Beschikbare apparaten"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Apparaten zoeken…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Fout"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Verbinden…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Verbonden"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Geannuleerd"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s kan geen verbinding maken"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s is gekoppeld"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s is ontkoppeld"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-or/strings.xml b/libraries/BluetoothServices/res/values-or/strings.xml
index 3cc31e1..e37706b 100644
--- a/libraries/BluetoothServices/res/values-or/strings.xml
+++ b/libraries/BluetoothServices/res/values-or/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"ଜଟିଳ"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"କମ୍"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"ଭଲ"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"ରିମୋଟ୍ ଅପ୍‌ଡେଟ୍ କରିବା ନିଶ୍ଚିତ କରନ୍ତୁ"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"ଅପ୍‌ଡେଟ୍ କରାଯିବା ବେଳେ ଆପଣଙ୍କର ରିମୋଟ୍ ପ୍ରାୟ ବିଚ୍ଛିନ୍ନ ହୋଇଯାଇପାରେ।"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"ଜାରି ରଖନ୍ତୁ"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"ବାତିଲ୍ କରନ୍ତୁ"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"ରିମୋଟ୍ ଅପ୍‌ଡେଟ୍ କରନ୍ତୁ"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"ନୂଆ ସଫ୍ଟୱେୟାର୍ ଉପଲବ୍ଧ ଅଛି"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"ଅପ୍‌ଡେଟ୍ ଉପଲବ୍ଧ ଅଛି"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"ରିମୋଟ୍ ଅପ୍-ଟୁ-ଡେଟ୍ ଅଛି"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"ରିମୋଟ୍ ଅପ୍‌ଡେଟ୍ କରିବା ବିଫଳ ହୋଇଛି"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"ଆପଣଙ୍କର ରିମୋଟ୍ ଅପ୍‍‍ଡେଟ୍ କରିବା ବେଳେ ଆମେ ଏକ ତ୍ରୁଟି ପାଇଲୁ। ଦୟାକରି ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"ଆପଣଙ୍କର ରିମୋଟ୍ ପୁଣି ପେୟାର୍ କରନ୍ତୁ"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"ସକ୍ଷମ କରାଯାଇଛି"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"ଅକ୍ଷମ ହୋଇଛି"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"ବ୍ୟାଟେରୀର ସ୍ତର"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"ଫାର୍ମୱେର୍"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"ବ୍ଲୁଟୁଥ ଠିକଣା"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"ଦୟାକରି ବ୍ୟାଟେରୀ ବଦଳାନ୍ତୁ"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"ବ୍ୟାଟେରୀରେ ଚାର୍ଜ କମ୍ ଅଛି"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"ସଂଯୋଗ ହୋଇଥିବା ଡିଭାଇସ୍‌ଗୁଡ଼ିକ"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"ରିମୋଟ୍ ଓ ଆସୋସରିଗୁଡ଼ିକ"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"ଆପଣଙ୍କ ରିମୋଟ୍ ଅପ୍‍‍‍‍‍‍‍‍‍‍‍‍ଡେଟ୍‍ କରନ୍ତୁ"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"ଇନ୍‍ଷ୍ଟଲ୍ କରାଯିବାକୁ ପ୍ରସ୍ତୁତ"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ଅପ୍‌ଡେଟ୍ କରନ୍ତୁ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ଖାରଜ କରନ୍ତୁ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"ରିମୋଟ୍ ବ୍ୟାଟେରୀ କମ୍ ଅଛି"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"ଶୀଘ୍ର ବ୍ୟାଟେରୀ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"ରିମୋଟ୍ ବ୍ୟାଟେରୀ ପ୍ରାୟ ସରିଯାଇଛି"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"ଶୀଘ୍ର ବ୍ୟାଟେରୀ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"ରିମୋଟ୍ ବ୍ୟାଟେରୀ ସରିଯାଇଛି"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"ରିମୋଟ୍ ବ୍ୟବହାର କରିବାକୁ ବ୍ୟାଟେରୀ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"ହଁ"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"ନା"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$sରୁ ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$sରେ ସଂଯୋଗ କରନ୍ତୁ"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s ଭୁଲି ଯାଇଛନ୍ତି"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"ଆପଣଙ୍କ ସଂଯୋଗ ହୋଇଥିବା ଡିଭାଇସ୍ ରିନେମ୍ କରନ୍ତୁ"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC ସକ୍ଷମ କରନ୍ତୁ"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC ଦ୍ୱାରା ଆପଣ HDMI-CEC ଦ୍ୱାରା ଚାଲୁଥିବା ଅନ୍ୟ ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ଗୋଟିଏ ରିମୋଟ୍‌ରେ କଣ୍ଟ୍ରୋଲ୍ ତଥା ସ୍ୱତଃସ୍ପୃତ ଭାବେ ଚାଲୁ/ବନ୍ଦ କରିପାରିବେ।\n\nଧ୍ୟାନ ଦିଅନ୍ତୁ: ନିଶ୍ଚିତ କରନ୍ତୁ ଯେ HDMI-CEC ଆପଣଙ୍କ ଟିଭି ଏବଂ ଅନ୍ୟ HDMI ଡିଭାଇସ୍‌ଗୁଡ଼ିକରେ ସକ୍ଷମ କରାଯାଇଛି। ଉତ୍ପାଦକଗଣ HDMI-CECର ନାମ ପ୍ରାୟତଃ ଭିନ୍ନ ରଖିଥାନ୍ତି, ଉଦାହରଣ ସ୍ୱରୂପ:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"ରିମୋଟ୍ ବଟନଗୁଡ଼ିକୁ ସେଟ୍ ଅପ୍ କରନ୍ତୁ"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"ଟିଭି, ରିସିଭର୍ ଏବଂ ସାଉଣ୍ଡବାରଗୁଡ଼ିକରେ ଭଲ୍ୟୁମ୍, ପାୱାର, ଇନପୁଟକୁ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"ବ୍ୟାଟେରୀ ସ୍ତର: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"ଜିନିଷଗୁଡ଼ିକ"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"ରିମୋଟ୍ କଣ୍ଟ୍ରୋଲ୍"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"ସଂଯୋଗ କରାଯାଇଛି"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"ପୂର୍ବରୁ ସଂଯୋଗ ହୋଇଛି"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"ରିମୋଟ୍ ବା ଆସୋସରି ପେୟାର୍ କରନ୍ତୁ"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"ସଂଯୋଗ କରନ୍ତୁ"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"ରିନେମ୍ କରନ୍ତୁ"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"ଭୁଲିଯଆନ୍ତୁ"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"ସଂଯୋଗ କରାଯାଇଛି"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"ବିଚ୍ଛିନ୍ନ କରାଯାଇଛି"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"ଡିଭାଇସ୍ କଣ୍ଟ୍ରୋଲ୍"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"ନୂଆ ଡିଭାଇସ୍ ସଂଯୋଗ କରନ୍ତୁ"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"ନୂଆ ବ୍ଲୁଟୁଥ୍ ଡିଭାଇସ୍‌ଗୁଡ଼ିକରେ ସଂଯୋଗ କରିବା ପୂର୍ବରୁ, ସୁନିଶ୍ଚିତ ହୁଅନ୍ତୁ ଯେ ସେଗୁଡ଼ିକ ପେୟାର୍ ହେବା ମୋଡ୍‌ରେ ଅଛି। %1$s ସଂଯୋଗ କରିବାକୁ, %2$s + %3$s 3 ସେକେଣ୍ଡ ପାଇଁ ଦବାଇ ଧରି ରଖନ୍ତୁ।"</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"ଏକ Android TV ରିମୋଟ୍"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"ଉପଲବ୍ଧ ଡିଭାଇସ୍‌ଗୁଡ଼ିକ"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"ଡିଭାଇସ୍‌ଗୁଡ଼ିକୁ ଖୋଜାଯାଉଛି…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"ତ୍ରୁଟି"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"ସଂଯୋଗ କରାଯାଉଛି…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"ସଂଯୋଗ କରାଯାଇଛି"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"ବାତିଲ୍ ହୋଇଛି"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s ସଂଯୋଗ କରିବାରେ ବିଫଳ ହୋଇଛି"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s ସଂଯୋଗ କରାଯାଇଛି"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s ବିଚ୍ଛିନ୍ନ କରାଯାଇଛି"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"ବହୁତ ଭଲ"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"କମ"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"ଭଲ"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"ରିମୋଟ୍ ଅପ୍‌ଡେଟ୍ କରିବା ନିଶ୍ଚିତ କରନ୍ତୁ"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"ଅପଡେଟ୍ ହେଉଥିବା ସମୟରେ ଆପଣଙ୍କ ରିମୋଟ୍ କିଛି ସମୟ ପାଇଁ ବିଚ୍ଛିନ୍ନ ହୋଇପାରେ।"</string>
+    <string name="settings_continue" msgid="5640776697820481568">"ଜାରି ରଖନ୍ତୁ"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"ବାତିଲ କରନ୍ତୁ"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"ରିମୋଟ୍ ଅପ୍‌ଡେଟ୍ କରନ୍ତୁ"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"ନୂଆ ସଫ୍ଟୱେୟାର୍ ଉପଲବ୍ଧ ଅଛି"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"ଅପ୍‌ଡେଟ୍‌ ଉପଲବ୍ଧ"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"ରିମୋଟ୍ ଅପ୍-ଟୁ-ଡେଟ୍ ଅଛି"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"ରିମୋଟ୍‌ ଅପ୍‌ଡେଟ୍‌ ବିଫଳ ହୋଇଛି"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"ଆପଣଙ୍କର ରିମୋଟ୍ ଅପ୍‍‍ଡେଟ୍ କରିବା ବେଳେ ଆମେ ଏକ ତ୍ରୁଟି ପାଇଲୁ। ଦୟାକରି ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"ଅପେକ୍ଷା କରନ୍ତୁ"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"ଆପଣଙ୍କର ରିମୋଟ୍ ପୁଣି ପେୟାର୍ କରନ୍ତୁ"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"ଚାଲୁ ହୋଇଛି"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"ଅକ୍ଷମ ହୋଇଛି"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"ବ୍ୟାଟେରୀ ସ୍ତର"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"ଫାର୍ମୱେର୍‌"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"ବ୍ଲୁଟୁଥ୍‍ ଠିକଣା"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"ଦୟାକରି ବେଟେରୀ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"ବେଟେରୀର ଚାର୍ଜ କମ୍ ଅଛି"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"କନେକ୍ଟ ହୋଇଥିବା ଡିଭାଇସଗୁଡ଼ିକ"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"ରିମୋଟ୍ ଓ ଆକସେସୋରୀଗୁଡ଼ିକ"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"ଆପଣଙ୍କ ରିମୋଟ୍ ଅପଡେଟ୍ କରନ୍ତୁ"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"ଇନ୍‍ଷ୍ଟଲ୍ କରାଯିବାକୁ ପ୍ରସ୍ତୁତ"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ଅପଡେଟ୍ କରନ୍ତୁ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ଖାରଜ କରନ୍ତୁ"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"ରିମୋଟ ବେଟେରୀ ଚାର୍ଜ କମ ଅଛି"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"ଶୀଘ୍ର ବେଟେରୀ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"ରିମୋଟ ବେଟେରୀ ଚାର୍ଜ ପ୍ରାୟ ସରିଯାଇଛି"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"ଶୀଘ୍ର ବେଟେରୀ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"ରିମୋଟ ବେଟେରୀ ଚାର୍ଜ ସରିଯାଇଛି"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"ରିମୋଟ ବ୍ୟବହାର କରିବାକୁ ବେଟେରୀ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"ହଁ"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"ନା"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s ଠାରୁ ବିଛିନ୍ନ କରନ୍ତୁ"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s ସହ ସଂଯୋଗ କରନ୍ତୁ"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s ଭୁଲି ଯାଇଛନ୍ତି"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"ଆପଣଙ୍କ କନେକ୍ଟ ହୋଇଥିବା ଡିଭାଇସ୍‍ ରିନେମ୍‌ କରନ୍ତୁ"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC ସକ୍ଷମ କରନ୍ତୁ"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC ଆପଣଙ୍କୁ ଏକ ଏକକ ରିମୋଟ୍ କଣ୍ଟ୍ରୋଲ୍ ସହ ଅନ୍ୟ HDMI-CEC ସମର୍ଥିତ ଡିଭାଇସ୍‍ଗୁଡିକୁ ସ୍ବଚାଳିତଭାବରେ ଚାଲୁ/ବନ୍ଦ ଏବଂ ନିୟନ୍ତ୍ରଣ କରିବାକୁ ଅନୁମତି ଦେଇଥାଏ।\n\nଟିପ୍ପଣୀ: ଆପଣଙ୍କର ଟିଭି ଏବଂ ଅନ୍ୟ HDMI ଡିଭାଇସ୍‍ଗୁଡିକରେ HDMI-CEC ସକ୍ଷମ କରାଯାଇଥିବା ସୁନିଶ୍ଚିତ ହୁଅନ୍ତୁ। HDMI-CEC ପାଇଁ ଉତ୍ପାଦକଗଣ ପ୍ରାୟତଃ ଭିନ୍ନ ଭିନ୍ନ ନାମ ରଖିଥାନ୍ତି:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nସାର୍ପ: Aquos ଲିିିିଙ୍କ୍"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"ରିମୋଟ୍ ବଟନଗୁଡ଼ିକୁ ସେଟ୍ ଅପ୍ କରନ୍ତୁ"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"ଟିଭି, ରିସିଭର୍ ଏବଂ ସାଉଣ୍ଡବାରଗୁଡ଼ିକରେ ଭଲ୍ୟୁମ୍, ପାୱାର, ଇନପୁଟକୁ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"ବେଟେରୀ ଲେଭେଲ: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"ଆକସେସୋରୀଗୁଡ଼ିକ"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"ରିମୋଟ କଣ୍ଟ୍ରୋଲ"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"ସଂଯୋଗ କରାଗଲା"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"ପୂର୍ବରୁ ସଂଯୋଗ ହୋ‍ଇଛି"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"ରିମୋଟ୍ କିମ୍ବା ଆକସେସୋରୀ ପେୟାର୍ କରନ୍ତୁ"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"କନେକ୍ଟ କରନ୍ତୁ"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"ରିନେମ କରନ୍ତୁ"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"ଭୁଲିଯାଆନ୍ତୁ"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"ସଂଯୋଗ କରାଯାଇଛି"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"ବିଚ୍ଛିନ୍ନ କରାଯାଇଛି"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"ଡିଭାଇସ କଣ୍ଟ୍ରୋଲ"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"ନୂଆ ଡିଭାଇସ କନେକ୍ଟ କରନ୍ତୁ"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"ନୂଆ ବ୍ଲୁଟୁଥ୍ ଡିଭାଇସ୍‌ଗୁଡ଼ିକରେ ସଂଯୋଗ କରିବା ପୂର୍ବରୁ, ସୁନିଶ୍ଚିତ ହୁଅନ୍ତୁ ଯେ ସେଗୁଡ଼ିକ ପେୟାର୍ ହେବା ମୋଡ୍‌ରେ ଅଛି। %1$s ସଂଯୋଗ କରିବାକୁ, %2$s + %3$s 3 ସେକେଣ୍ଡ ପାଇଁ ଦବାଇ ଧରି ରଖନ୍ତୁ।"</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"ଏକ Android TV ରିମୋଟ୍"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"ଉପଲବ୍ଧ ଡିଭାଇସଗୁଡ଼ିକ"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"ଡିଭାଇସଗୁଡ଼ିକୁ ଖୋଜାଯାଉଛି…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"ତ୍ରୁଟି"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"କନେକ୍ଟ ହେଉଛି…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"କନେକ୍ଟ କରାଯାଇଛି"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"ବାତିଲ୍ କରାଯାଇଛି"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s ସଂଯୋଗ କରିବାରେ ବିଫଳ ହୋଇଛି"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s ସଂଯୋଗ କରାଯାଇଛି"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s ବିଚ୍ଛିନ୍ନ କରାଯାଇଛି"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-pa/strings.xml b/libraries/BluetoothServices/res/values-pa/strings.xml
index 8fd4533..0025819 100644
--- a/libraries/BluetoothServices/res/values-pa/strings.xml
+++ b/libraries/BluetoothServices/res/values-pa/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"ਲਾਗੂ ਨਹੀਂ"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"ਗੰਭੀਰ"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"ਘੱਟ"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"ਵਧੀਆ"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"ਰਿਮੋਟ ਅੱਪਡੇਟ ਦੀ ਤਸਦੀਕ ਕਰੋ"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"ਅੱਪਡੇਟ ਕਰਨ ਵੇਲੇ ਤੁਹਾਡਾ ਰਿਮੋਟ ਥੋੜ੍ਹੇ ਸਮੇਂ ਲਈ ਡਿਸਕਨੈਕਟ ਹੋ ਸਕਦਾ ਹੈ।"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"ਰੱਦ ਕਰੋ"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"ਰਿਮੋਟ ਅੱਪਡੇਟ"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"ਨਵਾਂ ਸਾਫ਼ਟਵੇਅਰ ਉਪਲਬਧ ਹੈ"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"ਅੱਪਡੇਟ ਉਪਲਬਧ ਹੈ"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"ਰਿਮੋਟ ਅੱਪ-ਟੂ-ਡੇਟ ਹੈ"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"ਰਿਮੋਟ ਅੱਪਡੇਟ ਅਸਫਲ ਹੋਇਆ"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"ਤੁਹਾਡਾ ਰਿਮੋਟ ਅੱਪਡੇਟ ਕਰਨ ਵੇਲੇ ਸਾਨੂੰ ਸਮੱਸਿਆ ਆਈ। ਕਿਰਪਾ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"ਆਪਣੇ ਰਿਮੋਟ ਨੂੰ ਦੁਬਾਰਾ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"ਚਾਲੂ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"ਬੰਦ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"ਬੈਟਰੀ ਪੱਧਰ"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"ਫ਼ਰਮਵੇਅਰ"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"ਬਲੂਟੁੱਥ ਪਤਾ"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"ਕਿਰਪਾ ਕਰਕੇ ਬੈਟਰੀ ਬਦਲੋ"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"ਘੱਟ ਬੈਟਰੀ"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸ"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"ਰਿਮੋਟ ਅਤੇ ਐਕਸੈਸਰੀ"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"ਆਪਣਾ ਰਿਮੋਟ ਅੱਪਡੇਟ ਕਰੋ"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"ਸਥਾਪਨਾ ਲਈ ਤਿਆਰ ਹੈ"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ਅੱਪਡੇਟ ਕਰੋ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ਖਾਰਜ ਕਰੋ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"ਰਿਮੋਟ ਦੀ ਬੈਟਰੀ ਘੱਟ ਹੈ"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"ਜਲਦ ਹੀ ਬੈਟਰੀ ਬਦਲੋ"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"ਰਿਮੋਟ ਦੀ ਬੈਟਰੀ ਲਗਭਗ ਖਤਮ ਹੋ ਗਈ ਹੈ"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"ਜਲਦ ਹੀ ਬੈਟਰੀ ਬਦਲੋ"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"ਰਿਮੋਟ ਦੀ ਬੈਟਰੀ ਖਤਮ ਹੋ ਗਈ ਹੈ"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"ਰਿਮੋਟ ਵਰਤਣ ਲਈ ਬੈਟਰੀ ਬਦਲੋ"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"ਹਾਂ"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"ਨਹੀਂ"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s ਤੋਂ ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s ਨੂੰ ਭੁੱਲ ਜਾਓ"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"ਆਪਣੇ ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸ ਦਾ ਨਾਮ ਬਦਲੋ"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC ਚਾਲੂ ਕਰੋ"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC ਤੁਹਾਨੂੰ ਇਕਹਿਰੇ ਰਿਮੋਟ ਕੰਟਰੋਲ ਨਾਲ ਹੋਰਾਂ HDMI-CEC ਸਮਰਥਿਤ ਡੀਵਾਈਸਾਂ ਨੂੰ ਕੰਟਰੋਲ ਅਤੇ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰਨ ਦਿੰਦਾ ਹੈ।\n\nਨੋਟ-ਕਥਨ: ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਹਾਡੇ TV ਅਤੇ ਹੋਰਾਂ HDMI ਡੀਵਾਈਸਾਂ \'ਤੇ HDMI-CEC ਚਾਲੂ ਹੈ। ਨਿਰਮਾਤਾ ਅਕਸਰ HDMI-CEC ਲਈ ਵੱਖੋ-ਵੱਖਰੇ ਨਾਮ ਰੱਖਦੇ ਹਨ, ਉਦਾਹਰਨ ਲਈ:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"ਰਿਮੋਟ ਦੇ ਬਟਨਾਂ ਦਾ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"ਟੀਵੀ, ਰਿਸੀਵਰ ਅਤੇ ਸਾਊਂਡਬਾਰ \'ਤੇ ਅਵਾਜ਼, ਪਾਵਰ ਅਤੇ ਇਨਪੁੱਟ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"ਬੈਟਰੀ ਪੱਧਰ: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"ਐਕਸੈਸਰੀ"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"ਰਿਮੋਟ ਕੰਟਰੋਲ"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"ਪਹਿਲਾਂ ਤੋਂ ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"ਰਿਮੋਟ ਅਤੇ ਐਕਸੈਸਰੀ ਨੂੰ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"ਨਾਮ ਬਦਲੋ"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"ਭੁੱਲ ਜਾਓ"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"ਕਨੈਕਟ ਹੋ ਗਿਆ"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"ਡਿਸਕਨੈਕਟ ਹੋ ਗਿਆ"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"ਡੀਵਾਈਸ ਕੰਟਰੋਲ"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"ਨਵਾਂ ਡੀਵਾਈਸ ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"ਨਵੇਂ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਨੂੰ ਕਨੈਕਟ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ, ਇਹ ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਉਹ ਜੋੜਾਬੱਧ ਮੋਡ ਵਿੱਚ ਹਨ। %1$s ਨੂੰ ਕਨੈਕਟ ਕਰਨ ਲਈ, %2$s + %3$s ਨੂੰ 3 ਸਕਿੰਟਾਂ ਲਈ ਦਬਾਈ ਰੱਖੋ।"</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV ਰਿਮੋਟ"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"ਉਪਲਬਧ ਡੀਵਾਈਸ"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"ਡੀਵਾਈਸ ਲੱਭੇ ਜਾ ਰਹੇ ਹਨ…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"ਗੜਬੜ"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"ਕਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"ਰੱਦ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s ਨੂੰ ਕਨੈਕਟ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s ਨੂੰ ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s ਨੂੰ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"ਲਾਗੂ ਨਹੀਂ"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"ਗੰਭੀਰ"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"ਘੱਟ"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"ਵਧੀਆ"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"ਰਿਮੋਟ ਅੱਪਡੇਟ ਦੀ ਤਸਦੀਕ ਕਰੋ"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"ਅੱਪਡੇਟ ਕਰਨ ਵੇਲੇ ਤੁਹਾਡਾ ਰਿਮੋਟ ਥੋੜ੍ਹੇ ਸਮੇਂ ਲਈ ਡਿਸਕਨੈਕਟ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="settings_continue" msgid="5640776697820481568">"ਜਾਰੀ ਰੱਖੋ"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"ਰੱਦ ਕਰੋ"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"ਰਿਮੋਟ ਅੱਪਡੇਟ"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"ਨਵਾਂ ਸਾਫ਼ਟਵੇਅਰ ਉਪਲਬਧ ਹੈ"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"ਅੱਪਡੇਟ ਉਪਲਬਧ ਹੈ"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"ਰਿਮੋਟ ਅੱਪ-ਟੂ-ਡੇਟ ਹੈ"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"ਰਿਮੋਟ ਅੱਪਡੇਟ ਅਸਫਲ ਹੋਇਆ"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"ਤੁਹਾਡਾ ਰਿਮੋਟ ਅੱਪਡੇਟ ਕਰਨ ਵੇਲੇ ਸਾਨੂੰ ਸਮੱਸਿਆ ਆਈ। ਕਿਰਪਾ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"ਆਪਣੇ ਰਿਮੋਟ ਨੂੰ ਦੁਬਾਰਾ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"ਚਾਲੂ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"ਬੰਦ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"ਬੈਟਰੀ ਪੱਧਰ"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"ਫ਼ਰਮਵੇਅਰ"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"ਬਲੂਟੁੱਥ ਪਤਾ"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"ਕਿਰਪਾ ਕਰਕੇ ਬੈਟਰੀ ਬਦਲੋ"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"ਬੈਟਰੀ ਘੱਟ ਹੈ"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸ"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"ਰਿਮੋਟ ਅਤੇ ਐਕਸੈਸਰੀਆਂ"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"ਆਪਣਾ ਰਿਮੋਟ ਅੱਪਡੇਟ ਕਰੋ"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"ਸਥਾਪਨਾ ਲਈ ਤਿਆਰ ਹੈ"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ਅੱਪਡੇਟ ਕਰੋ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ਖਾਰਜ ਕਰੋ"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"ਰਿਮੋਟ ਦੀ ਬੈਟਰੀ ਘੱਟ ਹੈ"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"ਜਲਦ ਹੀ ਬੈਟਰੀ ਬਦਲੋ"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"ਰਿਮੋਟ ਦੀ ਬੈਟਰੀ ਲਗਭਗ ਖਤਮ ਹੋ ਗਈ ਹੈ"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"ਜਲਦ ਹੀ ਬੈਟਰੀ ਬਦਲੋ"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"ਰਿਮੋਟ ਦੀ ਬੈਟਰੀ ਖਤਮ ਹੋ ਗਈ ਹੈ"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"ਰਿਮੋਟ ਵਰਤਣ ਲਈ ਬੈਟਰੀ ਬਦਲੋ"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"ਹਾਂ"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"ਨਹੀਂ"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s ਤੋਂ ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s ਨੂੰ ਭੁੱਲ ਜਾਓ"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"ਆਪਣੇ ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸ ਦਾ ਨਾਮ ਬਦਲੋ"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC ਚਾਲੂ ਕਰੋ"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC ਤੁਹਾਨੂੰ ਇਕਹਿਰੇ ਰਿਮੋਟ ਕੰਟਰੋਲ ਨਾਲ ਹੋਰਾਂ HDMI-CEC ਸਮਰਥਿਤ ਡੀਵਾਈਸਾਂ ਨੂੰ ਕੰਟਰੋਲ ਅਤੇ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰਨ ਦਿੰਦਾ ਹੈ।\n\nਨੋਟ ਕਰੋ: ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਹਾਡੇ ਟੀਵੀ ਅਤੇ ਹੋਰਾਂ HDMI ਡੀਵਾਈਸਾਂ \'ਤੇ HDMI-CEC ਚਾਲੂ ਕੀਤਾ ਹੋਵੇ। ਨਿਰਮਾਤਾ ਅਕਸਰ HDMI-CEC ਲਈ ਵੱਖੋ-ਵੱਖਰੇ ਨਾਮ ਰੱਖਦੇ ਹਨ, ਉਦਾਹਰਨ ਲਈ:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"ਰਿਮੋਟ ਦੇ ਬਟਨਾਂ ਦਾ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"ਅਵਾਜ਼, ਪਾਵਰ, ਟੀਵੀਆਂ \'ਤੇ ਇਨਪੁੱਟ, ਰਿਸੀਵਰਾਂ ਅਤੇ ਸਾਊਂਡਬਾਰਾਂ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"ਬੈਟਰੀ ਪੱਧਰ: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"ਐਕਸੈਸਰੀਆਂ"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"ਰਿਮੋਟ ਕੰਟਰੋਲ"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"ਕਨੈਕਟ ਹੈ"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"ਪਹਿਲਾਂ ਤੋਂ ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"ਰਿਮੋਟ ਜਾਂ ਐਕਸੈਸਰੀ ਨੂੰ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"ਨਾਮ ਬਦਲੋ"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"ਭੁੱਲ ਜਾਓ"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"ਕਨੈਕਟ ਹੋ ਗਿਆ"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"ਡਿਸਕਨੈਕਟ ਹੋ ਗਿਆ"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"ਡੀਵਾਈਸ ਕੰਟਰੋਲ"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"ਨਵਾਂ ਡੀਵਾਈਸ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"ਨਵੇਂ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਨੂੰ ਕਨੈਕਟ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ, ਇਹ ਪੱਕਾ ਕਰੋ ਕਿ ਉਹ ਜੋੜਾਬੱਧਕਰਨ ਮੋਡ ਵਿੱਚ ਹਨ। %1$s ਨੂੰ ਕਨੈਕਟ ਕਰਨ ਲਈ, %2$s + %3$s ਨੂੰ 3 ਸਕਿੰਟਾਂ ਲਈ ਦਬਾਈ ਰੱਖੋ।"</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV ਰਿਮੋਟ"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"ਉਪਲਬਧ ਡੀਵਾਈਸ"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"ਡੀਵਾਈਸ ਲੱਭੇ ਜਾ ਰਹੇ ਹਨ…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"ਗੜਬੜ"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"ਕਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"ਕਨੈਕਟ ਹੈ"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"ਰੱਦ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s ਨੂੰ ਕਨੈਕਟ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s ਨੂੰ ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s ਨੂੰ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-pl/strings.xml b/libraries/BluetoothServices/res/values-pl/strings.xml
index 80aa50f..155e139 100644
--- a/libraries/BluetoothServices/res/values-pl/strings.xml
+++ b/libraries/BluetoothServices/res/values-pl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Brak danych"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Krytyczny"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Niski"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Dobry"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Potwierdź aktualizację pilota"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Podczas aktualizowania pilot może się na chwilę rozłączyć."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Dalej"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Anuluj"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Aktualizacja pilota"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Dostępne jest nowe oprogramowanie"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Dostępna aktualizacja"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Pilot jest aktualny"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Nie udało się zaktualizować pilota"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Podczas aktualizowania pilota wystąpił błąd. Spróbuj ponownie."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Zaczekaj"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Jeszcze raz sparuj pilota"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Włączono"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Wyłączono"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Poziom naładowania baterii"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Oprogramowanie układowe"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Adres Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Wymień baterię"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Słaba bateria"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Połączone urządzenia"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Piloty i akcesoria"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Zaktualizuj pilota"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Można zainstalować"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"AKTUALIZUJ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ODRZUĆ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Niski poziom naładowania baterii w pilocie"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Wymień baterię"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Bateria w pilocie jest prawie rozładowana"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Wymień baterię"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Bateria w pilocie jest rozładowana"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Wymień baterię, by móc korzystać z pilota"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Tak"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Nie"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Odłącz od: %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Połącz z %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Zapomnij: %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Zmień nazwę połączonego urządzenia"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Włącz HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Złącze HDMI-CEC umożliwia sterowanie innymi urządzeniami obsługującymi ten standard oraz ich automatyczne włączanie i wyłączanie przy użyciu jednego pilota.\n\nUwaga: na telewizorze i pozostałych urządzeniach ze złączem HDMI musi być włączona komunikacja HDMI-CEC. Różni producenci stosują różne nazwy standardu HDMI-CEC, na przykład:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Skonfiguruj przyciski pilota"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Steruj głośnością, zasilaniem i źródłem sygnału na telewizorach, amplitunerach i soundbarach"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Poziom naładowania baterii: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Akcesoria"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Pilot"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Połączono"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Wcześniej połączone"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Sparuj pilota lub akcesorium"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Rozłącz"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Połącz"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Zmień nazwę"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Zapomnij"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Połączono"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Rozłączono"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Sterowanie urządzeniem"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Połącz z nowym urządzeniem"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Przed połączeniem nowych urządzeń Bluetooth przestaw je w tryb parowania. Aby połączyć z %1$s, naciśnij i przytrzymaj %2$s + %3$s przez trzy sekundy."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"pilot Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Dostępne urządzenia"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Szukam urządzeń…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Błąd"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Łączę…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Połączono"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Anulowano"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Nie można połączyć z: %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"Połączono: %1$s"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"Odłączono: %1$s"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Nie dotyczy"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Krytyczny"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Niski"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Dobry"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Potwierdź aktualizację pilota"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Podczas aktualizowania pilot może się na chwilę rozłączyć."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Dalej"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Anuluj"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Aktualizacja pilota"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Dostępne jest nowe oprogramowanie"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Dostępna aktualizacja"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Pilot jest aktualny"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Nie udało się zaktualizować pilota"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Podczas aktualizowania pilota wystąpił błąd. Spróbuj ponownie."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Zaczekaj"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Jeszcze raz sparuj pilota"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Włączone"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Wyłączone"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Poziom naładowania baterii"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Oprogramowanie układowe"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Adres Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Wymień baterię"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Słaba bateria"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Połączone urządzenia"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Piloty i urządzenia współpracujące"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Zaktualizuj pilota"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Można zainstalować"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"AKTUALIZUJ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ODRZUĆ"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Niski poziom naładowania baterii w pilocie"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Wymień baterię"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Bateria w pilocie jest prawie rozładowana"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Wymień baterię"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Bateria w pilocie jest rozładowana"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Wymień baterię, aby móc korzystać z pilota"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Tak"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Nie"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Odłącz od: %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Połącz z: %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Zapomnij: %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Zmień nazwę połączonego urządzenia"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Włącz HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Złącze HDMI-CEC umożliwia sterowanie innymi urządzeniami obsługującymi ten standard oraz ich automatyczne włączanie i wyłączanie przy użyciu jednego pilota.\n\nUwaga: upewnij się, że komunikacja HDMI-CEC jest włączona na telewizorze i innych urządzeniach ze złączem HDMI. Różni producenci stosują różne nazwy standardu HDMI-CEC, na przykład:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Skonfiguruj przyciski pilota"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Steruj głośnością, zasilaniem i źródłem sygnału na telewizorach, amplitunerach i soundbarach"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Poziom naładowania baterii: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Akcesoria"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Pilot"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Połączone"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Wcześniej połączone"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Sparuj pilota lub urządzenie"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Rozłącz"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Połącz"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Zmień nazwę"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Zapomnij"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Połączono"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Rozłączono"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Sterowanie urządzeniem"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Połącz nowe urządzenie"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Przed połączeniem nowych urządzeń Bluetooth przestaw je w tryb parowania. Aby połączyć %1$s, naciśnij i przytrzymaj %2$s + %3$s przez 3 sekundy."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"pilota Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Dostępne urządzenia"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Szukam urządzeń…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Błąd"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Łączę…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Połączono"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Anulowano"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Nie można połączyć z: %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Połączono: %1$s"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Odłączono: %1$s"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-pt-rBR/strings.xml b/libraries/BluetoothServices/res/values-pt-rBR/strings.xml
index 9bb8914..fb13262 100644
--- a/libraries/BluetoothServices/res/values-pt-rBR/strings.xml
+++ b/libraries/BluetoothServices/res/values-pt-rBR/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Crítico"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Baixo"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Bom"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Confirme a atualização do controle remoto"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Durante a atualização, o controle remoto pode ser desconectado brevemente."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Continuar"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Cancelar"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Atualização de controle remoto"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Novo software disponível"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Atualização disponível"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"O controle remoto está atualizado"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Falha na atualização do controle remoto"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Ocorreu um problema na atualização do controle remoto. Tente novamente."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Aguarde"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Pareie seu controle remoto novamente"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Ativado"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Desativado"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Nível da bateria"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Endereço Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Troque a bateria"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Pouca bateria"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Dispositivos conectados"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Controles remotos e acessórios"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Atualize seu controle remoto"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Pronto para instalar"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ATUALIZAR"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"DISPENSAR"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"A pilha do controle remoto está fraca"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Troque a pilha em breve"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"A pilha do controle remoto está quase vazia"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Troque a pilha em breve"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"A pilha do controle remoto está vazia"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Troque a pilha para continuar usando o controle remoto"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Sim"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Não"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Desconectar de %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Conectar a %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Esquecer %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Renomear o dispositivo conectado"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Ativar HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"O HDMI-CEC permite que você controle e ative/desative automaticamente outros dispositivos compatíveis com HDMI-CEC com um único controle remoto.\n\nObservação: verifique se o HDMI-CEC está ativado na sua TV e nos outros dispositivos HDMI. Muitas vezes, os fabricantes usam outros nomes para o HDMI-CEC, por exemplo:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Configurar botões de controle remoto"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Controle volume, função liga/desliga e entrada em TVs, receptores e soundbars"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Nível da bateria: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Acessórios"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Controle remoto"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Conectado"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Conectado anteriormente"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Parear controle remoto ou acessório"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Desconectar"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Conectar"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Renomear"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Esquecer"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Conectado"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Desconectado"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Controle de dispositivo"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Conectar novo dispositivo"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Antes de conectar novos dispositivos Bluetooth, verifique se eles estão no modo de pareamento. Para conectar %1$s, toque em %2$s + %3$s mantenha-os pressionados por três segundos."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"um controle remoto do Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Dispositivos disponíveis"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Procurando dispositivos…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Erro"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Conectando…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Conectado"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Cancelado"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Falha ao conectar %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s conectado"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s desconectado"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Crítico"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Baixo"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Bom"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Confirme a atualização do controle remoto"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Durante a atualização, o controle remoto pode ser desconectado brevemente."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Continuar"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Cancelar"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Atualização do controle remoto"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Novo software disponível"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Atualização disponível"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"O controle remoto está atualizado"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Falha na atualização do controle remoto"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Ocorreu um problema na atualização do controle remoto. Tente de novo."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Aguarde"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Pareie o controle remoto novamente"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Ativado"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Desativado"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Nível da bateria"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Endereço Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Troque a pilha"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Pilha fraca"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Dispositivos conectados"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Controles remotos e acessórios"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Atualize seu controle remoto"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Pronto para instalar"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ATUALIZAR"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"DISPENSAR"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"A pilha do controle remoto está fraca"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Troque a pilha em breve"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"A pilha do controle remoto está quase vazia"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Troque a pilha em breve"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"A pilha do controle remoto está sem carga"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Troque a pilha para continuar usando o controle remoto"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Sim"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Não"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Desconectar de %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Conectar a %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Esquecer %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Renomear o dispositivo conectado"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Ativar HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Com o HDMI-CEC, é possível controlar e ativar/desativar automaticamente outros dispositivos compatíveis com HDMI-CEC usando o mesmo controle remoto.\n\nObservação: o HDMI-CEC precisa estar ativado na TV e nos outros dispositivos HDMI. Muitas vezes, os fabricantes usam outros nomes para o HDMI-CEC, por exemplo:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Configurar botões de controle remoto"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Controle o volume, a função liga/desliga e a entrada em TVs, receptores e soundbars"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Nível da pilha: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Acessórios"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Controle remoto"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Conectado"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Conectados anteriormente"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Parear controle remoto ou acessório"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Desconectar"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Conectar"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Renomear"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Esquecer"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Conectado"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Desconectado"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Controle de dispositivo"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Conectar novo dispositivo"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Antes de conectar novos dispositivos Bluetooth, verifique se eles estão no modo de pareamento. Para conectar %1$s, toque em %2$s + %3$s e pressione por três segundos."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"um controle remoto do Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Dispositivos disponíveis"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Procurando dispositivos…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Erro"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Conectando…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Conectado"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Cancelado"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Falha ao conectar %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s conectado"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s desconectado"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-pt-rPT/strings.xml b/libraries/BluetoothServices/res/values-pt-rPT/strings.xml
index 7ca22d2..22f3e91 100644
--- a/libraries/BluetoothServices/res/values-pt-rPT/strings.xml
+++ b/libraries/BluetoothServices/res/values-pt-rPT/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/D"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Crítico"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Fraco"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Bom"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Confirmar atualização do comando"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Durante a atualização, o comando poderá desligar-se momentaneamente."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Continuar"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Cancelar"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Atualização do comando"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Novo software disponível"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Atualização disponível"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"O comando está atualizado"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Falha ao atualizar o comando."</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Ocorreu um problema ao atualizar o comando. Tente novamente."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Aguarde"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Sincronize o comando novamente."</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Ativado"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Desativado"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Nível da bateria"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Endereço Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Substitua a bateria."</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Bateria fraca"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Dispositivos ligados"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Controlos remotos e acessórios"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Atualize o comando"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Pronto a instalar"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ATUALIZAR"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"IGNORAR"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Pilha do comando fraca"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Substitua a pilha em breve."</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Pilha do comando quase vazia"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Substitua a pilha em breve."</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Pilha do comando vazia"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Substitua a pilha para utilizar o comando."</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Sim"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Não"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Desligar de %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Ligar a %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Esquecer %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Mudar o nome do seu dispositivo ligado"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Ativar HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"O HDMI-CEC permite-lhe controlar e ativar/desativar automaticamente outros dispositivos compatíveis com o HDMI-CEC com um único comando.\n\nNota: certifique-se de que o HDMI-CEC está ativado na sua TV e nos outros dispositivos com HDMI. Muitas vezes, os fabricantes atribuem nomes diferentes ao HDMI-CEC, por exemplo:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Configure os botões do comando"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Controle o volume, o botão ligar/desligar, a entrada em TVs, os recetores e as barras de som"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Nível da bateria: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Acessórios"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Comando"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Ligado"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Ligados anteriormente"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Sincronize o comando ou o acessório."</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Desligar"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Ligar"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Mudar o nome"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Esquecer"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Ligado"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Desligado"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Controlo dos dispositivos"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Ligue um novo dispositivo"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Antes de ligar novos dispositivos Bluetooth, certifique-se de que estão no modo de sincronização. Para ligar o dispositivo %1$s, prima sem soltar %2$s + %3$s durante 3 segundos."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"um Comando do Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Dispositivos disponíveis"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"A procurar dispositivos…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Erro"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"A ligar…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Ligado"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Cancelado"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Falha ao ligar %1$s."</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s ligado"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s desligado"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/D"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Crítico"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Baixo"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Bom"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Confirmar atualização do comando"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Durante a atualização, o comando pode desligar-se momentaneamente."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Continuar"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Cancelar"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Atualização do comando"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Novo software disponível"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Atualização disponível"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"O comando está atualizado"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Falha ao atualizar o comando."</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Ocorreu um problema ao atualizar o comando. Tente novamente."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Aguarde"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Sincronize o comando novamente"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Ativado"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Desativado"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Nível da bateria"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Endereço Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Substitua a pilha"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Pilha fraca"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Dispositivos ligados"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Comandos e acessórios"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Atualize o comando"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Pronto a instalar"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ATUALIZAR"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"IGNORAR"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Pilha do comando fraca"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Substitua a pilha em breve"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Pilha do comando quase vazia"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Substitua a pilha em breve"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Pilha do comando vazia"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Substitua a pilha para usar o comando"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Sim"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Não"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Desligar de %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Ligar a %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Esquecer %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Mudar o nome do seu dispositivo ligado"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Ativar HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"O HDMI-CEC permite-lhe controlar e ativar/desativar automaticamente outros dispositivos compatíveis com o HDMI-CEC com um único comando.\n\nNota: certifique-se de que o HDMI-CEC está ativado na sua TV e nos outros dispositivos com HDMI. Muitas vezes, os fabricantes atribuem nomes diferentes ao HDMI-CEC, por exemplo:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Configure os botões do comando"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Controle o volume, o botão ligar/desligar, a entrada em TVs, os recetores e as barras de som"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Nível da bateria: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Acessórios"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Comando"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Ligado"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Ligados anteriormente"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Sincronize o comando ou o acessório"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Desligar"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Ligar"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Mudar o nome"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Esquecer"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Ligado"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Desligado"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Controlo dos dispositivos"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Ligue um novo dispositivo"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Antes de ligar novos dispositivos Bluetooth, certifique-se de que estão no modo de sincronização. Para ligar o dispositivo %1$s, prima sem soltar %2$s + %3$s durante 3 segundos."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"um Comando do Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Dispositivos disponíveis"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"A procurar dispositivos…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Erro"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"A ligar…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Ligado"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Cancelado"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Falha ao ligar %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s ligado"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s desligado"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-pt/strings.xml b/libraries/BluetoothServices/res/values-pt/strings.xml
index 9bb8914..fb13262 100644
--- a/libraries/BluetoothServices/res/values-pt/strings.xml
+++ b/libraries/BluetoothServices/res/values-pt/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Crítico"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Baixo"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Bom"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Confirme a atualização do controle remoto"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Durante a atualização, o controle remoto pode ser desconectado brevemente."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Continuar"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Cancelar"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Atualização de controle remoto"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Novo software disponível"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Atualização disponível"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"O controle remoto está atualizado"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Falha na atualização do controle remoto"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Ocorreu um problema na atualização do controle remoto. Tente novamente."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Aguarde"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Pareie seu controle remoto novamente"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Ativado"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Desativado"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Nível da bateria"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Endereço Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Troque a bateria"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Pouca bateria"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Dispositivos conectados"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Controles remotos e acessórios"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Atualize seu controle remoto"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Pronto para instalar"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ATUALIZAR"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"DISPENSAR"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"A pilha do controle remoto está fraca"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Troque a pilha em breve"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"A pilha do controle remoto está quase vazia"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Troque a pilha em breve"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"A pilha do controle remoto está vazia"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Troque a pilha para continuar usando o controle remoto"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Sim"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Não"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Desconectar de %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Conectar a %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Esquecer %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Renomear o dispositivo conectado"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Ativar HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"O HDMI-CEC permite que você controle e ative/desative automaticamente outros dispositivos compatíveis com HDMI-CEC com um único controle remoto.\n\nObservação: verifique se o HDMI-CEC está ativado na sua TV e nos outros dispositivos HDMI. Muitas vezes, os fabricantes usam outros nomes para o HDMI-CEC, por exemplo:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Configurar botões de controle remoto"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Controle volume, função liga/desliga e entrada em TVs, receptores e soundbars"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Nível da bateria: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Acessórios"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Controle remoto"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Conectado"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Conectado anteriormente"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Parear controle remoto ou acessório"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Desconectar"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Conectar"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Renomear"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Esquecer"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Conectado"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Desconectado"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Controle de dispositivo"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Conectar novo dispositivo"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Antes de conectar novos dispositivos Bluetooth, verifique se eles estão no modo de pareamento. Para conectar %1$s, toque em %2$s + %3$s mantenha-os pressionados por três segundos."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"um controle remoto do Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Dispositivos disponíveis"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Procurando dispositivos…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Erro"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Conectando…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Conectado"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Cancelado"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Falha ao conectar %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s conectado"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s desconectado"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Crítico"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Baixo"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Bom"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Confirme a atualização do controle remoto"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Durante a atualização, o controle remoto pode ser desconectado brevemente."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Continuar"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Cancelar"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Atualização do controle remoto"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Novo software disponível"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Atualização disponível"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"O controle remoto está atualizado"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Falha na atualização do controle remoto"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Ocorreu um problema na atualização do controle remoto. Tente de novo."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Aguarde"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Pareie o controle remoto novamente"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Ativado"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Desativado"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Nível da bateria"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Endereço Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Troque a pilha"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Pilha fraca"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Dispositivos conectados"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Controles remotos e acessórios"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Atualize seu controle remoto"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Pronto para instalar"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ATUALIZAR"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"DISPENSAR"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"A pilha do controle remoto está fraca"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Troque a pilha em breve"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"A pilha do controle remoto está quase vazia"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Troque a pilha em breve"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"A pilha do controle remoto está sem carga"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Troque a pilha para continuar usando o controle remoto"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Sim"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Não"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Desconectar de %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Conectar a %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Esquecer %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Renomear o dispositivo conectado"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Ativar HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Com o HDMI-CEC, é possível controlar e ativar/desativar automaticamente outros dispositivos compatíveis com HDMI-CEC usando o mesmo controle remoto.\n\nObservação: o HDMI-CEC precisa estar ativado na TV e nos outros dispositivos HDMI. Muitas vezes, os fabricantes usam outros nomes para o HDMI-CEC, por exemplo:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Configurar botões de controle remoto"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Controle o volume, a função liga/desliga e a entrada em TVs, receptores e soundbars"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Nível da pilha: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Acessórios"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Controle remoto"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Conectado"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Conectados anteriormente"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Parear controle remoto ou acessório"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Desconectar"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Conectar"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Renomear"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Esquecer"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Conectado"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Desconectado"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Controle de dispositivo"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Conectar novo dispositivo"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Antes de conectar novos dispositivos Bluetooth, verifique se eles estão no modo de pareamento. Para conectar %1$s, toque em %2$s + %3$s e pressione por três segundos."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"um controle remoto do Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Dispositivos disponíveis"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Procurando dispositivos…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Erro"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Conectando…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Conectado"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Cancelado"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Falha ao conectar %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s conectado"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s desconectado"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-ro/strings.xml b/libraries/BluetoothServices/res/values-ro/strings.xml
index cc512e5..2f83f8b 100644
--- a/libraries/BluetoothServices/res/values-ro/strings.xml
+++ b/libraries/BluetoothServices/res/values-ro/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Nu este cazul"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Critic"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Scăzut"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"OK"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Confirmați actualizarea telecomenzii"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"În timpul actualizării, este posibil ca telecomanda să se deconecteze temporar."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Continuați"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Anulați"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Actualizarea telecomenzii"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Software nou disponibil"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Actualizare disponibilă"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Telecomanda este actualizată"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Nu s-a putut actualiza telecomanda"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Am întâmpinat o problemă la actualizarea telecomenzii. Încercați din nou."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Așteptați"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Asociați din nou telecomanda"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Activat"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Dezactivat"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Nivelul bateriei"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Adresă Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Înlocuiți bateria"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Baterie descărcată"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Dispozitive conectate"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Telecomenzi și accesorii"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Actualizați telecomanda"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Gata de instalare"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ACTUALIZAȚI"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ÎNCHIDEȚI"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Nivel scăzut al bateriei telecomenzii"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Înlocuiți bateria în curând"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Bateria telecomenzii este aproape descărcată"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Înlocuiți bateria în curând"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Bateria telecomenzii este descărcată"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Înlocuiți bateria pentru a folosi telecomanda"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Da"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Nu"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Deconectați de la %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Conectați-vă la %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Eliminați %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Redenumiți dispozitivul conectat"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Activați HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Cu HDMI-CEC, puteți să controlați și să porniți/opriți automat alte dispozitive compatibile cu HDMI-CEC cu o singură telecomandă.\n\nNotă: asigurați-vă că HDMI-CEC este activat pe televizor și pe alte dispozitive HDMI. Producătorii au adesea nume diferite pentru HDMI-CEC, de exemplu:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Configurați butoanele telecomenzii"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Controlați volumul, alimentarea și intrarea pentru televizoare, receivere și bare de sunet"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Nivelul bateriei: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Accesorii"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Telecomandă"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Conectat"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Conectat anterior"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Asociați telecomanda sau accesoriul"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Deconectați-vă"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Conectați"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Redenumiți"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Ștergeți"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Conectat"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Deconectat"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Controlul dispozitivului"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Conectați un nou dispozitiv"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Înainte de a conecta noi dispozitive prin Bluetooth, asigurați-vă că acestea se află în modul de conectare. Pentru a conecta %1$s, apăsați lung %2$s + %3$s timp de trei secunde."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"o telecomandă pentru Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Dispozitive disponibile"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Se caută dispozitive…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Eroare"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Se conectează…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Conectat"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Anulat"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s nu s-a putut conecta"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s s-a conectat"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s s-a deconectat"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Nu este cazul"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Critic"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Scăzut"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Bun"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Confirmă actualizarea telecomenzii"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"În timpul actualizării, este posibil ca telecomanda să se deconecteze temporar."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Continuă"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Anulează"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Actualizarea telecomenzii"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Software nou disponibil"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Actualizare disponibilă"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Telecomanda este actualizată"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Nu s-a putut actualiza telecomanda"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Am întâmpinat o problemă la actualizarea telecomenzii. Încearcă din nou."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Așteaptă"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Asociază din nou telecomanda"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Activat"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Dezactivat"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Nivelul bateriei"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Adresă Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Înlocuiește bateria"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Nivel scăzut al bateriei"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Dispozitive conectate"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Telecomenzi și accesorii"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Actualizează telecomanda"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Gata de instalare"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ACTUALIZEAZĂ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ÎNCHIDE"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Nivel scăzut al bateriei telecomenzii"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Înlocuiește bateria în curând"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Bateria telecomenzii este aproape descărcată"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Înlocuiește bateria în curând"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Bateria telecomenzii este descărcată"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Înlocuiește bateria pentru a folosi telecomanda"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Da"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Nu"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Deconectează de la %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Conectează-te la %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Elimină %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Redenumește dispozitivul conectat"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Activează HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC îți permite să controlezi și să pornești/oprești alte dispozitive compatibile HDMI-CEC cu o singură telecomandă.\n\nNotă: Asigură-te că HDMI-CEC este activat pe televizor și pe alte dispozitive HDMI. Producătorii au adesea nume diferite pentru HDMI-CEC, de exemplu:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Configurează butoanele telecomenzii"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Controlează volumul, alimentarea și intrarea pentru televizoare, receivere și bare de sunet"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Nivelul bateriei: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Accesorii"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Telecomandă"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Conectat"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Conectat anterior"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Asociază telecomanda sau accesoriul"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Deconectează"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Conectează"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Redenumește"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Elimină"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Conectat"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Deconectat"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Controlul dispozitivului"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Conectează un nou dispozitiv"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Înainte de a conecta noi dispozitive prin Bluetooth, verifică dacă acestea se află în modul de conectare. Pentru a conecta %1$s, apasă lung %2$s + %3$s timp de trei secunde."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"o telecomandă pentru Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Dispozitive disponibile"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Se caută dispozitive…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Eroare"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Se conectează…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Conectată"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Anulată"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s nu s-a putut conecta"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s s-a conectat"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s s-a deconectat"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-ru/strings.xml b/libraries/BluetoothServices/res/values-ru/strings.xml
index 97c970b..2616f0c 100644
--- a/libraries/BluetoothServices/res/values-ru/strings.xml
+++ b/libraries/BluetoothServices/res/values-ru/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Н/Д"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Критический"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Низкий"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Высокий"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Подтвердить обновление пульта ДУ"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Во время обновления ПО связь с пультом ДУ может ненадолго прерваться"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Продолжить"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Отмена"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Обновление ПО пульта ДУ"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Доступно новое ПО"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Доступно обновление"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Обновление ПО не требуется"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Не удалось обновить ПО пульта ДУ"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Не удалось обновить ПО пульта ДУ. Повторите попытку."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Подождите…"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Подключите пульт ДУ ещё раз"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Включено"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Отключено"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Уровень заряда батареи"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d %%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Встроенное ПО"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Адрес Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Замените батарею"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Низкий уровень заряда батареи"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Подключенные устройства"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Пульты и аксессуары"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Установите обновление ПО пульта ДУ"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Оно готово к установке."</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ОБНОВИТЬ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ОТКАЗАТЬСЯ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Низкий уровень заряда батареи в пульте ДУ"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Замените ее в ближайшее время."</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Батарея в пульте ДУ почти разряжена"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Замените ее в ближайшее время."</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Батарея в пульте ДУ разряжена"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Замените ее, чтобы пользоваться пультом ДУ."</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Да"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Нет"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Отключиться от устройства \"%1$s\""</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Подключиться к устройству (%1$s)?"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Удалить устройство \"%1$s\""</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Переименовать подключенное устройство"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Включить HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Устройствами, совместимыми с протоколом HDMI-CEC, можно управлять (в том числе автоматически включать и выключать их) с помощью одного пульта ДУ.\n\nПримечание. Убедитесь, что протокол включен на телевизоре и на других HDMI-устройствах. Разные производители используют для HDMI-CEC разные названия, например:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung – Anynet+;\nLG – SimpLink;\nSony – BRAVIA Sync;\nPhilips – EasyLink;\nSharp – Aquos Link."</string>
-    <string name="settings_axel" msgid="859248404436889205">"Задайте настройки для кнопок на пульте ДУ"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Управляйте громкостью, питанием и выбирайте источники сигнала на телевизорах, ресиверах и саундбарах"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Уровень заряда батареи: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Аксессуары"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Пульт ДУ"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Связь установлена"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Ранее подключенные устройства"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Подключить пульт или аксессуар"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Отключить"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Подключить"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Переименовать"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Удалить"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Подключено"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Отключено"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Управление устройствами"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Подключить новое устройство"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Прежде чем подключать новые устройства Bluetooth, убедитесь, что они находятся в режиме подключения. Чтобы подключить устройство \"%1$s\", нажмите и удерживайте кнопки %2$s + %3$s в течение трех секунд."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Пульт Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Доступные устройства"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Поиск устройств…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Ошибка"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Подключение…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Связь установлена"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Подключение отменено"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Не удалось подключиться к устройству \"%1$s\"."</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"Устройство \"%1$s\" подключено."</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"Устройство \"%1$s\" отключено."</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"-"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Критический"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Низкий"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Хороший"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Подтвердите обновление пульта ДУ"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Во время обновления связь с пультом ДУ может ненадолго прерваться."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Продолжить"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Отмена"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Обновление ПО пульта ДУ"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Доступно новое ПО"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Доступно обновление"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Обновление ПО не требуется"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Не удалось обновить ПО устройства."</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Не удалось обновить ПО пульта ДУ. Повторите попытку."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Подождите…"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Подключите пульт ДУ ещё раз"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Включено"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Отключено"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Уровень заряда батареи"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Встроенное ПО"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Адрес Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Замените батарею"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Низкий заряд батареи"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Подключенные устройства"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Пульты и аксессуары"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Обновите ПО пульта ДУ"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Новая версия готова к установке."</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ОБНОВИТЬ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ЗАКРЫТЬ"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Низкий уровень заряда батареи в пульте ДУ"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Замените ее в ближайшее время."</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Батарея в пульте ДУ почти разряжена"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Замените ее в ближайшее время."</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Батарея в пульте ДУ разряжена"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Чтобы пользоваться пультом, замените ее."</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Да"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Нет"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Отключить от устройства \"%1$s\""</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Подключиться к устройству \"%1$s\"?"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Удалить устройство \"%1$s\""</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Переименовать подключенное устройство"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Включить HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Устройствами, совместимыми с протоколом HDMI-CEC, можно управлять (в том числе автоматически включать и выключать их) с помощью одного пульта ДУ.\n\nПримечание. Убедитесь, что протокол включен на телевизоре и на других HDMI-устройствах. Разные производители используют для HDMI-CEC разные названия, например:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SIMPLINK\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Настройка кнопок на пульте ДУ"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Управляйте громкостью и питанием, а также выбирайте источники сигнала на телевизорах, ресиверах и саундбарах"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Уровень заряда батареи: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Аксессуары"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Пульт ДУ"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Подключено"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Ранее подключенные устройства"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Подключите пульт ДУ или аксессуар"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Отключить"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Подключить"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Переименовать"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Удалить"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Подключено"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Отключено"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Управление устройством"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Подключение нового устройства"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Прежде чем подключать новые устройства Bluetooth, убедитесь, что они находятся в режиме подключения. Чтобы подключить устройство \"%1$s\", нажмите и удерживайте одновременно кнопку \"%2$s\" и \"%3$s\" в течение трех секунд."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Пульт Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Доступные устройства"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Поиск устройств…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Ошибка"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Подключение…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Подключено"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Отменено"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Не удалось подключиться к устройству \"%1$s\"."</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Устройство \"%1$s\" подключено."</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Устройство \"%1$s\" отключено."</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-si/strings.xml b/libraries/BluetoothServices/res/values-si/strings.xml
index 0e5c6ff..33d4809 100644
--- a/libraries/BluetoothServices/res/values-si/strings.xml
+++ b/libraries/BluetoothServices/res/values-si/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"අ/නැ"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"තීරණාත්මක"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"අඩු"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"හොඳ"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"දුරස්ථ යාවත්කාලීනය තහවුරු කරන්න"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"යාවත්කාලීනය අතරතුර ඔබේ දුරස්ථය කෙටියෙන් විසන්ධි විය හැකිය."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"ඉදිරියට යන්න"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"අවලංගු කරන්න"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"දුරස්ථ යාවත්කාලීනය"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"නව මෘදුකාංග තිබේ"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"යාවත්කාලීනයක් ඇත"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"දුරස්ථය යාවත්කාලීනයි"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"දුරස්ථ යාවත්කාලීනය අසමත් විය"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"ඔබේ දුරස්ථය යාවත්කාලීන කරන අතරේ අපට ගැටලුවක් අත්දැකීමට වුණෙමු. නැවත උත්සාහ කරන්න."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"රැඳී සිටින්න"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"ඔබේ දුරස්ථය නැවත යුගල කරන්න"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"සබලයි"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"අබලයි"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"බැටරි මට්ටම"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"ස්ථිරාංග"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"බ්ලූටූත් ලිපිනය"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"බැටරිය ආදේශ කරන්න"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"බැටරිය අඩුයි"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"සම්බන්ධිත උපාංග"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"දුරස්ථ පාලක සහ අමතර උපාංග"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"ඔබේ දුරස්ථය යාවත්කාලීනය"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"ස්ථාපනයට සූදානම්ය"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"යාවත්කාලීනය"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"අස් කරන්න"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"දුරස්ථ බැටරිය අඩුය"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"බැටරිය ඉක්මනින් ප්‍රතිස්ථාපනය කරන්න"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"දුරස්ථ පාලකයේ බැටරිය හිස්ව ඇති තරම්ය"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"බැටරිය ඉක්මනින් ප්‍රතිස්ථාපනය කරන්න"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"දුරස්ථ බැටරිය හිස්ය"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"දුරස්ථ පාලකය භාවිත කිරීමට බැටරිය ප්‍රතිස්ථාපනය කරන්න"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"ඔව්"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"නැහැ"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s වෙතින් විසන්ධි කරන්න"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s වෙත සම්බන්ධ වන්න"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s අමතක කරන්න"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"ඔබේ සම්බන්ධිත උපාංගය යළි නම් කරන්න"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC සබල කරන්න"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC මඟින් ඔබට තනි දුරස්ථ පාලකයකින් වෙනත් HDMI-CEC සබලිත උපාංග පාලනය කිරීමට සහ ස්වයංක්‍රීයව ක්‍රියාත්මක/ක්‍රියා විරහිත කිරීමට ඉඩ දෙයි.\n\nසටහන: HDMI-CEC ඔබේ රූපවාහිනියෙහි සහ වෙනත් HDMI උපාංග වල සබල කර ඇති බව සහතික කර ගන්න. නිෂ්පාදකයින්ට බොහෝ විට HDMI-CEC සඳහා විවිධ නම් තිබේ, උදාහරණයක් ලෙස:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"දුරස්ථ පාලක බොත්තම් පිහිටුවන්න"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"TV, ග්‍රාහක සහ හඬ තීරුවල හඬ පරිමාව, බලය, ආදානය පාලනය කරන්න"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"බැටරි මට්ටම: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"අතිරේක උපාංග"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"දුරස්ථ පාලකය"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"සම්බන්ධිතයි"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"පෙර සම්බන්ධිත"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"දුරස්ථ පාලකය හෝ අමතර උපාංගය යුගල කරන්න"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"විසන්ධි කරන්න"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"සබඳින්න"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"යළි නම් කරන්න"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"අමතක කරන්න"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"සම්බන්ධිතයි"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"විසන්ධි විය"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"උපාංග පාලනය"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"නව උපාංගය සබඳින්න"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"නව බ්ලූටූත් උපාංග සබැඳීමට පෙර, ඒවා යුගලන ප්‍රකාරයේ ඇති බවට වග බලා ගන්න. %1$s සබැඳීමට, තත්පර 3ක් සඳහා %2$s + %3$s ඔබා සිටින්න."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV දුරස්ථයක්"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"තිබෙන උපාංග"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"උපාංග සඳහා සොයමින්…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"දෝෂය"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"සබැඳෙමින්…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"සම්බන්ධිතයි"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"අවලංගුයි"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s සබැඳීමට අසමත් විය"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s සම්බන්ධිතයි"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s විසන්ධි විය"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"අ/නැ"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"තීරණාත්මක"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"අඩු"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"හොඳයි"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"දුරස්ථ යාවත්කාලීනය තහවුරු කරන්න"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"යාවත්කාලීනය අතරතුර ඔබේ දුරස්ථ පාලකය කෙටියෙන් විසන්ධි විය හැක."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"ඉදිරියට යන්න"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"අවලංගු කරන්න"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"දුරස්ථ යාවත්කාලීනය"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"නව මෘදුකාංග තිබේ"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"යාවත්කාලීනයක් ඇත"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"දුරස්ථය යාවත්කාලීනයි"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"දුරස්ථ යාවත්කාලීනය අසාර්ථක විය"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"ඔබේ දුරස්ථය යාවත්කාලීන කරන අතරේ අපට ගැටලුවක් අත්දැකීමට වුණෙමු. නැවත උත්සාහ කරන්න."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"කරුණාකර රැඳී සිටින්න"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"ඔබේ දුරස්ථය නැවත යුගල කරන්න"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"සබලයි"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"අබල කරන ලදී"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"බැටරි මට්ටම"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"ස්ථිරාංග"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"බ්ලූටූත් ලිපිනය"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"බැටරිය ආදේශ කරන්න"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"බැටරිය අඩුයි"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"සම්බන්ධිත උපාංග"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"දුරස්ථ පාලක සහ අමතර උපාංග"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"ඔබේ දුරස්ථ පාලකය යාවත්කාලීන කරන්න"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"ස්ථාපනයට සූදානම් ය"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"යාවත්කාලීන කරන්න"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"අස් කරන්න"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"දුරස්ථ බැටරිය අඩු ය"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"බැටරිය ඉක්මනින් ප්‍රතිස්ථාපනය කරන්න"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"දුරස්ථ පාලකයේ බැටරිය මුළුමනින්ම හිස්ව ඇත"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"බැටරිය ඉක්මනින් ප්‍රතිස්ථාපනය කරන්න"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"දුරස්ථ බැටරිය හිස් ය"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"දුරස්ථ පාලකය භාවිත කිරීමට බැටරිය ප්‍රතිස්ථාපනය කරන්න"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"ඔව්"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"නැහැ"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s වෙතින් විසන්ධි කරන්න"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s වෙත සම්බන්ධ වන්න"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s අමතක කරන්න"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"ඔබේ සම්බන්ධිත උපාංගය යළි නම් කරන්න"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC සබල කරන්න"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC මඟින් ඔබට තනි දුරස්ථ පාලකයකින් වෙනත් HDMI-CEC සබලිත උපාංග පාලනය කිරීමට සහ ස්වයංක්‍රීයව ක්‍රියාත්මක/ක්‍රියා විරහිත කිරීමට ඉඩ දෙයි.\n\nසටහන: HDMI-CEC ඔබේ රූපවාහිනියෙහි සහ වෙනත් HDMI උපාංගවල සබල කර ඇති බව සහතික කර ගන්න. නිෂ්පාදකයින්ට බොහෝ විට HDMI-CEC සඳහා විවිධ නම් තිබේ, උදාහරණයක් ලෙස:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"දුරස්ථ පාලක බොත්තම් පිහිටුවන්න"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"රූපවාහිනී, ග්‍රාහක සහ හඬ තීරුවල හඬ පරිමාව, බලය, ආදානය පාලනය කරන්න"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"බැටරි මට්ටම: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"ආයිත්තම්"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"දුරස්ථ පාලකය"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"සම්බන්ධයි"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"පෙර සම්බන්ධිත"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"දුරස්ථ පාලකය හෝ අමතර උපාංගය යුගල කරන්න"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"විසන්ධි කරන්න"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"සම්බන්ධ කරන්න"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"යළි නම් කරන්න"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"අමතක කරන්න"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"සම්බන්ධිතයි"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"විසන්ධි විය"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"උපාංග පාලනය"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"නව උපාංගය සම්බන්ධ කරන්න"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"නව බ්ලූටූත් උපාංග සබැඳීමට පෙර, ඒවා යුගලන ප්‍රකාරයේ ඇති බවට වග බලා ගන්න. %1$s සබැඳීමට, තත්පර 3ක් සඳහා %2$s + %3$s ඔබා සිටින්න."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV දුරස්ථයක්"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"තිබෙන උපාංග"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"උපාංග සඳහා සොයමින්…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"දෝෂයකි"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"සම්බන්ධ වෙමින්…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"සම්බන්ධයි"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"අවලංගු කරන ලදි"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s සබැඳීමට අසමත් විය"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s සම්බන්ධ විය"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s විසන්ධි විය"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-sk/strings.xml b/libraries/BluetoothServices/res/values-sk/strings.xml
index 1c69299..bd1809f 100644
--- a/libraries/BluetoothServices/res/values-sk/strings.xml
+++ b/libraries/BluetoothServices/res/values-sk/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"-"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"kritická"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"nízka"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"dobrá"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Potvrďte vzdialenú aktualizáciu"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Počas aktualizácie sa môže diaľkové ovládanie krátko odpojiť."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Pokračovať"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Zrušiť"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Aktualizácia diaľkového ovládania"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Je k dispozícii nový softvér"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"K dispozícii je aktualizácia"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Diaľkové ovládanie je aktuálne"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Diaľkové ovládanie sa nepodarilo aktualizovať"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Pri aktualizovaní diaľkového ovládania došlo k chybe. Skúste to znova."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Čakajte"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Znova spárujte svoje diaľkové ovládanie"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Zapnuté"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Zakázané"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Stav batérie"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmvér"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Adresa Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Vymeňte batériu"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Slabá batéria"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Pripojené zariadenia"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Diaľkové ovládanie a príslušenstvo"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Aktualizácia diaľkového ovládania"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Pripravené na inštaláciu"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"AKTUALIZOVAŤ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ZAVRIEŤ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Batéria diaľkového ovládania je takmer vybitá"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Čoskoro bude potrebné vymeniť batériu"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Batéria diaľkového ovládania je takmer vybitá"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Čoskoro bude potrebné vymeniť batériu"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Batéria diaľkového ovládania je vybitá"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Ak chcete používať diaľkové ovládanie, vymeňte batériu"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Áno"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Nie"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Odpojiť od zariadenia %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Pripojiť k zariadeniu %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Zabudnúť zariadenie %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Premenovať pripojené zariadenie"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Povoliť HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC umožňuje ovládať a automaticky zapínať alebo vypínať zariadenia s povolenou funkciou HDMI-CEC jediným diaľkovým ovládaním.\n\nPoznámka: Skontrolujte, či je funkcia HDMI-CEC povolená v televízore a ďalších zariadeniach HDMI. Výrobcovia nazývajú HDMI-CEC rôzne, napríklad:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Nastavenie tlačidiel diaľkového ovládania"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Ovládanie hlasitosti, vypínača a vstupu v televízoroch, prijímačoch a soundbaroch"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Úroveň nabitia batérie: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Príslušenstvo"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Diaľkové ovládanie"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Pripojené"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Predtým pripojené zariadenia"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Spárovať diaľkové ovládanie alebo príslušenstvo"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Odpojiť"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Pripojiť"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Premenovať"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Zabudnúť"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Pripojené"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Odpojené"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Ovládanie zariadenia"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Pripojiť nové zariadenie"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Skôr ako pripojíte nové zariadenia Bluetooth, presvedčte sa, že majú zapnutý režim párovania. Ak chcete pripojiť zariadenie %1$s, tri sekundy pridržte %2$s + %3$s."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"diaľkové ovládanie Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Dostupné zariadenia"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Hľadajú sa zariadenia…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Chyba"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Pripája sa…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Pripojené"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Zrušené"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s – nepodarilo sa pripojiť"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s – pripojené"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s – odpojené"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"-"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritický"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Nízky"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Dobrý"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Potvrďte vzdialenú aktualizáciu"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Počas aktualizácie môže byť diaľkové ovládanie nakrátko odpojené."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Pokračovať"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Zrušiť"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Aktualizácia diaľkového ovládania"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"K dispozícii je nový softvér"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"K dispozícii je aktualizácia"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Diaľkové ovládanie je aktuálne"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Diaľkové ovládanie sa nepodarilo aktualizovať"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Pri aktualizovaní diaľkového ovládania došlo k chybe. Skúste to znova."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Čakajte"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Znova spárujte diaľkové ovládanie"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Zapnuté"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Vypnuté"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Stav batérie"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmvér"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Adresa Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Vymeňte batériu"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Slabá batéria"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Pripojené zariadenia"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Diaľkové ovládanie a príslušenstvo"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Aktualizácia diaľkového ovládania"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Pripravené na inštaláciu"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"AKTUALIZOVAŤ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ZAVRIEŤ"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Batéria diaľkového ovládania je takmer vybitá"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Čoskoro bude potrebné vymeniť batériu"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Batéria diaľkového ovládania je takmer vybitá"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Čoskoro bude potrebné vymeniť batériu"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Batéria diaľkového ovládania je vybitá"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Ak chcete používať diaľkové ovládanie, vymeňte batériu"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Áno"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Nie"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Odpojiť od zariadenia %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Pripojiť k zariadeniu %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Zabudnúť zariadenie %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Premenovať pripojené zariadenie"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Povoliť HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC umožňuje ovládať a automaticky zapínať alebo vypínať zariadenia s povolenou funkciou HDMI-CEC jediným diaľkovým ovládaním.\n\nPoznámka: Skontrolujte, či je funkcia HDMI-CEC povolená v televízore a ďalších zariadeniach HDMI. Výrobcovia nazývajú HDMI-CEC rôzne, napríklad:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Nastavenie tlačidiel diaľkového ovládania"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Ovládanie hlasitosti, vypínača a vstupu v televízoroch, prijímačoch a soundbaroch"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Stav batérie: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Príslušenstvo"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Diaľkové ovládanie"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Pripojené"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Predtým pripojené zariadenia"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Spárovanie diaľkového ovládania alebo príslušenstva"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Odpojiť"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Pripojiť"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Premenovať"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Odstrániť"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Pripojené"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Odpojené"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Ovládanie zariadenia"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Pripojiť nové zariadenie"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Pred pripojením nových zariadení s rozhraním Bluetooth skontrolujte, či sú v párovacom režime. Ak chcete pripojiť %1$s, tri sekundy pridržte %2$s + %3$s."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"diaľkové ovládanie Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Dostupné zariadenia"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Hľadajú sa zariadenia…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Chyba"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Pripája sa…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Pripojené"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Zrušené"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s sa nepodarilo pripojiť"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Zariadenie %1$s je pripojené"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Zariadenie %1$s je odpojené"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-sl/strings.xml b/libraries/BluetoothServices/res/values-sl/strings.xml
index e8d75d1..e646440 100644
--- a/libraries/BluetoothServices/res/values-sl/strings.xml
+++ b/libraries/BluetoothServices/res/values-sl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"/"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritična"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Nizka"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Dobra"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Potrdite posodobitev daljinskega upravljalnika"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Med posodobitvijo bo daljinski upravljalnik morda na kratko izgubil povezavo."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Naprej"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Prekliči"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Posodobitev daljinskega upravljalnika"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Na voljo je nova programska oprema"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Na voljo je posodobitev"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Daljinski upravljalnik je posodobljen"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Posodobitev daljinskega upravljalnika ni uspela"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Pri posodabljanju daljinskega upravljalnika je prišlo do težave. Poskusite znova."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Počakajte"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Znova seznanite daljinski upravljalnik"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Omogočeno"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Onemogočeno"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Raven napolnjenosti baterije"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d %%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Vdelana programska oprema"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Naslov vmesnika Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Zamenjajte baterijo"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Baterija je skoraj prazna"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Povezane naprave"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Daljinsko upravljanje in dodatki"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Posodobitev daljinskega upravljalnika"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Pripravljeno za namestitev"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"POSODOBI"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"OPUSTI"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Nizak raven baterije v daljinskem upravljalniku"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Kmalu zamenjajte baterijo."</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Baterija v daljinskem upravljalniku je skoraj prazna"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Kmalu zamenjajte baterijo."</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Baterija v daljinskem upravljalniku je prazna"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Zamenjajte baterijo, če želite uporabljati daljinski upravljalnik."</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Da"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Ne"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Prekinitev povezave z napravo %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Povezava s/z: %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Pozabi napravo %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Preimenujte povezano napravo"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Omogoči HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC vam z enim samim daljinskim upravljalnikom omogoča upravljanje in samodejni vklop/izklop drugih naprav z omogočeno funkcijo HDMI-CEC.\n\nOpomba: Funkcija HDMI-CEC mora biti omogočena v televizorju in drugih napravah HDMI. Proizvajalci imajo za funkcijo HDMI-CEC pogosto drugačna imena, na primer:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Nastavitev gumbov daljinskega upravljalnika"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Nadziranje glasnosti, vklopa/izklopa in vhodov v televizorjih, sprejemnikih ter zvočniških modulih"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Raven napolnjenosti baterij: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Dodatki"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Daljinski upravljalnik"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Povezano"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Predhodno povezane naprave"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Seznanjanje daljinskega upravljalnika ali dodatka"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Prekini povezavo"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Poveži"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Preimenuj"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Pozabi"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Povezava je vzpostavljena"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Povezava je prekinjena"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Upravljanje naprav"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Povezava nove naprave"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Pred povezovanjem novih naprav Bluetooth poskrbite, da so v načinu seznanjanja. Če želite povezati napravo %1$s, za tri sekunde pridržite tipki %2$s in %3$s."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"daljinski upravljalnik za Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Razpoložljive naprave"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Iskanje naprav …"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Napaka"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Povezovanje …"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Povezano"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Preklicano"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Povezave z napravo %1$s ni bilo mogoče vzpostaviti"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s – povezava je vzpostavljena"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s – povezava je prekinjena"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"/"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritična"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Nizka"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Dobra"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Potrdite posodobitev daljinskega upravljalnika"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Med posodobitvijo bo daljinski upravljalnik morda na kratko izgubil povezavo."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Naprej"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Prekliči"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Posodobitev daljinskega upravljalnika"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Na voljo je nova programska oprema"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Na voljo je posodobitev"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Daljinski upravljalnik je posodobljen"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Posodobitev daljinskega upravljalnika ni uspela"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Pri posodabljanju daljinskega upravljalnika je prišlo do težave. Poskusite znova."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Počakajte"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Znova seznanite daljinski upravljalnik"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Omogočeno"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Onemogočeno"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Raven napolnjenosti akumulatorja"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d %%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Vdelana programska oprema"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Naslov vmesnika Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Zamenjajte baterijo"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Skoraj prazna baterija"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Povezane naprave"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Daljinsko upravljanje in dodatki"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Posodobite daljinski upravljalnik"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Pripravljeno za namestitev"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"POSODOBI"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"OPUSTI"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Nizka raven baterije v daljinskem upravljalniku"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Kmalu zamenjajte baterijo"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Baterija v daljinskem upravljalniku je skoraj prazna"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Kmalu zamenjajte baterijo"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Baterija v daljinskem upravljalniku je prazna"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Zamenjajte baterijo, če želite uporabljati daljinski upravljalnik"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Da"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Ne"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Povezava z napravo %1$s je prekinjena"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Povezava s/z: %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Pozabi napravo %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Preimenujte povezano napravo"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Omogoči HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC vam z enim samim daljinskim upravljalnikom omogoča upravljanje in samodejni vklop/izklop drugih naprav z omogočeno funkcijo HDMI-CEC.\n\nOpomba: Funkcija HDMI-CEC mora biti omogočena v televizorju in drugih napravah HDMI. Proizvajalci imajo za funkcijo HDMI-CEC pogosto drugačna imena, na primer:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Nastavitev gumbov daljinskega upravljalnika"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Nadziranje glasnosti, vklopa/izklopa in vhodov v televizorjih, sprejemnikih ter zvočniških modulih"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Raven napolnjenosti baterije: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Dodatki"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Daljinski upravljalnik"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Povezano"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Predhodno povezane naprave"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Seznanjanje daljinskega upravljalnika ali dodatka"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Prekini povezavo"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Poveži"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Preimenuj"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Pozabi"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Povezava je vzpostavljena"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Povezava je prekinjena"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Upravljanje naprav"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Poveži novo napravo"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Pred povezovanjem novih naprav Bluetooth poskrbite, da so v načinu seznanjanja. Če želite povezati napravo %1$s, za tri sekunde pridržite tipki %2$s in %3$s."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"daljinski upravljalnik za Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Razpoložljive naprave"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Iskanje naprav …"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Napaka"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Povezovanje …"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Povezano"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Preklicano"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Povezave z napravo %1$s ni bilo mogoče vzpostaviti"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s – povezava vzpostavljena"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s – povezava prekinjena"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-sq/strings.xml b/libraries/BluetoothServices/res/values-sq/strings.xml
index 8bf6927..65b220f 100644
--- a/libraries/BluetoothServices/res/values-sq/strings.xml
+++ b/libraries/BluetoothServices/res/values-sq/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Nuk ofrohet"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritik"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"I ulët"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"I mirë"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Konfirmo përditësimin e telekomandës"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Gjatë përditësimit telekomanda jote mund të shkëputet shkurtimisht."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Vazhdo"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Anulo"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Përditësimi i telekomandës"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Ofrohet softuer i ri"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Ofrohet përditësim"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Telekomanda është e përditësuar"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Përditësimi i telekomandës dështoi"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Kishim një problem gjatë përditësimit të telekomandës. Provo përsëri."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Qëndro në pritje"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Çiftoje përsëri telekomandën"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Aktiv"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Joaktiv"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Niveli i baterisë"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmueri"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Adresa e Bluetooth-it"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Zëvendëso baterinë"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Po bie bateria"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Pajisjet e lidhura"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Telekomandat dhe aksesorët"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Përditëso telekomandën"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Gati për ta instaluar"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"PËRDITËSO"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"HIQ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Bateria e telekomandës në nivel të ulët"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Zëvendëso baterinë së shpejti"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Bateria e telekomandës është pothuajse bosh"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Zëvendëso baterinë së shpejti"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Bateria e telekomandës është bosh"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Zëvendëso baterinë për të përdorur telekomandën"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Po"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Jo"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Shkëputu nga %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Lidhu me %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Harro %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Riemërto pajisjen tënde"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Aktivizo HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC të lejon të kontrollosh dhe të aktivizosh/çaktivizosh automatikisht pajisjet që mbështesin HDMI-CEC me një telekomandë të vetme.\n\nShënim. Sigurohu që televizori yt dhe pajisjet e tjera HDMI të mbështesin HDMI-CEC. Prodhuesit shpesh kanë emra të ndryshëm për HDMI-CEC, për shembull:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Konfiguro butonat e telekomandës"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Kontrollo volumin, energjinë dhe hyrjen në televizorë, marrës dhe soundbar-ë"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Niveli i baterisë: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Aksesorët"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Telekomanda"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"U lidh"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Të lidhura më parë"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Çifto telekomandën ose aksesorin"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Shkëput"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Lidh"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Riemërto"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Harro"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Lidhur"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Shkëputur"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Kontrolli i pajisjes"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Lidh pajisjen e re"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Para se të lidhësh pajisjet e reja me Bluetooth, sigurohu që janë në modalitetin e çiftimit. Për të lidhur %1$s, shtyp dhe mbaj shtypur %2$s + %3$s për 3 sekonda."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"në telekomandën e Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Pajisjet që ofrohen"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Po kërkon për pajisje…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Gabim"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Po lidhet…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"U lidh"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Anuluar"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Dështoi lidhja me %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s u lidh"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s u shkëput"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Nuk zbatohet"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritik"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"I ulët"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"I mirë"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Konfirmo përditësimin e telekomandës"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Gjatë përditësimit telekomanda jote mund të shkëputet shkurtimisht."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Vazhdo"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Anulo"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Përditësimi i telekomandës"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Ofrohet softuer i ri"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Ka përditësim"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Telekomanda është e përditësuar"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Përditësimi i telekomandës dështoi"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Kishim një problem gjatë përditësimit të telekomandës. Provo përsëri."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Qëndro në pritje"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Çiftoje përsëri telekomandën"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Aktiv"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Joaktiv"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Niveli i baterisë"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmueri"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Adresa e Bluetooth-it"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Zëvendëso baterinë"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Bateria në nivel të ulët"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Pajisjet e lidhura"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Telekomandat dhe aksesorët"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Përditëso telekomandën"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Gati për ta instaluar"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"PËRDITËSO"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"HIQ"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Bateria e telekomandës në nivel të ulët"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Zëvendëso baterinë së shpejti"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Bateria e telekomandës është pothuajse bosh"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Zëvendëso baterinë së shpejti"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Bateria e telekomandës është bosh"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Zëvendëso baterinë për të përdorur telekomandën"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Po"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Jo"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Shkëputu nga %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Lidhe me %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Harro %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Riemërto pajisjen tënde"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Aktivizo HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC të lejon të kontrollosh dhe të aktivizosh/çaktivizosh automatikisht pajisjet që mbështesin HDMI-CEC me një telekomandë të vetme.\n\nShënim: Sigurohu që televizori yt dhe pajisjet e tjera HDMI të mbështesin HDMI-CEC. Prodhuesit shpesh kanë emra të ndryshëm për HDMI-CEC, për shembull:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Konfiguro butonat e telekomandës"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Kontrollo volumin, energjinë dhe hyrjen në televizorë, marrës dhe soundbar-ë"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Niveli i baterisë: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Aksesorët"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Telekomanda"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Lidhur"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Të lidhura më parë"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Çifto telekomandën ose aksesorin"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Shkëput"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Lidh"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Riemërto"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Harro"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Lidhur"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Shkëputur"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Kontrolli i pajisjes"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Lidh pajisje të re"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Para se të lidhësh pajisjet e reja me Bluetooth, sigurohu që janë në modalitetin e çiftimit. Për të lidhur %1$s, shtyp dhe mbaj shtypur %2$s + %3$s për 3 sekonda."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"në telekomandën e Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Pajisjet që ofrohen"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Po kërkon për pajisje…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Gabim"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Po lidhet…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Lidhur"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Anuluar"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Dështoi lidhja me %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s u lidh"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s u shkëput"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-sr/strings.xml b/libraries/BluetoothServices/res/values-sr/strings.xml
index 43d7983..9eb3be5 100644
--- a/libraries/BluetoothServices/res/values-sr/strings.xml
+++ b/libraries/BluetoothServices/res/values-sr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Није доступно"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Критичан"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Низак"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Добар"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Потврдите ажурирање даљинског управљача"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Веза са даљинским управљачем може да се накратко прекине током ажурирања."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Настави"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Откажи"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Ажурирање даљинског управљача"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Доступан је нов софтвер"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Доступно је ажурирање"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Даљински управљач је ажуриран"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Ажурирање даљинског управљача није успело"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Дошло је до проблема при ажурирању даљинског управљача. Пробајте поново."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Сачекајте"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Поново упарите даљински управљач"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Омогућено"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Онемогућено"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Ниво батерије"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Фирмвер"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth адреса"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Замените батерију"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Батерија је скоро празна"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Повезани уређаји"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Даљински управљачи и додатна опрема"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Ажурирајте даљински управљач"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Спремно је за инсталацију"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"АЖУРИРАЈ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ОДБАЦИ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Ниво напуњености батерије даљинског управљача је низак"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Замените батерију ускоро"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Батерија даљинског управљача је скоро празна"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Замените батерију ускоро"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Батерија даљинског управљача је празна"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Замените батерију да бисте користили даљински управљач"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Да"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Не"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Прекини везу са: %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Повежите се са уређајем %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Заборави: %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Преименујте повезани уређај"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Омогући HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC вам омогућава да контролишете и аутоматски укључујете/искључујете остале уређаје на којима је омогућен HDMI-CEC помоћу само једног даљинског управљача.\n\nНапомена: Уверите се да је HDMI-CEC омогућен на телевизору и другим HDMI уређајима. Произвођачи обично имају различите називе за HDMI-CEC, на пример:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Подесите дугмад на даљинском управљачу"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Контролишите јачину звука, напајање и улаз TV-а, пријемника и саундбарова"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Ниво напуњености батерије: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Додаци"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Даљински управљач"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Повезано"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Претходно повезани"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Упарите даљински управљач или додатну опрему"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Прекини везу"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Повежи"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Преименуј"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Заборави"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Повезано"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Веза је прекинута"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Контрола уређаја"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Повежите нов уређај"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Пре него што повежете нове Bluetooth уређаје, уверите се да су у режиму упаривања. Да бисте повезали уређај %1$s, притисните и задржите %2$s и %3$s три секунде."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"даљински управљач за Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Доступни уређаји"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Траже се уређаји…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Грешка"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Повезује се…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Повезано"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Отказано"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Повезивање није успело: %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"Повезано: %1$s"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"Прекинута je веза: %1$s"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Није примењиво"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Критично"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Ниско"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Добро"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Потврдите ажурирање даљинског управљача"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Веза са даљинским управљачем може да се накратко прекине током ажурирања."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Настави"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Откажи"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Ажурирање даљинског управљача"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Доступан је нов софтвер"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Доступно је ажурирање"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Даљински управљач је ажуриран"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Ажурирање даљинског управљача није успело"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Дошло је до проблема при ажурирању даљинског управљача. Пробајте поново."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Сачекајте"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Поново упарите даљински управљач"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Омогућено"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Онемогућено"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Ниво напуњености батерије"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Фирмвер"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth адреса"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Замените батерију"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Низак ниво батерије"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Повезани уређаји"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Даљински управљачи и додатна опрема"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Ажурирајте даљински управљач"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Спремно је за инсталацију"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"АЖУРИРАЈ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ОДБАЦИ"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Ниво напуњености батерије даљинског управљача је низак"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Замените батерију ускоро"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Батерија даљинског управљача је скоро празна"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Замените батерију ускоро"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Батерија даљинског управљача је празна"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Замените батерију да бисте користили даљински управљач"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Да"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Не"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Прекини везу са ставком %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Повежите са уређајем %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Заборави ставку %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Преименујте повезани уређај"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Омогући HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC вам омогућава да контролишете и аутоматски укључујете/искључујете остале уређаје на којима је омогућен HDMI-CEC помоћу само једног даљинског управљача.\n\nНапомена: Уверите се да је HDMI-CEC омогућен на телевизору и другим HDMI уређајима. Произвођачи обично имају различите називе за HDMI-CEC, на пример:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Подесите дугмад на даљинском управљачу"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Контролишите јачину звука, напајање и улаз TV-а, пријемника и саундбарова"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Ниво напуњености батерије: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Додаци"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Даљински управљач"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Повезано"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Претходно повезани"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Упарите даљински управљач или додатну опрему"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Прекини везу"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Повежи"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Преименуј"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Заборави"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Повезано"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Веза је прекинута"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Контрола уређаја"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Повежите нов уређај"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Пре него што повежете нове Bluetooth уређаје, уверите се да су у режиму упаривања. Да бисте повезали уређај %1$s, притисните и задржите %2$s и %3$s три секунде."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"даљински управљач за Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Доступни уређаји"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Траже се уређаји…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Грешка"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Повезује се…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Повезано"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Отказано"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Повезивање није успело: %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Повезано: %1$s"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Прекинута je веза: %1$s"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-sv/strings.xml b/libraries/BluetoothServices/res/values-sv/strings.xml
index 927c19f..31ec9a5 100644
--- a/libraries/BluetoothServices/res/values-sv/strings.xml
+++ b/libraries/BluetoothServices/res/values-sv/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Inte tillämpligt"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritisk"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Låg"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Bra"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Bekräfta uppdateringen av fjärrkontrollen"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Fjärrkontrollen kan tillfälligt kopplas från under uppdateringen."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Fortsätt"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Avbryt"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Ta bort uppdatering"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Ny programvara är tillgänglig"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Det finns en uppdatering"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Fjärrkontrollen är uppdaterad"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Det gick inte att uppdatera fjärrkontrollen"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Ett problem uppstod när fjärrkontrollen skulle uppdateras. Försök igen."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Vänta"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Koppla fjärrkontrollen igen"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Aktiverad"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Inaktiverat"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Batterinivå"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth-adress"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Byt batteriet"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Låg batterinivå"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Anslutna enheter"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Fjärrkontroller och tillbehör"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Uppdatera fjärrkontrollen"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Klar att installera"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"UPPDATERA"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"STÄNG"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Fjärrkontrollens batterinivå är låg"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Byt batteriet snart"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Fjärrkontrollens batteri är nästan tomt"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Byt batteriet snart"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Fjärrkontrollens batteri är tomt"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Byt batteriet för att använda fjärrkontrollen"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Ja"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Nej"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Koppla från %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Anslut till %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Glöm %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Byt namn på din anslutna enhet"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Aktivera HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Med HDMI-CEC kan du styra andra HDMI-CEC-kompatibla enheter och slå på eller av dem automatiskt med en enda fjärrkontroll.\n\nObs! Kontrollera att HDMI-CEC har aktiverats på tv:n och övriga HDMI-enheter. Olika tillverkare kan använda olika namn på HDMI-CEC. Några exempel:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Konfigurera fjärrkontrollsknappar"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Styr volymen, strömbrytaren och val av ingångskälla på tv:ar, mottagare och soundbar-högtalare"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Batterinivå: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Tillbehör"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Fjärrkontroll"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Ansluten"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Tidigare anslutna enheter"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Parkoppla en fjärrkontroll eller ett tillbehör"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Koppla från"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Anslut"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Byt namn"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Glöm"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Ansluten"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Frånkopplad"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Enhetskontroll"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Anslut en ny enhet"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Innan du ansluter nya Bluetooth-enheter kontrollerar du att de är i kopplingsläge. Anslut %1$s genom att trycka och hålla ned %2$s + %3$s i tre sekunder."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"en fjärrkontroll till Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Tillgängliga enheter"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Söker efter enheter …"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Fel"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Ansluter …"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Ansluten"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Avbruten"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s kunde inte anslutas"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s är ansluten"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s är frånkopplad"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Inte tillämpligt"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritisk"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Låg"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Bra"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Bekräfta uppdateringen av fjärrkontrollen"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Fjärrkontrollen kan tillfälligt kopplas från under uppdateringen."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Fortsätt"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Avbryt"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Uppdatering av fjärrkontroll"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Ny programvara är tillgänglig"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Det finns en uppdatering"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Fjärrkontrollen är uppdaterad"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Det gick inte att uppdatera fjärrkontrollen"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Ett problem uppstod när fjärrkontrollen skulle uppdateras. Försök igen."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Vänta"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Koppla fjärrkontrollen igen"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Aktiverad"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Inaktiverad"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Batterinivå"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d %%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Inbyggd programvara"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth-adress"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Byt batteriet"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Låg batterinivå"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Anslutna enheter"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Fjärrkontroller och tillbehör"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Uppdatera fjärrkontrollen"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Klar att installera"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"UPPDATERA"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"AVVISA"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Fjärrkontrollens batterinivå är låg"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Byt batteriet snart"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Fjärrkontrollens batteri är nästan tomt"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Byt batteriet snart"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Fjärrkontrollens batteri är tomt"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Byt batteriet för att använda fjärrkontrollen"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Ja"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Nej"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Koppla från %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Anslut till %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Glöm %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Byt namn på din anslutna enhet"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Aktivera HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Med HDMI-CEC kan du styra andra HDMI-CEC-kompatibla enheter och slå på eller av dem automatiskt med en enda fjärrkontroll.\n\nObs! Kontrollera att HDMI-CEC har aktiverats på tv:n och övriga HDMI-enheter. Olika tillverkare kan använda olika namn på HDMI-CEC. Några exempel:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Konfigurera fjärrkontrollsknappar"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Styr volymen, av/på-knappen och val av ingångskälla på tv:ar, mottagare och soundbar-högtalare"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Batterinivå: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Tillbehör"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Fjärrkontroll"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Ansluten"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Tidigare anslutna enheter"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Parkoppla en fjärrkontroll eller ett tillbehör"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Koppla från"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Anslut"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Byt namn"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Glöm"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Ansluten"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Frånkopplad"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Enhetskontroll"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Anslut ny enhet"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Innan du ansluter nya Bluetooth-enheter kontrollerar du att de är i parkopplingsläge. Anslut %1$s genom att trycka och hålla ned %2$s + %3$s i tre sekunder."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"en fjärrkontroll till Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Tillgängliga enheter"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Söker efter enheter …"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Fel"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Ansluter …"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Ansluten"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Avslutad"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s kunde inte anslutas"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s är ansluten"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s är frånkopplad"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-sw/strings.xml b/libraries/BluetoothServices/res/values-sw/strings.xml
index c429790..5776094 100644
--- a/libraries/BluetoothServices/res/values-sw/strings.xml
+++ b/libraries/BluetoothServices/res/values-sw/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Haitumiki"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Imepungua sana"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Chini"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Nzuri"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Thibitisha sasisho la kidhibiti mbali"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Huenda kidhibiti mbali kitatenganishwa kwa muda wakati wa kusasisha."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Endelea"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Ghairi"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Sasisho la kidhibiti mbali"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Programu mpya inapatikana"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Sasisho linapatikana"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Kidhibiti mbali kimesasishwa"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Imeshindwa kusasisha kidhibiti mbali"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Tumekumbwa na hitilafu fulani wakati wa kusasisha kidhibiti mbali chako. Tafadhali jaribu tena."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Tafadhali subiri"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Oanisha kidhibiti mbali chako tena"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Imewashwa"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Imezimwa"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Kiwango cha chaji kwenye betri"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Programu dhibiti"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Anwani ya Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Tafadhali badilisha betri yako"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Chaji ya betri imepungua"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Vifaa Vilivyounganishwa"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Vidhibiti Mbali na Vifaa vya Ziada"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Sasisha kidhibiti mbali chako"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Iko tayari kusakinisha"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"SASISHA"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ONDOA"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Chaji ya betri imepungua kwenye kidhibiti cha mbali"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Badilisha betri hivi karibuni"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Chaji ya betri imekaribia kuisha kwenye kidhibiti cha mbali"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Badilisha betri hivi karibuni"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Chaji ya betri imekwisha kwenye kidhibiti cha mbali"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Badilisha betri ili utumie kidhibiti cha mbali"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Ndiyo"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"La"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Tenganisha na %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Unganisha kwenye %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Sahau %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Badilisha jina la kifaa chako kilichounganishwa"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Washa HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC hukuwezesha kudhibiti na kuwasha au kuzima kiotomatiki vifaa vingine vinavyotumia HDMI-CEC ukitumia kidhibiti kimoja cha mbali.\n\nKumbuka: Hakikisha umewasha HDMI-CEC kwenye TV yako na vifaa vingine vya HDMI. Watengenezaji hutumia majina tofauti kurejelea HDMI-CEC, Kwa mfano:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Weka mipangilio ya vitufe vya kidhibiti cha mbali"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Dhibiti sauti, kuzima/kuwasha na vyanzo kwenye TV, spika na kipokea sauti na video"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Kiasi cha chaji kwenye betri: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Vifaa vya ziada"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Kidhibiti cha Mbali"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Vimeunganishwa"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Vilivyounganishwa awali"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Oanisha kidhibiti mbali au kifaa cha ziada"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Tenganisha"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Unganisha"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Badilisha jina"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Sahau"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Imeunganishwa"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Imetenganishwa"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Kudhibiti kifaa"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Unganisha kifaa kipya"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Kabla hujaunganisha vifaa vipya vya Bluetooth, hakikisha vipo katika hali ya kuoanisha. Ili uunganishe %1$s, bonyeza na ushikilie %2$s + %3$s kwa sekunde 3."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"kidhibiti mbali cha Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Vifaa vinavyopatikana"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Inatafuta vifaa…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Hitilafu"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Inaunganisha…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Imeunganishwa"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Imeghairiwa"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s imeshindwa kuunganisha"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s imeunganishwa"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s imetenganishwa"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Hamna"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Imepungua sana"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Chini"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Nzuri"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Thibitisha sasisho la kidhibiti cha mbali"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Huenda kidhibiti cha mbali kitatenganishwa kwa muda wakati wa kusasisha."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Endelea"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Ghairi"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Sasisho la kidhibiti cha mbali"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Programu mpya inapatikana"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Sasisho linapatikana"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Kidhibiti cha mbali kimesasishwa"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Imeshindwa kusasisha kidhibiti mbali"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Tumekumbwa na hitilafu fulani wakati wa kusasisha kidhibiti chako cha mbali. Tafadhali jaribu tena."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Tafadhali subiri"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Oanisha tena kidhibiti chako cha mbali"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Imewashwa"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Imezimwa"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Kiwango cha chaji kwenye betri"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Programu dhibiti"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Anwani ya Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Tafadhali badilisha betri yako"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Chaji ya betri imepungua"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Vifaa Vilivyounganishwa"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Vidhibiti vya Mbali na Vifuasi"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Sasisha kidhibiti chako cha mbali"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Iko tayari kusakinisha"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"SASISHA"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ONDOA"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Chaji ya betri imepungua kwenye kidhibiti cha mbali"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Badilisha betri hivi karibuni"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Chaji ya betri imekaribia kuisha kwenye kidhibiti cha mbali"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Badilisha betri hivi karibuni"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Chaji ya betri imekwisha kwenye kidhibiti cha mbali"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Badilisha betri ili utumie kidhibiti cha mbali"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Ndiyo"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"La"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Tenganisha na %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Unganisha kwenye %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Sahau %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Badilisha jina la kifaa chako kilichounganishwa"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Washa HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC hukuwezesha kudhibiti na kuwasha au kuzima kiotomatiki vifaa vingine vinavyotumia HDMI-CEC ukitumia kidhibiti kimoja cha mbali.\n\nKumbuka: Hakikisha umewasha HDMI-CEC kwenye TV yako na vifaa vingine vya HDMI. Watengenezaji hutumia majina tofauti kurejelea HDMI-CEC, Kwa mfano:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Weka mipangilio ya vitufe vya kidhibiti cha mbali"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Dhibiti sauti, nishati, vifaa vya kuingiza data kwenye TV, spika na vipokea sauti na video"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Kiasi cha chaji kwenye betri: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Vifuasi"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Kidhibiti cha Mbali"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Imeunganisha"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Vilivyounganishwa awali"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Oanisha kidhibiti cha mbali au kifuasi"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Ondoa"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Unganisha"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Badilisha jina"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Sahau"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Imeunganishwa"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Imetenganishwa"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Kudhibiti kifaa"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Unganisha kifaa kipya"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Kabla hujaunganisha vifaa vipya vyenye Bluetooth, hakikisha vipo katika hali ya kuoanisha. Ili uunganishe %1$s, bonyeza na ushikilie %2$s + %3$s kwa sekunde 3."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"kidhibiti mbali cha Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Vifaa vinavyopatikana"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Inatafuta vifaa…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Hitilafu"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Inaunganisha…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Imeunganishwa"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Imeghairiwa"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s imeshindwa kuunganisha"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s imeunganishwa"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s imetenganishwa"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-ta/strings.xml b/libraries/BluetoothServices/res/values-ta/strings.xml
index 2d8a04f..3378db2 100644
--- a/libraries/BluetoothServices/res/values-ta/strings.xml
+++ b/libraries/BluetoothServices/res/values-ta/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"மிகவும் குறைவு"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"குறைவு"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"நன்று"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"ரிமோட் புதுப்பிப்பை உறுதிப்படுத்தவும்"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"புதுப்பிக்கப்படும்போது ரிமோட்டின் இணைப்பு சிறிது நேரம் துண்டிக்கப்படலாம்."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"தொடர்க"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"ரத்துசெய்"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"ரிமோட் புதுப்பிப்பு"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"புதிய மென்பொருள் உள்ளது"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"புதுப்பிப்பு உள்ளது"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"ரிமோட் புதுப்பிக்கப்பட்ட நிலையில் உள்ளது"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"ரிமோட்டைப் புதுப்பிக்க முடியவில்லை"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"உங்கள் ரிமோட்டைப் புதுப்பிப்பதில் சிக்கல் உள்ளது. மீண்டும் முயலவும்."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"காத்திருக்கவும்"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"ரிமோட்டை மீண்டும் இணைக்கவும்"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"இயக்கப்பட்டது"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"முடக்கப்பட்டது"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"பேட்டரி நிலை"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"நிலைபொருள்"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"புளூடூத் முகவரி"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"பேட்டரியை மாற்றவும்"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"பேட்டரி குறைவாக உள்ளது"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"இணைத்துள்ள சாதனங்கள்"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"ரிமோட்கள் &amp; துணைக்கருவிகள்"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"ரிமோட்டைப் புதுப்பியுங்கள்"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"நிறுவுவதற்குத் தயார்"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"புதுப்பி"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"நிராகரி"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"ரிமோட் பேட்டரி குறைவாக உள்ளது"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"பேட்டரியை விரைவில் மாற்றவும்"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"ரிமோட் பேட்டரி காலியாகப் போகிறது"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"பேட்டரியை விரைவில் மாற்றவும்"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"ரிமோட் பேட்டரி காலியாகிவிட்டது"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"ரிமோட்டை உபயோகிக்க பேட்டரியை மாற்றவும்"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"ஆம்"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"வேண்டாம்"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s இலிருந்து இணைப்பை நீக்கு"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s உடன் இணை"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$sஐ அகற்று"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"இணைக்கப்பட்ட சாதனத்திற்கு மறுபெயரிடு"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CECயை இயக்கு"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC இயக்கப்பட்டுள்ள வேறு சாதனங்களை ஒரே ரிமோட் கன்ட்ரோல் மூலம் கட்டுப்படுத்தவும் தானாகவே ஆன்/ஆஃப் செய்யவும் HDMI-CEC அனுமதிக்கும்.\n\nகவனத்திற்கு: உங்கள் டிவியிலும் பிற HDMI சாதனங்களிலும் HDMI-CEC இயக்கப்பட்டிருப்பதை உறுதிப்படுத்திக் கொள்ளவும். HDMI-CECக்கு ஒவ்வொரு தயாரிப்பாளரும் ஒவ்வொரு பெயரை வைத்திருப்பார், உதாரணமாக:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"ரிமோட் பட்டன்களை அமைத்தல்"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"ஒலியளவு, பவர், டிவிகளுக்கான உள்ளீடு, ரிசீவர்கள், சவுண்ட்பார்கள் ஆகியவற்றைக் கட்டுப்படுத்தலாம்"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"பேட்டரி நிலை: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"துணைக்கருவிகள்"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"ரிமோட் கன்ட்ரோல்"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"இணைக்கப்பட்டது"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"ஏற்கெனவே இணைத்தவை"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"ரிமோட்டையோ துணைக்கருவிகளையோ இணையுங்கள்"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"இணைப்பைத் துண்டி"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"இணை"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"மறுபெயரிடு"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"அகற்று"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"இணைக்கப்பட்டது"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"துண்டிக்கப்பட்டது"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"சாதனக் கட்டுப்பாடு"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"புதிய சாதனத்தை இணைத்தல்"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"புளூடூத் சாதனங்களை இணைப்பதற்கு முன்பாக அவை இணைத்தல் பயன்முறையில் உள்ளனவா என்பதை உறுதிசெய்து கொள்ளவும். %1$sஐ இணைக்க 3 வினாடிகளுக்கு %2$s + %3$sஐ அழுத்திப் பிடித்திருக்கவும்."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV ரிமோட்"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"கிடைக்கும் சாதனங்கள்"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"சாதனங்களைத் தேடுகிறது…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"பிழை"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"இணைக்கிறது…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"இணைக்கப்பட்டது"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"ரத்துசெய்யப்பட்டது"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$sஐ இணைக்க முடியவில்லை"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s இணைக்கப்பட்டது"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s துண்டிக்கப்பட்டது"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"பொருந்தாது"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"மிகவும் குறைவு"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"குறைவு"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"நன்று"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"ரிமோட் புதுப்பிப்பை உறுதிப்படுத்தவும்"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"புதுப்பிக்கப்படும்போது ரிமோட்டின் இணைப்பு சிறிதுநேரம் துண்டிக்கப்படலாம்."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"தொடர்க"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"ரத்துசெய்"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"ரிமோட் புதுப்பிப்பு"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"புதிய மென்பொருள் உள்ளது"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"புதுப்பிப்பு உள்ளது"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"ரிமோட் புதுப்பிக்கப்பட்ட நிலையிலுள்ளது"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"ரிமோட் புதுப்பிப்பு தோல்வியடைந்தது"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"உங்கள் ரிமோட்டைப் புதுப்பிப்பதில் சிக்கல் உள்ளது. மீண்டும் முயலவும்."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"காத்திருக்கவும்"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"ரிமோட்டை மீண்டும் இணைக்கவும்"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"இயக்கப்பட்டது"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"முடக்கப்பட்டது"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"பேட்டரி நிலை"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"நிலைபொருள்"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"புளூடூத் முகவரி"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"பேட்டரியை மாற்றவும்"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"பேட்டரி குறைவு"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"இணைக்கப்பட்டுள்ள சாதனங்கள்"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"ரிமோட்களும் துணைக்கருவிகளும்"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"ரிமோட்டைப் புதுப்பியுங்கள்"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"நிறுவுவதற்குத் தயார்"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"புதுப்பி"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"நிராகரி"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"ரிமோட் பேட்டரி குறைவாக உள்ளது"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"பேட்டரியை விரைவில் மாற்றவும்"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"ரிமோட் பேட்டரி காலியாகப் போகிறது"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"பேட்டரியை விரைவில் மாற்றவும்"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"ரிமோட் பேட்டரி காலியாகிவிட்டது"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"ரிமோட்டைப் பயன்படுத்த பேட்டரியை மாற்றவும்"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"சரி"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"வேண்டாம்"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s இலிருந்து இணைப்பை நீக்கு"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s உடன் இணை"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$sஐ அகற்று"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"இணைக்கப்பட்ட சாதனத்திற்கு மறுபெயரிடு"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CECயை இயக்கு"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC இயக்கப்பட்டுள்ள வேறு சாதனங்களை ரிமோட் கன்ட்ரோல் மூலம் கட்டுப்படுத்தவும் தானாகவே ஆன்/ஆஃப் செய்யவும் HDMI-CEC அனுமதிக்கும்.\n\nகவனத்திற்கு: டிவியிலும் பிற HDMI சாதனங்களிலும் HDMI-CEC இயக்கப்பட்டிருப்பதை உறுதிசெய்யவும். HDMI-CECக்கு ஒவ்வொரு தயாரிப்பாளரும் ஒவ்வொரு பெயரை வைத்திருப்பார், உதாரணமாக:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"ரிமோட் பட்டன்களை அமைத்தல்"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"டிவிகள், ரிசீவர்கள், சவுண்ட்பார்கள் ஆகியவற்றில் ஒலியளவையும் பவரையும் உள்ளீட்டையும் கட்டுப்படுத்தலாம்"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"பேட்டரி நிலை: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"துணைக்கருவிகள்"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"ரிமோட் கன்ட்ரோல்"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"இணைக்கப்பட்டது"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"ஏற்கனவே இணைத்தவை"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"ரிமோட் அல்லது துணைக்கருவியை இணை"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"வெளியேறு"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"இணை"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"பெயர் மாற்று"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"அகற்று"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"இணைக்கப்பட்டது"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"துண்டிக்கப்பட்டது"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"சாதனக் கட்டுப்பாடு"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"புதிய சாதனத்தை இணைத்தல்"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"புதிய புளூடூத் சாதனங்களை இணைப்பதற்கு முன்பாக அவை இணைத்தல் பயன்முறையில் உள்ளனவா என்பதை உறுதிசெய்துகொள்ளவும். %1$s ஐ இணைக்க 3 வினாடிகளுக்கு %2$s + %3$s ஐ அழுத்திப் பிடித்திருக்கவும்."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV ரிமோட்"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"கிடைக்கும் சாதனங்கள்"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"சாதனங்களைத் தேடுகிறது…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"பிழை"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"இணைக்கிறது…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"இணைக்கப்பட்டது"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"ரத்துசெய்யப்பட்டது"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s ஐ இணைக்க முடியவில்லை"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s இணைக்கப்பட்டது"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s துண்டிக்கப்பட்டது"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-te/strings.xml b/libraries/BluetoothServices/res/values-te/strings.xml
index 0eace49..7d83247 100644
--- a/libraries/BluetoothServices/res/values-te/strings.xml
+++ b/libraries/BluetoothServices/res/values-te/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"వర్తించదు"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"బ్యాటరీ అయిపోవచ్చింది"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"తక్కువగా ఉంది"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"సరిపడా ఉంది"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"రిమోట్ అప్‌డేట్‌ను నిర్ధారించండి"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"అప్‌డేట్ సమయంలో మీ రిమోట్ కొద్ది సమయం పాటు డిస్‌కనెక్ట్ అవ్వవచ్చు."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"కొనసాగించండి"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"రద్దు చేయండి"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"రిమోట్ అప్‌డేట్"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"కొత్త సాఫ్ట్‌వేర్ అప్‌డేట్ అందుబాటులో ఉంది"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"అప్‌డేట్ అందుబాటులో ఉంది"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"రిమోట్ ఇప్పటికే తాజాగా ఉంది"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"రిమోట్ అప్‌డేట్ విఫలమైంది"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"మీ రిమోట్‌ను మేము అప్‌డేట్ చేస్తున్నప్పుడు ఏదో ఎర్రర్ ఏర్పడింది. దయచేసి మళ్లీ ప్రయత్నించండి."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"దయచేసి వేచి ఉండండి"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"మీ రిమోట్‌ను మళ్లీ జత చేయండి"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"ఎనేబుల్ చేయబడింది"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"డిజేబుల్ చేయబడింది"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"బ్యాటరీ స్థాయి"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"ఫర్మ్‌వేర్"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"బ్లూటూత్ అడ్రస్‌"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"దయచేసి బ్యాటరీని భర్తీ చేయండి"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"బ్యాటరీ తక్కువగా ఉంది"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"కనెక్ట్ చేసిన పరికరాలు"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"రిమోట్‌లు &amp; యాక్సెసరీలు"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"మీ రిమోట్‌ను అప్‌డేట్ చేయండి"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"ఇన్‌స్టాల్ చేయడానికి సిద్ధంగా ఉంది"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"అప్‌డేట్ చేయండి"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"తీసివేయండి"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"రిమోట్ బ్యాటరీ తక్కువగా ఉంది"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"త్వరగా బ్యాటరీని రీప్లేస్ చేయండి"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"రిమోట్ బ్యాటరీ దాదాపు ఖాళీగా ఉంది"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"త్వరగా బ్యాటరీని రీప్లేస్ చేయండి"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"రిమోట్ బ్యాటరీ ఖాళీగా ఉంది"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"రిమోట్‌ను ఉపయోగించడానికి బ్యాటరీని రీప్లేస్ చేయండి"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"అవును"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"లేదు"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s నుండి డిస్‌కనెక్ట్ చేయండి"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$sకు కనెక్ట్ అవ్వండి"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$sను విస్మరించండి"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"కనెక్ట్ చేసిన మీ పరికరం పేరు మార్చండి"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CECను ఎనేబుల్ చేయండి"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"ఇతర HDMI-CEC ఎనేబుల్ అయిన పరికరాలను ఒకే రిమోట్ నియంత్రణతో నియంత్రించడానికి ఇంకా ఆటోమేటిక్‌గా ఆన్/ఆఫ్ చేయడానికి HDMI-CEC మిమ్మల్ని అనుమతిస్తుంది.\n\nగమనిక: మీ టీవీలోనూ అలాగే ఇతర HDMI పరికరాలలోనూ HDMI-CECని ఆన్ చేయాలని గుర్తుంచుకోండి. తయారీదారులు తరచుగా HDMI-CECకి వివిధ పేర్లను కలిగి ఉంటారు, ఉదాహరణకు:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"రిమోట్ బటన్‌లను సెటప్ చేయండి"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"టీవీలు, రిసీవర్‌లు, సౌండ్ బార్‌లలో వాల్యూమ్, పవర్, ఇన్‌పుట్‌లను కంట్రోల్ చేయండి"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"బ్యాటరీ స్థాయి: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"ఉపకరణాలు"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"రిమోట్ నియంత్రణ"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"కనెక్ట్ చేయబడింది"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"ఇంతకు మునుపు కనెక్ట్ చేయబడినవి"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"రిమోట్ లేదా యాక్సెసరీని పెయిర్ చేయండి"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"డిస్‌కనెక్ట్ చేయండి"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"కనెక్ట్ చేయి"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"పేరు మార్చండి"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"విస్మరించండి"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"కనెక్ట్ చేయబడింది"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"డిస్‌కనెక్ట్ అయింది"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"పరికర నియంత్రణ"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"కొత్త పరికరాన్ని కనెక్ట్ చేయండి"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"కొత్త బ్లూటూత్ పరికరాలను జత చేసే ముందు, అవి జత చేసే మోడ్‌లోనే ఉన్నాయని నిర్ధారించుకోండి. \'%1$s\' ను కనెక్ట్ చేయడానికి, 3 సెకన్ల పాటు \'%2$s + %3$s\'ను నొక్కి ఉంచండి."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android టీవీ రిమోట్"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"అందుబాటులో ఉన్న పరికరాలు"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"పరికరాల కోసం వెతుకుతోంది…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"ఎర్రర్"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"కనెక్ట్ అవుతోంది…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"కనెక్ట్ చేయబడింది"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"రద్దు చేయబడింది"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$sను కనెక్ట్ చేయడం విఫలమైంది"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s కనెక్ట్ చేయబడింది"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s డిస్‌కనెక్ట్ చేయబడింది"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"బ్యాటరీ స్థాయి క్లిష్టంగా ఉంది"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"బ్యాటరీ స్థాయి తక్కువగా ఉంది"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"బ్యాటరీ స్థాయి బాగుంది"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"రిమోట్ అప్‌డేట్‌ను నిర్ధారించండి"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"అప్‌డేట్ జరిగే సమయంలో మీ రిమోట్ కొద్ది సమయం పాటు డిస్‌కనెక్ట్ అవ్వవచ్చు."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"కొనసాగించండి"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"రద్దు చేయండి"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"రిమోట్ అప్‌డేట్"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"కొత్త సాఫ్ట్‌వేర్ అప్‌డేట్ అందుబాటులో ఉంది"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"అప్‌డేట్ లభిస్తుంది"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"రిమోట్ అప్‌డేట్ అయ్యి ఉంది"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"రిమోట్ అప్‌డేట్ విఫలమైంది"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"మీ రిమోట్‌ను మేము అప్‌డేట్ చేస్తున్నప్పుడు ఏదో సమస్య ఏర్పడింది. దయచేసి మళ్లీ ట్రై చేయండి."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"దయచేసి వేచి ఉండండి"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"మీ రిమోట్‌ను మళ్లీ పెయిర్ చేయండి"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"ప్రారంభించబడింది"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"నిలిపివేయబడింది"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"బ్యాటరీ స్థాయి"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"ఫర్మ్‌వేర్"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"బ్లూటూత్ అడ్రస్‌"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"దయచేసి బ్యాటరీని రీప్లేస్ చేయండి"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"బ్యాటరీ తక్కువగా ఉంది"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"కనెక్ట్ అయిన పరికరాలు"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"రిమోట్‌లు &amp; యాక్సెసరీలు"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"మీ రిమోట్‌ను అప్‌డేట్ చేయండి"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"ఇన్‌స్టాల్ చేయడానికి సిద్ధంగా ఉంది"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"అప్‌డేట్ చేయండి"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"విస్మరించండి"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"రిమోట్ బ్యాటరీ తక్కువగా ఉంది"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"త్వరగా బ్యాటరీని రీప్లేస్ చేయండి"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"రిమోట్ బ్యాటరీ దాదాపు ఖాళీగా ఉంది"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"త్వరగా బ్యాటరీని రీప్లేస్ చేయండి"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"రిమోట్ బ్యాటరీ ఖాళీగా ఉంది"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"రిమోట్‌ను ఉపయోగించడానికి బ్యాటరీని రీప్లేస్ చేయండి"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"అవును"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"లేదు"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s నుండి డిస్‌కనెక్ట్ చేయండి"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$sకు కనెక్ట్ చేయండి"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$sని విస్మరించండి"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"మీ కనెక్ట్ చేసిన పరికరం పేరు మార్చండి"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CECని ప్రారంభించండి"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"ఒక రిమోట్ నియంత్రణతో ఇతర HDMI-CEC ప్రారంభించబడిన పరికరాలను నియంత్రించడానికి మరియు ఆటోమేటిక్‌గా ఆన్/ఆఫ్ చేయడానికి HDMI-CEC మిమ్మల్ని అనుమతిస్తుంది.\n\nగమనిక: మీ టీవీ మరియు ఇతర HDMI పరికరాలలో HDMI-CEC ప్రారంభించబడిందని నిర్థారించండి. తయారీదారులు తరచుగా HDMI-CECకి వివిధ పేర్లను కలిగి ఉంటారు, ఉదాహరణకు:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"రిమోట్ బటన్‌లను సెటప్ చేయండి"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"వాల్యూమ్, పవర్, టీవీలలోని ఇన్‌పుట్, రిసీవర్‌లు అలాగే సౌండ్‌బార్‌లను కంట్రోల్ చేయండి"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"బ్యాటరీ స్థాయి: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"యాక్సెసరీలు"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"రిమోట్ కంట్రోల్"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"కనెక్ట్ చేయబడింది"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"ఇంతకు మునుపు కనెక్ట్ చేయబడినవి"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"రిమోట్ లేదా యాక్సెసరీని పెయిర్ చేయండి"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"డిస్‌కనెక్ట్"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"కనెక్ట్ చేయండి"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"పేరుమార్చండి"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"విస్మరించండి"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"కనెక్ట్ చేయబడింది"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"డిస్‌కనెక్ట్ అయింది"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"పరికర నియంత్రణ"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"కొత్త పరికరాన్ని కనెక్ట్ చేయండి"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"కొత్త బ్లూటూత్ పరికరాలను కనెక్ట్ చేసే ముందు, అవి పెయిరింగ్ మోడ్‌లోనే ఉన్నాయని నిర్ధారించుకోండి. \'%1$s\' ను కనెక్ట్ చేయడానికి, 3 సెకన్ల పాటు \'%2$s + %3$s\'ను నొక్కి, పట్టుకోండి."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android టీవీ రిమోట్"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"అందుబాటులో ఉన్న పరికరాలు"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"పరికరాల కోసం వెతుకుతోంది…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"ఎర్రర్"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"కనెక్ట్ అవుతోంది…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"కనెక్ట్ అయింది"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"రద్దు చేయబడింది"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$sను కనెక్ట్ చేయడం విఫలమైంది"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s కనెక్ట్ చేయబడింది"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s డిస్‌కనెక్ట్ చేయబడింది"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-th/strings.xml b/libraries/BluetoothServices/res/values-th/strings.xml
index 6114c38..11fdde4 100644
--- a/libraries/BluetoothServices/res/values-th/strings.xml
+++ b/libraries/BluetoothServices/res/values-th/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"วิกฤต"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"ต่ำ"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"ดี"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"ยืนยันการอัปเดตรีโมต"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"รีโมตอาจยกเลิกการเชื่อมต่อเป็นระยะเวลาสั้นๆ ระหว่างการอัปเดต"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"ดำเนินการต่อ"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"ยกเลิก"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"การอัปเดตรีโมต"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"มีซอฟแวร์ใหม่ให้บริการ"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"มีการอัปเดต"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"รีโมตอัปเดตแล้ว"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"อัปเดตรีโมตไม่สำเร็จ"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"เราพบปัญหาขณะอัปเดตรีโมต โปรดลองอีกครั้ง"</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"โปรดรอสักครู่"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"จับคู่รีโมตอีกครั้ง"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"เปิดใช้"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"ปิดใช้"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"ระดับแบตเตอรี่"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"เฟิร์มแวร์"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"ที่อยู่บลูทูธ"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"โปรดเปลี่ยนแบตเตอรี่"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"แบตเตอรี่อ่อน"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"อุปกรณ์ที่เชื่อมต่อ"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"รีโมตและอุปกรณ์เสริม"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"อัปเดตรีโมต"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"พร้อมติดตั้ง"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"อัปเดต"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ปิด"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"แบตเตอรี่รีโมตอ่อน"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"เปลี่ยนแบตเตอรี่โดยเร็ว"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"แบตเตอรี่รีโมตใกล้หมด"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"เปลี่ยนแบตเตอรี่โดยเร็ว"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"แบตเตอรี่รีโมตหมด"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"เปลี่ยนแบตเตอรี่เพื่อใช้รีโมต"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"ใช่"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"ไม่"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"ยกเลิกการเชื่อมต่อจาก %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"เชื่อมต่อกับ %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"ไม่จำ %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"เปลี่ยนชื่ออุปกรณ์ที่เชื่อมต่อ"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"เปิดใช้ HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC ช่วยให้คุณควบคุมและเปิดหรือปิดอุปกรณ์ที่ใช้ HDMI-CEC อื่นๆ โดยอัตโนมัติได้ด้วยรีโมตคอนโทรลอันเดียว\n\nหมายเหตุ: ตรวจสอบว่าเปิดใช้ HDMI-CEC ในทีวีและอุปกรณ์ HDMI อื่นๆ แล้ว ผู้ผลิตมักจะใช้ชื่อสำหรับ HDMI-CEC แตกต่างกันไป เช่น"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"ตั้งค่าปุ่มรีโมต"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"ควบคุมระดับเสียง การเปิด/ปิด อินพุตในทีวี ตัวรับสัญญาณ และซาวด์บาร์"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"ระดับแบตเตอรี่: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"อุปกรณ์เสริม"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"รีโมตคอนโทรล"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"เชื่อมต่อแล้ว"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"อุปกรณ์ที่เคยเชื่อมต่อ"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"จับคู่รีโมทหรืออุปกรณ์เสริม"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"ยกเลิกการเชื่อมต่อ"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"เชื่อมต่อ"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"เปลี่ยนชื่อ"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"ไม่จำ"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"เชื่อมต่อแล้ว"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"เลิกเชื่อมต่อแล้ว"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"การควบคุมอุปกรณ์"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"เชื่อมต่ออุปกรณ์ใหม่"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"ก่อนเชื่อมต่ออุปกรณ์บลูทูธใหม่ ให้ตรวจสอบว่าอุปกรณ์อยู่ในโหมดจับคู่อุปกรณ์ หากต้องการเชื่อมต่อ %1$s ให้กด %2$s + %3$s ค้างไว้ 3 วินาที"</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"รีโมต Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"อุปกรณ์ที่ใช้ได้"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"กำลังค้นหาอุปกรณ์…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"ข้อผิดพลาด"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"กำลังเชื่อมต่อ…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"เชื่อมต่อแล้ว"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"ยกเลิกแล้ว"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s เชื่อมต่อไม่สำเร็จ"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"เชื่อมต่อ %1$s แล้ว"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"ยกเลิกการเชื่อมต่อ %1$s แล้ว"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"ไม่มีข้อมูล"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"วิกฤต"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"ต่ำ"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"ดี"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"ยืนยันการอัปเดตรีโมต"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"รีโมตอาจยกเลิกการเชื่อมต่อเป็นระยะเวลาสั้นๆ ระหว่างอัปเดต"</string>
+    <string name="settings_continue" msgid="5640776697820481568">"ทำต่อ"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"ยกเลิก"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"การอัปเดตรีโมต"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"มีซอฟแวร์ใหม่ให้บริการ"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"มีการอัปเดต"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"รีโมตอัปเดตแล้ว"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"การอัปเดตรีโมตล้มเหลว"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"เราพบปัญหาขณะอัปเดตรีโมต โปรดลองอีกครั้ง"</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"โปรดรอสักครู่"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"จับคู่รีโมตอีกครั้ง"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"เปิดใช้"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"ปิดใช้"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"ระดับแบตเตอรี่"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"เฟิร์มแวร์"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"ที่อยู่บลูทูธ"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"โปรดเปลี่ยนแบตเตอรี่"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"แบตเตอรี่อ่อน"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"อุปกรณ์ที่เชื่อมต่อ"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"รีโมตและอุปกรณ์เสริม"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"อัปเดตรีโมต"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"พร้อมติดตั้ง"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"อัปเดต"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ปิด"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"แบตเตอรี่รีโมตอ่อน"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"เปลี่ยนแบตเตอรี่โดยเร็ว"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"แบตเตอรี่รีโมตใกล้หมด"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"เปลี่ยนแบตเตอรี่โดยเร็ว"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"แบตเตอรี่รีโมตหมด"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"เปลี่ยนแบตเตอรี่เพื่อใช้รีโมต"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"ใช่"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"ไม่"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"ยกเลิกการเชื่อมต่อจาก %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"เชื่อมต่อกับ %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"ไม่จำ %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"เปลี่ยนชื่ออุปกรณ์ที่เชื่อมต่อ"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"เปิดใช้ HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC ช่วยให้คุณควบคุมและเปิดหรือปิดอุปกรณ์ที่ใช้ HDMI-CEC อื่นๆ ได้ด้วยรีโมตควบคุม\n\nหมายเหตุ: ตรวจสอบว่าเปิดใช้ HDMI-CEC ในทีวีและอุปกรณ์ HDMI อื่นๆ แล้ว ผู้ผลิตมักจะใช้ชื่อสำหรับ HDMI-CEC แตกต่างกันไป ตัวอย่างเช่น:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"ตั้งค่าปุ่มรีโมต"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"ควบคุมระดับเสียง การเปิด/ปิด อินพุตในทีวี ตัวรับสัญญาณ และซาวด์บาร์"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"ระดับแบตเตอรี่: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"อุปกรณ์เสริม"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"รีโมตคอนโทรล"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"เชื่อมต่อแล้ว"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"อุปกรณ์ที่เคยเชื่อมต่อ"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"จับคู่รีโมตหรืออุปกรณ์เสริม"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"ยกเลิกการเชื่อมต่อ"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"เชื่อมต่อ"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"เปลี่ยนชื่อ"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"ไม่จำ"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"เชื่อมต่อแล้ว"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"เลิกเชื่อมต่อแล้ว"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"การควบคุมอุปกรณ์"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"เชื่อมต่ออุปกรณ์เครื่องใหม่"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"ก่อนเชื่อมต่ออุปกรณ์บลูทูธใหม่ ให้ตรวจสอบว่าอุปกรณ์อยู่ในโหมดจับคู่อุปกรณ์ หากต้องการเชื่อมต่อ %1$s ให้กด %2$s + %3$s ค้างไว้ 3 วินาที"</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"รีโมต Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"อุปกรณ์ที่ใช้ได้"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"กำลังค้นหาอุปกรณ์…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"ข้อผิดพลาด"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"กำลังเชื่อมต่อ…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"เชื่อมต่อแล้ว"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"ยกเลิกแล้ว"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s เชื่อมต่อไม่สำเร็จ"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"เชื่อมต่อ %1$s แล้ว"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"ยกเลิกการเชื่อมต่อ %1$s แล้ว"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-tl/strings.xml b/libraries/BluetoothServices/res/values-tl/strings.xml
index 1df789d..236b351 100644
--- a/libraries/BluetoothServices/res/values-tl/strings.xml
+++ b/libraries/BluetoothServices/res/values-tl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritikal"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Mababa"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Mataas"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Kumpirmahin ang pag-update ng remote"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Habang isinasagawa ang pag-update, baka madiskonekta nang ilang sandali ang iyong remote."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Magpatuloy"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Kanselahin"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Update ng remote"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"May bagong available na software"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"May available na update"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Up to date na ang remote"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Hindi na-update ang remote"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Nakaranas kami ng isyu habang ina-update ang iyong remote. Pakisubukan ulit."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Maghintay"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Ipares ulit ang iyong remote"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Naka-enable"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Naka-disable"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Antas ng baterya"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Address ng bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Pakipalitan ang baterya"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Paubos na ang baterya"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Mga Nakakonektang Device"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Mga Remote at Accessory"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"I-update ang iyong remote"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Handa nang i-install"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"I-UPDATE"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"I-DISMISS"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Paubos na ang baterya ng remote"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Palitan na ang baterya"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Paubos na ang baterya ng remote"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Palitan na ang baterya"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Ubos na ang baterya ng remote"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Palitan ang baterya para magamit ang remote"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Oo"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Hindi"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Magdiskonekta sa %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Kumonekta sa %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Kalimutan ang %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"I-rename ang iyong nakakonektang device"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"I-enable ang HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Nagbibigay-daan sa iyo ang HDMI-CEC na kontrolin at awtomatikong i-on/i-off ang iba pang device na may naka-enable na HDMI-CEC, gamit ang isang remote control.\n\nTandaan: Tiyaking naka-enable ang HDMI-CEC sa iyong TV at iba pang HDMI device. Kadalasan, magkakaiba ang gamit na pangalan ng mga manufacturer para sa HDMI-CEC, halimbawa:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Mag-set up ng mga button ng remote"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Kontrolin ang volume, power, input sa mga TV, receiver, at soundbar"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Antas ng baterya: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Mga Accessory"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Remote Control"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Nakakonekta"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Dating nakakonekta"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Magpares ng remote o accessory"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Idiskonekta"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Kumonekta"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Palitan ng pangalan"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Kalimutan"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Nakakonekta"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Nadiskonekta"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Kontrol sa device"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Magkonekta ng bagong device"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Bago magkonekta ng mga bagong Bluetooth device, tiyaking nasa pairing mode ang mga ito. Para ikonekta ang %1$s, pindutin nang matagal ang %2$s + %3$s nang 3 segundo."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"isang Android TV remote"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Mga available na device"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Naghahanap ng mga device…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Error"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Kumokonekta…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Nakakonekta"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Kinansela"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Hindi nagawang kumonekta sa %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"Nakakonekta ang %1$s"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"Nadiskonekta ang %1$s"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"N/A"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritikal"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Mahina"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Malakas"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Kumpirmahin ang pag-update ng remote"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Habang isinasagawa ang pag-update, posibleng saglit na madiskonekta ang iyong remote."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Magpatuloy"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Kanselahin"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Update ng remote"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"May bagong available na software"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"May available na update"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Up to date na ang remote"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Hindi na-update ang remote"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Nakaranas kami ng isyu habang ina-update ang iyong remote. Subukan ulit."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Maghintay"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Ipares ulit ang iyong remote"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Naka-enable"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Naka-disable"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Antas ng baterya"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Address ng bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Pakipalitan ang baterya"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Mahinang baterya"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Mga Nakakonektang Device"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Mga Remote at Accessory"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"I-update ang iyong remote"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Handa nang i-install"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"I-UPDATE"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"I-DISMISS"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Paubos na ang baterya ng remote"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Palitan na ang baterya"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Paubos na ang baterya ng remote"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Palitan na ang baterya"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Ubos na ang baterya ng remote"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Palitan ang baterya para magamit ang remote"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Oo"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Huwag"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Magdiskonekta sa %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Kumonekta sa %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Kalimutan ang %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"I-rename ang iyong nakakonektang device"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"I-enable ang HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Nagbibigay-daan sa iyo ang HDMI-CEC na kontrolin at awtomatikong i-on/i-off ang iba pang device na may naka-enable na HDMI-CEC sa pamamagitan ng isang remote control.\n\nTandaan: Tiyaking naka-enable ang HDMI-CEC sa iyong TV at iba pang HDMI device. Madalas na magkaiba ang mga pangalan ng mga manufacturer para sa HDMI-CEC, halimbawa:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Mag-set up ng mga button ng remote"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Kontrolin ang volume, power, input sa mga TV, receiver, at soundbar"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Antas ng baterya: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Mga Accessory"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Remote Control"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Nakakonekta"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Dating nakakonekta"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Magpares ng remote o accessory"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Idiskonekta"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Kumonekta"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"I-rename"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Kalimutan"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Nakakonekta"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Nadiskonekta"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Kontrol sa device"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Magkonekta ng bagong device"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Bago magkonekta ng mga bagong Bluetooth device, tiyaking nasa pairing mode ang mga ito. Para ikonekta ang %1$s, pindutin nang matagal ang %2$s + %3$s nang 3 segundo."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"isang Android TV remote"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Mga available na device"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Naghahanap ng mga device…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Error"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Kumokonekta…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Nakakonekta"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Kinansela"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Hindi nagawang kumonekta sa %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Nakakonekta ang %1$s"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Nadiskonekta ang %1$s"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-tr/strings.xml b/libraries/BluetoothServices/res/values-tr/strings.xml
index ebcc982..a386d64 100644
--- a/libraries/BluetoothServices/res/values-tr/strings.xml
+++ b/libraries/BluetoothServices/res/values-tr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Yok"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Kritik düzeyde"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Düşük"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"İyi"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Uzaktan kumanda güncellemesini onaylayın"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Güncelleme sırasında uzaktan kumandanızın bağlantısı kısa süreliğine kesilebilir."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Devam"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"İptal"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Uzaktan kumanda güncellemesi"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Yeni yazılım mevcut"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Uygulama güncellendi"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Uzaktan kumanda güncel"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Uzaktan kumanda güncellenemedi"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Uzaktan kumandanızı güncellerken bir sorunla karşılaştık. Lütfen tekrar deneyin."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Lütfen bekleyin"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Uzaktan kumandanızı tekrar eşleyin"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Etkin"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Devre dışı"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Pil seviyesi"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%%%1$d</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Donanım yazılımı"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth adresi"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Lütfen pili değiştirin"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Düşük pil"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Bağlı Cihazlar"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Uzaktan Kumandalar ve Aksesuarlar"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Uzaktan kumandanızı güncelleyin"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Yüklemeye hazır"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"GÜNCELLE"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"KAPAT"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Uzaktan kumandanın pil seviyesi düşük"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Pili yakında değiştirin"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Uzaktan kumandanın pili bitmek üzere"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Pili yakında değiştirin"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Uzaktan kumandanın pili bitti"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Uzaktan kumandayı kullanmak için pili değiştirin"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Evet"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Hayır"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s bağlantısını kes"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Şuna bağlan: %s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s cihazını unut"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Bağlı cihazınızın adını değiştirin"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC\'yi etkinleştir"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC, tek bir uzaktan kumanda ile HDMI-CEC özellikli diğer cihazları kontrol etmenize olanak sağlar.\n\nNot: TV\'nizde ve diğer HDMI cihazlarınızda HDMI-CEC\'nin etkin olduğundan emin olun. Üreticiler çoğunlukla HDMI-CEC için farklı adlar kullanırlar. Örneğin:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Uzaktan kumanda düğmeleri ayarlayın"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"TV\'lerde, alıcılarda ve ses çubuklarında ses düzeyini, gücü, girişi kontrol edin"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Pil seviyesi: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Aksesuarlar"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Uzaktan Kumanda"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Bağlı Cihazlar"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Daha önce bağlanılmış cihazlar"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Uzaktan kumanda veya aksesuar eşleme"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Bağlantıyı kes"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Bağlan"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Yeniden adlandır"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Unut"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Bağlı"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Bağlantı değil"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Cihaz kontrolü"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Yeni cihaz bağla"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Yeni Bluetooth cihazları bağlamadan önce cihazların eşleme modunda olduklarından emin olun. %1$s cihazını bağlamak için %2$s + %3$s tuşlarını 3 saniye basılı tutun."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV uzaktan kumandası"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Kullanılabilir cihazlar"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Cihazlar aranıyor…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Hata"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Bağlanıyor…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Bağlandı"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"İptal edildi"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s bağlantısı başarısız oldu"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s bağlı"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s bağlı değil"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Yok"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kritik düzeyde"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Düşük"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"İyi"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Uzaktan kumanda güncellemesini onaylayın"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Güncelleme sırasında uzaktan kumandanızın bağlantısı kısa süreliğine kesilebilir."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Devam"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"İptal"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Uzaktan kumanda güncellemesi"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Yeni yazılım mevcut"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Güncelleme mevcut"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Uzaktan kumanda güncel"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Uzaktan kumanda güncellenemedi"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Uzaktan kumandanızı güncellerken bir sorunla karşılaştık. Lütfen tekrar deneyin."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Lütfen bekleyin"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Uzaktan kumandanızı tekrar eşleyin"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Etkin"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Devre dışı"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Pil düzeyi"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%%%1$d"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Donanım Yazılımı"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth adresi"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Lütfen pili değiştirin"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Pil seviyesi düşük"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Bağlı Cihazlar"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Uzaktan Kumandalar ve Aksesuarlar"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Uzaktan kumandanızı güncelleyin"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Yüklemeye hazır"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"GÜNCELLE"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"KAPAT"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Uzaktan kumandanın pil seviyesi düşük"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Pili yakında değiştirin"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Uzaktan kumandanın pili bitmek üzere"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Pili yakında değiştirin"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Uzaktan kumandanın pili bitti"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Uzaktan kumandayı kullanmak için pili değiştirin"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Evet"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Hayır"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s bağlantısını kes"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Şuna bağlan: %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s cihazını unut"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Bağlı cihazınızın adını değiştirin"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC\'yi etkinleştir"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC, tek bir uzaktan kumanda ile HDMI-CEC özellikli diğer cihazları kontrol etmenize olanak sağlar .\n\nNot: TV\'nizde ve diğer HDMI cihazlarınızda HDMI-CEC\'nin etkin olduğundan emin olun. Üreticiler çoğunlukla HDMI-CEC için farklı adlar kullanırlar. Örneğin:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Uzaktan kumanda düğmeleri ayarlayın"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"TV\'lerde, alıcılarda ve ses çubuklarında ses düzeyini, gücü, girişi kontrol edin"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Pil seviyesi: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Aksesuarlar"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Uzaktan Kumanda"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Bağlı"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Daha önce bağlanılmış cihazlar"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Uzaktan kumanda veya aksesuar eşleme"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Bağlantıyı kes"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Bağlan"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Yeniden adlandır"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Unut"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Bağlı"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Bağlantı değil"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Cihaz kontrolü"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Yeni cihaz bağla"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Yeni Bluetooth cihazları bağlamadan önce cihazların eşleme modunda olduklarından emin olun. %1$s cihazını bağlamak için %2$s + %3$s tuşlarını 3 saniye basılı tutun."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV uzaktan kumandası"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Kullanılabilir cihazlar"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Cihazlar aranıyor…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Hata"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Bağlanıyor…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Bağlı"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"İptal edildi"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s bağlantısı başarısız oldu"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s bağlandı"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s bağlantısı kesildi"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-uk/strings.xml b/libraries/BluetoothServices/res/values-uk/strings.xml
index 5b5d2f2..d12fe49 100644
--- a/libraries/BluetoothServices/res/values-uk/strings.xml
+++ b/libraries/BluetoothServices/res/values-uk/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Н/Д"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Критичний"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Низький"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Нормальний"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Підтвердьте оновлення пульта дистанційного керування"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Під час оновлення пульт дистанційного керування буде ненадовго відключено."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Продовжити"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Скасувати"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Оновлення пульта дистанційного керування"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Доступне нове програмне забезпечення"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Доступне оновлення"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Пульт дистанційного керування оновлено"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Не вдалось оновити пульт дистанційного керування"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Під час оновлення пульта дистанційного керування сталася помилка. Повторіть спробу."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Зачекайте"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Підключіть пульт дистанційного керування ще раз"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Увімкнено"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Вимкнено"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Рівень заряду акумулятора"</string>
-    <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Мікропрограма"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Адреса Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Замініть акумулятор"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Низький рівень заряду акумулятора"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Підключені пристрої"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Дистанційне керування й аксесуари"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Оновіть пульт дистанційного керування"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Можна встановлювати"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"ОНОВИТИ"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ЗАКРИТИ"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Низький заряд батарейок пульта ДК"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Замініть батарейки якнайшвидше"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Дуже низький заряд батарейок пульта ДК"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Замініть батарейки якнайшвидше"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Батарейки пульта ДК розряджено"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Замініть батарейки, щоб користуватися пультом ДК"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Так"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Ні"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Відключити від пристрою %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Підключитися до %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Забути пристрій %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Перейменувати підключений пристрій"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Увімкнути HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Функція HDMI-CEC дає змогу контролювати, а також автоматично вмикати й вимикати сумісні з нею пристрої за допомогою єдиного пульта дистанційного керування.\n\nПримітка: упевніться, що HDMI-CEC ввімкнено на телевізорі й інших HDMI-пристроях. Назви функції HDMI-CEC можуть відрізнятися залежно від виробника, наприклад:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Налаштувати кнопки дистанційного керування"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Керуйте гучністю, живленням і джерелами вхідного сигналу телевізора, приймача та звукової панелі"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Рівень заряду акумулятора: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Аксесуари"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Пульт ДК"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Підключено"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Підключені раніше"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Підключити пульт дистанційного керування або аксесуари"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Відключити"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Підключити"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Перейменувати"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Забути"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Підключено"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Відключено"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Керування пристроями"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Підключити новий пристрій"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Перш ніж підключати нові пристрої Bluetooth, переконайтеся, що на них увімкнено режим підключення. Щоб підключити пристрій %1$s, утримуйте %2$s + %3$s протягом 3 секунд."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"пульт дистанційного керування Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Доступні пристрої"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Пошук пристроїв…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Помилка"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Підключення…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Підключено"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Скасовано"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"Не вдалося підключити пристрій %1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s підключено"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s відключено"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Н/Д"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Критичний"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Низький"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Нормальний"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Підтвердьте оновлення пульта дистанційного керування"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Під час оновлення пульт ДК буде ненадовго відключено."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Продовжити"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Скасувати"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Оновлення пульта дистанційного керування"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Доступне нове програмне забезпечення"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Доступне оновлення"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Пульт дистанційного керування оновлено"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Не вдалось оновити пульт дистанційного керування"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Не вдалось оновити пульт дистанційного керування. Повторіть спробу."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Зачекайте"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Підключіть пульт дистанційного керування ще раз"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Увімкнено"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Вимкнено"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Рівень заряду акумулятора"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Мікропрограма"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Адреса Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Замініть акумулятор"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Низький заряд акумулятора"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Підключені пристрої"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Дистанційне керування й аксесуари"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Оновіть пульт ДК"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Можна встановлювати"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"ОНОВИТИ"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ЗАКРИТИ"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Низький заряд акумулятора пульта ДК"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Замініть акумулятор якнайшвидше"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Дуже низький заряд акумулятора пульта ДК"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Замініть акумулятор якнайшвидше"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Акумулятор пульта ДК розряджено"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Замініть акумулятор, щоб користуватися пультом ДК"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Так"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Ні"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Від’єднати від пристрою %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Підключитися до пристрою %1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Забути пристрій %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Перейменувати під’єднаний пристрій"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Увімкнути HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"Функція HDMI-CEC дає змогу контролювати, а також автоматично вмикати й вимикати сумісні з нею пристрої за допомогою єдиного пульта дистанційного керування.\n\nПримітка: упевніться, що HDMI-CEC ввімкнено на телевізорі та інших HDMI-пристроях. Назви функції HDMI-CEC можуть відрізнятися залежно від виробника, наприклад:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung – Anynet+\nLG – SimpLink\nSony – BRAVIA Sync\nPhilips – EasyLink\nSharp – Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Налаштувати кнопки дистанційного керування"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Керуйте гучністю, живленням і джерелами вхідного сигналу телевізора, приймача й звукової панелі"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Рівень заряду акумулятора: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Аксесуари"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Пульт ДК"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Під’єднано"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Під’єднано раніше"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Підключити пульт ДК або аксесуар"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Від’єднати"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Підключити"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Перейменувати"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Забути"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Підключено"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Відключено"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Керування пристроями"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Підключити новий пристрій"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Перш ніж підключати нові пристрої з Bluetooth, переконайтеся, що на них увімкнено режим пари. Щоб підключити пристрій \"%1$s\", утримуйте %2$s + %3$s протягом 3 секунд."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"пульт дистанційного керування Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Доступні пристрої"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Пошук пристроїв…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Помилка"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Підключення…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Підключено"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Скасовано"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"Не вдалося підключити пристрій %1$s"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s підключено"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s відключено"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-ur/strings.xml b/libraries/BluetoothServices/res/values-ur/strings.xml
index b5f04a1..0718322 100644
--- a/libraries/BluetoothServices/res/values-ur/strings.xml
+++ b/libraries/BluetoothServices/res/values-ur/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"قابل اطلاق نہیں"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"انتہائی اہم"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"کم"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"اچھا"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"ریموٹ کو اپ ڈیٹ کرنا تصدیق کریں"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"اپ ڈیٹ کے دوران آپ کا ریموٹ کچھ دیر کے ليے غیر منسلک ہو سکتا ہے۔"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"جاری رکھیں"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"منسوخ کريں"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"ریموٹ اپ ڈیٹ"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"نیا سافٹ ویئر دستیاب ہے"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"اپ ڈیٹ دستیاب ہے"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"ریموٹ اپ ٹو ڈیٹ ہے"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"ریموٹ کو اپ ڈیٹ کرنا ناکام ہو گیا"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"آپ کا ریموٹ اپ ڈیٹ کرتے وقت ہمیں ایک مسئلہ پیش آ گیا۔ براہ کرم دوبارہ کوشش کریں۔"</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"براہ کرم انتظار کریں"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"اپنے ریموٹ کا دوبارہ جوڑا بنائیں"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"فعال"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"غیر فعال"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"بیٹری کی سطح"</string>
-  <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%%‏ %1$d</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"فرم ویئر"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"بلوٹوتھ پتہ"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"براہ کرم بیٹری بدلیں"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"بیٹری کم ہے"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"منسلک آلات"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"ریموٹس اور لوازمات"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"اپنے ریموٹ کو اپ ڈیٹ کریں"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"انسٹال کے ليے تیار ہے"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"اپ ڈیٹ کریں"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"برخاست کریں"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"ریموٹ کی بیٹری کم ہے"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"جلد ہی بیٹری تبدیل کریں"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"ریموٹ کی بیٹری تقریباً خالی ہے"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"جلد ہی بیٹری تبدیل کریں"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"ریموٹ کی بیٹری خالی ہے"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"ریموٹ استعمال کرنے کے لیے بیٹری تبدیل کریں"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"ہاں"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"نہیں"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s سے غیر منسلک کریں"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s سے منسلک ہوں"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"%1$s کو بھول جائيں"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"اپنے منسلک آلہ کا نام تبدیل کریں"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC فعال کریں"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC آپ کو صرف ایک ریموٹ کنٹرول کے ذریعے HDMI-CEC فعال کردہ دیگر آلات کو خودکار طور پر آن/آف کرنے کی اجازت دیتی ہے۔\n\nنوٹ: یقینی بنائیں کہ HDMI-CEC آپ کے TV اور دیگر HDMI آلات پر فعال ہو۔ بسا اوقات مینوفیکچررز کے پاس HDMI-CEC کے مختلف نام ہوتے ہیں، مثال کے طور پر:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"ریموٹ بٹنز سیٹ اپ کریں"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"TVs، ریسیورز اور ساؤنڈ بارز پر والیوم، پاور اور ان پٹ کنٹرول کریں"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"بیٹری کی سطح: ‏ %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"لوازمات"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"ریموٹ کنٹرول"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"منسلک ہے"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"پہلے سے منسلک کردہ"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"ریموٹ یا لوازم کا جوڑا بنائیں"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"غیر منسلک کریں"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"منسلک کریں"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"نام بدلیں"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"بھول جائیں"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"منسلک ہے"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"غیر منسلک ہے"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"آلہ کا کنٹرول"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"نیا آلہ منسلک کریں"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"نئے بلوٹوتھ آلات کو منسلک کرنے سے پہلے، اس بات کو یقینی بنائیں کہ وہ جوڑا بنانے والی وضع میں ہیں۔ %1$s سے منسلک کرنے کے لیے، ‎%2$s + %3$s کو 3 سیکنڈز کے ليے چھوئیں اور دبائے رکھیں۔"</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"ایک Android TV ریموٹ"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"دستیاب آلات"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"آلات کے ليے تلاش جاری ہیں…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"خرابی"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"منسلک ہو رہا ہے…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"منسلک ہے"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"منسوخ کر دیا گیا"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s سے منسلک ہونے میں ناکام ہوگیا"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"‎%1$s‎‎‎ منسلک ہے"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s غیر منسلک کر دیا گیا"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"ناقابل اطلاق"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"انتہائی کم"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"کم"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"اچھا"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"ریموٹ کو اپ ڈیٹ کرنا تصدیق کریں"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"اپ ڈیٹ کے دوران آپ کا ریموٹ کچھ دیر کیلئے غیر منسلک ہو سکتا ہے۔"</string>
+    <string name="settings_continue" msgid="5640776697820481568">"جاری رکھیں"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"منسوخ کریں"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"ریموٹ اپ ڈیٹ"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"نیا سافٹ ویئر دستیاب ہے"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"اپ ڈیٹ دستیاب ہے"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"ریموٹ اپ ٹو ڈیٹ ہے"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"ریموٹ کو اپ ڈیٹ کرنا ناکام ہو گیا"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"آپ کا ریموٹ اپ ڈیٹ کرتے وقت ہمیں ایک مسئلہ پیش آ گیا۔ براہ کرم دوبارہ کوشش کریں۔"</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"براہ کرم انتظار کریں"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"اپنے ریموٹ کا دوبارہ جوڑا بنائیں"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"فعال"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"غیر فعال"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"بیٹری کی سطح"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"فرم ویئر"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"بلوٹوتھ پتہ"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"براہ کرم بیٹری بدلیں"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"بیٹری کم ہے"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"منسلک آلات"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"ریموٹس اور لوازمات"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"اپنے ریموٹ کو اپ ڈیٹ کریں"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"انسٹال کے ليے تیار ہے"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"اپ ڈیٹ کریں"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"برخاست کریں"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"ریموٹ کی بیٹری کم ہے"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"جلد ہی بیٹری تبدیل کریں"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"ریموٹ کی بیٹری تقریباً خالی ہے"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"جلد ہی بیٹری تبدیل کریں"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"ریموٹ کی بیٹری خالی ہے"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"ریموٹ استعمال کرنے کے لیے بیٹری تبدیل کریں"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"ہاں"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"نہیں"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s سے غیر منسلک کریں"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s سے منسلک کریں"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s کو بھول جائيں"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"اپنے منسلک آلہ کا نام تبدیل کریں"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC فعال کریں"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC آپ کو صرف ایک ریموٹ کنٹرول کے ذریعے HDMI-CEC فعال کردہ دیگر آلات کو خودکار طور پر آن/آف کرنے کی اجازت دیتی ہے۔ \n\nنوٹ: یقینی بنائیں کہ HDMI-CEC آپ کے TV اور دیگر HDMI آلات پر فعال ہو۔ بسا اوقات مینوفیکچررز کے پاس HDMI-CEC کے الگ الگ نام ہوتے ہیں، مثال کے طور پر:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung:‎ Anynet+\nLG:‎ SimpLink\nSony:‎ BRAVIA Sync\nPhilips:‎ EasyLink\nSharp:‎ Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"ریموٹ بٹنز سیٹ اپ کریں"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"TVs، ریسیورز اور ساؤنڈ بارز پر والیوم، پاور اور ان پٹ کنٹرول کریں"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"بیٹری لیول: ‏ %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"لوازمات"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"ریموٹ کنٹرول"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"منسلک"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"پہلے سے منسلک کردہ"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"ریموٹ یا لوازم کا جوڑا بنائیں"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"غیر منسلک کریں"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"منسلک ہوں"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"نام تبدیل کریں"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"بھول جائیں"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"منسلک ہے"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"غیر منسلک ہے"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"آلہ کا کنٹرول"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"نیا آلہ منسلک کریں"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"نئے بلوٹوتھ آلات کو منسلک کرنے سے پہلے، اس بات کو یقینی بنائیں کہ وہ جوڑا بنانے والے موڈ میں ہیں۔ %1$s سے منسلک کرنے کے لیے، ‎%2$s + %3$s کو چھوئیں اور 3 سیکنڈز تک دبائے رکھیں۔"</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"ایک Android TV ریموٹ"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"دستیاب آلات"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"آلات تلاش کيے جا رہے ہیں…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"خرابی"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"منسلک ہو رہا ہے…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"منسلک ہے"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"منسوخ کیا گیا"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s منسلک ہونے میں ناکام ہو گیا"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s کو منسلک کر دیا گیا"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s کو غیر منسلک کر دیا گیا"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-uz/strings.xml b/libraries/BluetoothServices/res/values-uz/strings.xml
index 559489f..ac51db2 100644
--- a/libraries/BluetoothServices/res/values-uz/strings.xml
+++ b/libraries/BluetoothServices/res/values-uz/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Mavjud emas"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Juda kam"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Past"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Yaxshi"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Pult mikrodasturi yangilanishini tasdiqlang"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Yangilash paytida pult qisqa vaqt uzilishi mumkin."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Davom etish"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Bekor qilish"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Pult uchun yangilanish"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Yangi dastur mavjud"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Yangilanish chiqdi"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Pult mikrodasturi allaqachon yangilangan"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Pult mikrodasturi yangilanmadi"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Pult mikrodasturi yangilanayotganda muammo yuz berdi. Qayta urining."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Kutib turing"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Pultni qayta ulang"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Yoniq"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Faol emas"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Batareya quvvati"</string>
-  <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Mikrodastur"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Bluetooth manzili"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Batareyani almashtiring"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Batareya quvvati kam"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Ulangan qurilmalar"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Pultlar va aksessuarlar"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Pult mikrodasturini yangilang"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Oʻrnatish uchun tayyor"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"YANGILASH"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"YOPISH"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Pult batareyasi quvvati kam"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Batareyani tezroq almashtiring"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Pult batareyasi quvvati deyarli qolmadi"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Batareyani tezroq almashtiring"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Pult batareyasi quvvatsiz"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Pultni ishlatish uchun batareyasini almashtiring"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Ha"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Yoʻq"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"%1$s bilan aloqani uzish"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"%1$s bilan ulash"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Olib tashlash: %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Ulangan qurilmani qayta nomlash"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"HDMI-CEC xususiyatini yoqish"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC bilan boshqa HDMI-CEC xususiyatli qurilmalarni bir pult orqali boshqarish va avtomatik yoqish/oʻchirish mumkin.\n\nEslatma: TV va boshqa HDMI qurilmalaringizda HDMI-CEC yoniqligini tekshiring. Odatda ishlab chiqaruvchilar HDMI-CEC uchun boshqa nomlar ishlatadi, masalan:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Pult tugmalarini sozlash"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Televizor, resiver va saundbarlardagi tovush balandligi, quvvat va manbalarni boshqarish"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Batareya quvvati: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Aksessuarlar"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Masofaviy boshqaruv"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Ulandi"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Avval ulangan qurilmalar"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Pult yoki aksessuarni ulang"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Uzish"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Ulash"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Qayta nomlash"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Olib tashlash"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Ulandi"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Uzildi"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Qurilmalar boshqaruvi"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Yangi qurilmani ulash"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Bluetooth qurilmalarni ulashdan avval ularning ulanish rejimida ekanligini tekshiring %1$s qurilmasini ulash uchun %2$s + %3$s tugmalarini 3 soniya bosib turing."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV pulti"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Mavjud qurilmalar"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Qurilmalar qidirilmoqda…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Xato"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Ulanmoqda…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Ulandi"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Bekor qilingan"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s ulanmadi"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"%1$s ulandi"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"%1$s uzildi"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Noaniq"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Juda kam"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Past"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Yaxshi"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Pult mikrodasturi yangilanishini tasdiqlang"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Yangilash paytida pult qisqa vaqt uzilishi mumkin."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Davom etish"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Bekor qilish"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Pult uchun yangilanish"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Yangi dastur mavjud"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Yangilanish chiqdi"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Pult mikrodasturi allaqachon yangilangan"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Pult yangilanmadi"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Pult mikrodasturi yangilanayotganda muammo yuz berdi. Qayta urining."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Kutib turing"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Pultni qayta ulang"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Yoqilgan"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Oʻchiq"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Batareya quvvati darajasi"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Mikrodastur"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Bluetooth manzili"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Batareyani almashtiring"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Batareya quvvati kam"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Ulangan qurilmalar"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Pultlar va aksessuarlar"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Pult dasturini yangilang"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Oʻrnatish uchun tayyor"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"YANGILASH"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"YOPISH"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Pult batareyasi quvvati kam"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Batareyani tezroq almashtiring"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Pult batareyasi quvvati deyarli qolmadi"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Batareyani tezroq almashtiring"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Pult batareyasi quvvatsiz"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Pultni ishlatish uchun batareyasini almashtiring"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Ha"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Yo‘q"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"%1$s bilan aloqani uzish"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"%1$s bilan ulash"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"%1$s qurilmasini olib tashlash"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Ulangan qurilmani qayta nomlash"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"HDMI-CEC xususiyatini yoqish"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC bilan boshqa HDMI-CEC xususiyatli qurilmalarni bir pult orqali boshqarish va avtomatik yoqish/oʻchirib qoʻyish mumkin.\n\nEslatma: TV va boshqa HDMI qurilmalaringizda HDMI-CEC yoniqligini tekshiring. Odatda ishlab chiqaruvchilar HDMI-CEC uchun boshqa nomlar ishlatadi, masalan:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Pult tugmalarini sozlash"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Televizor, resiver va saundbarlardagi tovush balandligi, quvvat va manbalarni boshqarish"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Batareya quvvati: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Aksessuarlar"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Masofaviy boshqaruv"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Ulandi"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Avval ulangan qurilmalar"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Pult yoki aksessuarni ulash"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Uzish"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Ulash"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Qayta nomlash"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Olib tashlash"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Ulandi"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Uzildi"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Qurilma boshqaruvi"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Yangi qurilmani ulash"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Bluetooth qurilmalarni ulashdan avval ularning ulanish rejimida ekanligini tekshiring %1$s qurilmasini ulash uchun %2$s + %3$s tugmalarini 3 soniya bosib turing."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV pulti"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Mavjud qurilmalar"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Qurilmalar qidirilmoqda…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Xato"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Ulanmoqda…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Ulandi"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Bekor qilindi"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s ulanmadi"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"%1$s ulandi"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"%1$s uzildi"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-vi/strings.xml b/libraries/BluetoothServices/res/values-vi/strings.xml
index 8873608..1623211 100644
--- a/libraries/BluetoothServices/res/values-vi/strings.xml
+++ b/libraries/BluetoothServices/res/values-vi/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"Không xác định"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Cực thấp"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Thấp"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Tốt"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Xác nhận cập nhật điều khiển từ xa"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Trong khi cập nhật, điều khiển từ xa có thể ngắt kết nối một thời gian ngắn."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Tiếp tục"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Hủy"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Cập nhật từ xa"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Đã có phần mềm mới"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Đã có bản cập nhật"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Điều khiển từ xa đã được cập nhật"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Không cập nhật được điều khiển từ xa"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Chúng tôi đã gặp phải sự cố khi cập nhật điều khiển từ xa của bạn. Vui lòng thử lại."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Vui lòng đợi"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Ghép nối lại điều khiển từ xa của bạn"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Đã bật"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Đã tắt"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Mức pin"</string>
-  <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"Chương trình cơ sở"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Địa chỉ Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Vui lòng thay pin"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Pin yếu"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Thiết bị đã kết nối"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Điều khiển từ xa và phụ kiện"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Cập nhật điều khiển từ xa"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Sẵn sàng cài đặt"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"CẬP NHẬT"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"ĐÓNG"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Điều khiển từ xa sắp hết pin"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Hãy thay pin ngay"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Điều khiển từ xa sắp hết pin"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Hãy thay pin ngay"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Điều khiển từ xa đã hết pin"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Hãy thay pin để sử dụng điều khiển từ xa"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Có"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Không"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Ngắt kết nối khỏi %1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Kết nối với %1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Xóa %1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Đổi tên thiết bị đã kết nối của bạn"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Bật HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"Nhờ có HDMI-CEC, bạn có thể điều khiển và tự động bật/tắt các thiết bị hỗ trợ HDMI-CEC khác chỉ với một bộ điều khiển từ xa.\n\nLưu ý: Hãy đảm bảo bạn đã bật HDMI-CEC trên TV và các thiết bị HDMI khác. Các nhà sản xuất thường có các tên khác nhau cho HDMI-CEC, ví dụ:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Thiết lập nút trên điều khiển từ xa"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Điều chỉnh âm lượng, điều khiển nguồn, nguồn đầu vào của TV, bộ thu và loa thanh"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Mức pin: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Phụ kiện"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Điều khiển từ xa"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Đã kết nối"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Đã kết nối trước đó"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Ghép nối điều khiển từ xa hoặc phụ kiện"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Ngắt kết nối"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Kết nối"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Đổi tên"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Xóa"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Đã kết nối"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Đã ngắt kết nối"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Điều khiển thiết bị"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Kết nối thiết bị mới"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Trước khi kết nối các thiết bị Bluetooth mới, hãy đảm bảo các thiết bị đó đang ở chế độ ghép nối. Để kết nối %1$s, hãy nhấn và giữ %2$s + %3$s trong 3 giây."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"điều khiển từ xa cho Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Thiết bị hiện có"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Đang tìm thiết bị…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Lỗi"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Đang kết nối…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Đã kết nối"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Đã hủy"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"%1$s không kết nối được"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"Đã kết nối %1$s"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"Đã ngắt kết nối %1$s"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Không có"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Cực thấp"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Thấp"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Phù hợp"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Xác nhận cập nhật điều khiển từ xa"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Trong khi cập nhật, điều khiển từ xa của bạn có thể ngắt kết nối một lát."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Tiếp tục"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Huỷ"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Cập nhật điều khiển từ xa"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Đã có phần mềm mới"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Đã có bản cập nhật"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Điều khiển từ xa đã được cập nhật"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Không thể cập nhật điều khiển từ xa"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Chúng tôi đã gặp phải sự cố khi cập nhật điều khiển từ xa của bạn. Vui lòng thử lại."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Vui lòng đợi"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Ghép nối lại điều khiển từ xa của bạn"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Đã bật"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Đã tắt"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Mức pin"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"Chương trình cơ sở"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Địa chỉ Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Vui lòng thay pin"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Pin yếu"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Thiết bị đã kết nối"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Điều khiển từ xa và phụ kiện"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Cập nhật điều khiển từ xa"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Sẵn sàng cài đặt"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"CẬP NHẬT"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"ĐÓNG"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Điều khiển từ xa sắp hết pin"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Hãy thay pin ngay"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Điều khiển từ xa sắp hết pin"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Hãy thay pin ngay"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Điều khiển từ xa đã hết pin"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Hãy thay pin để sử dụng điều khiển từ xa"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Có"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Không"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Ngắt kết nối khỏi %1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Kết nối với %1$s?"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Quên %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Đổi tên thiết bị đã kết nối của bạn"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Bật HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC cho phép bạn điều khiển và tự động bật/tắt các thiết bị hỗ trợ HDMI-CEC khác chỉ với một bộ điều khiển từ xa.\n\nLưu ý: Hãy đảm bảo là bạn đã bật HDMI-CEC trên TV và các thiết bị HDMI khác. Các nhà sản xuất thường có các tên khác nhau cho HDMI-CEC, ví dụ:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Thiết lập nút trên điều khiển từ xa"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Điều chỉnh âm lượng, điều khiển nguồn, nguồn đầu vào của TV, bộ thu và loa thanh"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Mức pin: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Phụ kiện"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Điều khiển từ xa"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Đã kết nối"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Đã kết nối trước đây"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Ghép nối điều khiển từ xa hoặc phụ kiện"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Ngắt kết nối"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Kết nối"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Đổi tên"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Quên"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Đã kết nối"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Đã ngắt kết nối"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Điều khiển thiết bị"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Kết nối thiết bị mới"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Trước khi kết nối các thiết bị Bluetooth mới, hãy đảm bảo các thiết bị đó đang ở chế độ ghép nối. Để kết nối %1$s, hãy nhấn và giữ %2$s + %3$s trong 3 giây."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"điều khiển từ xa cho Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Thiết bị có sẵn"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Đang tìm thiết bị…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Lỗi"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Đang kết nối…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Đã kết nối"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Đã huỷ"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"%1$s không kết nối được"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"Đã kết nối %1$s"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"Đã ngắt kết nối %1$s"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-zh-rCN/strings.xml b/libraries/BluetoothServices/res/values-zh-rCN/strings.xml
index 41b07cc..6ad9c16 100644
--- a/libraries/BluetoothServices/res/values-zh-rCN/strings.xml
+++ b/libraries/BluetoothServices/res/values-zh-rCN/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"不适用"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"严重不足"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"低"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"充足"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"确认遥控器更新"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"在更新过程中,您的遥控器可能会暂时断开连接。"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"继续"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"取消"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"遥控器更新"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"有可用的新软件"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"有可用的更新"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"遥控器已是最新版本"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"遥控器更新失败"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"更新您的遥控器时出现问题。请重试。"</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"请稍候"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"重新配对遥控器"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"已启用"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"已停用"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"电池电量"</string>
-  <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"固件"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"蓝牙地址"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"请更换电池"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"电量不足"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"已连接的设备"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"遥控器和配件"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"更新您的遥控器"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"可以安装了"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"更新"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"关闭"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"遥控器电池电量低"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"请尽快更换电池"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"遥控器电池电量即将耗尽"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"请尽快更换电池"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"遥控器电池电量已耗尽"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"如要使用遥控器,请更换电池"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"是"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"否"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"断开与“%1$s”的连接"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"连接到%s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"取消保存“%1$s”"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"重命名已连接的设备"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"启用 HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC 可让您通过一个遥控器控制及自动开启/关闭其他启用了 HDMI-CEC 的设备。\n\n注意:请确认您的电视和其他 HDMI 设备均已启用 HDMI-CEC。不同的制造商对 HDMI-CEC 通常有不同的称呼,例如:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung:Anynet+\nLG:SimpLink\nSony:BRAVIA Sync\nPhilips:EasyLink\nSharp:Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"设置遥控器按钮"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"控制电视、接收器及条形音箱的音量、电源和输入源"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"电池电量:%1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"配件"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"遥控器"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"已连接"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"之前连接的设备"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"与遥控器或配件配对"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"断开连接"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"连接"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"重命名"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"取消保存"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"已连接"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"已断开连接"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"设备控制"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"连接新设备"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"在连接新蓝牙设备之前,请确保它们处于配对模式。要连接%1$s,请按住%2$s + %3$s,并保持 3 秒钟的时间。"</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV 遥控器"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"可用的设备"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"正在搜索设备…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"错误"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"正在连接…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"已连接"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"已取消"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"“%1$s”无法连接"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"“%1$s”已连接"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"“%1$s”已断开连接"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"不适用"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"严重不足"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"低"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"良好"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"确认遥控器更新"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"在更新过程中,您的遥控器可能会暂时断开连接。"</string>
+    <string name="settings_continue" msgid="5640776697820481568">"继续"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"取消"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"遥控器更新"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"有可用的新软件"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"有可用的更新"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"遥控器已是最新版本"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"遥控器更新失败"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"更新您的遥控器时出现问题。请重试。"</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"请稍候"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"重新配对遥控器"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"已启用"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"已停用"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"电池电量"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"固件"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"蓝牙地址"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"请更换电池"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"电池电量低"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"已连接的设备"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"遥控器和配件"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"更新您的遥控器"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"可以安装了"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"更新"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"忽略"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"遥控器电池电量低"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"请尽快更换电池"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"遥控器电池电量即将耗尽"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"请尽快更换电池"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"遥控器电池电量已耗尽"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"如要使用遥控器,请更换电池"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"是"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"否"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"断开与“%1$s”的连接"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"连接到“%1$s”"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"取消保存“%1$s”"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"重命名已连接的设备"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"启用 HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC 可让您通过一个遥控器控制及自动开启/关闭其他启用了 HDMI-CEC 的设备。\n\n注意:请确认您的电视和其他 HDMI 设备均已启用 HDMI-CEC。不同的制造商对 HDMI-CEC 通常有不同的称呼,例如:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"三星:Anynet+\nLG:SimpLink\n索尼:BRAVIA Sync\n飞利浦:EasyLink\n夏普:Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"设置遥控器按钮"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"控制电视、接收器及条形音箱的音量、电源和输入源"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"电池电量:%1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"配件"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"遥控器"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"已连接"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"之前连接的设备"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"与遥控器或配件配对"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"断开连接"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"连接"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"重命名"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"取消保存"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"已连接"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"已断开连接"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"设备控制"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"连接新设备"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"在连接新蓝牙设备之前,请确保相应设备处于配对模式。如要连接“%1$s”,请同时按住“%2$s”和“%3$s”3 秒。"</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV 遥控器"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"可用的设备"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"正在搜索设备…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"错误"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"正在连接…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"已连接"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"已取消"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"无法连接“%1$s”"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"已连接“%1$s”"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"已断开与“%1$s”的连接"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-zh-rHK/strings.xml b/libraries/BluetoothServices/res/values-zh-rHK/strings.xml
index 7e22793..7457802 100644
--- a/libraries/BluetoothServices/res/values-zh-rHK/strings.xml
+++ b/libraries/BluetoothServices/res/values-zh-rHK/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"不適用"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"過低"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"低"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"良好"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"確定更新遙控器"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"在更新過程中,您的遙控器或會短暫解除連接。"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"繼續"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"取消"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"遙控器更新"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"有可用的新軟件"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"有可用的更新"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"遙控器已是最新版本"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"無法更新遙控器"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"系統在更新遙控器時遇到問題,請再試一次。"</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"請稍候"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"重新配對遙控器"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"已啟用"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"已停用"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"電量"</string>
-  <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"韌體"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"藍牙位址"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"請更換電池"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"低電量"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"已連接的裝置"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"遙控器和配件"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"更新遙控器"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"準備好安裝"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"更新"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"關閉"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"遙控器電池電量不足"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"請盡快更換電池"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"遙控器電池即將耗盡"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"請盡快更換電池"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"遙控器電池已耗盡"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"請更換電池以使用遙控器"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"是"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"否"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"與%1$s解除連接"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"連接至「%1$s」"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"刪除%1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"為已連接的裝置重新命名"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"啟用 HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC 讓您使用同一個遙控器即可控制和自動開啟/關閉其他已啟用 HDMI-CEC 的裝置。\n\n請注意:請確定電視和其他 HDMI 裝置已啟用 HDMI-CEC。不同製造商有不同的 HDMI-CEC 名稱,例如:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung:Anynet+\nLG:SimpLink\nSony:BRAVIA Sync\nPhilips:EasyLink\nSharp:Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"設定遙控器按鈕"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"控制電視、接收器和 Soundbar 揚聲器的音量、電源開關和訊號源"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"電量:%1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"配件"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"遙控器"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"已連接"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"之前已連接的裝置"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"配對遙控器或配件"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"解除連接"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"連接"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"重新命名"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"刪除"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"已連接"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"已中斷連接"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"裝置控制"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"連接新裝置"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"連接新的藍牙裝置前,請確認裝置處於配對模式如要連接%1$s,請按住 %2$s + %3$s 3 秒。"</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV 遙控器"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"可用的裝置"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"正在尋找裝置…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"錯誤"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"正在連接…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"已連接"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"已取消"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"無法連接%1$s"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"已連接%1$s"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"已解除連接%1$s"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"不適用"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"極低"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"低"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"正常"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"確定更新遙控器"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"在更新過程中,您的遙控器或會短暫中斷連線。"</string>
+    <string name="settings_continue" msgid="5640776697820481568">"繼續"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"取消"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"遙控器更新"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"有可用的新軟件"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"有可用的更新"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"遙控器已是最新版本"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"無法更新遙控"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"系統在更新遙控器時遇到問題,請再試一次。"</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"請稍候"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"重新配對遙控器"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"已啟用"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"已停用"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"電量"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"韌體"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"藍牙位址"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"請更換電池"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"電量不足"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"已連接裝置"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"遙控器和配件"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"更新遙控器"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"準備安裝"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"更新"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"忽略"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"遙控器電池電量不足"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"請盡快更換電池"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"遙控器電池即將耗盡"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"請盡快更換電池"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"遙控器電池已耗盡"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"請更換電池以使用遙控器"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"是"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"否"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"與 %1$s 解除連接"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"連接至「%1$s」"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"忘記 %1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"為已連接的裝置重新命名"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"啟用 HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC 讓你使用同一個遙控即可控制和自動開啟/關閉其他已啟用 HDMI-CEC 的裝置。\n\n請注意:請確定電視和其他 HDMI 裝置已啟用 HDMI-CEC。不同製造商有不同的 HDMI-CEC 名稱,例如:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung:Anynet+\nLG:SimpLink\nSony:BRAVIA Sync\nPhilips:EasyLink\nSharp:Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"設定遙控器按鈕"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"控制電視、接收器和 Soundbar 揚聲器的音量、電源開關和訊號源"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"電量:%1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"配件"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"遙控器"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"已連接"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"之前已連接的裝置"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"配對遙控器或配件"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"解除連接"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"連線"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"重新命名"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"忘記"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"已連接"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"已中斷連接"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"裝置控制"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"連接新裝置"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"連接新的藍牙裝置前,請確認裝置處於配對模式。如要連接「%1$s」,請按住 %2$s + %3$s 3 秒。"</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV 遙控器"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"可用裝置"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"正在尋找裝置…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"錯誤"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"正在連線…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"已連接"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"已取消"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"無法連接「%1$s」"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"「%1$s」已連接"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"「%1$s」已解除連接"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-zh-rTW/strings.xml b/libraries/BluetoothServices/res/values-zh-rTW/strings.xml
index 72b45a1..338ca37 100644
--- a/libraries/BluetoothServices/res/values-zh-rTW/strings.xml
+++ b/libraries/BluetoothServices/res/values-zh-rTW/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"無資料"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"嚴重不足"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"低"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"充足"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"確認更新遙控器"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"在更新的過程中,你的遙控器可能會暫時中斷連線。"</string>
-    <string name="settings_continue" msgid="7439781146866165114">"繼續"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"取消"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"遙控器更新"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"有可用的新軟體"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"有可用的更新"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"你的遙控器軟體是最新版本"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"無法更新遙控器"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"更新遙控器軟體時發生問題,請再試一次。"</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"請稍候"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"重新配對遙控器"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"已啟用"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"已停用"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"電池電量"</string>
-  <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"韌體"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"藍牙位址"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"請更換電池"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"電力不足"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"已連線的裝置"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"遙控器與配件"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"更新遙控器"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"已可供安裝"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"更新"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"關閉"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"遙控器電池電量偏低"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"請盡快更換電池"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"遙控器電池電量即將耗盡"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"請盡快更換電池"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"遙控器電池電量已耗盡"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"如要使用遙控器,請更換電池"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"是"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"否"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"中斷與「%1$s」的連線"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"連線至「%s」"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"清除「%1$s」"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"重新命名已連線的裝置"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"啟用 HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"HDMI-CEC 可讓你透過一個遙控器控制及自動開啟/關閉其他支援 HDMI-CEC 的裝置。\n\n注意:請確認你的電視和其他 HDMI 裝置已啟用 HDMI-CEC 功能。不同的製造商對 HDMI-CEC 功能的稱呼不盡相同。例如:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"Samsung:Anynet+\nLG:SimpLink\nSony:BRAVIA Sync\nPhilips:EasyLink\nSharp:Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"設定遙控器按鈕"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"控制電視、接收器和單件式環繞劇院的音量、電源和輸入來源"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"電池電量:%1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"配件"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"遙控器"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"已連線"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"先前連線的裝置"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"與遙控器或配件配對"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"中斷連線"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"連線"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"重新命名"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"清除"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"已連線"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"連線已中斷"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"裝置管理"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"與新裝置連線"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"與新的藍牙裝置連線前,請確定裝置已進入配對模式。如要與「%1$s」連線,請按住「%2$s」和「%3$s」3 秒鐘。"</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"Android TV 遙控器"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"可用的裝置"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"正在尋找裝置…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"錯誤"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"連線中…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"已連線"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"已取消"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"無法與「%1$s」連線"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"已與「%1$s」的連線"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"已中斷與「%1$s」的連線"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"無法取得"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"極低"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"低"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"高"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"確認更新遙控器"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"在更新期間,遙控器可能會暫時中斷連線。"</string>
+    <string name="settings_continue" msgid="5640776697820481568">"繼續"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"取消"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"遙控器更新"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"有可用的新版軟體"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"有可用的更新"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"遙控器目前為最新版本"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"無法更新遙控器"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"更新遙控器時發生問題,請再試一次。"</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"請稍候"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"重新配對遙控器"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"已啟用"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"已停用"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"電池電量"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"韌體"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"藍牙位址"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"請更換電池"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"電力不足"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"已連結的裝置"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"遙控器與配件"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"更新遙控器"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"可以開始安裝"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"更新"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"關閉"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"遙控器電池電量偏低"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"請盡快更換電池"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"遙控器電池電量即將耗盡"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"請盡快更換電池"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"遙控器電池電量已耗盡"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"如要使用遙控器,請更換電池"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"是"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"否"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"中斷與「%1$s」的連線"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"連結至「%1$s」"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"清除「%1$s」"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"重新命名已連線的裝置"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"啟用 HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"HDMI-CEC 可讓你透過一個遙控器控制及自動開啟/關閉其他支援 HDMI-CEC 的裝置。\n\n注意:請確認你的電視和其他 HDMI 裝置已啟用 HDMI-CEC 功能。不同的製造商對 HDMI-CEC 功能有其各自的稱呼。例如:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"Samsung:Anynet+\nLG:SimpLink\nSony:BRAVIA Sync\nPhilips:EasyLink\nSharp:Aquos Link"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"設定遙控器按鈕"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"控制電視、接收器和單件式環繞劇院的音量、電源和輸入來源"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"電池電量:%1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"配件"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"遙控器"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"已連線"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"先前連線的裝置"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"與遙控器或配件配對"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"中斷連線"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"連結"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"重新命名"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"清除"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"已連線"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"連線已中斷"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"裝置管理"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"連結新裝置"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"連結新的藍牙裝置前,請確定裝置已進入配對模式。如要連結「%1$s」,請同時按住「%2$s」和「%3$s」3 秒。"</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"Android TV 遙控器"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"可用的裝置"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"正在尋找裝置…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"錯誤"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"連結中…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"已連結"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"已取消"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"無法與「%1$s」連結"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"已連結到「%1$s」"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"已取消連結「%1$s」"</string>
 </resources>
diff --git a/libraries/BluetoothServices/res/values-zu/strings.xml b/libraries/BluetoothServices/res/values-zu/strings.xml
index a1e2a79..639fd21 100644
--- a/libraries/BluetoothServices/res/values-zu/strings.xml
+++ b/libraries/BluetoothServices/res/values-zu/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!-- 
   ~ Copyright (C) 2021 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,80 +13,81 @@
   ~ 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="battery_not_available" msgid="4363239544686724984">"N/A"</string>
-    <string name="battery_level_critical" msgid="5923330432434405521">"Bucayi"</string>
-    <string name="battery_level_low" msgid="3732072669162559152">"Phansi"</string>
-    <string name="battery_level_good" msgid="4981454057830724794">"Kuhle"</string>
-    <string name="settings_bt_confirm_update" msgid="6129230380492578493">"Qinisekisa isibuyekezo sesilawuli-kude"</string>
-    <string name="settings_bt_update_summary" msgid="1407162346756478508">"Phakathi nesibuyekezo isilawuli-kude sako singangaqamula kancane."</string>
-    <string name="settings_continue" msgid="7439781146866165114">"Qhubeka"</string>
-    <string name="settings_cancel" msgid="3939686184230439505">"Khansela"</string>
-    <string name="settings_bt_update" msgid="966832530402103023">"Isibuyekezo sesilawuli-kude"</string>
-    <string name="settings_bt_update_software_available" msgid="3120140118110089670">"Isofthiwe entsha iyatholakala"</string>
-    <string name="settings_bt_update_available" msgid="7871859692542595220">"Isibuyekezo siyatholakala"</string>
-    <string name="settings_bt_update_not_necessary" msgid="1272127906146895359">"Isilawuli-kude sisesikhathini"</string>
-    <string name="settings_bt_update_failed" msgid="9099155837532638335">"Isibuyekezo sesilawuli-kude sihlulekile"</string>
-    <string name="settings_bt_update_error" msgid="2552121342045814857">"Sihlangabezane nenkinga ngenkathi sibuyekeza isilawuli-kude sakho. Sicela uzame futhi."</string>
-    <string name="settings_bt_update_please_wait" msgid="7215892536971160069">"Sicela ulinde"</string>
-    <string name="settings_bt_update_needs_repair" msgid="1096426599808505928">"Bhangqa isilawuli-kude sakho futhi"</string>
-    <string name="settings_enabled" msgid="4164674211291175678">"Inikwe amandla"</string>
-    <string name="settings_disabled" msgid="4626695692196357413">"Ikhutshaziwe"</string>
-    <string name="settings_remote_battery_level_label" msgid="8649612732948142737">"Ileveli yebhethri"</string>
-  <string name="settings_remote_battery_level_percentage_label" msgid="1771717432090516984">%1$d%%</string>
-    <string name="settings_remote_firmware_label" msgid="8924845692887005455">"I-Firmware"</string>
-    <string name="settings_remote_serial_number_label" msgid="407950420697944948">"Ikheli le-Bluetooth"</string>
-    <string name="settings_bt_battery_low" msgid="4487348957313624256">"Sicela ushintshe ibhethri"</string>
-    <string name="settings_bt_battery_low_warning" msgid="5660789688799457747">"Ibhethri liphansi"</string>
-    <string name="connected_devices_pref_title" msgid="2617255292554345723">"Amadivayisi axhunyiwe"</string>
-    <string name="connected_devices_slice_pref_title" msgid="8716252057083688885">"Izilawuli kude nezinsiza"</string>
-    <string name="settings_notif_update_title" msgid="5463118574346079495">"Buyekeza isilawuli-kude sakho"</string>
-    <string name="settings_notif_update_text" msgid="5466918316361570215">"Usulindele ukufaka"</string>
-    <string name="settings_notif_update_action" msgid="5970935876855410574">"BUYEKEZA"</string>
-    <string name="settings_notif_update_dismiss" msgid="6614203755972578657">"CASHISA"</string>
-    <string name="settings_notif_low_battery_title" msgid="8363515608568792551">"Ibhethri lesilawuli-kude liphansi"</string>
-    <string name="settings_notif_low_battery_text" msgid="5036367259620134537">"Miselela ibhethri maduze"</string>
-    <string name="settings_notif_critical_battery_title" msgid="2932744213624091546">"Ibhethri lesilawuli-kude cishe seliphelile"</string>
-    <string name="settings_notif_critical_battery_text" msgid="7611153628893734902">"Miselela ibhethri maduze"</string>
-    <string name="settings_notif_depleted_battery_title" msgid="2571917420776818173">"Ibhethri lesilawuli-kude liphelile"</string>
-    <string name="settings_notif_depleted_battery_text" msgid="2398532528486464044">"Miselela ibhethri ukuze usebenzise isilawuli-kude"</string>
-    <string name="settings_choices_yes" msgid="2846918703851679454">"Yebo"</string>
-    <string name="settings_choices_no" msgid="1069494287551959027">"Cha"</string>
-    <string name="settings_bt_disconnect" msgid="3926883493314648711">"Nqamula kusukela ku-%1$s"</string>
-    <string name="settings_bt_connect" msgid="7488569500103145573">"Xhuma ku-%1$s"</string>
-    <string name="settings_bt_forget" msgid="7862641043281426278">"Khohlwa i-%1$s"</string>
-    <string name="settings_bt_rename" msgid="296394594397921021">"Qamba kabusha idivayisi yakho exhunyiwe"</string>
-    <string name="settings_hdmi_cec" msgid="7227878981727034559">"I-HDMI-CEC"</string>
-    <string name="settings_enable_hdmi_cec" msgid="2522493967942490013">"Nika amandla i-HDMI-CEC"</string>
-    <string name="settings_cec_explain" msgid="911626255223049913">"I-HDMI-CEC ikuvumela ukuthi ulawule uphinde uvule/uvale ngokuzenzakalela amanye amadivayisi anikwe amandla e-HDMI-CEC ngesilawuli-kude esisodwa.\n\nQaphela: Qinisekisa ukuthi i-HDMI-CEC inikwe amandla ku-TV yakho nakwamanye amadivayisi e-HDMI. Abakhiqizi bavame ukuba namagama ahlukahlukene e-HDMI-CEC, isibonelo:"</string>
-    <string name="settings_cec_feature_names" msgid="8470424063788054136">"I-Samsung: Anynet+\nLG: SimpLink\nSony: BRAVIA Sync\nPhilips: EasyLink\nSharp: Aquos Link"</string>
-    <string name="settings_axel" msgid="859248404436889205">"Setha izinkinobho zesilawuli-kude"</string>
-    <string name="settings_axel_description" msgid="6033294262165949416">"Lawula ivolumu, amandla, okokufaka kuma-TV, izamukeli namabha womsindo"</string>
-    <string name="settings_remote_battery_level" msgid="457729442110109776">"Ileveli yebhethri: %1$s"</string>
-    <string name="settings_known_devices_category" msgid="1540063892581931395">"Okuhambisanayo"</string>
-    <string name="settings_official_remote_category" msgid="5188969235127184097">"Isilawuli-kude"</string>
-    <string name="settings_devices_connected" msgid="6877350530040954951">"Ixhunyiwe"</string>
-    <string name="settings_devices_paired" msgid="2621291277619909987">"Kuxhunywe ngaphambilini"</string>
-    <string name="settings_pair_remote" msgid="6703692816294828667">"Bhangqa isilawuli-kude noma insiza"</string>
-    <string name="bluetooth_disconnect" msgid="6750118548623705193">"Nqamula"</string>
-    <string name="bluetooth_connect" msgid="4809187070439789397">"Xhuma"</string>
-    <string name="bluetooth_rename" msgid="3866030281590534078">"Qamba kabusha"</string>
-    <string name="bluetooth_forget" msgid="2304557507840517178">"Khohlwa"</string>
-    <string name="bluetooth_connected_status" msgid="2445751338303462640">"Ixhunyiwe"</string>
-    <string name="bluetooth_disconnected_status" msgid="8217553843170356254">"Inqamukile"</string>
-    <string name="settings_devices_control" msgid="5315752605677221119">"Ukulawula idivayisi"</string>
-    <string name="settings_bt_pair_title" msgid="7666400883358524553">"Xhuma idivayisi entsha"</string>
-    <string name="pair_device_description" msgid="7955553499324666950">"Ngaphambi kokuxhuma amadivayisi amasha e-Bluetooth, yenza isiqinisekiso sokuthi akumodi yokumatanisa. Ukuze uxhume i-%1$s, cindezela uphinde ubambe i-%2$s + %3$s amasekhondi angu-3."</string>
-    <string name="pair_device_device_name" msgid="580032998745434834">"isilawuli kude se-Android TV"</string>
-    <string name="settings_bt_available_devices" msgid="6645182819584578819">"Amadivayisi atholakalayo"</string>
-    <string name="settings_bt_empty_text" msgid="8332085133838257843">"Ifuna amadivayisi…"</string>
-    <string name="settings_bt_pair_status_error" msgid="1795732485043154388">"Iphutha"</string>
-    <string name="settings_bt_pair_status_connecting" msgid="4157328222685537069">"Iyaxhumeka…"</string>
-    <string name="settings_bt_pair_status_done" msgid="3574182448076062786">"Ixhunyiwe"</string>
-    <string name="settings_bt_pair_status_cancelled" msgid="8669857835593073002">"Kukhanselwe"</string>
-    <string name="settings_bt_pair_toast_fail" msgid="6775531736952071145">"I-%1$s ihlulekile ukuxhumeka"</string>
-    <string name="settings_bt_pair_toast_connected" msgid="4892704875054315689">"I-%1$s ixhunyiwe"</string>
-    <string name="settings_bt_pair_toast_disconnected" msgid="3661543481090697131">"I-%1$s inqanyuliwe"</string>
+    <string name="battery_not_available" msgid="5120583262792310269">"Akusebenzi"</string>
+    <string name="battery_level_critical" msgid="1217236822824234202">"Kubucayi"</string>
+    <string name="battery_level_low" msgid="8156936236696805171">"Phansi"</string>
+    <string name="battery_level_good" msgid="529772292250195778">"Kuhle"</string>
+    <string name="settings_bt_confirm_update" msgid="7490528407190318108">"Qinisekisa isibuyekezo serimothi"</string>
+    <string name="settings_bt_update_summary" msgid="137113561617823800">"Phakathi nesibuyekezo irimothi yakho ingaqamuka kancane."</string>
+    <string name="settings_continue" msgid="5640776697820481568">"Qhubeka"</string>
+    <string name="settings_cancel" msgid="1284029950430684039">"Khansela"</string>
+    <string name="settings_bt_update" msgid="8210371540974244481">"Isibuyekezo serimothi"</string>
+    <string name="settings_bt_update_software_available" msgid="7002004529854458452">"Isofthiwe entsha iyatholakala"</string>
+    <string name="settings_bt_update_available" msgid="414405852666517260">"Isibuyekezo siyatholakala"</string>
+    <string name="settings_bt_update_not_necessary" msgid="6906777343269759565">"Irimothi isesikhathini"</string>
+    <string name="settings_bt_update_failed" msgid="2593228509570726064">"Isibuyekezo sesilawulikude sehlulekile"</string>
+    <string name="settings_bt_update_error" msgid="6267154862961568780">"Sihlangabezane nenkinga ngenkathi sibuyekeza irimothi yakho. Sicela uzame futhi."</string>
+    <string name="settings_bt_update_please_wait" msgid="8029641271132945499">"Sicela ulinde"</string>
+    <string name="settings_bt_update_needs_repair" msgid="1310917691218455907">"Bhangqa irimothi yakho futhi"</string>
+    <string name="settings_enabled" msgid="431464375814187683">"Kunikwe amandla"</string>
+    <string name="settings_disabled" msgid="1459717258643130682">"Kukhutshaziwe"</string>
+    <string name="settings_remote_battery_level_label" msgid="3644348379742819020">"Ileveli yebhethri"</string>
+    <string name="settings_remote_battery_level_percentage_label" msgid="7301487906665476276">"%1$d%%"</string>
+    <string name="settings_remote_firmware_label" msgid="2132403094910284670">"I-Firmware"</string>
+    <string name="settings_remote_serial_number_label" msgid="7591347399882767241">"Ikheli le-Bluetooth"</string>
+    <string name="settings_bt_battery_low" msgid="3547517382697124858">"Sicela ushintshe ibhethri"</string>
+    <string name="settings_bt_battery_low_warning" msgid="721091326401791089">"Ibhethri liphansi"</string>
+    <string name="connected_devices_pref_title" msgid="8985364841073196008">"Amadivayisi Axhunyiwe"</string>
+    <string name="connected_devices_slice_pref_title" msgid="8637777961277201747">"Amarimothi Nezinsiza"</string>
+    <string name="settings_notif_update_title" msgid="4767043003900594863">"Buyekeza irimothi yakho"</string>
+    <string name="settings_notif_update_text" msgid="1092279154776177720">"Usulindele ukufaka"</string>
+    <string name="settings_notif_update_action" msgid="7614942170621338703">"BUYEKEZA"</string>
+    <string name="settings_notif_update_dismiss" msgid="2492993446930472109">"CHITHA"</string>
+    <string name="settings_notif_low_battery_title" msgid="4638332702264612574">"Ibhethri lerimothi liphansi"</string>
+    <string name="settings_notif_low_battery_text" msgid="4371868286738256938">"Shintshanisa ibhethri maduze"</string>
+    <string name="settings_notif_critical_battery_title" msgid="2790514511512220266">"Ibhethri lerimothi cishe seliphelile"</string>
+    <string name="settings_notif_critical_battery_text" msgid="7540676820061160224">"Shintshanisa ibhethri maduze"</string>
+    <string name="settings_notif_depleted_battery_title" msgid="5564074017335214430">"Ibhethri lerimothi liphelile"</string>
+    <string name="settings_notif_depleted_battery_text" msgid="5656927974233544784">"Shintshanisa ibhethri ukuze usebenzise irimothi"</string>
+    <string name="settings_choices_yes" msgid="791981754037655968">"Yebo"</string>
+    <string name="settings_choices_no" msgid="8559979491355839764">"Cha"</string>
+    <string name="settings_bt_disconnect" msgid="887583681642627405">"Nqamula kusuka ku-%1$s"</string>
+    <string name="settings_bt_connect" msgid="486902469425565740">"Xhuma ku-%1$s"</string>
+    <string name="settings_bt_forget" msgid="1032095001156402398">"Khohlwa i-%1$s"</string>
+    <string name="settings_bt_rename" msgid="477643459806883336">"Qamba kabusha idivayisi yakho exhunyiwe"</string>
+    <string name="settings_hdmi_cec" msgid="7945299353290226128">"I-HDMI-CEC"</string>
+    <string name="settings_enable_hdmi_cec" msgid="3955194037299390473">"Nika amandla i-HDMI-CEC"</string>
+    <string name="settings_cec_explain" msgid="282126756909187653">"I-HDMI-CEC ikuvumela ukuthi ulawule futhi uvule/uvale ngokuzenzakalela amadivayisi anikwe amandla i-HDMI-CEC ngesilawulikude esisodwa.\n\nQaphela: Qiniseka ukuthi i-HDMI-CEC inikwe amandla ku-TV yakho namanye amadivayisi. Abakhiqizi bavame ukuba namagama ahlukahlukene e-HDMI-CEC, isibonelo:"</string>
+    <string name="settings_cec_feature_names" msgid="3250254903330955270">"I-Samsung: I-Anynet+\nLG: I-SimpLink\nSony: I-BRAVIA Sync\nPhilips: I-EasyLink\nSharp: Isixhumanisi se-Aquos"</string>
+    <string name="settings_axel" msgid="8253298947221430993">"Setha izinkinobho zerimothi"</string>
+    <string name="settings_axel_description" msgid="5432968671905160994">"Lawula ivolumu, amandla, okokufaka kuma-TV, izamukeli namabha omsindo"</string>
+    <string name="settings_remote_battery_level" msgid="1817513765913707505">"Ileveli yebhethri: %1$s"</string>
+    <string name="settings_known_devices_category" msgid="2307810690946536753">"Okuhambisanayo"</string>
+    <string name="settings_official_remote_category" msgid="1373956695709331265">"Isilawuli-kude"</string>
+    <string name="settings_devices_connected" msgid="3256213134907921013">"Ixhunyiwe"</string>
+    <string name="settings_devices_paired" msgid="4460141776955368574">"Kuxhunywe ngaphambilini"</string>
+    <string name="settings_pair_remote" msgid="7566753084479902759">"Bhangqa irimothi noma okuhambisanayo"</string>
+    <string name="bluetooth_disconnect" msgid="1385608885917484057">"Nqamula"</string>
+    <string name="bluetooth_connect" msgid="6283971929092004620">"Xhuma"</string>
+    <string name="bluetooth_rename" msgid="4433577238394058486">"Qamba kabusha"</string>
+    <string name="bluetooth_forget" msgid="4933552074497360964">"Khohlwa"</string>
+    <string name="bluetooth_connected_status" msgid="8391804274846835227">"Ixhunyiwe"</string>
+    <string name="bluetooth_disconnected_status" msgid="972515438988962457">"Inqamukile"</string>
+    <string name="settings_devices_control" msgid="1862490057009510077">"Ukulawula idivayisi"</string>
+    <string name="settings_bt_pair_title" msgid="1205942796805671508">"Xhuma idivayisi entsha"</string>
+    <string name="pair_device_description" msgid="5145574754576245361">"Ngaphambi kokuxhuma amadivayisi amasha e-Bluetooth, yenza isiqinisekiso sokuthi akumodi yokubhangqa. Ukuze uxhume i-%1$s, cindezela uphinde ubambe i-%2$s + %3$s imizuzwana emi-3."</string>
+    <string name="pair_device_device_name" msgid="4004194247588260613">"irimothi ye-Android TV"</string>
+    <string name="settings_bt_available_devices" msgid="6237789711837183219">"Amadivayisi atholakalayo"</string>
+    <string name="settings_bt_empty_text" msgid="6228875847390369960">"Ifuna amadivayisi…"</string>
+    <string name="settings_bt_pair_status_error" msgid="4153213506048075994">"Iphutha"</string>
+    <string name="settings_bt_pair_status_connecting" msgid="1438458595123669762">"Iyaxhuma…"</string>
+    <string name="settings_bt_pair_status_done" msgid="6151867483707947194">"Ixhunyiwe"</string>
+    <string name="settings_bt_pair_status_cancelled" msgid="5247663100749067089">"Ikhanseliwe"</string>
+    <string name="settings_bt_pair_toast_fail" msgid="8025560978364284117">"I-%1$s ihlulekile ukuxhuma"</string>
+    <string name="settings_bt_pair_toast_connected" msgid="3073130641004809067">"I-%1$s ixhunyiwe"</string>
+    <string name="settings_bt_pair_toast_disconnected" msgid="2046165143924352053">"I-%1$s inqanyuliwe"</string>
 </resources>
diff --git a/libraries/BluetoothServices/src/com/google/android/tv/btservices/remote/Version.java b/libraries/BluetoothServices/src/com/google/android/tv/btservices/remote/Version.java
index da94570..df2cf6e 100644
--- a/libraries/BluetoothServices/src/com/google/android/tv/btservices/remote/Version.java
+++ b/libraries/BluetoothServices/src/com/google/android/tv/btservices/remote/Version.java
@@ -96,6 +96,6 @@
     @Override
     public String toString() {
         return String.format(
-                "%02X.%02X (%02X:%02X)", mMajorVersion, mMinorVersion, mVendorId, mProductId);
+                "%s (%02X:%02X)", toVersionString(), mVendorId, mProductId);
     }
 }
diff --git a/mdns_offload/interface/aidl/Android.bp b/mdns_offload/interface/aidl/Android.bp
new file mode 100644
index 0000000..7d4971d
--- /dev/null
+++ b/mdns_offload/interface/aidl/Android.bp
@@ -0,0 +1,43 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+aidl_interface {
+    name: "device.google.atv.mdns_offload-aidl",
+    vendor_available: true,
+    system_ext_specific: true,
+    srcs: [
+        "device/google/atv/mdns_offload/IMdnsOffload.aidl",
+    ],
+    stability: "vintf",
+    backend: {
+        ndk: {
+            enabled: true,
+        },
+        java: {
+            enabled: true,
+        },
+        cpp: {
+            enabled: true,
+        },
+    },
+}
+
+aidl_interface {
+    name: "device.google.atv.mdns_offload_manager-aidl",
+    vendor_available: true,
+    system_ext_specific: true,
+    srcs: [
+        "device/google/atv/mdns_offload/IMdnsOffloadManager.aidl",
+    ],
+    stability: "vintf",
+    backend: {
+        java: {
+            enabled: true,
+        },
+        cpp: {
+            enabled: true,
+        },
+    },
+}
+
diff --git a/mdns_offload/interface/aidl/aidl_api/device.google.atv.mdns_offload-aidl/current/device/google/atv/mdns_offload/IMdnsOffload.aidl b/mdns_offload/interface/aidl/aidl_api/device.google.atv.mdns_offload-aidl/current/device/google/atv/mdns_offload/IMdnsOffload.aidl
new file mode 100644
index 0000000..2ecc93a
--- /dev/null
+++ b/mdns_offload/interface/aidl/aidl_api/device.google.atv.mdns_offload-aidl/current/device/google/atv/mdns_offload/IMdnsOffload.aidl
@@ -0,0 +1,44 @@
+///////////////////////////////////////////////////////////////////////////////
+// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
+///////////////////////////////////////////////////////////////////////////////
+
+// This file is a snapshot of an AIDL file. Do not edit it manually. There are
+// two cases:
+// 1). this is a frozen version file - do not edit this in any case.
+// 2). this is a 'current' file. If you make a backwards compatible change to
+//     the interface (from the latest frozen version), the build system will
+//     prompt you to update this file with `m <name>-update-api`.
+//
+// You must not make a backward incompatible change to any AIDL file built
+// with the aidl_interface module type with versions property set. The module
+// type is used to build AIDL files in a way that they can be used across
+// independently updatable components of the system. If a device is shipped
+// with such a backward incompatible change, it has a high risk of breaking
+// later when a module using the interface is updated, e.g., Mainline modules.
+
+package device.google.atv.mdns_offload;
+@VintfStability
+interface IMdnsOffload {
+  boolean setOffloadState(boolean enabled);
+  void resetAll();
+  int addProtocolResponses(String networkInterface, in device.google.atv.mdns_offload.IMdnsOffload.MdnsProtocolData offloadData);
+  void removeProtocolResponses(int recordKey);
+  int getAndResetHitCounter(int recordKey);
+  int getAndResetMissCounter();
+  boolean addToPassthroughList(String networkInterface, String qname);
+  void removeFromPassthroughList(String networkInterface, String qname);
+  void setPassthroughBehavior(String networkInterface, device.google.atv.mdns_offload.IMdnsOffload.PassthroughBehavior behavior);
+  parcelable MdnsProtocolData {
+    byte[] rawOffloadPacket;
+    List<device.google.atv.mdns_offload.IMdnsOffload.MdnsProtocolData.MatchCriteria> matchCriteriaList;
+    parcelable MatchCriteria {
+      int type;
+      int nameOffset;
+    }
+  }
+  enum PassthroughBehavior {
+    FORWARD_ALL,
+    DROP_ALL,
+    PASSTHROUGH_LIST,
+  }
+}
diff --git a/mdns_offload/interface/aidl/aidl_api/device.google.atv.mdns_offload_manager-aidl/current/device/google/atv/mdns_offload/IMdnsOffloadManager.aidl b/mdns_offload/interface/aidl/aidl_api/device.google.atv.mdns_offload_manager-aidl/current/device/google/atv/mdns_offload/IMdnsOffloadManager.aidl
new file mode 100644
index 0000000..b54dcd2
--- /dev/null
+++ b/mdns_offload/interface/aidl/aidl_api/device.google.atv.mdns_offload_manager-aidl/current/device/google/atv/mdns_offload/IMdnsOffloadManager.aidl
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2023 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.
+ */
+///////////////////////////////////////////////////////////////////////////////
+// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
+///////////////////////////////////////////////////////////////////////////////
+
+// This file is a snapshot of an AIDL file. Do not edit it manually. There are
+// two cases:
+// 1). this is a frozen version file - do not edit this in any case.
+// 2). this is a 'current' file. If you make a backwards compatible change to
+//     the interface (from the latest frozen version), the build system will
+//     prompt you to update this file with `m <name>-update-api`.
+//
+// You must not make a backward incompatible change to any AIDL file built
+// with the aidl_interface module type with versions property set. The module
+// type is used to build AIDL files in a way that they can be used across
+// independently updatable components of the system. If a device is shipped
+// with such a backward incompatible change, it has a high risk of breaking
+// later when a module using the interface is updated, e.g., Mainline modules.
+
+package device.google.atv.mdns_offload;
+@VintfStability
+interface IMdnsOffloadManager {
+  int addProtocolResponses(String networkInterface, in device.google.atv.mdns_offload.IMdnsOffloadManager.OffloadServiceInfo offloadData, IBinder clientToken);
+  void removeProtocolResponses(int recordKey, IBinder clientToken);
+  void addToPassthroughList(String networkInterface, String qname, IBinder clientToken);
+  void removeFromPassthroughList(String networkInterface, String qname, IBinder clientToken);
+  parcelable OffloadServiceInfo {
+    String serviceName;
+    String serviceType;
+    String deviceHostName;
+    byte[] rawOffloadPacket;
+  }
+}
diff --git a/mdns_offload/interface/aidl/device/google/atv/mdns_offload/IMdnsOffload.aidl b/mdns_offload/interface/aidl/device/google/atv/mdns_offload/IMdnsOffload.aidl
new file mode 100644
index 0000000..d48cb35
--- /dev/null
+++ b/mdns_offload/interface/aidl/device/google/atv/mdns_offload/IMdnsOffload.aidl
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2023 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 device.google.atv.mdns_offload;
+
+/**
+ * Service interface to communicate with network interfaces that provide mDNS Offload
+ * capabilities.
+ * Requirements:
+ * - Must respond the raw packet (we guarantee a well formed packet) as a direct answer to queries
+ * matching. No post processing is expected from the offload responder.
+ * - Optional: Must keep track of the number of hits and misses.
+ */
+@VintfStability
+interface IMdnsOffload {
+    parcelable MdnsProtocolData {
+        /**
+         * Defines a mDNS response to answer during setOffloadState(true) mode and the
+         * criteria to match against the incoming queries.
+         */
+        parcelable MatchCriteria {
+            /* QTYPE RRTYPE */
+            int type;
+            /* RRNAME offset in the rawOffloadPacket */
+            int nameOffset;
+        }
+
+        /**
+         * Ready to send DNS packet containing mDNS responses in the
+         * AnswerSection. It follows the packet specification as described in
+         * the RFC6762 (https://www.rfc-editor.org/rfc/rfc6762).
+         * - All the answers are stored in the answer section, nothing in the
+         *   additional section.
+         * - RRNAME and RDATA part might use name compression, so the
+         *   implementation must be able to read compressed names.
+         */
+        byte[] rawOffloadPacket;
+
+        /**
+         * The list of criteria to match against.
+         * Each criteria contains a QNAME offset to read from the
+         * rawOffloadPacket. The offset is a starting point to read the name.
+         * The name then follows the name definition standard as defined in the
+         * RFC1035-4.1.4 (https://www.rfc-editor.org/rfc/rfc1035#section-4.1.4)
+         */
+        List<MatchCriteria> matchCriteriaList;
+    }
+
+    /**
+     * Set the current offload state on the hardware.
+     * If enabled=false everything should be forwarded to the CPU regardless of the
+     * offloaded responses or the set passthrough behavior. Waking up the CPU if
+     * required.
+     * If enabled=true is passed, the offload behavior must be applied (respecting
+     * all the contracts stated in the following methods).
+     *
+     * Returns the offload state after the change has been applied.
+     *
+     * The default state at boot is expected to be enabled=false.
+     */
+    boolean setOffloadState(boolean enabled);
+
+    /**
+     * Reset the state of the hardware or the offload service to a clear state.
+     * Only used when the OffloadManager starts to ensure a clear state.
+     *
+     * The default state is:
+     * The passthrough state is DROP_ALL for every available network interface.
+     * The passthrough lists are empty for every available network interface.
+     * Any internal state holding previously offloaded record sets must be cleared.
+     * Internal counters of hits and misses must be reset to 0.
+     */
+    void resetAll();
+
+    /**
+     * Add a fully formed mDNS response to the offload on the specified network interface.
+     * See https://developer.android.com/reference/java/net/NetworkInterface#getNetworkInterfaces()
+     *
+     * Returns a recordKey represented by an int.
+     * If the key returned is >= 0; the insertion was successful.
+     * If the key returned is < 0; the insertion failed.
+     *
+     * When the network interface receives an mDNS query packet it must iterate over
+     * all the queries. For each query where the qName and qType matches the rRName and
+     * rRtype of any of the MatchCriteria, the sender MUST return the rawOffloadPacket
+     * response AS IS.
+     * If the qType is ANY, then the match must be done only against the rRName in the
+     * match criteria. If many queries match the same MdnsProtocolData, a special
+     * attention must be taken to only send the response once, minimizing noise on the
+     * network.
+     *
+     * Additional queries may use name compression in the QNAME field.
+     * https://www.rfc-editor.org/rfc/rfc1035#section-4.1.4
+     * In order to be compliant with the standard, the offload implementation MUST
+     * be able to decode compressed QNAMEs.
+     *
+     * Apart from the sign of the key, no other assumption should be taken from the
+     * user side. The implementation is free to reuse an old key for a new insertion
+     * as long as it doesn't conflict with any active one.
+     *
+     * IT IS NOT part of the contract of this method to guarantee uniqueness
+     * with previously added items. THE ONLY requirement is that this method succeeds
+     * if it can guarantee the offload of the provided responses on the given
+     * network interface, and fails otherwise.
+     */
+    int addProtocolResponses(String networkInterface, // eth0, wlan0,...
+            in MdnsProtocolData offloadData);
+
+    /**
+     * Removes a record set that matches the given record key. Does nothing if
+     * this record key belongs to nothing.
+     */
+    void removeProtocolResponses(int recordKey);
+
+    /**
+     * Returns the >= 0 number of hits for the given recordKey.
+     * Resets the internal counter to 0 for the given record key.
+     * If the implementation is not able to track hits, return -1.
+     */
+    int getAndResetHitCounter(int recordKey);
+
+    /**
+     * Returns the >= 0 number of non fulfilled queries.
+     * Resets the internal counter to 0 at every call.
+     * If the implementation is not able to track misses, return -1.
+     */
+    int getAndResetMissCounter();
+
+    /**
+     * Add the supplied QNAME to the allowlist that can forward queries to the
+     * main system when the offload cannot provide responses. Return true if
+     * the addition is successful,false otherwise. The allowlist is defined per
+     * network interface (eth0, wlan0,...)
+     * This is only used to filter queries. The matching is done only against QNAME.
+     * Be careful with this list, as it will allow additional queries to wake up
+     * the system. If the same QNAME is used in the offloaded records and in the
+     * passthrough list, the offloaded response takes precedence.
+     */
+    boolean addToPassthroughList(String networkInterface, String qname);
+
+    /**
+     * Removes the supplied QNAME from the passthrough allowlist of a given
+     * networkInterface.
+     */
+    void removeFromPassthroughList(String networkInterface, String qname);
+
+    enum PassthroughBehavior {
+        // All the queries are forwarded to the system without any modification.
+        FORWARD_ALL,
+        // All the queries are dropped.
+        DROP_ALL,
+        // Only the queries present in the passthrough list are forwarded
+        // to the system without any modification.
+        PASSTHROUGH_LIST,
+    }
+
+    /**
+     * Sets the passtrough behavior for the offload on a specific networkInterface.
+     */
+    void setPassthroughBehavior(String networkInterface, PassthroughBehavior behavior);
+}
diff --git a/mdns_offload/interface/aidl/device/google/atv/mdns_offload/IMdnsOffloadManager.aidl b/mdns_offload/interface/aidl/device/google/atv/mdns_offload/IMdnsOffloadManager.aidl
new file mode 100644
index 0000000..3072612
--- /dev/null
+++ b/mdns_offload/interface/aidl/device/google/atv/mdns_offload/IMdnsOffloadManager.aidl
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2023 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 device.google.atv.mdns_offload;
+
+/**
+ * Offload interface to collect, prioritize and offload mDNS responses.
+ * All methods act asynchronously.
+ * They all consume a clientToken binder, to cleanup offload memory if the client app dies.
+ */
+@VintfStability
+interface IMdnsOffloadManager {
+    /**
+     * Data class to collect mDNS information to offload on the network interfaces.
+     */
+    parcelable OffloadServiceInfo {
+        String serviceName;
+        String serviceType;
+        String deviceHostName;
+        byte[] rawOffloadPacket;
+    }
+
+    /**
+     * Collects the offload responses intent for a given network interface and
+     * returns a key representing the intent. The system will do its best to offload
+     * the given responses asynchronously.
+     *
+     * If the binder instance dies, the records will be automatically cleaned up from
+     * the offload service and the offload manager.
+     */
+    int addProtocolResponses(
+            String networkInterface, in OffloadServiceInfo offloadData, IBinder clientToken);
+
+    /**
+     * Removes the offload intent from the manager. Any offloaded responses will also
+     * be removed from the offload service.
+     * If the binder doesn't match with the one used for registering, nothing
+     * happens.
+     */
+    void removeProtocolResponses(int recordKey, IBinder clientToken);
+
+    /**
+     * Collects a passthrough intent for a given network interface. The system will do its best to
+     * allow the passtrough.
+     *
+     * If the binder instance dies, the passthrough intents will be automatically
+     * cleaned up from the offload service and the offload manager.
+     */
+    void addToPassthroughList(String networkInterface, String qname, IBinder clientToken);
+
+    /**
+     * Remove the passthrough intent for the given network interface. If the passthrough was active
+     * it is immediately discarded from the offload service.
+     *
+     * If the binder instance doesn't match with the one used for registering, nothing happens.
+     */
+    void removeFromPassthroughList(String networkInterface, String qname, IBinder clientToken);
+}
diff --git a/overlay/TvFrameworkOverlay/res/values-ky/strings.xml b/overlay/TvFrameworkOverlay/res/values-ky/strings.xml
index 278b60d..7e28978 100644
--- a/overlay/TvFrameworkOverlay/res/values-ky/strings.xml
+++ b/overlay/TvFrameworkOverlay/res/values-ky/strings.xml
@@ -16,12 +16,12 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="accessibility_shortcut_multiple_service_warning" msgid="7133244216041378936">"<xliff:g id="SERVICE_0">%1$s</xliff:g> кызматын колдонуу үчүн артка жана ылдый баскычтарын үч секунддай коё бербей басып турдуңуз.\n\n <xliff:g id="SERVICE_1">%1$s</xliff:g> кызматын азыр иштетүү үчүн артка жана ылдый баскычтарын үч секунддай коё бербей басып туруңуз. <xliff:g id="SERVICE_2">%1$s</xliff:g> кызматын каалаган убакта ушул ыкчам баскыч менен иштетип же өчүрө аласыз.\n\n Параметрлерди тууралоо үчүн Параметрлер &gt; Тутум &gt; Атайын мүмкүнчүлүктөргө өтүңүз."</string>
+    <string name="accessibility_shortcut_multiple_service_warning" msgid="7133244216041378936">"<xliff:g id="SERVICE_0">%1$s</xliff:g> кызматын колдонуу үчүн артка жана ылдый баскычтарын үч секунддай коё бербей басып турдуңуз.\n\n <xliff:g id="SERVICE_1">%1$s</xliff:g> кызматын азыр иштетүү үчүн артка жана ылдый баскычтарын үч секунддай коё бербей басып туруңуз. <xliff:g id="SERVICE_2">%1$s</xliff:g> кызматын каалаган убакта ушул ыкчам баскыч менен иштетип же өчүрө аласыз.\n\n Параметрлерди тууралоо үчүн Параметрлер &gt; Система &gt; Атайын мүмкүнчүлүктөргө өтүңүз."</string>
     <string name="accessibility_shortcut_toogle_warning" msgid="6107141001991769734">"Атайын мүмкүнчүлүктөр функциясын пайдалануу үчүн ал күйгүзүлгөндө, үндү катуулатып/акырындаткан эки баскычты тең 3 секунддай коё бербей басып туруңуз.\n\n Учурдагы атайын мүмкүнчүлүктөрдүн параметрлери:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Параметрлер &gt; Атайын мүмкүнчүлүктөр бөлүмүнөн өзгөртө аласыз."</string>
     <string name="accessibility_shortcut_enabling_service" msgid="955379455142747901">"Артка жана ылдый баскычтарын коё бербей басып турдуңуз. <xliff:g id="SERVICE_NAME">%1$s</xliff:g> күйгүзүлдү."</string>
     <string name="accessibility_shortcut_disabling_service" msgid="1407311966343470931">"Артка жана ылдый баскычтарын коё бербей басып турдуңуз. <xliff:g id="SERVICE_NAME">%1$s</xliff:g> өчүрүлдү."</string>
     <string name="accessibility_shortcut_spoken_feedback" msgid="7263788823743141556">"<xliff:g id="SERVICE_0">%1$s</xliff:g> кызматын колдонуу үчүн артка жана ылдый баскычтарын үч секунддай коё бербей басып турдуңуз. <xliff:g id="SERVICE_1">%1$s</xliff:g> кызматын азыр иштетүү үчүн артка жана ылдый баскычтарын үч секунддай коё бербей басып туруңуз. <xliff:g id="SERVICE_2">%1$s</xliff:g> кызматын каалаган убакта ушул ыкчам баскыч менен иштетип же өчүрө аласыз."</string>
-    <string name="accessibility_shortcut_single_service_warning" msgid="7941823324711523679">"<xliff:g id="SERVICE_0">%1$s</xliff:g> кызматын колдонуу үчүн артка жана ылдый баскычтарын үч секунддай коё бербей басып турдуңуз.\n\n <xliff:g id="SERVICE_1">%1$s</xliff:g> кызматын азыр иштетүү үчүн артка жана ылдый баскычтарын үч секунддай коё бербей басып туруңуз.\n <xliff:g id="SERVICE_2">%1$s</xliff:g> кызматын каалаган убакта ушул ыкчам баскыч менен иштетип же өчүрө аласыз.\n\n Параметрлерди тууралоо үчүн Параметрлер &gt; Тутум &gt; Атайын мүмкүнчүлүктөргө өтүңүз."</string>
+    <string name="accessibility_shortcut_single_service_warning" msgid="7941823324711523679">"<xliff:g id="SERVICE_0">%1$s</xliff:g> кызматын колдонуу үчүн артка жана ылдый баскычтарын үч секунддай коё бербей басып турдуңуз.\n\n <xliff:g id="SERVICE_1">%1$s</xliff:g> кызматын азыр иштетүү үчүн артка жана ылдый баскычтарын үч секунддай коё бербей басып туруңуз.\n <xliff:g id="SERVICE_2">%1$s</xliff:g> кызматын каалаган убакта ушул ыкчам баскыч менен иштетип же өчүрө аласыз.\n\n Параметрлерди тууралоо үчүн Параметрлер &gt; Система &gt; Атайын мүмкүнчүлүктөргө өтүңүз."</string>
     <string name="disable_accessibility_shortcut" msgid="4559312586447750126">"Азыр эмес"</string>
     <string name="leave_accessibility_shortcut_on" msgid="6807632291651241490">"Күйгүзүү"</string>
 </resources>
diff --git a/overlay/TvFrameworkOverlay/res/values-zh-rHK/strings.xml b/overlay/TvFrameworkOverlay/res/values-zh-rHK/strings.xml
index 7f4db17..7ffc6f7 100644
--- a/overlay/TvFrameworkOverlay/res/values-zh-rHK/strings.xml
+++ b/overlay/TvFrameworkOverlay/res/values-zh-rHK/strings.xml
@@ -16,12 +16,12 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="accessibility_shortcut_multiple_service_warning" msgid="7133244216041378936">"您已按住返回和向下按鈕三秒以使用 <xliff:g id="SERVICE_0">%1$s</xliff:g>。\n\n如要立即啟用 <xliff:g id="SERVICE_1">%1$s</xliff:g>,請再次按住返回和向下按鈕三秒。您可隨時使用此捷徑啟用或停用 <xliff:g id="SERVICE_2">%1$s</xliff:g>。\n\n您可以在 [設定] &gt; [系統] &gt; [無障礙功能] 中調整偏好設定。"</string>
-    <string name="accessibility_shortcut_toogle_warning" msgid="6107141001991769734">"啟用快速鍵後,同時按下返回和向下按鈕 3 秒便可啟動無障礙功能。\n\n目前的無障礙功能:\n<xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n您可在「設定」&gt;「無障礙功能」中變更此功能。"</string>
+    <string name="accessibility_shortcut_multiple_service_warning" msgid="7133244216041378936">"你已按住返回和向下按鈕三秒以使用 <xliff:g id="SERVICE_0">%1$s</xliff:g>。\n\n如要立即啟用 <xliff:g id="SERVICE_1">%1$s</xliff:g>,請再次按住返回和向下按鈕三秒。你可隨時使用此捷徑啟用或停用 <xliff:g id="SERVICE_2">%1$s</xliff:g>。\n\n你可以在 [設定] &gt; [系統] &gt; [無障礙功能] 中調整偏好設定。"</string>
+    <string name="accessibility_shortcut_toogle_warning" msgid="6107141001991769734">"啟用快速鍵後,同時按下返回和向下按鈕 3 秒便可啟動無障礙功能。\n\n目前的無障礙功能:\n<xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n你可在「設定」&gt;「無障礙功能」中變更此功能。"</string>
     <string name="accessibility_shortcut_enabling_service" msgid="955379455142747901">"已按住返回和向下按鈕。<xliff:g id="SERVICE_NAME">%1$s</xliff:g> 已開啟。"</string>
     <string name="accessibility_shortcut_disabling_service" msgid="1407311966343470931">"已按住返回和向下按鈕。<xliff:g id="SERVICE_NAME">%1$s</xliff:g> 已關閉。"</string>
     <string name="accessibility_shortcut_spoken_feedback" msgid="7263788823743141556">"你㩒住咗返回同埋向下按鈕三秒嚟使用 <xliff:g id="SERVICE_0">%1$s</xliff:g>。如果宜家想啟用 <xliff:g id="SERVICE_1">%1$s</xliff:g>,麻煩你再㩒住返回同埋向下按鈕三秒。你可以隨時用呢個捷徑嚟啟用或者停用 <xliff:g id="SERVICE_2">%1$s</xliff:g>。"</string>
-    <string name="accessibility_shortcut_single_service_warning" msgid="7941823324711523679">"您已按住返回和向下按鈕三秒以使用 <xliff:g id="SERVICE_0">%1$s</xliff:g>。\n\n如要立即啟用 <xliff:g id="SERVICE_1">%1$s</xliff:g>,請再次按住返回和向下按鈕三秒。\n您可隨時使用此捷徑啟用或停用 <xliff:g id="SERVICE_2">%1$s</xliff:g>。\n\n您可以在 [設定] &gt; [系統] &gt; [無障礙功能] 中調整偏好設定。"</string>
+    <string name="accessibility_shortcut_single_service_warning" msgid="7941823324711523679">"你已按住返回和向下按鈕三秒以使用 <xliff:g id="SERVICE_0">%1$s</xliff:g>。\n\n如要立即啟用 <xliff:g id="SERVICE_1">%1$s</xliff:g>,請再次按住返回和向下按鈕三秒。\n你可隨時使用此捷徑啟用或停用 <xliff:g id="SERVICE_2">%1$s</xliff:g>。\n\n你可以在 [設定] &gt; [系統] &gt; [無障礙功能] 中調整偏好設定。"</string>
     <string name="disable_accessibility_shortcut" msgid="4559312586447750126">"暫時不要"</string>
     <string name="leave_accessibility_shortcut_on" msgid="6807632291651241490">"立即開啟"</string>
 </resources>
diff --git a/overlay/TvWifiOverlay/res/values/config.xml b/overlay/TvWifiOverlay/res/values/config.xml
index 679995b..57ae24a 100644
--- a/overlay/TvWifiOverlay/res/values/config.xml
+++ b/overlay/TvWifiOverlay/res/values/config.xml
@@ -38,4 +38,10 @@
     If no spontaneous awakening happens at the end of the time window, the device is awakened to
     perform the scan.-->
     <bool translatable="false" name="config_wifiSwPnoEnabled">true</bool>
+
+    <!-- Boolean indicating performing a partial initial scan is enabled -->
+    <bool translatable="false" name="config_wifiEnablePartialInitialScan">true</bool>
+
+    <!-- Integer for maximum number of channels to use in initial partial scan. If equals to 0, means add all available channels for networks -->
+    <integer translatable="false" name="config_wifiInitialPartialScanChannelMaxCount">4</integer>
 </resources>
diff --git a/permissions/tv_sdk_excluded_core_hardware.xml b/permissions/tv_sdk_excluded_core_hardware.xml
index e2917b4..a27fc7a 100644
--- a/permissions/tv_sdk_excluded_core_hardware.xml
+++ b/permissions/tv_sdk_excluded_core_hardware.xml
@@ -17,7 +17,11 @@
 <!-- Excludes all non-default ATV SDK features to comply with CTS -->
 <permissions>
     <!-- ATV SDK needs some basic camera features to enable video calling, but can exclude some -->
+    <unavailable-feature name="android.hardware.camera" />
     <unavailable-feature name="android.hardware.camera.ar" />
+    <unavailable-feature name="android.hardware.camera.autofocus" />
+    <unavailable-feature name="android.hardware.camera.concurrent" />
+    <unavailable-feature name="android.hardware.camera.flash" />
     <unavailable-feature name="android.hardware.camera.level.full" />
     <unavailable-feature name="android.hardware.camera.capability.manual_sensor" />
     <unavailable-feature name="android.hardware.camera.capability.manual_post_processing" />
diff --git a/products/aosp_tv_arm64.mk b/products/aosp_tv_arm64.mk
index bb97c2d..0b2ab38 100644
--- a/products/aosp_tv_arm64.mk
+++ b/products/aosp_tv_arm64.mk
@@ -49,6 +49,8 @@
 # All components inherited here go to product image
 #
 $(call inherit-product, device/google/atv/products/atv_product.mk)
+# Default sound experience
+$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioTv.mk)
 # Packages required for ATV GSI
 PRODUCT_PACKAGES += \
     LeanbackIME \
diff --git a/products/aosp_tv_x86.mk b/products/aosp_tv_x86.mk
index 3b9083b..474c5ed 100644
--- a/products/aosp_tv_x86.mk
+++ b/products/aosp_tv_x86.mk
@@ -48,10 +48,14 @@
 # All components inherited here go to product image
 #
 $(call inherit-product, device/google/atv/products/atv_product.mk)
+# Default sound experience
+$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioTv.mk)
 # Packages required for ATV GSI
+ifeq (aosp_tv_x86,$(TARGET_PRODUCT))
 PRODUCT_PACKAGES += \
     LeanbackIME \
     TvSampleLeanbackLauncher
+endif
 
 #
 # All components inherited here go to vendor image
diff --git a/products/atv_emulator_vendor.mk b/products/atv_emulator_vendor.mk
index 4659e0b..32d5e2b 100644
--- a/products/atv_emulator_vendor.mk
+++ b/products/atv_emulator_vendor.mk
@@ -22,10 +22,14 @@
 EMULATOR_VENDOR_NO_BIOMETRICS := true
 EMULATOR_VENDOR_NO_SENSORS := true
 
-$(call inherit-product, device/google/atv/products/atv_vendor.mk)
+ifneq ($(PRODUCT_IS_ATV_ARM64_SDK),true)
+    $(call inherit-product, device/google/atv/products/atv_vendor.mk)
+endif
 
 # Sets HDMI CEC as Playback Device.
-PRODUCT_PROPERTY_OVERRIDES += ro.hdmi.device_type=4
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.hdmi.device_type=4 \
+    ro.hdmi.cec_device_types=playback_device
 
 # need this for gles libraries to load properly
 # after moving to /vendor/lib/
@@ -33,10 +37,15 @@
     vndk-sp
 
 DEVICE_PACKAGE_OVERLAYS += \
-    device/generic/goldfish/overlay \
     device/google/atv/sdk_overlay \
     development/sdk_overlay
 
+# Declared in emulator64_vendor.mk for 64-bit targets.
+ifneq ($(PRODUCT_IS_ATV_ARM64_SDK),true)
+    DEVICE_PACKAGE_OVERLAYS += \
+        device/generic/goldfish/overlay
+endif
+
 PRODUCT_CHARACTERISTICS := emulator
 
 PRODUCT_FULL_TREBLE_OVERRIDE := true
@@ -45,8 +54,8 @@
     device/generic/goldfish/data/etc/config.ini.tv:config.ini
 
 PRODUCT_COPY_FILES += \
-    device/generic/goldfish/data/etc/apns-conf.xml:$(TARGET_COPY_OUT_VENDOR)/etc/apns-conf.xml \
     device/generic/goldfish/camera/media/media_codecs_google_tv.xml:${TARGET_COPY_OUT_VENDOR}/etc/media_codecs_google_tv.xml \
+    device/generic/goldfish/data/etc/apns-conf.xml:$(TARGET_COPY_OUT_VENDOR)/etc/apns-conf.xml \
     frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \
     hardware/libhardware_legacy/audio/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf
 
@@ -56,7 +65,11 @@
     device/google/atv/permissions/tv_sdk_excluded_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tv_sdk_excluded_core_hardware.xml
 
 # goldfish vendor partition configurations
-$(call inherit-product-if-exists, device/generic/goldfish/64bitonly/product/vendor.mk)
+ifeq ($(PRODUCT_IS_ATV_ARM64_SDK),true)
+    $(call inherit-product-if-exists, device/generic/goldfish/64bitonly/product/emulator64_vendor.mk)
+else
+    $(call inherit-product-if-exists, device/generic/goldfish/64bitonly/product/vendor.mk)
+endif
 
 #watchdog tiggers reboot because location service is not
 #responding, disble it for now.
diff --git a/products/atv_logpersist.mk b/products/atv_logpersist.mk
new file mode 100644
index 0000000..7c0f814
--- /dev/null
+++ b/products/atv_logpersist.mk
@@ -0,0 +1,9 @@
+# Optional configuration that can be used to enable persistent logcat on -eng and -userdebug builds
+# See go/agw/platform/system/logging/+/refs/heads/master/logd/README.property for available options
+
+ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
+PRODUCT_PRODUCT_PROPERTIES +=
+    logd.logpersistd=logcatd \
+    logd.logpersistd.size=30 \
+    logd.logpersistd.rotate_kbytes=2048
+endif
diff --git a/products/atv_system_ext.mk b/products/atv_system_ext.mk
index 68f7755..48d8b2d 100644
--- a/products/atv_system_ext.mk
+++ b/products/atv_system_ext.mk
@@ -20,8 +20,13 @@
 PRODUCT_PACKAGES += \
     blur_sysprop_notifier \
     TvSystemUI \
+    TvFeedbackConsent \
     TvFrameworkPackageStubs \
-    TvSettings
+    TvSettings \
+    MdnsOffloadManagerService
 
 SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/atv/sepolicy/system_ext/public
 SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/atv/sepolicy/system_ext/private
+
+# Always disable Compose features in SystemUI to avoid APK size increase.
+SYSTEMUI_USE_COMPOSE := false
diff --git a/products/gsi_tv_base.mk b/products/gsi_tv_base.mk
index d9576ab..86abe4a 100644
--- a/products/gsi_tv_base.mk
+++ b/products/gsi_tv_base.mk
@@ -41,6 +41,8 @@
 # All components inherited here go to product image
 #
 $(call inherit-product, device/google/atv/products/atv_product.mk)
+# Default sound experience
+$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioTv.mk)
 # Packages required for ATV GSI
 PRODUCT_PACKAGES += \
     LeanbackIME \
diff --git a/products/sdk_atv_arm64.mk b/products/sdk_atv_arm64.mk
deleted file mode 100644
index f887f8b..0000000
--- a/products/sdk_atv_arm64.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (C) 2023 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.
-#
-PRODUCT_IS_ATV_SDK := true
-
-# Overrides
-PRODUCT_BRAND := Android
-PRODUCT_NAME := sdk_atv_arm64
-PRODUCT_DEVICE := generic_arm64