Merge "Fire off BluetoothConnectionCallback when we fire off the broadcasts for ACL connections and disconnections."
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 48d60ac..8aa0dbf 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -12,10 +12,10 @@
          android:description="@string/permdesc_bluetoothShareManager"
          android:protectionLevel="signature"/>
 
-    <!--  Allows temporarily whitelisting Bluetooth addresses for sharing -->
-    <permission android:name="com.android.permission.WHITELIST_BLUETOOTH_DEVICE"
-         android:label="@string/permlab_bluetoothWhitelist"
-         android:description="@string/permdesc_bluetoothWhitelist"
+    <!--  Allows temporarily acceptlisting Bluetooth addresses for sharing -->
+    <permission android:name="com.android.permission.ALLOWLIST_BLUETOOTH_DEVICE"
+         android:label="@string/permlab_bluetoothAcceptlist"
+         android:description="@string/permdesc_bluetoothAcceptlist"
          android:protectionLevel="signature"/>
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
@@ -120,10 +120,10 @@
         </receiver>
          <receiver android:process="@string/process"
               android:name=".opp.BluetoothOppHandoverReceiver"
-              android:permission="com.android.permission.WHITELIST_BLUETOOTH_DEVICE"
+              android:permission="com.android.permission.ALLOWLIST_BLUETOOTH_DEVICE"
               android:exported="true">
             <intent-filter>
-                <action android:name="android.btopp.intent.action.WHITELIST_DEVICE"/>
+                <action android:name="android.btopp.intent.action.ACCEPTLIST_DEVICE"/>
                 <action android:name="android.btopp.intent.action.STOP_HANDOVER_TRANSFER"/>
             </intent-filter>
             <intent-filter>
diff --git a/jni/com_android_bluetooth_btservice_AdapterService.cpp b/jni/com_android_bluetooth_btservice_AdapterService.cpp
index 6bf8739..e851f68 100644
--- a/jni/com_android_bluetooth_btservice_AdapterService.cpp
+++ b/jni/com_android_bluetooth_btservice_AdapterService.cpp
@@ -682,7 +682,7 @@
 
 static bool initNative(JNIEnv* env, jobject obj, jboolean isGuest,
                        jboolean isNiapMode, int configCompareResult,
-                       jobjectArray initFlags) {
+                       jobjectArray initFlags, jboolean isAtvDevice) {
   ALOGV("%s", __func__);
 
   android_bluetooth_UidTraffic.clazz =
@@ -711,7 +711,8 @@
 
   int ret = sBluetoothInterface->init(
       &sBluetoothCallbacks, isGuest == JNI_TRUE ? 1 : 0,
-      isNiapMode == JNI_TRUE ? 1 : 0, configCompareResult, flags);
+      isNiapMode == JNI_TRUE ? 1 : 0, configCompareResult, flags,
+      isAtvDevice == JNI_TRUE ? 1 : 0);
 
   for (int i = 0; i < flagCount; i++) {
     env->ReleaseStringUTFChars(flagObjs[i], flags[i]);
@@ -1335,7 +1336,7 @@
 static JNINativeMethod sMethods[] = {
     /* name, signature, funcPtr */
     {"classInitNative", "()V", (void*)classInitNative},
-    {"initNative", "(ZZI[Ljava/lang/String;)Z", (void*)initNative},
+    {"initNative", "(ZZI[Ljava/lang/String;Z)Z", (void*)initNative},
     {"cleanupNative", "()V", (void*)cleanupNative},
     {"enableNative", "()Z", (void*)enableNative},
     {"disableNative", "()Z", (void*)disableNative},
diff --git a/jni/com_android_bluetooth_gatt.cpp b/jni/com_android_bluetooth_gatt.cpp
index 683a173..c09c440 100644
--- a/jni/com_android_bluetooth_gatt.cpp
+++ b/jni/com_android_bluetooth_gatt.cpp
@@ -774,6 +774,95 @@
     &sGattScannerCallbacks,
 };
 
+class JniAdvertisingCallbacks : AdvertisingCallbacks {
+ public:
+  static AdvertisingCallbacks* GetInstance() {
+    static AdvertisingCallbacks* instance = new JniAdvertisingCallbacks();
+    return instance;
+  }
+
+  void OnAdvertisingSetStarted(int reg_id, uint8_t advertiser_id,
+                               int8_t tx_power, uint8_t status) {
+    CallbackEnv sCallbackEnv(__func__);
+    if (!sCallbackEnv.valid()) return;
+    sCallbackEnv->CallVoidMethod(mAdvertiseCallbacksObj,
+                                 method_onAdvertisingSetStarted, reg_id,
+                                 advertiser_id, tx_power, status);
+  }
+
+  void OnAdvertisingEnabled(uint8_t advertiser_id, bool enable,
+                            uint8_t status) {
+    CallbackEnv sCallbackEnv(__func__);
+    if (!sCallbackEnv.valid()) return;
+    sCallbackEnv->CallVoidMethod(mAdvertiseCallbacksObj,
+                                 method_onAdvertisingEnabled, advertiser_id,
+                                 enable, status);
+  }
+
+  void OnAdvertisingDataSet(uint8_t advertiser_id, uint8_t status) {
+    CallbackEnv sCallbackEnv(__func__);
+    if (!sCallbackEnv.valid()) return;
+    sCallbackEnv->CallVoidMethod(mAdvertiseCallbacksObj,
+                                 method_onAdvertisingDataSet, advertiser_id,
+                                 status);
+  }
+
+  void OnScanResponseDataSet(uint8_t advertiser_id, uint8_t status) {
+    CallbackEnv sCallbackEnv(__func__);
+    if (!sCallbackEnv.valid()) return;
+    sCallbackEnv->CallVoidMethod(mAdvertiseCallbacksObj,
+                                 method_onScanResponseDataSet, advertiser_id,
+                                 status);
+  }
+
+  void OnAdvertisingParametersUpdated(uint8_t advertiser_id, int8_t tx_power,
+                                      uint8_t status) {
+    CallbackEnv sCallbackEnv(__func__);
+    if (!sCallbackEnv.valid()) return;
+    sCallbackEnv->CallVoidMethod(mAdvertiseCallbacksObj,
+                                 method_onAdvertisingParametersUpdated,
+                                 advertiser_id, tx_power, status);
+  }
+
+  void OnPeriodicAdvertisingParametersUpdated(uint8_t advertiser_id,
+                                              uint8_t status) {
+    CallbackEnv sCallbackEnv(__func__);
+    if (!sCallbackEnv.valid()) return;
+    sCallbackEnv->CallVoidMethod(mAdvertiseCallbacksObj,
+                                 method_onPeriodicAdvertisingParametersUpdated,
+                                 advertiser_id, status);
+  }
+
+  void OnPeriodicAdvertisingDataSet(uint8_t advertiser_id, uint8_t status) {
+    CallbackEnv sCallbackEnv(__func__);
+    if (!sCallbackEnv.valid()) return;
+    sCallbackEnv->CallVoidMethod(mAdvertiseCallbacksObj,
+                                 method_onPeriodicAdvertisingDataSet,
+                                 advertiser_id, status);
+  }
+
+  void OnPeriodicAdvertisingEnabled(uint8_t advertiser_id, bool enable,
+                                    uint8_t status) {
+    CallbackEnv sCallbackEnv(__func__);
+    if (!sCallbackEnv.valid()) return;
+    sCallbackEnv->CallVoidMethod(mAdvertiseCallbacksObj,
+                                 method_onPeriodicAdvertisingEnabled,
+                                 advertiser_id, enable, status);
+  }
+
+  void OnOwnAddressRead(uint8_t advertiser_id, uint8_t address_type,
+                        RawAddress address) {
+    CallbackEnv sCallbackEnv(__func__);
+    if (!sCallbackEnv.valid()) return;
+
+    ScopedLocalRef<jstring> addr(sCallbackEnv.get(),
+                                 bdaddr2newjstr(sCallbackEnv.get(), &address));
+    sCallbackEnv->CallVoidMethod(mAdvertiseCallbacksObj,
+                                 method_onOwnAddressRead, advertiser_id,
+                                 address_type, addr.get());
+  }
+};
+
 /**
  * Native function definitions
  */
@@ -924,6 +1013,9 @@
     return;
   }
 
+  sGattIf->advertiser->RegisterCallbacks(
+      JniAdvertisingCallbacks::GetInstance());
+
   mCallbacksObj = env->NewGlobalRef(object);
 }
 
@@ -1837,8 +1929,8 @@
   env->ReleaseByteArrayElements(periodic_data, periodic_data_data, JNI_ABORT);
 
   sGattIf->advertiser->StartAdvertisingSet(
-      base::Bind(&ble_advertising_set_started_cb, reg_id), params, data_vec,
-      scan_resp_vec, periodicParams, periodic_data_vec, duration,
+      reg_id, base::Bind(&ble_advertising_set_started_cb, reg_id), params,
+      data_vec, scan_resp_vec, periodicParams, periodic_data_vec, duration,
       maxExtAdvEvents, base::Bind(ble_advertising_set_timeout_cb));
 }
 
diff --git a/jni/com_android_bluetooth_hearing_aid.cpp b/jni/com_android_bluetooth_hearing_aid.cpp
index b459ae2..e359faf 100644
--- a/jni/com_android_bluetooth_hearing_aid.cpp
+++ b/jni/com_android_bluetooth_hearing_aid.cpp
@@ -193,7 +193,7 @@
   return JNI_TRUE;
 }
 
-static jboolean addToWhiteListNative(JNIEnv* env, jobject object,
+static jboolean addToAcceptlistNative(JNIEnv* env, jobject object,
                                      jbyteArray address) {
   std::shared_lock<std::shared_timed_mutex> lock(interface_mutex);
   if (!sHearingAidInterface) return JNI_FALSE;
@@ -204,7 +204,7 @@
   }
 
   RawAddress* tmpraw = (RawAddress*)addr;
-  sHearingAidInterface->AddToWhiteList(*tmpraw);
+  sHearingAidInterface->AddToAcceptlist(*tmpraw);
   env->ReleaseByteArrayElements(address, addr, 0);
   return JNI_TRUE;
 }
@@ -224,7 +224,7 @@
     {"cleanupNative", "()V", (void*)cleanupNative},
     {"connectHearingAidNative", "([B)Z", (void*)connectHearingAidNative},
     {"disconnectHearingAidNative", "([B)Z", (void*)disconnectHearingAidNative},
-    {"addToWhiteListNative", "([B)Z", (void*)addToWhiteListNative},
+    {"addToAcceptlistNative", "([B)Z", (void*)addToAcceptlistNative},
     {"setVolumeNative", "(I)V", (void*)setVolumeNative},
 };
 
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5e6639b..7c6e3a9 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Maak toegang aflaaibestuurder oop."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Gee aan die program toegang tot die BluetoothShare-bestuurder en om dit te gebruik om lêers oor te dra."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Witlys Bluetooth-toesteltoegang."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Laat die program toe om \'n Bluetooth-toestel tydelik te witlys, sodat daardie toestel lêers na hierdie toestel kan stuur sonder die gebruiker se bevestiging."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Witlys Bluetooth-toesteltoegang."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Laat die program toe om \'n Bluetooth-toestel tydelik te witlys, sodat daardie toestel lêers na hierdie toestel kan stuur sonder die gebruiker se bevestiging."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Onbekende toestel"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Onbekend"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 3b0fa82..a711cc7 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"አውርድ አደራጅን ድረስ።"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"የብሉቱዝ አጋራ አስተዳዳሪውን ለመድረስ እና ፋይሎች እንዲያስተላልፉ ለመጠቀም ለመተግበሪያው ይፈቅዳል።"</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"የብሉቱዝ መሳሪያ መዳረሻን በተወዳጆች ዝርዝር ያስገቡ።"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"መተግበሪያው አንድን የብሉቱዝ መሳሪያ በጊዜያዊነት በተወዳጆች ዝርዝር እንዲያስገባ ይፈቅድለታል፣ ይህም መሳሪያው ወደዚህኛው መሳሪያ ፋይሎችን ያለተጠቃሚው ማረጋገጫ ለመላክ ያስችለዋል።"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"የብሉቱዝ መሳሪያ መዳረሻን በተወዳጆች ዝርዝር ያስገቡ።"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"መተግበሪያው አንድን የብሉቱዝ መሳሪያ በጊዜያዊነት በተወዳጆች ዝርዝር እንዲያስገባ ይፈቅድለታል፣ ይህም መሳሪያው ወደዚህኛው መሳሪያ ፋይሎችን ያለተጠቃሚው ማረጋገጫ ለመላክ ያስችለዋል።"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"ብሉቱዝ"</string>
     <string name="unknown_device" msgid="9221903979877041009">"ያልታወቀ መሣሪያ"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"ያልታወቀ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 68e268f..3cdad5b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -18,13 +18,13 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"الدخول إلى إدارة التنزيل."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"‏للسماح للتطبيق بالدخول إلى إدارة BluetoothShare واستخدامها لنقل الملفات."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"إضافة وصول جهاز بلوتوث إلى القائمة البيضاء."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"يسمح للتطبيق مؤقتًا بإضافة جهاز بلوتوث إلى القائمة البيضاء مما يتيح لذلك الجهاز إرسال ملفات إلى هذا الجهاز بدون تأكيد المستخدم."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"إضافة وصول جهاز بلوتوث إلى القائمة البيضاء."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"يسمح للتطبيق مؤقتًا بإضافة جهاز بلوتوث إلى القائمة البيضاء مما يتيح لذلك الجهاز إرسال ملفات إلى هذا الجهاز بدون تأكيد المستخدم."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"بلوتوث"</string>
     <string name="unknown_device" msgid="9221903979877041009">"جهاز غير معروف"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"غير معروف"</string>
-    <string name="airplane_error_title" msgid="2683839635115739939">"وضع الطائرة"</string>
-    <string name="airplane_error_msg" msgid="8698965595254137230">"لا يمكنك استخدام البلوتوث في وضع الطائرة."</string>
+    <string name="airplane_error_title" msgid="2683839635115739939">"وضع الطيران"</string>
+    <string name="airplane_error_msg" msgid="8698965595254137230">"لا يمكنك استخدام البلوتوث في وضع الطيران."</string>
     <string name="bt_enable_title" msgid="8657832550503456572"></string>
     <string name="bt_enable_line1" msgid="7203551583048149">"لإستخدام خدمات البلوتوث، يجب تفعيل البلوتوث أولاً."</string>
     <string name="bt_enable_line2" msgid="4341936569415937994">"هل تريد تفعيل البلوتوث الآن؟"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 3f939ee..89c4a8d 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ডাউনল’ড মেনেজাৰ ব্যৱহাৰ কৰিব পাৰে।"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"এপটোক BluetoothShare মেনেজাৰ ব্যৱহাৰ কৰি ফাইল স্থানান্তৰ কৰিবলৈ অনুমতি দিয়ে।"</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"ব্লুটুথ ডিভাইচ ব্যৱাহৰ কৰিবলৈ স্বীকৃতি দিয়ক।"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"ব্যৱহাৰকাৰীৰ অনুমতি অবিহনে এই ডিভাইচক ফাইলবোৰ পঠিয়াবলৈ দি এপটোক ব্লুটুথ ডিভাইচক কিছু সময়ৰ বাবে স্বীকৃতি দিয়ে।"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"ব্লুটুথ ডিভাইচ ব্যৱাহৰ কৰিবলৈ স্বীকৃতি দিয়ক।"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"ব্যৱহাৰকাৰীৰ অনুমতি অবিহনে এই ডিভাইচক ফাইলবোৰ পঠিয়াবলৈ দি এপটোক ব্লুটুথ ডিভাইচক কিছু সময়ৰ বাবে স্বীকৃতি দিয়ে।"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"ব্লুটুথ"</string>
     <string name="unknown_device" msgid="9221903979877041009">"অজ্ঞাত ডিভাইচ"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"অজ্ঞাত"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 3096a5b..6c5908f 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Endirmə menecerinə daxil olun."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Tətbiq BluetoothPaylaşım menecerinə daxil ola və faylları ötürmək üçün ondan istifadə edə bilər."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Bluetooth cihazına girişi ağ siyahıya salın."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Tətbiq Bluetooth cihazını müvəqqəti olaraq ağ siyahıya daxil edə bilər, bununla həmin cihaz istifadəçi təsdiqi olmadan bu cihaza fayllar göndərə biləcək."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Bluetooth cihazına girişi ağ siyahıya salın."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Tətbiq Bluetooth cihazını müvəqqəti olaraq ağ siyahıya daxil edə bilər, bununla həmin cihaz istifadəçi təsdiqi olmadan bu cihaza fayllar göndərə biləcək."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Naməlum cihaz"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Naməlum"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 4de387e..83fab31 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Pristup menadžeru preuzimanja."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Omogućava aplikaciji da pristupa menadžeru za deljenje preko Bluetooth-a i da ga koristi za prenos datoteka."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Pristup Bluetooth uređaja sa bele liste."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Dozvoljava aplikaciji da privremeno stavi Bluetooth uređaj na belu listu, što omogućava tom uređaju da šalje datoteke ovom uređaju bez potvrde korisnika."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Pristup Bluetooth uređaja sa bele liste."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Dozvoljava aplikaciji da privremeno stavi Bluetooth uređaj na belu listu, što omogućava tom uređaju da šalje datoteke ovom uređaju bez potvrde korisnika."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Nepoznati uređaj"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Nepoznato"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index afc03ea..1a1f0b6 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Доступ да Менеджара спамповак."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Дазваляе прыкладанням атрымліваць доступ да менеджэра BluetoothShare і выкарыстоўваць яго для перадачы файлаў."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Даданне прылад Bluetooth у белы спiс."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Дазваляе прыкладанням часова ўносiць у белы спіс прылады Bluetooth, дазваляючы iм адпраўляць файлы на гэту прыладу без пацверджання карыстальнiка."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Даданне прылад Bluetooth у белы спiс."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Дазваляе прыкладанням часова ўносiць у белы спіс прылады Bluetooth, дазваляючы iм адпраўляць файлы на гэту прыладу без пацверджання карыстальнiка."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Невядомая прылада"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Невядомы"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 279eb9c..da346bb 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Достъп до диспечера за изтегляне."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Дава на приложението достъп и възможност за прехвърляне на файлове с диспечера за BluetoothShare."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Достъп до устройство с Bluetooth, поставено в белия списък."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Разрешава на приложението временно да постави в белия списък устройство с Bluetooth, позволявайки му да изпраща файлове до това устройство без потвърждение от потребителя."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Достъп до устройство с Bluetooth, поставено в белия списък."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Разрешава на приложението временно да постави в белия списък устройство с Bluetooth, позволявайки му да изпраща файлове до това устройство без потвърждение от потребителя."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Неизвестно устройство"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Неизвестно"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 62f7105..51765f5 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ডাউনলোড ম্যানেজার অ্যাক্সেস করুন।"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"অ্যাপ্লিকেশানটিকে BluetoothShare ম্যানেজার অ্যাক্সেস করতে ও ফাইলগুলি স্থানান্তর করতে এটি ব্যবহার করার অনুমতি দেয়।"</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"শ্বেততালিকাভুক্ত ব্লুটুথ ডিভাইসের অ্যাক্সেস।"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"অ্যাপ্লিকেশানটিকে অস্থায়ীভাবে কোনো ব্লুটুথ ডিভাইসকে শ্বেততালিকায় অন্তর্ভুক্ত করার অনুমতি দেয়, যা সেই ডিভাইসটিকে এই ডিভাইসে ব্যবহারকারীর নিশ্চিতকরণ ছাড়া ফাইল পাঠানোর অনুমতি দেয়।"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"শ্বেততালিকাভুক্ত ব্লুটুথ ডিভাইসের অ্যাক্সেস।"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"অ্যাপ্লিকেশানটিকে অস্থায়ীভাবে কোনো ব্লুটুথ ডিভাইসকে শ্বেততালিকায় অন্তর্ভুক্ত করার অনুমতি দেয়, যা সেই ডিভাইসটিকে এই ডিভাইসে ব্যবহারকারীর নিশ্চিতকরণ ছাড়া ফাইল পাঠানোর অনুমতি দেয়।"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"ব্লুটুথ"</string>
     <string name="unknown_device" msgid="9221903979877041009">"অজানা ডিভাইস"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"অজানা"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 615f1ae..c3515d8 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Pristupite upravitelju za preuzimanja."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Dozvoljava aplikaciji da pristupa BluetoothShare upravitelju i koristi ga za prenošenje fajlova."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Dozvoli pristup bluetooth uređaju."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Dozvoljava aplikaciji da privremeno stavi Bluetooth uređaj na spisak dopuštenih fajlova, omogućavajući tom uređaju da šalje fajlove na ovaj uređaj bez potvrde korisnika."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Dozvoli pristup bluetooth uređaju."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Dozvoljava aplikaciji da privremeno stavi Bluetooth uređaj na spisak dopuštenih fajlova, omogućavajući tom uređaju da šalje fajlove na ovaj uređaj bez potvrde korisnika."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Nepoznat uređaj"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Nepoznato"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 9461ca3..2f57d0e 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Accediu al gestor de baixades."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Permet que l\'aplicació accedeixi al gestor d\'ús compartit de Bluetooth i que l\'utilitzi per transferir fitxers."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Accés de dispositius Bluetooth en llista blanca."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Permet que l\'aplicació col·loqui temporalment en una llista blanca un dispositiu Bluetooth, cosa que permet que el dispositiu enviï fitxers a aquest dispositiu sense la confirmació de l\'usuari."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Accés de dispositius Bluetooth en llista blanca."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Permet que l\'aplicació col·loqui temporalment en una llista blanca un dispositiu Bluetooth, cosa que permet que el dispositiu enviï fitxers a aquest dispositiu sense la confirmació de l\'usuari."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Dispositiu desconegut"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Desconegut"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 75cd7a5..025c793 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Získat přístup ke správci stahování."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Umožňuje aplikaci přistupovat ke Správci sdílení Bluetooth a využívat jej k přenosu souborů."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Povolit přístup zařízení Bluetooth."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Umožňuje aplikaci dočasně povolit zařízení Bluetooth, aby tak mohlo odesílat soubory do tohoto zařízení bez potvrzení uživatele."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Povolit přístup zařízení Bluetooth."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Umožňuje aplikaci dočasně povolit zařízení Bluetooth, aby tak mohlo odesílat soubory do tohoto zařízení bez potvrzení uživatele."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Neznámé zařízení"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Neznámé"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ee54f12..9d02460 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Få adgang til downloadadministrator."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Tillader, at appen får adgang til BluetoothShare-administratoren og kan bruge den til overførsel af filer."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Godkender adgang til Bluetooth-enheden."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Tillader, at appen midlertidigt godkender en Bluetooth-enhed, så der kan sendes filer derfra til din enhed uden bekræftelse fra brugerens side."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Godkender adgang til Bluetooth-enheden."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Tillader, at appen midlertidigt godkender en Bluetooth-enhed, så der kan sendes filer derfra til din enhed uden bekræftelse fra brugerens side."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Ukendt enhed"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Ukendt"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7d418e3..07e5cf6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Auf Download-Manager zugreifen"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Ermöglicht der App, auf den Bluetooth-Weiterleitungs-Manager zuzugreifen und diesen für die Übertragung von Dateien zu verwenden."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Bluetooth-Gerät für Zugriff zur weißen Liste hinzufügen"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Ermöglicht der App, ein Bluetooth-Gerät vorübergehend zur weißen Liste hinzuzufügen, sodass es ohne Bestätigung des Nutzers Dateien an dieses Gerät senden kann"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Bluetooth-Gerät für Zugriff zur Zulassungsliste hinzufügen"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Ermöglicht der App, ein Bluetooth-Gerät vorübergehend zur Zulassungsliste hinzuzufügen, sodass es ohne Bestätigung des Nutzers Dateien an dieses Gerät senden kann"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Unbekanntes Gerät"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Unbekannter Anrufer"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 2564eaf..36afbad 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Πρόσβαση στη διαχείριση λήψεων."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Επιτρέπει στην εφαρμογή να αποκτά πρόσβαση στο πρόγραμμα διαχείρισης BluetoothShare και να το χρησιμοποιεί για τη μεταφορά αρχείων."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Πρόσβαση συσκευής Bluetooth επιτρεπόμενης λίστας."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Επιτρέπει στην εφαρμογή να προσθέσει μια συσκευή Bluetooth σε μια λίστα επιτρεπόμενων συσκευών, δίνοντας τη δυνατότητα στη συγκεκριμένη εφαρμογή να αποστέλλει αρχεία σε αυτήν τη συσκευή χωρίς επιβεβαίωση χρήστη."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Πρόσβαση συσκευής Bluetooth επιτρεπόμενης λίστας."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Επιτρέπει στην εφαρμογή να προσθέσει μια συσκευή Bluetooth σε μια λίστα επιτρεπόμενων συσκευών, δίνοντας τη δυνατότητα στη συγκεκριμένη εφαρμογή να αποστέλλει αρχεία σε αυτήν τη συσκευή χωρίς επιβεβαίωση χρήστη."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Άγνωστη συσκευή"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Άγνωστος"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 1ae94db..c1f456c 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Access download manager."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Allows the application to access the Bluetooth Share manager and to use it to transfer files."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Whitelist bluetooth device access."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Allows the app to temporarily whitelist a Bluetooth device, allowing that device to send files to this device without user confirmation."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Acceptlist bluetooth device access."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Allows the app to temporarily acceptlist a Bluetooth device, allowing that device to send files to this device without user confirmation."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Unknown device"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Unknown"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index cb120cb..aa4d6e5 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Access download manager."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Allows the application to access the Bluetooth Share manager and to use it to transfer files."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Whitelist bluetooth device access."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Allows the app to temporarily whitelist a Bluetooth device, allowing that device to send files to this device without user confirmation."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Acceptlist bluetooth device access."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Allows the app to temporarily acceptlist a Bluetooth device, allowing that device to send files to this device without user confirmation."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Unknown device"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Unknown"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 1ae94db..c1f456c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Access download manager."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Allows the application to access the Bluetooth Share manager and to use it to transfer files."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Whitelist bluetooth device access."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Allows the app to temporarily whitelist a Bluetooth device, allowing that device to send files to this device without user confirmation."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Acceptlist bluetooth device access."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Allows the app to temporarily acceptlist a Bluetooth device, allowing that device to send files to this device without user confirmation."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Unknown device"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Unknown"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 1ae94db..c1f456c 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Access download manager."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Allows the application to access the Bluetooth Share manager and to use it to transfer files."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Whitelist bluetooth device access."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Allows the app to temporarily whitelist a Bluetooth device, allowing that device to send files to this device without user confirmation."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Acceptlist bluetooth device access."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Allows the app to temporarily acceptlist a Bluetooth device, allowing that device to send files to this device without user confirmation."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Unknown device"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Unknown"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 7a456e0..c457e85 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‏‎Access download manager.‎‏‎‎‏‎"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎Allows the app to access the BluetoothShare manager and use it to transfer files.‎‏‎‎‏‎"</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎Whitelist bluetooth device access.‎‏‎‎‏‎"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎Allows the app to temporarily whitelist a Bluetooth device, allowing that device to send files to this device without user confirmation.‎‏‎‎‏‎"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎Acceptlist bluetooth device access.‎‏‎‎‏‎"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎Allows the app to temporarily acceptlist a Bluetooth device, allowing that device to send files to this device without user confirmation.‎‏‎‎‏‎"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎Bluetooth‎‏‎‎‏‎"</string>
     <string name="unknown_device" msgid="9221903979877041009">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‎Unknown device‎‏‎‎‏‎"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‎‏‏‏‎‎Unknown‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 4edcba6..ecfa4f5 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Accede al administrador de descarga."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Permite a la aplicación acceder al administrador de BluetoothShare y usarlo para transferir archivos."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Acceso a los dispositivos Bluetooth autorizados"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Permite a la aplicación autorizar temporalmente un dispositivo Bluetooth, lo cual permite que este dispositivo envíe archivos sin la confirmación del usuario."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Acceso a los dispositivos Bluetooth autorizados"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Permite a la aplicación autorizar temporalmente un dispositivo Bluetooth, lo cual permite que este dispositivo envíe archivos sin la confirmación del usuario."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Dispositivo desconocido"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Desconocido"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ec682f0..7b4d933 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Acceso al administrador de descargas"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Permite que la aplicación acceda al administrador BluetoothShare y lo use para transferir archivos."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Acceso de dispositivos Bluetooth autorizados"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Permite que la aplicación autorice temporalmente a un dispositivo Bluetooth para que pueda enviar archivos a este dispositivo sin la confirmación del usuario."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Acceso de dispositivos Bluetooth autorizados"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Permite que la aplicación autorice temporalmente a un dispositivo Bluetooth para que pueda enviar archivos a este dispositivo sin la confirmación del usuario."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Dispositivo desconocido"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Desconocido"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 0f5702b..4392b2c 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Pääs allalaadimishalduri juurde."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Võimaldab rakendusel pääseda BluetoothShare\'i haldurisse ja kasutada seda failide edastamiseks."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Lubage Bluetooth-seadme juurdepääs."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Lubab rakendusel lisada Bluetooth-seadme ajutiselt lubatud seadmete loendisse, mis võimaldab seadmel saata faile sellesse seadmesse ilma kasutaja kinnituseta."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Lubage Bluetooth-seadme juurdepääs."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Lubab rakendusel lisada Bluetooth-seadme ajutiselt lubatud seadmete loendisse, mis võimaldab seadmel saata faile sellesse seadmesse ilma kasutaja kinnituseta."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Tundmatu seade"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Tundmatu"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index b7a5e92..a6d3d09 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Atzitu deskargen kudeatzailea."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Bluetooth bidezko partekatzeen kudeatzailea atzitzea eta fitxategiak transferitzeko erabiltzeko baimena ematen die aplikazioei."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Jarri onartutakoen zerrendan Bluetooth bidezko gailua."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Bluetooth bidezko gailu bat aldi baterako onartutakoen zerrendan jartzeko baimena ematen die aplikazioei, gailu honetara fitxategiak bidaltzeko baimena izan dezan, baina gailu honen erabiltzaileari berrespena eskatu beharrik gabe."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Jarri onartutakoen zerrendan Bluetooth bidezko gailua."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Bluetooth bidezko gailu bat aldi baterako onartutakoen zerrendan jartzeko baimena ematen die aplikazioei, gailu honetara fitxategiak bidaltzeko baimena izan dezan, baina gailu honen erabiltzaileari berrespena eskatu beharrik gabe."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth-a"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Identifikatu ezin den gailua"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Ezezaguna"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c6df175..f942dfa 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"‏دسترسی به Download Manager."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"‏به برنامه برای دسترسی به مدیر BluetoothShare و استفاده از آن برای انتقال فایل‌ها اجازه می‌دهد."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"دسترسی دستگاه موجود در فهرست سفید بلوتوث."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"به برنامه اجازه می‌دهد تا موقتاً یک دستگاه بلوتوث را در فهرست سفید وارد کند، و به آن دستگاه اجازه می‌دهد بدون تأیید کاربر به این دستگاه فایل ارسال کند."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"دسترسی دستگاه موجود در فهرست سفید بلوتوث."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"به برنامه اجازه می‌دهد تا موقتاً یک دستگاه بلوتوث را در فهرست سفید وارد کند، و به آن دستگاه اجازه می‌دهد بدون تأیید کاربر به این دستگاه فایل ارسال کند."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"بلوتوث"</string>
     <string name="unknown_device" msgid="9221903979877041009">"دستگاه ناشناس"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"ناشناس"</string>
@@ -35,7 +35,7 @@
     <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"نپذیرفتن"</string>
     <string name="incoming_file_confirm_ok" msgid="281462442932231475">"پذیرفتن"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"تأیید"</string>
-    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"هنگام پذیرش یک فایل ورودی از \"<xliff:g id="SENDER">%1$s</xliff:g>\" وقفه زمانی پیش آمد"</string>
+    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"هنگام پذیرش یک فایل ورودی از \"<xliff:g id="SENDER">%1$s</xliff:g>\" درنگ پیش آمد"</string>
     <string name="incoming_file_confirm_Notification_title" msgid="5573329005298936903">"فایل ورودی"</string>
     <string name="incoming_file_confirm_Notification_content" msgid="3359694069319644738">"<xliff:g id="SENDER">%1$s</xliff:g> آماده ارسال <xliff:g id="FILE">%2$s</xliff:g> است"</string>
     <string name="notification_receiving" msgid="4674648179652543984">"اشتراک بلوتوث: در حال دریافت <xliff:g id="FILE">%1$s</xliff:g>"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f4e020d..955f241 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Lataustenhallinnan käyttö."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Antaa sovelluksen käyttää BluetoothShare-hallintaa tiedostojen siirtoon."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Käyttö Bluetooth-laitteella, jolla on tilapäinen käyttöoikeus."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Mahdollistaa tilapäisten käyttöoikeuksien antamisen Bluetooth-laitteelle, jolloin tiedostojen lähettäminen laitteesta tähän laitteeseen ei vaadi käyttäjän hyväksyntää."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Käyttö Bluetooth-laitteella, jolla on tilapäinen käyttöoikeus."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Mahdollistaa tilapäisten käyttöoikeuksien antamisen Bluetooth-laitteelle, jolloin tiedostojen lähettäminen laitteesta tähän laitteeseen ei vaadi käyttäjän hyväksyntää."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Tuntematon laite"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Tuntematon"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 69023fb..8d10dbb 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Accéder au gestionnaire de téléchargement."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Permet à l\'application d\'accéder au gestionnaire BluetoothShare et de l\'utiliser pour le transfert de fichiers."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Ajouter des appareils Bluetooth à la liste blanche."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Permet à l\'application d\'ajouter temporairement un appareil Bluetooth à la liste blanche. Ainsi, celui-ci peut envoyer des fichiers à cet appareil sans que la confirmation de l\'utilisateur soit nécessaire."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Ajouter des appareils Bluetooth à la liste blanche."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Permet à l\'application d\'ajouter temporairement un appareil Bluetooth à la liste blanche. Ainsi, celui-ci peut envoyer des fichiers à cet appareil sans que la confirmation de l\'utilisateur soit nécessaire."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Périphérique inconnu"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Inconnu"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0509e32..9d58620 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Accéder au gestionnaire de téléchargement"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Permet à l\'application d\'accéder au gestionnaire BluetoothShare et de l\'utiliser pour le transfert de fichiers."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Ajouter des appareils Bluetooth à la liste blanche"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Permet à l\'application d\'ajouter temporairement un appareil Bluetooth à la liste blanche. Ainsi, celui-ci peut envoyer des fichiers à cet appareil sans que la confirmation de l\'utilisateur ne soit nécessaire."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Ajouter des appareils Bluetooth à la liste blanche"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Permet à l\'application d\'ajouter temporairement un appareil Bluetooth à la liste blanche. Ainsi, celui-ci peut envoyer des fichiers à cet appareil sans que la confirmation de l\'utilisateur ne soit nécessaire."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Périphérique inconnu"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Inconnu"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 5332577..89ca00a 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Acceso ao administrador de descargas."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Permite á aplicación acceder ao administrador BluetoothShare e usalo para transferir ficheiros."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Acceso ao dispositivo Bluetooth da lista branca."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Permite á aplicación engadir un dispositivo Bluetooth a unha lista branca temporalmente, de forma que o dispositivo poida enviar ficheiros a este dispositivo sen confirmación do usuario."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Acceso ao dispositivo Bluetooth da lista branca."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Permite á aplicación engadir un dispositivo Bluetooth a unha lista branca temporalmente, de forma que o dispositivo poida enviar ficheiros a este dispositivo sen confirmación do usuario."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Dispositivo descoñecido"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Descoñecido"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 20e7e7d..3b07b2e 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ઍક્સેસ ડાઉનલોડ મેનેજર."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"એપ્લિકેશનને BluetoothShare મેનેજર અ‍ૅક્સેસ કરવાની અને ફાઇલો ટ્રાન્સફર કરવા માટે તેનો ઉપયોગ કરવાની મંજૂરી આપે છે."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"વ્હાઇટલિસ્ટ બ્લૂટૂથ ઉપકરણ ઍક્સેસ."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"એપ્લિકેશનને અસ્થાયી ધોરણે બ્લૂટૂથ ઉપકરણને વ્હાઇટલિસ્ટ કરવાની મંજૂરી આપે છે, તે ઉપકરણને આ ઉપકરણ પર વપરાશકર્તા પુષ્ટિ વિના ફાઇલો મોકલવાની મંજૂરી આપીને."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"વ્હાઇટલિસ્ટ બ્લૂટૂથ ઉપકરણ ઍક્સેસ."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"એપ્લિકેશનને અસ્થાયી ધોરણે બ્લૂટૂથ ઉપકરણને વ્હાઇટલિસ્ટ કરવાની મંજૂરી આપે છે, તે ઉપકરણને આ ઉપકરણ પર વપરાશકર્તા પુષ્ટિ વિના ફાઇલો મોકલવાની મંજૂરી આપીને."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"બ્લૂટૂથ"</string>
     <string name="unknown_device" msgid="9221903979877041009">"અજાણ્યું ઉપકરણ"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"અજાણ્યો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d6edb01..f3b72f5 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"डाउनलोड मैनेजर में पहुंच पाएं."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"ऐप्लिकेशन को BluetoothShare प्रबंधक के इस्तेमाल की मंज़ूरी देता है और फ़ाइलों को ट्रांसफ़र करने के लिए उसका उपयोग करने देता है."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"श्वेतसूची bluetooth डिवाइस पहुंच."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"ऐप को, ब्लूटूथ डिवाइस को उपयोगकर्ता की पुष्टि के बिना इस डिवाइस पर फ़ाइल भेजने की‍ अनुमति देकर, कुछ देर के लिए अनुमति देता है"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"श्वेतसूची bluetooth डिवाइस पहुंच."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"ऐप को, ब्लूटूथ डिवाइस को उपयोगकर्ता की पुष्टि के बिना इस डिवाइस पर फ़ाइल भेजने की‍ अनुमति देकर, कुछ देर के लिए अनुमति देता है"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"ब्लूटूथ"</string>
     <string name="unknown_device" msgid="9221903979877041009">"अज्ञात डिवाइस"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"अज्ञात"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d0c4492b..6cf0cce 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Pristupite upravitelju za preuzimanje."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Aplikaciji omogućuje pristup upravitelju za BluetoothShare i njegovu upotrebu za prijenos datoteka."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Stavi pristup Bluetooth uređaja na popis dopuštenih pristupa."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Omogućuje aplikaciji privremeno stavljanje Bluetooth uređaja na popis dopuštenih uređaja, čime mu omogućuje da šalje datoteke na ovaj uređaj bez potvrde korisnika."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Stavi pristup Bluetooth uređaja na popis dopuštenih pristupa."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Omogućuje aplikaciji privremeno stavljanje Bluetooth uređaja na popis dopuštenih uređaja, čime mu omogućuje da šalje datoteke na ovaj uređaj bez potvrde korisnika."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Nepoznati uređaj"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Nepoznato"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 5dc9308..b0feb9f 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Hozzáférés a letöltéskezelőhöz."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Lehetővé teszi az alkalmazás számára a BluetoothShare kezelő elérését és használatát fájlátvitelre."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Bluetooth-eszköz hozzáférésének engedélyezése."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Lehetővé teszi az alkalmazás számára egy Bluetooth-eszköz ideiglenesen engedélyezését, amely így a felhasználó jóváhagyása nélkül küldhet fájlokat erre a készülékre."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Bluetooth-eszköz hozzáférésének engedélyezése."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Lehetővé teszi az alkalmazás számára egy Bluetooth-eszköz ideiglenesen engedélyezését, amely így a felhasználó jóváhagyása nélkül küldhet fájlokat erre a készülékre."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Ismeretlen eszköz"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Ismeretlen"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index e72b481..34334e3 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Օգտվել ներբեռնման կառավարչից:"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Թույլ է տալիս, որ ծրագիրը մատչի BluetoothShare կառավարչին և այն օգտագործի ֆայլեր փոխանցելու համար:"</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Մուտք bluetooth սարքի ցուցակին:"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Թույլ է տալիս, որ ծրագիրը ժամանակավորապես մաքրի Bluetooth սարքի ցուցակը, ինչը թույլ է տալիս, որ այդ սարքը կարողանա ֆայլեր ուղարկել տվյալ սարքին առանց օգտատիրոջ հաստատման:"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Մուտք bluetooth սարքի ցուցակին:"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Թույլ է տալիս, որ ծրագիրը ժամանակավորապես մաքրի Bluetooth սարքի ցուցակը, ինչը թույլ է տալիս, որ այդ սարքը կարողանա ֆայլեր ուղարկել տվյալ սարքին առանց օգտատիրոջ հաստատման:"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Անհայտ սարք"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Անհայտ"</string>
@@ -59,7 +59,7 @@
     <string name="download_fail_line1" msgid="3846450148862894552">"Ֆայլը չհաջողվեց ստանալ"</string>
     <string name="download_fail_line2" msgid="8950394574689971071">"Ֆայլ՝ <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="download_fail_line3" msgid="3451040656154861722">"Պատճառը՝ <xliff:g id="REASON">%1$s</xliff:g>"</string>
-    <string name="download_fail_ok" msgid="1521733664438320300">"Հաստատել"</string>
+    <string name="download_fail_ok" msgid="1521733664438320300">"Եղավ"</string>
     <string name="download_succ_line5" msgid="4509944688281573595">"Ֆայլը ստացվել է"</string>
     <string name="download_succ_ok" msgid="7053688246357050216">"Բացել"</string>
     <string name="upload_line1" msgid="2055952074059709052">"Ում՝ «<xliff:g id="RECIPIENT">%1$s</xliff:g>»"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 000bf7a..6ed2814 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Akses pengelola download."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Izinkan apl mengakses pengelola BluetoothShare dan menggunakannya untuk mentransfer file."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Memasukkan akses perangkat bluetooth ke dalam daftar putih."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Mengizinkan aplikasi memasukkan perangkat Bluetooth ke dalam daftar putih untuk sementara, yang memungkinkan perangkat tersebut mengirimkan file ke perangkat ini tanpa konfirmasi pengguna."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Memasukkan akses perangkat bluetooth ke dalam daftar putih."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Mengizinkan aplikasi memasukkan perangkat Bluetooth ke dalam daftar putih untuk sementara, yang memungkinkan perangkat tersebut mengirimkan file ke perangkat ini tanpa konfirmasi pengguna."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Perangkat tidak diketahui"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Tidak diketahui"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 856b505..c240e8e 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Aðgangur að niðurhalsstjórnun."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Leyfir forriti að fá aðgang að BluetoothShare-stjórnun og nota hana til að flytja skrár."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Aðgangur að lista yfir leyfð Bluetooth-tæki."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Leyfir forrit að setja Bluetooth-tæki tímabundið á lista yfir leyfð tæki og gera því þannig kleift að senda skrár til þessa tækis án staðfestingar frá notanda."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Aðgangur að lista yfir leyfð Bluetooth-tæki."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Leyfir forrit að setja Bluetooth-tæki tímabundið á lista yfir leyfð tæki og gera því þannig kleift að senda skrár til þessa tækis án staðfestingar frá notanda."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Óþekkt tæki"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Óþekkt"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8f57eb1..0e6259c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Accedere alla gestione dei download."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Consente all\'applicazione di accedere al gestore BluetoothShare e di utilizzarlo per trasferire file."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Autorizzazione dell\'accesso del dispositivo Bluetooth."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Consente all\'applicazione di autorizzare temporaneamente un dispositivo Bluetooth, permettendo a tale dispositivo di inviare file a questo dispositivo senza la conferma dell\'utente."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Autorizzazione dell\'accesso del dispositivo Bluetooth."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Consente all\'applicazione di autorizzare temporaneamente un dispositivo Bluetooth, permettendo a tale dispositivo di inviare file a questo dispositivo senza la conferma dell\'utente."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Dispositivo sconosciuto"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Sconosciuto"</string>
@@ -50,7 +50,7 @@
     <string name="download_line2" msgid="5876973543019417712">"File: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="download_line3" msgid="4384821622908676061">"Dim. file: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
-    <string name="download_line5" msgid="3069560415845295386">"Ricezione file..."</string>
+    <string name="download_line5" msgid="3069560415845295386">"Ricezione file…"</string>
     <string name="download_cancel" msgid="9177305996747500768">"Interrompi"</string>
     <string name="download_ok" msgid="5000360731674466039">"Nascondi"</string>
     <string name="incoming_line1" msgid="2127419875681087545">"Da"</string>
@@ -64,7 +64,7 @@
     <string name="download_succ_ok" msgid="7053688246357050216">"Apri"</string>
     <string name="upload_line1" msgid="2055952074059709052">"A: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
     <string name="upload_line3" msgid="4920689672457037437">"Tipo di file: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
-    <string name="upload_line5" msgid="7759322537674229752">"Invio file..."</string>
+    <string name="upload_line5" msgid="7759322537674229752">"Invio file…"</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"File inviato"</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
     <string name="upload_fail_line1" msgid="7899394672421491701">"Impossibile inviare il file a \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"."</string>
@@ -75,7 +75,7 @@
     <string name="unknown_file_desc" msgid="480434281415453287">"Non sono disponibili applicazioni in grado di gestire questo tipo di file. \n"</string>
     <string name="not_exist_file" msgid="3489434189599716133">"Nessun file"</string>
     <string name="not_exist_file_desc" msgid="4059531573790529229">"Il file non esiste. \n"</string>
-    <string name="enabling_progress_title" msgid="436157952334723406">"Attendi..."</string>
+    <string name="enabling_progress_title" msgid="436157952334723406">"Attendi…"</string>
     <string name="enabling_progress_content" msgid="4601542238119927904">"Attivazione Bluetooth…"</string>
     <string name="bt_toast_1" msgid="972182708034353383">"Il file verrà ricevuto. Controlla l\'avanzamento nel pannello Notifiche."</string>
     <string name="bt_toast_2" msgid="8602553334099066582">"Impossibile ricevere il file."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index def6935..ff63042 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"גישה למנהל ההורדות."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"‏מאפשר לאפליקציה לגשת למנהל BluetoothShare ולהשתמש בו להעברת קבצים."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"‏הכנס מכשיר Bluetooth לרשימה הלבנה."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"‏מאפשר לאפליקציה להכניס מכשיר Bluetooth באופן זמני לרשימה הלבנה, ובכך לאפשר למכשיר לשלוח קבצים למכשיר זה ללא אישור משתמש."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"‏הכנס מכשיר Bluetooth לרשימה הלבנה."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"‏מאפשר לאפליקציה להכניס מכשיר Bluetooth באופן זמני לרשימה הלבנה, ובכך לאפשר למכשיר לשלוח קבצים למכשיר זה ללא אישור משתמש."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"מכשיר לא ידוע"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"לא ידוע"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c428a90..de07ed3 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ダウンロード マネージャーにアクセスします。"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"BluetoothShareマネージャーへのアクセスとそれを利用したファイル転送をアプリに許可します。"</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Bluetoothデバイスによるアクセスを許可します。"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Bluetoothデバイスによるアクセスを一時的に許可して、ユーザーの確認を受けずにそのデバイスからこのデバイスにファイルを送信することをアプリに許可します。"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Bluetoothデバイスによるアクセスを許可します。"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Bluetoothデバイスによるアクセスを一時的に許可して、ユーザーの確認を受けずにそのデバイスからこのデバイスにファイルを送信することをアプリに許可します。"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"不明なモバイルデバイス"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"不明"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 605393e..fda0a6b 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ჩამოტვირთვების მენეჯერზე წვდომა."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"ანიჭებს აპს BluetoothShare მენეჯერზე წვდომას და მისი გამოყენების უფლებას ფაილების გასაგზავნად."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Bluetooth მოწყობილობის წვდომის თეთრ სიაში შეყვანა."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"საშუალებას აძლევს აპს, რომ დროებით თეთრ სიაში შეიყვანოს Bluetooth მოწყობილობა, რაც ამ მოწყობილობას საშუალებას მიცემს ფაილები ამ მოწყობილობაზე მომხმარებლის დასტურის გარეშე გამოაგზავნოს."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Bluetooth მოწყობილობის წვდომის თეთრ სიაში შეყვანა."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"საშუალებას აძლევს აპს, რომ დროებით თეთრ სიაში შეიყვანოს Bluetooth მოწყობილობა, რაც ამ მოწყობილობას საშუალებას მიცემს ფაილები ამ მოწყობილობაზე მომხმარებლის დასტურის გარეშე გამოაგზავნოს."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"უცნობი მოწყობილობა"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"უცნობი"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index d833f95..67a0f70 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Жүктеу менеджеріне қол жетімділік."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Қолданбаға BluetoothБөлісу менеджеріне кіріп, оны файлдары аудару үшін қолдану мүмкіндігін береді."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Bluetooth құрылғысына қол жетімділікке рұқсат беру."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Қолданбаға Bluetooth құрылғысына уақытша рұқсат беріп, файлдарды сол құрылғыдан осы құрылғыға пайдаланушының растауынсыз жіберу мүмкіндігін береді."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Bluetooth құрылғысына қол жетімділікке рұқсат беру."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Қолданбаға Bluetooth құрылғысына уақытша рұқсат беріп, файлдарды сол құрылғыдан осы құрылғыға пайдаланушының растауынсыз жіберу мүмкіндігін береді."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Белгісіз құрылғы"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Белгісіз"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index fd6ff98..8c63c12 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ចូល​ដំណើរ​ការ​កម្មវិធី​គ្រប់គ្រង​ការ​ទាញ​យក​។"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"អនុញ្ញាត​ឲ្យ​កម្មវិធី​ត្រូវ​​ចូល​ដំណើរការ​កម្មវិធី​គ្រប់គ្រង BluetoothShare ហើយ​​ប្រើ​វា​ដើម្បី​ផ្ទេរ​ឯកសារ។"</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"បញ្ជី​ស​ការ​ចូល​ដំណើរការ​ប៊្លូធូស។"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"​ឲ្យ​កម្មវិធី​ដាក់​ឧបករណ៍​ប៊្លូធូស​ក្នុង​បញ្ជី​បណ្ដោះអាសន្ន​ ដែល​អនុញ្ញាត​ឲ្យ​ឧបករណ៍​​នោះ ​ផ្ញើ​ឯកសារ​ទៅ​​កាន់​ឧបករណ៍​​​ដោយ​មិន​ចាំបាច់​ការ​បញ្ជាក់​​អ្នក​ប្រើ។"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"បញ្ជី​ស​ការ​ចូល​ដំណើរការ​ប៊្លូធូស។"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"​ឲ្យ​កម្មវិធី​ដាក់​ឧបករណ៍​ប៊្លូធូស​ក្នុង​បញ្ជី​បណ្ដោះអាសន្ន​ ដែល​អនុញ្ញាត​ឲ្យ​ឧបករណ៍​​នោះ ​ផ្ញើ​ឯកសារ​ទៅ​​កាន់​ឧបករណ៍​​​ដោយ​មិន​ចាំបាច់​ការ​បញ្ជាក់​​អ្នក​ប្រើ។"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"ប៊្លូធូស"</string>
     <string name="unknown_device" msgid="9221903979877041009">"មិន​ស្គាល់​ឧបករណ៍"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"មិន​ស្គាល់"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 8f9fcb1..e859747 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ಡೌನ್‌ಲೋಡ್‌ ನಿರ್ವಾಹಕವನ್ನು ಪ್ರವೇಶಿಸಿ."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"ಬ್ಲೂಟೂತ್‌ ಹಂಚಿಕೆ ನಿರ್ವಾಹಕ ಮತ್ತು ಫೈಲ್‌ಗಳ ವರ್ಗಾವಣೆಯನ್ನು ಬಳಸಲು ಅಪ್ಲಿಕೇಶನ್‌ ಅನುಮತಿಸುತ್ತದೆ."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"ಶ್ವೇತಪಟ್ಟಿ ಬ್ಲೂಟೂತ್‌ ಸಾಧನವನ್ನು ಪ್ರವೇಶಿಸಿ."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"ಬಳಕೆದಾರರ ದೃಢೀಕರಣ ಇಲ್ಲದೆ ಈ ಸಾಧನಕ್ಕೆ ಫೈಲ್‌ಗಳನ್ನು ಕಳುಹಿಸಲು ಬ್ಲೂಟೂತ್‌ ಸಾಧನವನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ಶ್ವೇತಪಟ್ಟಿ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌‌ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"ಶ್ವೇತಪಟ್ಟಿ ಬ್ಲೂಟೂತ್‌ ಸಾಧನವನ್ನು ಪ್ರವೇಶಿಸಿ."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"ಬಳಕೆದಾರರ ದೃಢೀಕರಣ ಇಲ್ಲದೆ ಈ ಸಾಧನಕ್ಕೆ ಫೈಲ್‌ಗಳನ್ನು ಕಳುಹಿಸಲು ಬ್ಲೂಟೂತ್‌ ಸಾಧನವನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ಶ್ವೇತಪಟ್ಟಿ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌‌ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"ಬ್ಲೂಟೂತ್‌"</string>
     <string name="unknown_device" msgid="9221903979877041009">"ಅಪರಿಚಿತ ಸಾಧನ"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"ಅಪರಿಚಿತ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ec2f665..43ca4f5 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"다운로드 관리자에 액세스합니다."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"앱에서 BluetoothShare 관리자에 액세스하고 이를 사용하여 파일을 전송할 수 있도록 합니다."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"블루투스 기기에 액세스하도록 허용합니다."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"일시적으로 앱에서 블루투스 기기를 허용하여 사용자 확인을 받지 않고 해당 기기로 파일을 보내도록 허용합니다."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"블루투스 기기에 액세스하도록 허용합니다."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"일시적으로 앱에서 블루투스 기기를 허용하여 사용자 확인을 받지 않고 해당 기기로 파일을 보내도록 허용합니다."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"블루투스"</string>
     <string name="unknown_device" msgid="9221903979877041009">"알 수 없는 장치"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"알 수 없음"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index b1ab7ae..763662f 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Жүктөө менежерине жетүү."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Колдонмого BluetoothАлмашуу менежерине жетип, ал аркылуу файлдарды өткөрүү уруксатын берет."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Bluetooth түзмөгүнүн Таза тизмесине жетки берүү."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Колдонмого Bluetooth түзмөгүн таза тизмеге убактылуу жайгаштырып, колдонуучунун ырастоосусуз, ал түзмөктөн бул түзмөккө файлдарды жөнөтүү уруксатын берет."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Bluetooth түзмөгүнүн Таза тизмесине жетки берүү."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Колдонмого Bluetooth түзмөгүн таза тизмеге убактылуу жайгаштырып, колдонуучунун ырастоосусуз, ал түзмөктөн бул түзмөккө файлдарды жөнөтүү уруксатын берет."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Белгисиз түзмөк"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Белгисиз"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 552bccc..725aae0 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ເຂົ້າເຖິງໂຕຈັດການການດາວໂຫລດ​."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"ອະນຸຍາດໃຫ້ແອັບຯນີ້ເຂົາເຖິງໂຕຈັດການ BluetoothShare ແລະໃຊ້ມັນເພື່ອສົ່ງໄຟລ໌."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"ເຮັດບັນຊີອະນຸຍາດການເຂົ້າເຖິງອຸປະກອນ bluetooth."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"ອະນຸຍາດໃຫ້ແອັບຯດັ່ງກ່າວຕັ້ງບັນຊີຂາວໃຫ້ກັບອຸປະກອນ Bluetooth ຊົ່ວຄາວ, ການອະນຸຍາດໃຫ້ອຸປະກອນນັ້ນສົ່ງໄຟລ໌ມາທີ່ອຸປະກອນນີ້ໂດຍທີ່ບໍ່ຈຳເປັນຕ້ອງມີການຢືນຢັນຈາກຜູ່ໃຊ້."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"ເຮັດບັນຊີອະນຸຍາດການເຂົ້າເຖິງອຸປະກອນ bluetooth."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"ອະນຸຍາດໃຫ້ແອັບຯດັ່ງກ່າວຕັ້ງບັນຊີຂາວໃຫ້ກັບອຸປະກອນ Bluetooth ຊົ່ວຄາວ, ການອະນຸຍາດໃຫ້ອຸປະກອນນັ້ນສົ່ງໄຟລ໌ມາທີ່ອຸປະກອນນີ້ໂດຍທີ່ບໍ່ຈຳເປັນຕ້ອງມີການຢືນຢັນຈາກຜູ່ໃຊ້."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"ອຸປະກອນທີ່ບໍ່ຮູ້ຈັກ"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"ບໍ່ຮູ້ຈັກ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8fed98a..e886623 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Pasiekti atsisiuntimo tvarkytuvę."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Leidžiama programai pasiekti „BluetoothShare“ tvarkyklę ir naudoti ją failams perkelti."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Į baltąjį sąrašą įtraukto „Bluetooth“ įrenginio prieiga."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Leidžiama programai laikinai į baltąjį sąrašą įtraukti „Bluetooth“ įrenginį, suteikiant jam galimybę siųsti failus į šį įrenginį be naudotojo patvirtinimo."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Į baltąjį sąrašą įtraukto „Bluetooth“ įrenginio prieiga."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Leidžiama programai laikinai į baltąjį sąrašą įtraukti „Bluetooth“ įrenginį, suteikiant jam galimybę siųsti failus į šį įrenginį be naudotojo patvirtinimo."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Nežinomas įrenginys"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Nežinoma"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 7046554..9d3520c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Piekļuve lietojumprogrammai Download Manager."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Ļauj lietotnei piekļūt BluetoothShare pārvaldniekam, lai to izmantotu failu pārsūtīšanai."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Iekļaut Bluetooth ierīces piekļuvi baltajā sarakstā."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Ļauj lietotnei īslaicīgi iekļaut Bluetooth ierīci baltajā sarakstā, lai no šīs ierīces bez lietotāja apstiprinājuma varētu sūtīt failus uz šo ierīci."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Iekļaut Bluetooth ierīces piekļuvi baltajā sarakstā."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Ļauj lietotnei īslaicīgi iekļaut Bluetooth ierīci baltajā sarakstā, lai no šīs ierīces bez lietotāja apstiprinājuma varētu sūtīt failus uz šo ierīci."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Nezināma ierīce"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Nezināms"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 915cce2..8b9686e 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Пристапи кон управувач за преземања."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Овозможува апликацијата да пристапи до менаџерот на BluetoothShare и да го користи за пренос на датотеки."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Пристап на Bluetooth уред од белата листа."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Овозможува апликацијата привремено да го стави Bluetooth уредот на белата листа, со што му овозможува на уредот да испрати датотека до овој уред без потврда на корисникот."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Пристап на Bluetooth уред од белата листа."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Овозможува апликацијата привремено да го стави Bluetooth уредот на белата листа, со што му овозможува на уредот да испрати датотека до овој уред без потврда на корисникот."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Непознат уред"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Непознат"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index a4d3595..579fb26 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ഡൗൺലോഡ് മാനേജർ ആക്‌സസ്സ് ചെയ്യുക."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"BluetoothShare മാനേജർ ആക്‌സസ്സുചെയ്യാനും ഫയലുകൾ കൈമാറാൻ അത് ഉപയോഗിക്കാനും അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"വൈറ്റ്‌ലിസ്റ്റ് ബ്ലൂടൂത്ത് ഉപകരണ ആക്‌സസ്സ്."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"ഒരു ബ്ലൂടൂത്ത് ഉപകരണം താൽക്കാലികമായി വൈറ്റ്‌ലിസ്റ്റുചെയ്യാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു, അത് ഉപയോക്താവിന്റെ സ്ഥിരീകരണമില്ലാതെ ഈ ഉപകരണത്തിലേക്ക് ഫയലുകൾ അയയ്‌ക്കാൻ ആ ഉപകരണത്തെ അനുവദിക്കുന്നു."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"വൈറ്റ്‌ലിസ്റ്റ് ബ്ലൂടൂത്ത് ഉപകരണ ആക്‌സസ്സ്."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"ഒരു ബ്ലൂടൂത്ത് ഉപകരണം താൽക്കാലികമായി വൈറ്റ്‌ലിസ്റ്റുചെയ്യാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു, അത് ഉപയോക്താവിന്റെ സ്ഥിരീകരണമില്ലാതെ ഈ ഉപകരണത്തിലേക്ക് ഫയലുകൾ അയയ്‌ക്കാൻ ആ ഉപകരണത്തെ അനുവദിക്കുന്നു."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"അജ്ഞാത ഉപകരണം"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"അറിയില്ല"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 71c3a74..a023cf8 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Татан авалтын менежерт хандалт хийх."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Апп-д BluetoothShare менежерт хандах, үүнийг ашиглан файл дамжуулах боломж олгоно."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Цагаан жагсаалтаар bluetooth төхөөрөмжид хандалт хийх."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Апп-т Bluetooth төхөөрөмжийг цагаан жагсаалтад оруулж хэрэглэгчийн баталгаажуулалт шаардахгүйгээр тус төхөөрөмж рүү файл илгээх боломж олгоно."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Цагаан жагсаалтаар bluetooth төхөөрөмжид хандалт хийх."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Апп-т Bluetooth төхөөрөмжийг цагаан жагсаалтад оруулж хэрэглэгчийн баталгаажуулалт шаардахгүйгээр тус төхөөрөмж рүү файл илгээх боломж олгоно."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Үл мэдэгдэх төхөөрөмж"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Тодорхойгүй"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 66e63c4..24f2ce5 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"डाउनलोड व्यवस्थापक अ‍ॅक्सेस करा."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"अ‍ॅपला BluetoothShare व्‍यवस्‍थापकामध्‍ये प्रवेश करण्‍याची आणि फाइल स्‍थानांतरित करण्‍यासाठी त्याचा वापर करण्‍याची अनुमती देते."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"व्हाइटलिस्ट ब्लूटूथ डिव्हाइस अ‍ॅक्सेस."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"डीव्‍हाइसला वापरकर्ता पुष्‍टीशिवाय या डीव्हाइसवर फाइल पाठविण्‍याची अनुमती देऊन ब्लूटूथ डीव्हाइसला तात्पुरते व्हाइटलिस्ट करण्‍याची अ‍ॅपला अनुमती देते."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"व्हाइटलिस्ट ब्लूटूथ डिव्हाइस अ‍ॅक्सेस."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"डीव्‍हाइसला वापरकर्ता पुष्‍टीशिवाय या डीव्हाइसवर फाइल पाठविण्‍याची अनुमती देऊन ब्लूटूथ डीव्हाइसला तात्पुरते व्हाइटलिस्ट करण्‍याची अ‍ॅपला अनुमती देते."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"ब्लूटूथ"</string>
     <string name="unknown_device" msgid="9221903979877041009">"अज्ञात डिव्हाइस"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"अज्ञात"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 6eaa796..3af698d 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Akses pengurus muat turun."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Membenarkan aplikasi mengakses pengurus Perkongsian Bluetooth dan menggunakannya untuk memindahkan fail."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Akses peranti bluetooth senarai putih."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Membenarkan apl untuk menyenarai putihkan peranti Bluetooth sementara waktu, membolehkan peranti itu menghantar fail ke peranti ini tanpa pengesahan pengguna."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Akses peranti bluetooth senarai putih."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Membenarkan apl untuk menyenarai putihkan peranti Bluetooth sementara waktu, membolehkan peranti itu menghantar fail ke peranti ini tanpa pengesahan pengguna."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Peranti tidak diketahui"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Tidak diketahui"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 293917c..e8c7e3c 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ဒေါင်းလုပ်မန်နေဂျာကို အသုံးပြုနိုင်မည်"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"အပလီကေးရှင်းအား ဘလူးတုသ်မျှဝေမှု မန်နေဂျာကို အသုံးပြုခွင့်ပေးပြီး ဖိုင်လွှဲရန် အသုံးပြုပါ"</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"ဘလူးတုသ်ယာယီခွင့်ပြုစာရင်းကို အသုံးပြုခွင့်"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"အက်ပ်အား ဘလူးတုသ်စက်ကို ယာယီခွင့်ပြုစာရင်းထဲ ထည့်ရန်ခွင့်ပြုကာ အသုံးပြုသူ၏ အတည်ပြုချက်မရယူပဲ ဖိုင်များကို စက်ထဲသို့ ပို့ခွင့်ပြုမည်"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"ဘလူးတုသ်ယာယီခွင့်ပြုစာရင်းကို အသုံးပြုခွင့်"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"အက်ပ်အား ဘလူးတုသ်စက်ကို ယာယီခွင့်ပြုစာရင်းထဲ ထည့်ရန်ခွင့်ပြုကာ အသုံးပြုသူ၏ အတည်ပြုချက်မရယူပဲ ဖိုင်များကို စက်ထဲသို့ ပို့ခွင့်ပြုမည်"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"ဘလူးတုသ်"</string>
     <string name="unknown_device" msgid="9221903979877041009">"မသိသော စက်"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"မသိ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 77ea524..d428552 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Åpne nedlastingsbehandling."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Gir appen tilgang til BluetoothShare-administratoren, og tillatelse til å bruke det til filoverføring."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Godkjenne tilgang for Bluetooth-enheter."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Tillater at Bluetooth-enheter midlertidig godkjennes av appen, slik at de kan sende filer til denne enheten uten brukerbekreftelse."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Godkjenne tilgang for Bluetooth-enheter."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Tillater at Bluetooth-enheter midlertidig godkjennes av appen, slik at de kan sende filer til denne enheten uten brukerbekreftelse."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Ukjent enhet"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Ukjent"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index ba5a1cc..bff1998 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"डाउनलोड म्यानेजर पहुँच गर्नुहोस्।"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"एपलाई ब्लुटुथसाझेदारी प्रबन्धक पहुँचको अनुमति दिन्छ र यसलाई फाइलहरू स्थानान्तरण गर्न प्रयोग गर्दछ।"</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"स्वेतसूची ब्लुटुथ उपकरण पहुँच।"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"त्यस उपकरणलाई यस उपकरणमा फाइलहरू पठाउन बिना कुनै पुष्टि अनुमति दिँदै एपलाई अस्थायी रूपमा ब्लुटुथ उपकरणलाई स्वेतसूचीमा राख्न अनुमति दिन्छ।"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"स्वेतसूची ब्लुटुथ उपकरण पहुँच।"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"त्यस उपकरणलाई यस उपकरणमा फाइलहरू पठाउन बिना कुनै पुष्टि अनुमति दिँदै एपलाई अस्थायी रूपमा ब्लुटुथ उपकरणलाई स्वेतसूचीमा राख्न अनुमति दिन्छ।"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"ब्लुटुथ"</string>
     <string name="unknown_device" msgid="9221903979877041009">"अज्ञात उपकरण"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"अज्ञात"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 60636f6..7f6dda4 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Downloadbeheer weergeven."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Hiermee krijgt de app toegang tot de beheerfunctie voor delen via bluetooth om deze functie te gebruiken voor het overdragen van bestanden."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Toegang voor Bluetooth-apparaat op witte lijst plaatsen."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Hiermee kan de app tijdelijk een Bluetooth-apparaat op de witte lijst plaatsen, waardoor dat apparaat bestanden kan verzenden naar dit apparaat zonder bevestiging van de gebruiker."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Toegang voor Bluetooth-apparaat op witte lijst plaatsen."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Hiermee kan de app tijdelijk een Bluetooth-apparaat op de witte lijst plaatsen, waardoor dat apparaat bestanden kan verzenden naar dit apparaat zonder bevestiging van de gebruiker."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Onbekend apparaat"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Onbekend"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 4700656..8ff5d8f 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ଡାଉନଲୋଡ୍‌ ମ୍ୟାନେଜର୍‌କୁ ଆକ୍ସେସ୍‌ କରନ୍ତୁ।"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"BluetoothShare ମ୍ୟାନେଜର୍‌ ଆକ୍ସେସ୍‌ କରି ଫାଇଲ୍‌ଗୁଡ଼ିକ ଟ୍ରାନ୍ସଫର୍‌ କରିବାକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ଆପ୍‌କୁ ଅନୁମତି ଦିଅନ୍ତୁ।"</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସ୍‌ ଆକ୍ସେସ୍‌କୁ ସ୍ୱୀକୃତି ଦିଅନ୍ତୁ।"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"ୟୁଜର୍‌ଙ୍କ ସୁନିଶ୍ଚିତତା ବିନା ଏହି ଡିଭାଇସ୍‌କୁ ଫାଇଲ୍‌ ପଠାଇବା ନିମନ୍ତେ ଗୋଟିଏ ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସ୍‌କୁ ଅନୁମତି ଦେଇ କିଛି ସମୟ ପାଇଁ ଆପ୍‌କୁ ସ୍ୱୀକୃତି ଦେଇଥାଏ।"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସ୍‌ ଆକ୍ସେସ୍‌କୁ ସ୍ୱୀକୃତି ଦିଅନ୍ତୁ।"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"ୟୁଜର୍‌ଙ୍କ ସୁନିଶ୍ଚିତତା ବିନା ଏହି ଡିଭାଇସ୍‌କୁ ଫାଇଲ୍‌ ପଠାଇବା ନିମନ୍ତେ ଗୋଟିଏ ବ୍ଲୁଟୂଥ୍‍‌ ଡିଭାଇସ୍‌କୁ ଅନୁମତି ଦେଇ କିଛି ସମୟ ପାଇଁ ଆପ୍‌କୁ ସ୍ୱୀକୃତି ଦେଇଥାଏ।"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"ବ୍ଲୁଟୁଥ"</string>
     <string name="unknown_device" msgid="9221903979877041009">"ଅଜଣା ଡିଭାଇସ୍"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"ଅଜଣା"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 7a5996e..ab62462 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ਡਾਊਨਲੋਡ ਪ੍ਰਬੰਧਕ ਤੱਕ ਪਹੁੰਚ।"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"ਐਪ ਨੂੰ BluetoothShare ਪ੍ਰਬੰਧਕ ਤੱਕ ਪਹੁੰਚ ਅਤੇ ਫ਼ਾਈਲਾਂ ਟ੍ਰਾਂਸਫਰ ਕਰਨ ਲਈ ਇਸਦੀ ਵਰਤੋਂ ਕਰਨ ਦਿੰਦਾ ਹੈ।"</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"ਵਾਈਟਲਿਸਟ ਬਲੂਟੱਥ ਡੀਵਾਈਸ ਪਹੁੰਚ।"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"ਐਪ ਨੂੰ ਇਹ ਆਗਿਆ ਦਿੰਦੇ ਹੋਏ ਕਿ ਡੀਵਾਈਸ ਵਰਤੋਂਕਾਰ ਦੀ ਪੁਸ਼ਟੀ ਤੋਂ ਬਿਨਾਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਫ਼ਾਈਲਾਂ ਭੇਜੇ, ਇੱਕ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ ਨੂੰ ਅਸਥਾਈ ਤੌਰ ਤੇ ਵਾਈਟਲਿਸਟ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"ਵਾਈਟਲਿਸਟ ਬਲੂਟੱਥ ਡੀਵਾਈਸ ਪਹੁੰਚ।"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"ਐਪ ਨੂੰ ਇਹ ਆਗਿਆ ਦਿੰਦੇ ਹੋਏ ਕਿ ਡੀਵਾਈਸ ਵਰਤੋਂਕਾਰ ਦੀ ਪੁਸ਼ਟੀ ਤੋਂ ਬਿਨਾਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਫ਼ਾਈਲਾਂ ਭੇਜੇ, ਇੱਕ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ ਨੂੰ ਅਸਥਾਈ ਤੌਰ ਤੇ ਵਾਈਟਲਿਸਟ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"ਬਲੂਟੁੱਥ"</string>
     <string name="unknown_device" msgid="9221903979877041009">"ਅਗਿਆਤ ਡੀਵਾਈਸ"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"ਅਗਿਆਤ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 56e0997..51d09e2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Dostęp do menedżera pobierania."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Zezwala aplikacji na dostęp do menedżera BluetoothShare i używanie go do przesyłania plików."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Dodaj urządzenie Bluetooth do zaufanych."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Pozwala aplikacji na tymczasowe dodanie urządzenia Bluetooth do listy zaufanych. Dzięki temu wymiana danych z tym urządzeniem nie wymaga potwierdzenia użytkownika."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Dodaj urządzenie Bluetooth do zaufanych."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Pozwala aplikacji na tymczasowe dodanie urządzenia Bluetooth do listy zaufanych. Dzięki temu wymiana danych z tym urządzeniem nie wymaga potwierdzenia użytkownika."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Nieznane urządzenie"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Nieznany"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 81b9d37..f0dd658 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Aceder ao gestor de transferências."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Permite à app aceder ao gestor BluetoothShare e utilizá-lo para transferir ficheiros."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Colocar na lista de autorizações o acesso do dispositivo Bluetooth."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Permite que a app coloque temporariamente um dispositivo Bluetooth na lista de autorizações, permitindo que esse dispositivo envie ficheiros para este dispositivo sem a confirmação do utilizador."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Colocar na lista de autorizações o acesso do dispositivo Bluetooth."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Permite que a app coloque temporariamente um dispositivo Bluetooth na lista de autorizações, permitindo que esse dispositivo envie ficheiros para este dispositivo sem a confirmação do utilizador."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Dispositivo desconhecido"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Desconhecido"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9c9fd41..7433ecf 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Acessar o gerenciador de download."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Permite que o app acesse e use o gerenciador BluetoothShare para transferir arquivos."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Colocar o acesso do dispositivo Bluetooth na lista de permissões."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Permite que o app adicione um dispositivo Bluetooth à uma lista de permissões temporariamente. Assim, o dispositivo Bluetooth poderá enviar arquivos para este dispositivo sem precisar de confirmação do usuário."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Colocar o acesso do dispositivo Bluetooth na lista de permissões."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Permite que o app adicione um dispositivo Bluetooth à uma lista de permissões temporariamente. Assim, o dispositivo Bluetooth poderá enviar arquivos para este dispositivo sem precisar de confirmação do usuário."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Dispositivo desconhecido"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Desconhecido"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 2ec67a6..81347aa 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Accesați managerul de descărcare."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Permite aplicațiilor să acceseze managerul Distribuire prin Bluetooth și să-l utilizeze la transferul fișierelor."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Acces la dispozitivele Bluetooth din lista albă."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Permite aplicației să treacă temporar pe lista albă un dispozitiv Bluetooth, permițându-i să trimită fișiere la acest dispozitiv fără confirmare din partea utilizatorului."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Acces la dispozitivele Bluetooth din lista albă."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Permite aplicației să treacă temporar pe lista albă un dispozitiv Bluetooth, permițându-i să trimită fișiere la acest dispozitiv fără confirmare din partea utilizatorului."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Dispozitiv necunoscut"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Necunoscut"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index eaa503c..723dd86 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Доступ к диспетчеру загрузки."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Приложение получит доступ к диспетчеру обмена файлами по Bluetooth и сможет использовать его для передачи файлов."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Доступ для устройств Bluetooth из белого списка"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Приложение сможет временно внести устройство Bluetooth в белый список и разрешит ему отправлять файлы на ваше устройство, не требуя от вас подтверждения"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Доступ для устройств Bluetooth из белого списка"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Приложение сможет временно внести устройство Bluetooth в белый список и разрешит ему отправлять файлы на ваше устройство, не требуя от вас подтверждения"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Неизвестное устройство"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Неизвестно"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index aee4343..b53dc77 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"බාගැනීම් කළමනාකරු ප්‍රවේශ වන්න."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"යෙදුමට බ්ලූටූත් බෙදා ගැනීම් කළමනාකරු වෙත ප්‍රවේශ වීමට ඉඩ දී එය ගොනු මාරු කිරීමට භාවිතා කරන්න."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"බ්ලූටූත් උපාංග ප්‍රවේශය සුදු ලැයිස්තු ගත කරන්න."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"පරිශීලක සහතිකය රහිතව එම උපාංගයට මෙම උපාංගය වෙත ගොනු යැවීමට ඉඩ දෙමින්, බ්ලූටූත් උපාංගයක් තාවකාලිකව සුදු ලැයිස්තු ගත කිරීමට යෙදුමට ඉඩ දෙන්න."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"බ්ලූටූත් උපාංග ප්‍රවේශය සුදු ලැයිස්තු ගත කරන්න."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"පරිශීලක සහතිකය රහිතව එම උපාංගයට මෙම උපාංගය වෙත ගොනු යැවීමට ඉඩ දෙමින්, බ්ලූටූත් උපාංගයක් තාවකාලිකව සුදු ලැයිස්තු ගත කිරීමට යෙදුමට ඉඩ දෙන්න."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"බ්ලූටූත්"</string>
     <string name="unknown_device" msgid="9221903979877041009">"නොදන්නා උපාංගයකි"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"නොදනී"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 378d08e..29b5e8b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Získať prístup k správcovi sťahovania."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Umožňuje aplikácii pristupovať k Správcovi BluetoothShare a použiť ho na prenos súborov."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Prístup povoleného zariadenia Bluetooth."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Umožňuje aplikácii dočasne povoliť zariadenie Bluetooth, čím sa povolí zariadeniu odosielať súbory do tohto zariadenia bez potvrdenia používateľa."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Prístup povoleného zariadenia Bluetooth."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Umožňuje aplikácii dočasne povoliť zariadenie Bluetooth, čím sa povolí zariadeniu odosielať súbory do tohto zariadenia bez potvrdenia používateľa."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Neznáme zariadenie"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Neznáme"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 304676a..5ea172c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Dostop do upravitelja prenosov."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Aplikaciji omogoča dostop do upravitelja BluetoothShare in njegovo uporabo za prenašanje datotek."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Doda napravo Bluetooth na seznam z dovoljenim dostopom."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Aplikaciji omogoča, da začasno uvrsti napravo Bluetooth na seznam dovoljenih, kar omogoči napravi pošiljanje datotek v to napravo brez potrditve uporabnika."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Doda napravo Bluetooth na seznam z dovoljenim dostopom."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Aplikaciji omogoča, da začasno uvrsti napravo Bluetooth na seznam dovoljenih, kar omogoči napravi pošiljanje datotek v to napravo brez potrditve uporabnika."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Neznana naprava"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Neznano"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 14c81af..279175f 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Qasu në menaxherin e shkarkimit."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Lejon aplikacionin të ketë qasje në menaxherin \"Shpërndarje përmes bluetooth-it\" (BluetoothShare) dhe ta përdorë për transferim skedarësh."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Qasje në listën e miratimeve të pajisjes me bluetooth."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Lejon aplikacionin të vërë përkohësisht në listën e miratimeve një pajisje bluetooth-i, duke e lejuar atë t\'i dërgojë skedarë kësaj pajisjeje pa konfirmimin e përdoruesit."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Qasje në listën e miratimeve të pajisjes me bluetooth."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Lejon aplikacionin të vërë përkohësisht në listën e miratimeve një pajisje bluetooth-i, duke e lejuar atë t\'i dërgojë skedarë kësaj pajisjeje pa konfirmimin e përdoruesit."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Pajisje e panjohur"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"I panjohur"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index bbb7f81..87c47a5 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Приступ менаџеру преузимања."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Омогућава апликацији да приступа менаџеру за дељење преко Bluetooth-а и да га користи за пренос датотека."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Приступ Bluetooth уређаја са беле листе."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Дозвољава апликацији да привремено стави Bluetooth уређај на белу листу, што омогућава том уређају да шаље датотеке овом уређају без потврде корисника."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Приступ Bluetooth уређаја са беле листе."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Дозвољава апликацији да привремено стави Bluetooth уређај на белу листу, што омогућава том уређају да шаље датотеке овом уређају без потврде корисника."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Непознати уређај"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Непознато"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b22ea60..e393eed 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Åtkomst till nedladdningshanterare."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Tillåter att appen använder BluetoothShare-hanteraren vid överföring av filer."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Lägga till åtkomst för Bluetooth-enheter på den godkända listan"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Appen tillåts lägga till en Bluetooth-enhet tillfälligt på den godkända listan, vilket gör det möjligt att skicka filer mellan olika enheter utan bekräftelse från användaren."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Lägga till åtkomst för Bluetooth-enheter på den godkända listan"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Appen tillåts lägga till en Bluetooth-enhet tillfälligt på den godkända listan, vilket gör det möjligt att skicka filer mellan olika enheter utan bekräftelse från användaren."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Okänd enhet"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Okänd"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d57f7c5..6644c94 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Fikia kidhibiti cha vipakuliwa."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Huruhusu programu kufikia kidhibiti cha BluetoothShare na kukitumia kuhamisha faili."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Ruhusu ufikiaji kifaa cha bluetooth."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Huruhusu programu kuorodhesha kwa muda kifaa cha Bluetooth kwenye orodha ya vifaa maalum, ikiruhusu kifaa hicho kutuma faili kwa kifaa hiki bila uthibitishaji wa mtumiaji."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Ruhusu ufikiaji kifaa cha bluetooth."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Huruhusu programu kuorodhesha kwa muda kifaa cha Bluetooth kwenye orodha ya vifaa maalum, ikiruhusu kifaa hicho kutuma faili kwa kifaa hiki bila uthibitishaji wa mtumiaji."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Kifaa kisichojulikana"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Haijulikani"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 52c4c96..5bb85dc 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"பதிவிறக்க நிர்வாகியை அணுகவும்."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"BluetoothShare நிர்வாகியை அணுகுவதற்குப் ஆப்ஸை அனுமதித்து,  கோப்புகளைப் பரிமாற்ற அதைப் பயன்படுத்துகிறது."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"ஏற்புபட்டியல் புளூடூத் சாதன அணுகல்."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"புளூடூத் சாதனத்தைத் தற்காலிகமாக ஏற்புபட்டியலில் சேர்க்க ஆப்ஸை அனுமதிக்கிறது, பயனரின் உறுதிபடுத்தலின்றி கோப்புகளை இந்தச் சாதனத்திற்கு அனுப்ப அதை அனுமதிக்கிறது."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"ஏற்புபட்டியல் புளூடூத் சாதன அணுகல்."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"புளூடூத் சாதனத்தைத் தற்காலிகமாக ஏற்புபட்டியலில் சேர்க்க ஆப்ஸை அனுமதிக்கிறது, பயனரின் உறுதிபடுத்தலின்றி கோப்புகளை இந்தச் சாதனத்திற்கு அனுப்ப அதை அனுமதிக்கிறது."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"புளூடூத்"</string>
     <string name="unknown_device" msgid="9221903979877041009">"அறியப்படாத சாதனம்"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"அறியப்படாதது"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index af1f974..b4788ca 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"డౌన్‌లోడ్ మేనేజర్‌ను యాక్సెస్ చేయండి."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"బ్లూటూత్ భాగస్వామ్య మేనేజర్‌ను యాక్సెస్ చేయడానికి యాప్‌ను అనుమతిస్తుంది మరియు ఫైల్‌లను బదిలీ చేయడానికి దీన్ని ఉపయోగిస్తుంది."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"అనుమతి జాబితాలో ఉంచిన బ్లూటూత్ పరికర యాక్సెస్."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"బ్లూటూత్ పరికరాన్ని తాత్కాలికంగా అనుమతి జాబితాలో ఉంచడానికి యాప్‌ను అనుమతిస్తుంది, తద్వారా వినియోగదారు నిర్ధారణ లేకుండానే ఫైల్‌లను ఈ పరికరానికి పంపడానికి ఆ పరికరాన్ని అనుమతిస్తుంది."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"అనుమతి జాబితాలో ఉంచిన బ్లూటూత్ పరికర యాక్సెస్."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"బ్లూటూత్ పరికరాన్ని తాత్కాలికంగా అనుమతి జాబితాలో ఉంచడానికి యాప్‌ను అనుమతిస్తుంది, తద్వారా వినియోగదారు నిర్ధారణ లేకుండానే ఫైల్‌లను ఈ పరికరానికి పంపడానికి ఆ పరికరాన్ని అనుమతిస్తుంది."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"బ్లూటూత్"</string>
     <string name="unknown_device" msgid="9221903979877041009">"తెలియని పరికరం"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"తెలియదు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index eb815fc..3a7685c 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"เข้าถึงตัวจัดการการดาวน์โหลด"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"อนุญาตให้แอปพลิเคชันเข้าถึงและใช้ตัวจัดการ BluetoothShare เพื่อถ่ายโอนไฟล์"</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"รายการที่อนุญาตการเข้าถึงอุปกรณ์บลูทูธ"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"อนุญาตให้แอปบันทึกอุปกรณ์บลูทูธในรายการที่อนุญาตเป็นการชั่วคราว ซึ่งจะทำให้อุปกรณ์ดังกล่าวสามารถส่งไฟล์มายังอุปกรณ์นี้ได้โดยไม่ต้องยืนยันผู้ใช้"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"รายการที่อนุญาตการเข้าถึงอุปกรณ์บลูทูธ"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"อนุญาตให้แอปบันทึกอุปกรณ์บลูทูธในรายการที่อนุญาตเป็นการชั่วคราว ซึ่งจะทำให้อุปกรณ์ดังกล่าวสามารถส่งไฟล์มายังอุปกรณ์นี้ได้โดยไม่ต้องยืนยันผู้ใช้"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"บลูทูธ"</string>
     <string name="unknown_device" msgid="9221903979877041009">"อุปกรณ์ที่ไม่รู้จัก"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"ไม่รู้จัก"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index cfbb1ef..a4741bf 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"I-access ang tagapamahala ng pag-download."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Binibigyang-daan ang app na i-access ang BluetoothShare manager at gamitin ito upang maglipat ng mga file."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Mag-whitelist ng access ng isang bluetooth device."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Pinapayagan ang app na pansamantalang mag-whitelist ng isang Bluetooth device, na pinapayagan ang device na iyon na magpadala ng mga file sa device na ito nang walang kumpirmasyon ng user."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Mag-acceptlist ng access ng isang bluetooth device."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Pinapayagan ang app na pansamantalang mag-acceptlist ng isang Bluetooth device, na pinapayagan ang device na iyon na magpadala ng mga file sa device na ito nang walang kumpirmasyon ng user."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Hindi kilalang device"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Hindi alam"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5055960..2b95b63 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"İndirme yöneticisine erişin."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Uygulamaya, BluetoothShare yöneticisine erişme ve bunu dosyaları aktarmak için kullanma izni verir."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Bluetooth cihazı erişimine izin ver."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Uygulamaya, bir Bluetooth cihazını geçici olarak onaylananlar listesine ekleme izni verir. Böylece, izin verilen cihaz kullanıcının onayı olmadan bu cihaza dosya gönderebilir."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Bluetooth cihazı erişimine izin ver."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Uygulamaya, bir Bluetooth cihazını geçici olarak onaylananlar listesine ekleme izni verir. Böylece, izin verilen cihaz kullanıcının onayı olmadan bu cihaza dosya gönderebilir."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Bilinmeyen cihaz"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Bilinmiyor"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 24f29a2..e927bec 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Доступ до менедж. завантаж."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Дозволяє програмі отримувати доступ до менеджера BluetoothShare і використовувати його для передавання файлів."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Доступ до дозволеного пристрою Bluetooth."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Дозволяє програмі тимчасово додати пристрій Bluetooth у список дозволених пристроїв, що дасть йому змогу надсилати файли на цей пристрій без підтвердження від користувача."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Доступ до дозволеного пристрою Bluetooth."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Дозволяє програмі тимчасово додати пристрій Bluetooth у список дозволених пристроїв, що дасть йому змогу надсилати файли на цей пристрій без підтвердження від користувача."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Невідомий пристрій"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Невідомий"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index eb7c3fe..5fa0245 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ڈاؤن لوڈ مینیجر تک رسائی حاصل کریں۔"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"‏ایپ کو فائلیں منتقل کرنے کیلئے BluetoothShare مینیجر تک رسائی اور اسے استعمال کرنے کی اجازت دیتا ہے۔"</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"بلوٹوتھ آلہ کی رسائی کو وہائٹ لسٹ کریں۔"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"آلہ کو عارضی طور پر کسی بلوٹوتھ آلہ کو وہائٹ لسٹ کرنے کی اجازت دیتا ہے، اور اس آلہ کو صارف کی توثیق کے بغیر اس آلہ پر فائلیں بھیجنے دیتا ہے۔"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"بلوٹوتھ آلہ کی رسائی کو وہائٹ لسٹ کریں۔"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"آلہ کو عارضی طور پر کسی بلوٹوتھ آلہ کو وہائٹ لسٹ کرنے کی اجازت دیتا ہے، اور اس آلہ کو صارف کی توثیق کے بغیر اس آلہ پر فائلیں بھیجنے دیتا ہے۔"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"بلوٹوتھ"</string>
     <string name="unknown_device" msgid="9221903979877041009">"نامعلوم آلہ"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"نامعلوم"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 1eda2cb..f4448a9 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Yuklab olish menejeriga ruxsat."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Ilovaga BluetoothShare menejeriga kirishga va undan fayllar uzatishda foydalanishga ruxsat beradi."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Ishonchli Bluetooth qurilmalari ro‘yxatiga kirish."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Ilovaga Bluetooth qurilmasini vaqtinchalik ishonchli qurilmalar ro‘yxatiga kiritishga va u qurilmaga foydalanuvchining tasdig‘isiz bu qurilmaga fayllar jo‘natish uchun ruxsat beradi."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Ishonchli Bluetooth qurilmalari ro‘yxatiga kirish."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Ilovaga Bluetooth qurilmasini vaqtinchalik ishonchli qurilmalar ro‘yxatiga kiritishga va u qurilmaga foydalanuvchining tasdig‘isiz bu qurilmaga fayllar jo‘natish uchun ruxsat beradi."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Noma’lum qurilma"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Noma’lum"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 3449367..0e0095d 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Truy cập trình quản lý tải xuống."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Cho phép ứng dụng truy cập trình quản lý BluetoothShare và sử dụng trình quản lý đó để chuyển tệp."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Truy cập thiết bị bluetooth nằm trong danh sách trắng."</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Cho phép ứng dụng tạm thời đưa thiết bị Bluetooth vào danh sách trắng, cho phép thiết bị đó gửi các tệp tới thiết bị này mà không cần xác nhận của người dùng."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Truy cập thiết bị bluetooth nằm trong danh sách trắng."</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Cho phép ứng dụng tạm thời đưa thiết bị Bluetooth vào danh sách trắng, cho phép thiết bị đó gửi các tệp tới thiết bị này mà không cần xác nhận của người dùng."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Thiết bị không xác định"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Không xác định"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a4bf3be..1c1b7f9 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"使用下载管理器。"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"允许应用访问蓝牙共享 (BluetoothShare) 管理器并将其用于传输文件。"</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"将蓝牙设备列入访问权限白名单。"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"允许该应用暂时将某个蓝牙设备列入白名单,从而允许该设备在不经过用户确认的情况下,将文件发送到本设备。"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"将蓝牙设备列入访问权限白名单。"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"允许该应用暂时将某个蓝牙设备列入白名单,从而允许该设备在不经过用户确认的情况下,将文件发送到本设备。"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"蓝牙"</string>
     <string name="unknown_device" msgid="9221903979877041009">"未知设备"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"未知号码"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e33aa51..2e88288 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"存取下載管理員。"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"允許應用程式存取 BluetoothShare 管理員並使用 BluetoothShare 管理員傳輸檔案。"</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"將藍牙裝置列入許可名單。"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"允許應用程式暫時將藍牙裝置加入許可名單,使其不需經使用者確認便可把檔案傳送到裝置上。"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"將藍牙裝置列入許可名單。"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"允許應用程式暫時將藍牙裝置加入許可名單,使其不需經使用者確認便可把檔案傳送到裝置上。"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"藍牙"</string>
     <string name="unknown_device" msgid="9221903979877041009">"不明裝置"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"未知"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e92c8d9..b99e8f2 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"存取下載管理員。"</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"允許應用程式存取 BluetoothShare 管理員,並可使用 BluetoothShare 管理員傳輸檔案。"</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"將藍牙裝置列入許可清單。"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"允許應用程式暫時將藍牙裝置加入許可名單,使其不需經過使用者確認即可將檔案傳送到裝置。"</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"將藍牙裝置列入許可清單。"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"允許應用程式暫時將藍牙裝置加入許可名單,使其不需經過使用者確認即可將檔案傳送到裝置。"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"藍牙"</string>
     <string name="unknown_device" msgid="9221903979877041009">"未知的裝置"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"不明"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 35bd85e..7162359 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Finyelela kumphathi wokulayisha."</string>
     <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Ivumela uhlelo lokusebenza ukufinyelela umphathi we-BluetoothShare ngisho nokuyisebenzisela ukudlulisa amafayela."</string>
-    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Ukufinyelela idivaysi ye-bluetooth yohlu lwabathintwayo"</string>
-    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Ivumela uhlelo lokusebenza ukwenza uhlu lwabathintayo kwidivaysi ye-Bluetooth, ngokuvumela leyo divaysi ukuthumela amafayela kule divaysi ngaphandle kokuqinisekisa komsebenzisi."</string>
+    <string name="permlab_bluetoothAcceptlist" msgid="7091552898592306386">"Ukufinyelela idivaysi ye-bluetooth yohlu lwabathintwayo"</string>
+    <string name="permdesc_bluetoothAcceptlist" msgid="5494513855192170109">"Ivumela uhlelo lokusebenza ukwenza uhlu lwabathintayo kwidivaysi ye-Bluetooth, ngokuvumela leyo divaysi ukuthumela amafayela kule divaysi ngaphandle kokuqinisekisa komsebenzisi."</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Idivayisi engaziwa"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Akwaziwa"</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index 6ceacf7..9a1c5b1 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -51,7 +51,7 @@
 
     <!-- Specifies latency parameters for high priority, balanced and low power
          GATT configurations. These values represents the number of packets a
-         slave device is allowed to skip. -->
+         peripheral device is allowed to skip. -->
     <integer name="gatt_high_priority_latency">0</integer>
     <integer name="gatt_balanced_priority_latency">0</integer>
     <integer name="gatt_low_power_latency">2</integer>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4e3bea5..a1e0091 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -32,9 +32,9 @@
     <string name="permdesc_bluetoothShareManager">Allows the app to access the
         BluetoothShare manager and use it to transfer files. </string>
 
-    <string name="permlab_bluetoothWhitelist">Whitelist bluetooth device access.</string>
+    <string name="permlab_bluetoothAcceptlist">Acceptlist bluetooth device access.</string>
 
-    <string name="permdesc_bluetoothWhitelist">Allows the app to temporarily whitelist
+    <string name="permdesc_bluetoothAcceptlist">Allows the app to temporarily acceptlist
         a Bluetooth device, allowing that device to send files to this device without user
         confirmation.</string>
 
diff --git a/src/com/android/bluetooth/avrcp/AvrcpTargetService.java b/src/com/android/bluetooth/avrcp/AvrcpTargetService.java
index 3d3b9e2..4e5f7bf 100644
--- a/src/com/android/bluetooth/avrcp/AvrcpTargetService.java
+++ b/src/com/android/bluetooth/avrcp/AvrcpTargetService.java
@@ -35,9 +35,9 @@
 import com.android.bluetooth.a2dp.A2dpService;
 import com.android.bluetooth.audio_util.BTAudioEventLogger;
 import com.android.bluetooth.audio_util.MediaData;
-import com.android.bluetooth.audio_util.Metadata;
 import com.android.bluetooth.audio_util.MediaPlayerList;
 import com.android.bluetooth.audio_util.MediaPlayerWrapper;
+import com.android.bluetooth.audio_util.Metadata;
 import com.android.bluetooth.audio_util.PlayStatus;
 import com.android.bluetooth.audio_util.PlayerInfo;
 import com.android.bluetooth.btservice.MetricsLogger;
@@ -300,7 +300,7 @@
         return mVolumeManager.getVolume(device, mVolumeManager.getNewDeviceVolume());
     }
 
-    // TODO (apanicke): Add checks to blacklist Absolute Volume devices if they behave poorly.
+    // TODO (apanicke): Add checks to rejectlist Absolute Volume devices if they behave poorly.
     void setVolume(int avrcpVolume) {
         BluetoothDevice activeDevice = getA2dpActiveDevice();
         if (activeDevice == null) {
diff --git a/src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java b/src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java
index ba4d133..507fbe9 100644
--- a/src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java
+++ b/src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java
@@ -39,7 +39,7 @@
 
     // All volumes are stored at system volume values, not AVRCP values
     private static final String VOLUME_MAP = "bluetooth_volume_map";
-    private static final String VOLUME_BLACKLIST = "absolute_volume_blacklist";
+    private static final String VOLUME_REJECTLIST = "absolute_volume_rejectlist";
     private static final String VOLUME_CHANGE_LOG_TITLE = "Volume Events";
     private static final int AVRCP_MAX_VOL = 127;
     private static final int STREAM_MUSIC = AudioManager.STREAM_MUSIC;
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index 859cf3e..3b68755 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -445,7 +445,11 @@
         mBluetoothKeystoreService = new BluetoothKeystoreService(isNiapMode());
         mBluetoothKeystoreService.start();
         int configCompareResult = mBluetoothKeystoreService.getCompareResult();
-        initNative(isGuest(), isNiapMode(), configCompareResult, getInitFlags());
+
+        // Android TV doesn't show consent dialogs for just works and encryption only le pairing
+        boolean isAtvDevice = getApplicationContext().getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_LEANBACK_ONLY);
+        initNative(isGuest(), isNiapMode(), configCompareResult, getInitFlags(), isAtvDevice);
         mNativeAvailable = true;
         mCallbacks = new RemoteCallbackList<IBluetoothCallback>();
         mAppOps = getSystemService(AppOpsManager.class);
@@ -3090,6 +3094,7 @@
     private static final String GD_HCI_FLAG = "INIT_gd_hci";
     private static final String GD_CONTROLLER_FLAG = "INIT_gd_controller";
     private static final String GD_ACL_FLAG = "INIT_gd_acl";
+    private static final String GD_L2CAP_FLAG = "INIT_gd_l2cap";
     /**
      * Logging flags logic (only applies to DEBUG and VERBOSE levels):
      * if LOG_TAG in LOGGING_DEBUG_DISABLED_FOR_TAGS_FLAG:
@@ -3109,6 +3114,7 @@
             "INIT_logging_debug_enabled_for_tags";
     private static final String LOGGING_DEBUG_DISABLED_FOR_TAGS_FLAG =
             "INIT_logging_debug_disabled_for_tags";
+    private static final String BTAA_HCI_LOG_FLAG = "INIT_btaa_hci";
 
     private String[] getInitFlags() {
         ArrayList<String> initFlags = new ArrayList<>();
@@ -3127,6 +3133,9 @@
         if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_ACL_FLAG, false)) {
             initFlags.add(String.format("%s=%s", GD_ACL_FLAG, "true"));
         }
+        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_L2CAP_FLAG, false)) {
+            initFlags.add(String.format("%s=%s", GD_L2CAP_FLAG, "true"));
+        }
         if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,
                 LOGGING_DEBUG_ENABLED_FOR_ALL_FLAG, false)) {
             initFlags.add(String.format("%s=%s", LOGGING_DEBUG_ENABLED_FOR_ALL_FLAG, "true"));
@@ -3143,6 +3152,9 @@
             initFlags.add(String.format("%s=%s", LOGGING_DEBUG_DISABLED_FOR_TAGS_FLAG,
                     debugLoggingDisabledTags));
         }
+        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, BTAA_HCI_LOG_FLAG, false)) {
+            initFlags.add(BTAA_HCI_LOG_FLAG);
+        }
         return initFlags.toArray(new String[0]);
     }
 
@@ -3176,7 +3188,7 @@
     static native void classInitNative();
 
     native boolean initNative(boolean startRestricted, boolean isNiapMode, int configCompareResult,
-            String[] initFlags);
+            String[] initFlags, boolean isAtvDevice);
 
     native void cleanupNative();
 
diff --git a/src/com/android/bluetooth/gatt/GattService.java b/src/com/android/bluetooth/gatt/GattService.java
index def51dc..81ec766 100644
--- a/src/com/android/bluetooth/gatt/GattService.java
+++ b/src/com/android/bluetooth/gatt/GattService.java
@@ -700,14 +700,14 @@
         @Override
         public void leConnectionUpdate(int clientIf, String address,
                 int minConnectionInterval, int maxConnectionInterval,
-                int slaveLatency, int supervisionTimeout,
+                int peripheralLatency, int supervisionTimeout,
                 int minConnectionEventLen, int maxConnectionEventLen) {
             GattService service = getService();
             if (service == null) {
                 return;
             }
             service.leConnectionUpdate(clientIf, address, minConnectionInterval,
-                                       maxConnectionInterval, slaveLatency,
+                                       maxConnectionInterval, peripheralLatency,
                                        supervisionTimeout, minConnectionEventLen,
                                        maxConnectionEventLen);
         }
@@ -2639,7 +2639,7 @@
         int minInterval;
         int maxInterval;
 
-        // Slave latency
+        // Peripheral latency
         int latency;
 
         // Link supervision timeout is measured in N * 10ms
@@ -2677,21 +2677,21 @@
     }
 
     void leConnectionUpdate(int clientIf, String address, int minInterval,
-                            int maxInterval, int slaveLatency,
+                            int maxInterval, int peripheralLatency,
                             int supervisionTimeout, int minConnectionEventLen,
                             int maxConnectionEventLen) {
         enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
 
         if (DBG) {
             Log.d(TAG, "leConnectionUpdate() - address=" + address + ", intervals="
-                        + minInterval + "/" + maxInterval + ", latency=" + slaveLatency
+                        + minInterval + "/" + maxInterval + ", latency=" + peripheralLatency
                         + ", timeout=" + supervisionTimeout + "msec" + ", min_ce="
                         + minConnectionEventLen + ", max_ce=" + maxConnectionEventLen);
 
 
         }
         gattConnectionParameterUpdateNative(clientIf, address, minInterval, maxInterval,
-                                            slaveLatency, supervisionTimeout,
+                                            peripheralLatency, supervisionTimeout,
                                             minConnectionEventLen, maxConnectionEventLen);
     }
 
diff --git a/src/com/android/bluetooth/hearingaid/HearingAidNativeInterface.java b/src/com/android/bluetooth/hearingaid/HearingAidNativeInterface.java
index 1db0be6..9ef2678 100644
--- a/src/com/android/bluetooth/hearingaid/HearingAidNativeInterface.java
+++ b/src/com/android/bluetooth/hearingaid/HearingAidNativeInterface.java
@@ -105,14 +105,14 @@
     }
 
     /**
-     * Add a hearing aid device to white list.
+     * Add a hearing aid device to acceptlist.
      *
      * @param device the remote device
      * @return true on success, otherwise false.
      */
     @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
-    public boolean addToWhiteList(BluetoothDevice device) {
-        return addToWhiteListNative(getByteAddress(device));
+    public boolean addToAcceptlist(BluetoothDevice device) {
+        return addToAcceptlistNative(getByteAddress(device));
     }
 
     /**
@@ -179,6 +179,6 @@
     private native void cleanupNative();
     private native boolean connectHearingAidNative(byte[] address);
     private native boolean disconnectHearingAidNative(byte[] address);
-    private native boolean addToWhiteListNative(byte[] address);
+    private native boolean addToAcceptlistNative(byte[] address);
     private native void setVolumeNative(int volume);
 }
diff --git a/src/com/android/bluetooth/hearingaid/HearingAidStateMachine.java b/src/com/android/bluetooth/hearingaid/HearingAidStateMachine.java
index de1b4ee..7a299e7 100644
--- a/src/com/android/bluetooth/hearingaid/HearingAidStateMachine.java
+++ b/src/com/android/bluetooth/hearingaid/HearingAidStateMachine.java
@@ -266,8 +266,8 @@
                     Log.w(TAG, "Connecting connection timeout: " + mDevice);
                     mNativeInterface.disconnectHearingAid(mDevice);
                     if (mService.isConnectedPeerDevices(mDevice)) {
-                        Log.w(TAG, "One side connection timeout: " + mDevice + ". Try whitelist");
-                        mNativeInterface.addToWhiteList(mDevice);
+                        Log.w(TAG, "One side connection timeout: " + mDevice + ". Try acceptlist");
+                        mNativeInterface.addToAcceptlist(mDevice);
                     }
                     HearingAidStackEvent disconnectEvent =
                             new HearingAidStackEvent(
@@ -486,7 +486,7 @@
         private void processConnectionEvent(int state) {
             switch (state) {
                 case HearingAidStackEvent.CONNECTION_STATE_DISCONNECTED:
-                    Log.i(TAG, "Disconnected from " + mDevice + " but still in Whitelist");
+                    Log.i(TAG, "Disconnected from " + mDevice + " but still in Acceptlist");
                     transitionTo(mDisconnected);
                     break;
                 case HearingAidStackEvent.CONNECTION_STATE_DISCONNECTING:
diff --git a/src/com/android/bluetooth/hfpclient/HeadsetClientHalConstants.java b/src/com/android/bluetooth/hfpclient/HeadsetClientHalConstants.java
index d7b5067..99e3798 100644
--- a/src/com/android/bluetooth/hfpclient/HeadsetClientHalConstants.java
+++ b/src/com/android/bluetooth/hfpclient/HeadsetClientHalConstants.java
@@ -97,7 +97,7 @@
     static final int CMD_COMPLETE_ERROR_BUSY = 3;
     static final int CMD_COMPLETE_ERROR_NO_ANSWER = 4;
     static final int CMD_COMPLETE_ERROR_DELAYED = 5;
-    static final int CMD_COMPLETE_ERROR_BLACKLISTED = 6;
+    static final int CMD_COMPLETE_ERROR_REJECTLISTED = 6;
     static final int CMD_COMPLETE_ERROR_CME = 7;
 
     // match up with bthf_client_call_action_t enum of bt_hf_client.h
diff --git a/src/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java b/src/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java
index bae8cb9..6205408 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java
@@ -75,16 +75,16 @@
                 }
                 return;
             }
-        } else if (action.equals(Constants.ACTION_WHITELIST_DEVICE)) {
+        } else if (action.equals(Constants.ACTION_ACCEPTLIST_DEVICE)) {
             BluetoothDevice device =
                     (BluetoothDevice) intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
             if (D) {
-                Log.d(TAG, "Adding " + device + " to whitelist");
+                Log.d(TAG, "Adding " + device + " to acceptlist");
             }
             if (device == null) {
                 return;
             }
-            BluetoothOppManager.getInstance(context).addToWhitelist(device.getAddress());
+            BluetoothOppManager.getInstance(context).addToAcceptlist(device.getAddress());
         } else if (action.equals(Constants.ACTION_STOP_HANDOVER)) {
             int id = intent.getIntExtra(Constants.EXTRA_BT_OPP_TRANSFER_ID, -1);
             if (id != -1) {
diff --git a/src/com/android/bluetooth/opp/BluetoothOppManager.java b/src/com/android/bluetooth/opp/BluetoothOppManager.java
index 01b9209..a353d72 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppManager.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppManager.java
@@ -112,10 +112,10 @@
 
     // A list of devices that may send files over OPP to this device
     // without user confirmation. Used for connection handover from forex NFC.
-    private List<Pair<String, Long>> mWhitelist = new ArrayList<Pair<String, Long>>();
+    private List<Pair<String, Long>> mAcceptlist = new ArrayList<Pair<String, Long>>();
 
-    // The time for which the whitelist entries remain valid.
-    private static final int WHITELIST_DURATION_MS = 15000;
+    // The time for which the acceptlist entries remain valid.
+    private static final int ACCEPTLIST_DURATION_MS = 15000;
 
     /**
      * Get singleton instance.
@@ -156,37 +156,37 @@
     }
 
 
-    private void cleanupWhitelist() {
+    private void cleanupAcceptlist() {
         // Removes expired entries
         long curTime = SystemClock.elapsedRealtime();
-        for (Iterator<Pair<String, Long>> iter = mWhitelist.iterator(); iter.hasNext(); ) {
+        for (Iterator<Pair<String, Long>> iter = mAcceptlist.iterator(); iter.hasNext(); ) {
             Pair<String, Long> entry = iter.next();
-            if (curTime - entry.second > WHITELIST_DURATION_MS) {
+            if (curTime - entry.second > ACCEPTLIST_DURATION_MS) {
                 if (V) {
-                    Log.v(TAG, "Cleaning out whitelist entry " + entry.first);
+                    Log.v(TAG, "Cleaning out acceptlist entry " + entry.first);
                 }
                 iter.remove();
             }
         }
     }
 
-    public synchronized void addToWhitelist(String address) {
+    public synchronized void addToAcceptlist(String address) {
         if (address == null) {
             return;
         }
         // Remove any existing entries
-        for (Iterator<Pair<String, Long>> iter = mWhitelist.iterator(); iter.hasNext(); ) {
+        for (Iterator<Pair<String, Long>> iter = mAcceptlist.iterator(); iter.hasNext(); ) {
             Pair<String, Long> entry = iter.next();
             if (entry.first.equals(address)) {
                 iter.remove();
             }
         }
-        mWhitelist.add(new Pair<String, Long>(address, SystemClock.elapsedRealtime()));
+        mAcceptlist.add(new Pair<String, Long>(address, SystemClock.elapsedRealtime()));
     }
 
-    public synchronized boolean isWhitelisted(String address) {
-        cleanupWhitelist();
-        for (Pair<String, Long> entry : mWhitelist) {
+    public synchronized boolean isAcceptlisted(String address) {
+        cleanupAcceptlist();
+        for (Pair<String, Long> entry : mAcceptlist) {
             if (entry.first.equals(address)) {
                 return true;
             }
diff --git a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
index 4b59b62..04c9406 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
@@ -198,8 +198,8 @@
         } else {
             destination = "FF:FF:FF:00:00:00";
         }
-        boolean isWhitelisted =
-                BluetoothOppManager.getInstance(mContext).isWhitelisted(destination);
+        boolean isAcceptlisted =
+                BluetoothOppManager.getInstance(mContext).isAcceptlisted(destination);
 
         HeaderSet request;
         String name, mimeType;
@@ -259,8 +259,8 @@
             mimeType = mimeType.toLowerCase();
         }
 
-        // Reject anything outside the "whitelist" plus unspecified MIME Types.
-        if (mimeType == null || (!isWhitelisted && !Constants.mimeTypeMatches(mimeType,
+        // Reject anything outside the "acceptlist" plus unspecified MIME Types.
+        if (mimeType == null || (!isAcceptlisted && !Constants.mimeTypeMatches(mimeType,
                 Constants.ACCEPTABLE_SHARE_INBOUND_TYPES))) {
             if (D) {
                 Log.w(TAG, "mimeType is null or in unacceptable list, reject the transfer");
@@ -283,7 +283,7 @@
                     BluetoothShare.USER_CONFIRMATION_AUTO_CONFIRMED);
         }
 
-        if (isWhitelisted) {
+        if (isAcceptlisted) {
             values.put(BluetoothShare.USER_CONFIRMATION,
                     BluetoothShare.USER_CONFIRMATION_HANDOVER_CONFIRMED);
         }
@@ -594,7 +594,7 @@
         } else {
             destination = "FF:FF:FF:00:00:00";
         }
-        boolean isHandover = BluetoothOppManager.getInstance(mContext).isWhitelisted(destination);
+        boolean isHandover = BluetoothOppManager.getInstance(mContext).isAcceptlisted(destination);
         if (isHandover) {
             // Notify the handover requester file transfer has started
             Intent intent = new Intent(Constants.ACTION_HANDOVER_STARTED);
diff --git a/src/com/android/bluetooth/opp/Constants.java b/src/com/android/bluetooth/opp/Constants.java
index 3bf6cde..4f064f7 100644
--- a/src/com/android/bluetooth/opp/Constants.java
+++ b/src/com/android/bluetooth/opp/Constants.java
@@ -69,8 +69,8 @@
     static final String ACTION_OPEN_RECEIVED_FILES =
             "android.btopp.intent.action.OPEN_RECEIVED_FILES";
 
-    /** the intent that whitelists a remote bluetooth device for auto-receive confirmation (NFC) */
-    static final String ACTION_WHITELIST_DEVICE = "android.btopp.intent.action.WHITELIST_DEVICE";
+    /** the intent that acceptlists a remote bluetooth device for auto-receive confirmation (NFC) */
+    static final String ACTION_ACCEPTLIST_DEVICE = "android.btopp.intent.action.ACCEPTLIST_DEVICE";
 
     /** the intent that can be sent by handover requesters to stop a BTOPP transfer */
     static final String ACTION_STOP_HANDOVER = "android.btopp.intent.action.STOP_HANDOVER_TRANSFER";
@@ -172,7 +172,7 @@
 
     /**
      * The MIME type(s) of we could accept from other device.
-     * This is in essence a "white list" of acceptable types.
+     * This is in essence a "acceptlist" of acceptable types.
      * Today, restricted to images, audio, video and certain text types.
      */
     static final String[] ACCEPTABLE_SHARE_INBOUND_TYPES = new String[]{
diff --git a/tests/unit/AndroidManifest.xml b/tests/unit/AndroidManifest.xml
index eaf7fdc..6b1ca13 100644
--- a/tests/unit/AndroidManifest.xml
+++ b/tests/unit/AndroidManifest.xml
@@ -39,7 +39,7 @@
     <uses-permission android:name="android.permission.READ_SMS" />
     <uses-permission android:name="android.permission.WRITE_SMS" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="com.android.permission.WHITELIST_BLUETOOTH_DEVICE" />
+    <uses-permission android:name="com.android.permission.ALLOWLIST_BLUETOOTH_DEVICE" />
     <uses-permission android:name="com.android.email.permission.ACCESS_PROVIDER"/>
 
     <!-- For testing Email content access -->
diff --git a/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java b/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java
index 1baa131..01bb056 100644
--- a/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java
+++ b/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java
@@ -109,7 +109,7 @@
         Assert.assertNotNull(Looper.myLooper());
         AdapterService adapterService = new AdapterService();
         adapterService.initNative(false /* is_restricted */, false /* is_niap_mode */,
-                0 /* config_compare_result */, new String[0]);
+                0 /* config_compare_result */, new String[0], false);
         adapterService.cleanupNative();
         HashMap<String, HashMap<String, String>> adapterConfig = TestUtils.readAdapterConfig();
         Assert.assertNotNull(adapterConfig);
diff --git a/tests/unit/src/com/android/bluetooth/btservice/ProfileServiceTest.java b/tests/unit/src/com/android/bluetooth/btservice/ProfileServiceTest.java
index f2b4d94..42e4b57 100644
--- a/tests/unit/src/com/android/bluetooth/btservice/ProfileServiceTest.java
+++ b/tests/unit/src/com/android/bluetooth/btservice/ProfileServiceTest.java
@@ -99,7 +99,7 @@
         mProfiles = Config.getSupportedProfiles();
 
         mMockAdapterService.initNative(false /* is_restricted */, false /* is_niap_mode */,
-                0 /* config_compare_result */, new String[0]);
+                0 /* config_compare_result */, new String[0], false);
 
         TestUtils.setAdapterService(mMockAdapterService);
         doReturn(mDatabaseManager).when(mMockAdapterService).getDatabase();
diff --git a/tests/unit/src/com/android/bluetooth/hearingaid/HearingAidStateMachineTest.java b/tests/unit/src/com/android/bluetooth/hearingaid/HearingAidStateMachineTest.java
index 2512c5e..972fd75 100644
--- a/tests/unit/src/com/android/bluetooth/hearingaid/HearingAidStateMachineTest.java
+++ b/tests/unit/src/com/android/bluetooth/hearingaid/HearingAidStateMachineTest.java
@@ -213,7 +213,7 @@
         // Check that we are in Disconnected state
         Assert.assertThat(mHearingAidStateMachine.getCurrentState(),
                 IsInstanceOf.instanceOf(HearingAidStateMachine.Disconnected.class));
-        verify(mHearingAidNativeInterface).addToWhiteList(eq(mTestDevice));
+        verify(mHearingAidNativeInterface).addToAcceptlist(eq(mTestDevice));
     }
 
     /**
@@ -257,6 +257,6 @@
         // Check that we are in Disconnected state
         Assert.assertThat(mHearingAidStateMachine.getCurrentState(),
                 IsInstanceOf.instanceOf(HearingAidStateMachine.Disconnected.class));
-        verify(mHearingAidNativeInterface).addToWhiteList(eq(mTestDevice));
+        verify(mHearingAidNativeInterface).addToAcceptlist(eq(mTestDevice));
     }
 }