Import translations. DO NOT MERGE

Auto-generated-cl: translation import Bug: 32177112 Change-Id: I9178e13ccd88e7885dab8a5eb5099d26d1b20b6e
author: Bill Yi <byi@google.com> 2016-11-20 16:31:06 -0800
committer: Bill Yi <byi@google.com> 2016-11-20 16:31:06 -0800
commit: 3d24c0a0ebf596e260cd54b119b1b5a2fa98892a (patch)
tree: 4b531d6b94d7169ffa46a6ac7a7398b1a01d1d21
parent: 04c04e7e9804dd77317c063d4c2ca93bf077aa62 (diff)
download: android_packages_apps_Bluetooth-3d24c0a0ebf596e260cd54b119b1b5a2fa98892a.tar.gz
android_packages_apps_Bluetooth-3d24c0a0ebf596e260cd54b119b1b5a2fa98892a.tar.bz2
android_packages_apps_Bluetooth-3d24c0a0ebf596e260cd54b119b1b5a2fa98892a.zip
165 files changed, 825 insertions, 209 deletions
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index d9714bb29..07922f4b1 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Vee uit"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Stoor"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Kanselleer"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Kies die rekeninge wat jy deur Bluetooth wil deel. Jy moet steeds enige toegang tot die rekeninge aanvaar wanneer jy koppel."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Kies die rekeninge wat jy deur Bluetooth wil deel. Jy moet steeds enige toegang tot die rekeninge aanvaar wanneer jy koppel."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Gleuwe oor:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Programikoon"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth-boodskapdeelinstellings"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Kan nie rekening kies nie. 0 gleuwe oor"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth-oudio is gekoppel"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth-oudio is ontkoppel"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth-oudio"</string>
 </resources>
diff --git a/res/values-af/strings_pbap_client.xml b/res/values-af/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-af/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index a2836dfca..6e232f122 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"አጽዳ"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"አስቀምጥ"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"ይቅር"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"በብሉቱዝ በኩል ማጋራት የሚፈልጓቸውን መለያዎች ይምረጡ። አሁንም በሚገናኙበት ወቅት ማንኛቸውም የመለያዎቹ መዳረሻ መፍቀድ አለብዎት።"</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"በብሉቱዝ በኩል ማጋራት የሚፈልጓቸውን መለያዎች ይምረጡ። አሁንም በሚገናኙበት ወቅት ማንኛቸውም የመለያዎቹ መዳረሻ መፍቀድ አለብዎት።"</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"የቀሩ መክተቻዎች፦"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"የመተግበሪያ አዶ"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"የብሉቱዝ የመልዕክት ማጋሪያ ቅንብሮች"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"መለያን መምረጥ አይቻልም። 0 መክተቻዎች ይቀራሉ"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"የብሉቱዝ ኦዲዮ ተገናኝቷል"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"የብሉቱዝ ኦዲዮ ግንኙነት ተቋርጧል"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"የብሉቱዝ ኦዲዮ"</string>
 </resources>
diff --git a/res/values-am/strings_pbap_client.xml b/res/values-am/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-am/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 2953f37d9..87481ccd0 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -131,9 +131,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"محو"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"حفظ"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"إلغاء"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"حدد الحسابات التي تريد مشاركتها عبر بلوتوث. لا يزال يتعين عليك قبول أي دخول إلى الحسابات أثناء الاتصال."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"حدد الحسابات التي تريد مشاركتها عبر البلوتوث. لا يزال يتعين عليك قبول أي دخول إلى الحسابات أثناء الاتصال."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"المنافذ المتبقية:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"رمز التطبيق"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"إعدادات مشاركة الرسائل عبر بلوتوث"</string>
-    <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"يتعذر تحديد الحساب. عدد المنافذ المتبقية: 0"</string>
+    <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"يتعذر تحديد الحساب. عدد المنافذ المتبقية: ۰"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"تم الاتصال بالبث الصوتي عبر البلوتوث."</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"انقطع الاتصال بالبث الصوتي عبر البلوتوث."</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"بث صوتي عبر البلوتوث"</string>
 </resources>
diff --git a/res/values-ar/strings_pbap_client.xml b/res/values-ar/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-ar/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 72d09ed96..c789e84da 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Silin"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Yadda saxlayın"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Ləğv edin"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Bluetooth vasitəsilə bölüşmək istəyirəm hesabı seçin. Siz hələ birləşdirən zaman hesablarına hər hansı bir acceess qəbul etmək lazımdır."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Bluetooth vasitəsilə paylaşmaq istədiyiniz hesabları seçin. Qoşulma zamanı hesablara olan istənilən girişi qəbul etməlisiniz."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Qalmış slotlar:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Tətbiq ikonası"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth Mesaj Paylaşma Ayarları"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Hesab seçmək olmur. 0 slot qalıb"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth audio bağlantısı yaradıldı"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth audio ilə bağlantı kəsildi"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth audio"</string>
 </resources>
diff --git a/res/values-az-rAZ/strings_pbap_client.xml b/res/values-az-rAZ/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-az-rAZ/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index c8c892ca3..b22dae610 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Изчистване"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Запазване"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Отказ"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Изберете профилите, които искате да споделите през Bluetooth. Пак трябва да приемете достъпа до тях при свързване."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Изберете профилите, които искате да споделите през Bluetooth. Пак трябва да приемете достъпа до тях при свързване."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Оставащи слотове:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Икона на приложението"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Настройки за споделяне на съобщения през Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Не може да се избере профил. Остават 0 слота"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Установена е аудиовръзка през Bluetooth"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Аудиовръзката през Bluetooth е прекратена"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Аудио през Bluetooth"</string>
 </resources>
diff --git a/res/values-bg/strings_pbap_client.xml b/res/values-bg/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-bg/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 127cc7efd..218630009 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -18,16 +18,16 @@
     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="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
+    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"শ্বেততালিকাভুক্ত ব্লুটুথ ডিভাইসের অ্যাক্সেস।"</string>
+    <string name="permdesc_bluetoothWhitelist" 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">"আপনি বিমান মোডে Bluetooth ব্যবহার করতে পারবেন না।"</string>
+    <string name="airplane_error_msg" msgid="8698965595254137230">"আপনি বিমান মোডে ব্লুটুথ ব্যবহার করতে পারবেন না।"</string>
     <string name="bt_enable_title" msgid="8657832550503456572"></string>
-    <string name="bt_enable_line1" msgid="7203551583048149">"Bluetooth পরিষেবাগুলি ব্যবহার করার জন্য আপনাকে অবশ্যই প্রথমে Bluetooth চালু করতে হবে।"</string>
-    <string name="bt_enable_line2" msgid="4341936569415937994">"এখন Bluetooth চালু করবেন?"</string>
+    <string name="bt_enable_line1" msgid="7203551583048149">"ব্লুটুথ পরিষেবাগুলি ব্যবহার করার জন্য আপনাকে অবশ্যই প্রথমে ব্লুটুথ চালু করতে হবে।"</string>
+    <string name="bt_enable_line2" msgid="4341936569415937994">"এখন ব্লুটুথ চালু করবেন?"</string>
     <string name="bt_enable_cancel" msgid="1988832367505151727">"বাতিল করুন"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"চালু করুন"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"ফাইল স্থানান্তর"</string>
@@ -38,13 +38,13 @@
     <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">"Bluetooth share: <xliff:g id="FILE">%1$s</xliff:g> প্রাপ্ত করা হচ্ছে"</string>
-    <string name="notification_received" msgid="3324588019186687985">"Bluetooth share: <xliff:g id="FILE">%1$s</xliff:g> প্রাপ্ত করা হয়েছে"</string>
-    <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth share: <xliff:g id="FILE">%1$s</xliff:g> ফাইল প্রাপ্ত করা হয়নি"</string>
-    <string name="notification_sending" msgid="3035748958534983833">"Bluetooth share: <xliff:g id="FILE">%1$s</xliff:g> পাঠানো হচ্ছে"</string>
-    <string name="notification_sent" msgid="9218710861333027778">"Bluetooth share: <xliff:g id="FILE">%1$s</xliff:g> পাঠানো হয়েছে"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"ব্লুটুথ share: <xliff:g id="FILE">%1$s</xliff:g> প্রাপ্ত করা হচ্ছে"</string>
+    <string name="notification_received" msgid="3324588019186687985">"ব্লুটুথ share: <xliff:g id="FILE">%1$s</xliff:g> প্রাপ্ত করা হয়েছে"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"ব্লুটুথ share: <xliff:g id="FILE">%1$s</xliff:g> ফাইল প্রাপ্ত করা হয়নি"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"ব্লুটুথ share: <xliff:g id="FILE">%1$s</xliff:g> পাঠানো হচ্ছে"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"ব্লুটুথ share: <xliff:g id="FILE">%1$s</xliff:g> পাঠানো হয়েছে"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"১০০% সম্পূর্ণ"</string>
-    <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth share: <xliff:g id="FILE">%1$s</xliff:g> ফাইল পাঠানো হয়নি"</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"ব্লুটুথ share: <xliff:g id="FILE">%1$s</xliff:g> ফাইল পাঠানো হয়নি"</string>
     <string name="download_title" msgid="3353228219772092586">"ফাইল স্থানান্তর"</string>
     <string name="download_line1" msgid="4926604799202134144">"প্রেরক: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
     <string name="download_line2" msgid="5876973543019417712">"ফাইল: <xliff:g id="FILE">%1$s</xliff:g>"</string>
@@ -77,7 +77,7 @@
     <string name="not_exist_file" msgid="3489434189599716133">"কোনো ফাইল নেই"</string>
     <string name="not_exist_file_desc" msgid="4059531573790529229">"ফাইলটির অস্তিত্ব নেই। \n"</string>
     <string name="enabling_progress_title" msgid="436157952334723406">"দয়া করে অপেক্ষা করুন..."</string>
-    <string name="enabling_progress_content" msgid="4601542238119927904">"Bluetooth চালু করা হচ্ছে..."</string>
+    <string name="enabling_progress_content" msgid="4601542238119927904">"ব্লুটুথ চালু করা হচ্ছে..."</string>
     <string name="bt_toast_1" msgid="972182708034353383">"ফাইল প্রাপ্ত করা হবে। বিজ্ঞপ্তি প্যানেলে প্রগতি চেক করুন।"</string>
     <string name="bt_toast_2" msgid="8602553334099066582">"ফাইল প্রাপ্ত করা যাবে না।"</string>
     <string name="bt_toast_3" msgid="6707884165086862518">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" এর থেকে ফাইল পাওয়া বন্ধ করা হয়েছে"</string>
@@ -100,15 +100,15 @@
     <string name="status_connection_error" msgid="947681831523219891">"সংযোগ অসফল।"</string>
     <string name="status_protocol_error" msgid="3245444473429269539">"অনুরোধ সঠিকভাবে পরিচালনা করা যাবে না।"</string>
     <string name="status_unknown_error" msgid="8156660554237824912">"অজানা ত্রুটি৷"</string>
-    <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth প্রাপ্তি"</string>
+    <string name="btopp_live_folder" msgid="7967791481444474554">"ব্লুটুথ প্রাপ্তি"</string>
     <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> প্রাপ্ত করা সম্পূর্ণ।"</string>
     <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> পাঠানো সম্পূর্ণ।"</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"অন্তরমূখী স্থানান্তরগুলি"</string>
     <string name="outbound_history_title" msgid="4279418703178140526">"বহির্গামী স্থানান্তরগুলি"</string>
     <string name="no_transfers" msgid="3482965619151865672">"স্থানান্তরের ইতিহাস খালি।"</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"তালিকা থেকে সমস্ত আইটেম সাফ করা হবে।"</string>
-    <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth share: পাঠানো ফাইলগুলি"</string>
-    <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth share: প্রাপ্ত করা ফাইলগুলি"</string>
+    <string name="outbound_noti_title" msgid="8051906709452260849">"ব্লুটুথ share: পাঠানো ফাইলগুলি"</string>
+    <string name="inbound_noti_title" msgid="4143352641953027595">"ব্লুটুথ share: প্রাপ্ত করা ফাইলগুলি"</string>
     <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
       <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g>টি অসফল হয়েছে৷</item>
       <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g>টি অসফল হয়েছে৷</item>
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"সাফ করুন"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"সংরক্ষণ করুন"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"বাতিল করুন"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"আপনি Bluetooth এর মাধ্যমে যেই অ্যাকাউন্টগুলি ভাগ করতে চান সেগুলি নির্বাচন করুন। সংযোগের সময়ে আপনাকে এখনও পর্যন্ত অ্যাকাউন্টের যে কোনো অ্যাক্সেস গ্রহণ করতে হবে।"</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"আপনি ব্লুটুথ এর মাধ্যমে যে অ্যাকাউন্টগুলি শেয়ার করতে চান সেগুলি নির্বাচন করুন। সংযোগের সময়ে আপনাকে এখনো অ্যাকাউন্টের যে কোনো অ্যাক্সেস গ্রহণ করতে হবে।"</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"যে স্লটগুলি বাকি আছে:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"অ্যাপ্লিকেশান আইকন"</string>
-    <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth মারফত বার্তা ভাগ করার সেটিংস"</string>
+    <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"ব্লুটুথ মারফত বার্তা শেয়ার করার সেটিংস"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"অ্যাকাউন্ট নির্বাচন করা যাচ্ছে না। ০টি স্লট বাকি আছে"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"ব্লুটুথ অডিও সংযুক্ত হয়েছে"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"ব্লুটুথ অডিওর সংযোগ বিচ্ছিন্ন হয়েছে"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"ব্লুটুথ অডিও"</string>
 </resources>
diff --git a/res/values-bn-rBD/strings_pbap.xml b/res/values-bn-rBD/strings_pbap.xml
index 3b3a06171..741173313 100644
--- a/res/values-bn-rBD/strings_pbap.xml
+++ b/res/values-bn-rBD/strings_pbap.xml
@@ -2,7 +2,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"%1$s এর জন্য সেশন কী টাইপ করুন"</string>
-    <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Bluetooth সেশন কী প্রয়োজন"</string>
+    <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"ব্লুটুথ সেশন কী প্রয়োজন"</string>
     <string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"%1$s এর মাধ্যমে সংযোগ স্বীকার করার সময় অতিবাহিত হয়ে গেছে"</string>
     <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"%1$s এর মাধ্যেমে সেশন কী ইনপুট করার সময় অতিবাহিত হয়ে গেছে"</string>
     <string name="auth_notif_ticker" msgid="1575825798053163744">"Obex প্রমাণীকরণ অনুরোধ"</string>
diff --git a/res/values-bn-rBD/strings_pbap_client.xml b/res/values-bn-rBD/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-bn-rBD/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-bn-rBD/strings_sap.xml b/res/values-bn-rBD/strings_sap.xml
index 274998f17..23def2a6e 100644
--- a/res/values-bn-rBD/strings_sap.xml
+++ b/res/values-bn-rBD/strings_sap.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="bluetooth_sap_notif_title" msgid="6877860822993195074">"Bluetooth SIM -এ অ্যাক্সেস করুন"</string>
-    <string name="bluetooth_sap_notif_ticker" msgid="6807778527893726699">"Bluetooth SIM -এ অ্যাক্সেস করুন"</string>
+    <string name="bluetooth_sap_notif_title" msgid="6877860822993195074">"ব্লুটুথ SIM -এ অ্যাক্সেস করুন"</string>
+    <string name="bluetooth_sap_notif_ticker" msgid="6807778527893726699">"ব্লুটুথ SIM -এ অ্যাক্সেস করুন"</string>
     <string name="bluetooth_sap_notif_message" msgid="7138657801087500690">"ক্লায়েন্ট সংযোগ বিচ্ছিন্ন করার অনুরোধ জানাবেন?"</string>
     <string name="bluetooth_sap_notif_disconnecting" msgid="819150843490233288">"সংযোগ বিচ্ছিন্ন করতে ক্লায়েন্টের জন্য অপেক্ষা করা"</string>
     <string name="bluetooth_sap_notif_disconnect_button" msgid="3678476872583356919">"সংযোগ বিচ্ছিন্ন করুন"</string>
diff --git a/res/values-bn-rBD/test_strings.xml b/res/values-bn-rBD/test_strings.xml
index 1e9145f5b..46b34708f 100644
--- a/res/values-bn-rBD/test_strings.xml
+++ b/res/values-bn-rBD/test_strings.xml
@@ -2,7 +2,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="hello" msgid="1740533743008967039">"হ্যালো ওয়ার্ল্ড, TestActivity"</string>
-    <string name="app_name" msgid="1203877025577761792">"Bluetooth ভাগ করা"</string>
+    <string name="app_name" msgid="1203877025577761792">"ব্লুটুথ শেয়ার করা"</string>
     <string name="insert_record" msgid="1450997173838378132">"রেকর্ড ঢোকান"</string>
     <string name="update_record" msgid="2480425402384910635">"রেকর্ড নিশ্চিত করুন"</string>
     <string name="ack_record" msgid="6716152390978472184">"Ack রেকর্ড"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2e3f9dc24..1e28bedea 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -27,7 +27,7 @@
     <string name="airplane_error_msg" msgid="8698965595254137230">"No pots utilitzar Bluetooth en mode d\'avió."</string>
     <string name="bt_enable_title" msgid="8657832550503456572"></string>
     <string name="bt_enable_line1" msgid="7203551583048149">"Per utilitzar serveis Bluetooth, primer cal que activeu el Bluetooth."</string>
-    <string name="bt_enable_line2" msgid="4341936569415937994">"Voleu activar el Bluetooth ara?"</string>
+    <string name="bt_enable_line2" msgid="4341936569415937994">"Vols activar el Bluetooth ara?"</string>
     <string name="bt_enable_cancel" msgid="1988832367505151727">"Cancel·la"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Activa"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Transferència del fitxer"</string>
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Esborra"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Desa"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Cancel·la"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Selecciona els comptes que vulguis compartir mitjançant el Bluetooth. Cal que acceptis l\'accés als comptes en connectar-t\'hi."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Selecciona els comptes que vulguis compartir mitjançant el Bluetooth. Cal que acceptis l\'accés als comptes en connectar-t\'hi."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Espais que queden:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Icona d\'aplicació"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Configuració per compartir missatges mitjançant el Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"No es pot seleccionar el compte. No queda cap espai."</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Àudio per Bluetooth connectat"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Àudio per Bluetooth desconnectat"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Àudio per Bluetooth"</string>
 </resources>
diff --git a/res/values-ca/strings_pbap_client.xml b/res/values-ca/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-ca/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b4039ff5d..d2bd789a9 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -127,9 +127,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Vymazat"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Uložit"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Zrušit"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Vyberte účty, které chcete sdílet prostřednictvím rozhraní Bluetooth. Při připojování bude třeba přístup k účtům i nadále schvalovat."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Vyberte účty, které chcete sdílet prostřednictvím rozhraní Bluetooth. Při připojování budete přístup k účtům muset i nadále schválit."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Zbývající sloty:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Ikona aplikace"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Nastavení sdílení zpráv přes Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Účet nelze vybrat. Nezbývají žádné sloty."</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth Audio – připojeno"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth Audio – odpojeno"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth Audio"</string>
 </resources>
diff --git a/res/values-cs/strings_pbap_client.xml b/res/values-cs/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-cs/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 3ceb351e6..9183b8469 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Ryd"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Gem"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Annuller"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Vælg de konti, du vil dele via Bluetooth. Du skal stadig acceptere adgang til kontiene, når du opretter forbindelse."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Vælg de konti, du vil dele via Bluetooth. Du skal stadig acceptere adgang til kontiene, når du opretter forbindelse."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Pladser tilbage:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Appens ikon"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Indstillinger for beskeddeling via Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Kontoen kan ikke vælges. Der er ikke flere pladser tilbage"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth-lyden blev tilsluttet"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth-lyden blev afbrudt"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth-lyd"</string>
 </resources>
diff --git a/res/values-da/strings_pbap_client.xml b/res/values-da/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-da/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0c17ab074..3507df22c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Löschen"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Speichern"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Abbrechen"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Wähle die Konten aus, die du über Bluetooth freigeben möchtest. Du musst jedoch weiterhin jedem Zugriff auf die Konten zustimmen, wenn eine Verbindung hergestellt wird."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Wähle die Konten aus, die du über Bluetooth freigeben möchtest. Du musst jedoch weiterhin jedem Zugriff auf die Konten zustimmen, wenn eine Verbindung hergestellt wird."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Plätze frei:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"App-Symbol"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Einstellungen zur Bluetooth-Nachrichtenfreigabe"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Konto kann nicht ausgewählt werden. 0 Plätze frei."</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth-Audio verbunden"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth-Audio-Verbindung aufgehoben"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth-Audio"</string>
 </resources>
diff --git a/res/values-de/strings_pbap_client.xml b/res/values-de/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-de/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 935b61b24..b0c0476e3 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -94,8 +94,8 @@
     <string name="status_not_accept" msgid="1695082417193780738">"Το περιεχόμενο δεν υποστηρίζεται."</string>
     <string name="status_forbidden" msgid="613956401054050725">"Δεν επιτρέπεται αυτή η μεταφορά από τη συσκευή προορισμού."</string>
     <string name="status_canceled" msgid="6664490318773098285">"Η μεταφορά ακυρώθηκε από τον χρήστη."</string>
-    <string name="status_file_error" msgid="3671917770630165299">"Πρόβλημα χώρου αποθήκευσης."</string>
-    <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Δεν υπάρχει χώρος αποθήκευσης USB."</string>
+    <string name="status_file_error" msgid="3671917770630165299">"Πρόβλημα αποθηκευτικού χώρου."</string>
+    <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Δεν υπάρχει αποθηκευτικός χώρος USB."</string>
     <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Δεν υπάρχει κάρτα SD card. Εισαγάγετε μια κάρτα SD για να αποθηκεύετε τα μεταφερόμενα αρχεία."</string>
     <string name="status_connection_error" msgid="947681831523219891">"Η σύνδεση δεν ήταν επιτυχής."</string>
     <string name="status_protocol_error" msgid="3245444473429269539">"Δεν μπορεί να γίνει σωστός χειρισμός του αιτήματος."</string>
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Διαγραφή"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Αποθήκευση"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Ακύρωση"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Επιλέξτε τους λογαριασμούς που θέλετε να μοιραστείτε μέσω Bluetooth. Θα πρέπει ακόμη να αποδεχτείτε τυχόν αιτήματα πρόσβασης στους λογαριασμούς κατά τη σύνδεση."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Επιλέξτε τους λογαριασμούς που θέλετε να μοιραστείτε μέσω Bluetooth. Θα πρέπει ακόμη να αποδεχτείτε τυχόν αιτήματα πρόσβασης στους λογαριασμούς κατά τη σύνδεση."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Υποδοχές που απομένουν:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Εικονίδιο εφαρμογής"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Ρυθμίσεις κοινής χρήσης μηνυμάτων μέσω Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Δεν είναι δυνατή η επιλογή λογαριασμού. Απομένουν 0 υποδοχές"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Ο ήχος Bluetooth συνδέθηκε"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Ο ήχος Bluetooth αποσυνδέθηκε"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Ήχος Bluetooth"</string>
 </resources>
diff --git a/res/values-el/strings_pbap_client.xml b/res/values-el/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-el/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 5040458f8..8f2ab1b1a 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Clear"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Save"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Cancel"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Select the accounts that you want to share through Bluetooth. You still have to accept any access to the accounts when connecting."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Select the accounts that you want to share through Bluetooth. You still have to accept any access to the accounts when connecting."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Slots left:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Application Icon"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth Message Sharing Settings"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Cannot select account. 0 slots left"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth audio connected"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth audio disconnected"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth Audio"</string>
 </resources>
diff --git a/res/values-en-rAU/strings_pbap_client.xml b/res/values-en-rAU/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-en-rAU/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 5040458f8..8f2ab1b1a 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Clear"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Save"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Cancel"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Select the accounts that you want to share through Bluetooth. You still have to accept any access to the accounts when connecting."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Select the accounts that you want to share through Bluetooth. You still have to accept any access to the accounts when connecting."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Slots left:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Application Icon"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth Message Sharing Settings"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Cannot select account. 0 slots left"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth audio connected"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth audio disconnected"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth Audio"</string>
 </resources>
diff --git a/res/values-en-rGB/strings_pbap_client.xml b/res/values-en-rGB/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-en-rGB/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 5040458f8..8f2ab1b1a 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Clear"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Save"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Cancel"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Select the accounts that you want to share through Bluetooth. You still have to accept any access to the accounts when connecting."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Select the accounts that you want to share through Bluetooth. You still have to accept any access to the accounts when connecting."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Slots left:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Application Icon"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth Message Sharing Settings"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Cannot select account. 0 slots left"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth audio connected"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth audio disconnected"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth Audio"</string>
 </resources>
diff --git a/res/values-en-rIN/strings_pbap_client.xml b/res/values-en-rIN/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-en-rIN/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 3739eca88..87615939e 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Eliminar"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Guardar"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Cancelar"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Selecciona las cuentas que deseas compartir a través de Bluetooth. Al conectarte, tendrás que aceptar cualquier acceso a las cuentas."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Selecciona las cuentas que deseas compartir mediante Bluetooth. Al conectarte, tendrás que aceptar cualquier acceso a las cuentas."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Espacios restantes:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Ícono de la aplicación"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Configuración de mensajes compartidos por Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"No puedes seleccionar la cuenta. No quedan espacios."</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Audio Bluetooth conectado"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Audio Bluetooth desconectado"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Audio Bluetooth"</string>
 </resources>
diff --git a/res/values-es-rUS/strings_pbap_client.xml b/res/values-es-rUS/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-es-rUS/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5a1f068ef..b2fe75085 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Borrar"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Guardar"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Cancelar"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Selecciona las cuentas que quieras compartir por Bluetooth. Tendrás que aceptar cualquier acceso a las cuentas al establecer conexión."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Selecciona las cuentas que quieras compartir por Bluetooth. Tendrás que aceptar cualquier acceso a las cuentas al establecer conexión."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Ranuras libres:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Icono de aplicación"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Ajustes de mensajes compartidos por Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"No se puede seleccionar la cuenta. No quedan ranuras"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Audio por Bluetooth conectado"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Audio por Bluetooth desconectado"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Audio por Bluetooth"</string>
 </resources>
diff --git a/res/values-es/strings_pbap_client.xml b/res/values-es/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-es/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 103d70638..47290d8f2 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Kustuta"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Salvesta"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Tühista"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Valige kontod, mida soovite Bluetoothi kaudu jagada. Ühendamisel peate ikka lubama mis tahes juurdepääsu kontodele."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Valige kontod, mida soovite Bluetoothi kaudu jagada. Ühendamisel peate ikka lubama mis tahes juurdepääsu kontodele."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Järelejäänud vabu kohti:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Rakenduse ikoon"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetoothi sõnumi jagamise seaded"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Kontot ei saa valida. Pole ühtegi vaba kohta"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetoothi heli on ühendatud"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetoothi heli ühendus on katkestatud"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetoothi heli"</string>
 </resources>
diff --git a/res/values-et-rEE/strings_pbap_client.xml b/res/values-et-rEE/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-et-rEE/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index ecba58cf7..21ab851f7 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -38,13 +38,13 @@
     <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" igorlearen sarrerako fitxategia onartzeko denbora-muga gainditu da"</string>
     <string name="incoming_file_confirm_Notification_title" msgid="5573329005298936903">"Sarrerako fitxategia"</string>
     <string name="incoming_file_confirm_Notification_content" msgid="3359694069319644738">"<xliff:g id="SENDER">%1$s</xliff:g> prest dago <xliff:g id="FILE">%2$s</xliff:g> bidaltzeko"</string>
-    <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth bidezko partekatzea: <xliff:g id="FILE">%1$s</xliff:g> fitxategia jasotzen"</string>
-    <string name="notification_received" msgid="3324588019186687985">"Bluetooth bidezko partekatzea: <xliff:g id="FILE">%1$s</xliff:g> fitxategia jaso da"</string>
-    <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth bidezko partekatzea: ez da <xliff:g id="FILE">%1$s</xliff:g> fitxategia jaso"</string>
-    <string name="notification_sending" msgid="3035748958534983833">"Bluetooth bidezko partekatzea: <xliff:g id="FILE">%1$s</xliff:g> fitxategia bidaltzen"</string>
-    <string name="notification_sent" msgid="9218710861333027778">"Bluetooth bidezko partekatzea: <xliff:g id="FILE">%1$s</xliff:g> fitxategia bidali da"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth bidez partekatzea: <xliff:g id="FILE">%1$s</xliff:g> fitxategia jasotzen"</string>
+    <string name="notification_received" msgid="3324588019186687985">"Bluetooth bidez partekatzea: <xliff:g id="FILE">%1$s</xliff:g> fitxategia jaso da"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth bidez partekatzea: ez da jaso <xliff:g id="FILE">%1$s</xliff:g> fitxategia"</string>
+    <string name="notification_sending" msgid="3035748958534983833">"Bluetooth bidez partekatzea: <xliff:g id="FILE">%1$s</xliff:g> fitxategia bidaltzen"</string>
+    <string name="notification_sent" msgid="9218710861333027778">"Bluetooth bidez partekatzea: <xliff:g id="FILE">%1$s</xliff:g> fitxategia bidali da"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"% 100ean osatuta"</string>
-    <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth bidezko partekatzea: ez da <xliff:g id="FILE">%1$s</xliff:g> fitxategia bidali"</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth bidez partekatzea: ez da bidali <xliff:g id="FILE">%1$s</xliff:g> fitxategia"</string>
     <string name="download_title" msgid="3353228219772092586">"Fitxategi-transferentzia"</string>
     <string name="download_line1" msgid="4926604799202134144">"Igorlea: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
     <string name="download_line2" msgid="5876973543019417712">"Fitxategia: <xliff:g id="FILE">%1$s</xliff:g>"</string>
@@ -107,8 +107,8 @@
     <string name="outbound_history_title" msgid="4279418703178140526">"Irteerako transferentziak"</string>
     <string name="no_transfers" msgid="3482965619151865672">"Transferentzia-historia hutsik dago."</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Elementu guztiak zerrendatik garbituko dira."</string>
-    <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth bidezko partekatzea: fitxategiak bidali dira"</string>
-    <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth bidezko partekatzea: jasotako fitxategiak"</string>
+    <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth bidez partekatzea: fitxategiak bidali dira"</string>
+    <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth bidez partekatzea: fitxategiak jaso dira"</string>
     <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
       <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> hutsegite.</item>
       <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> hutsegite.</item>
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Garbitu"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Gorde"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Utzi"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Hautatu Bluetooth bidez partekatu nahi dituzun kontuak. Konektatzean, kontuetarako sarbidea eman behar duzu."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Hautatu Bluetooth bidez partekatu nahi dituzun kontuak. Konektatzean, berariaz eman beharko duzu kontuetarako sarbidea."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Geratzen diren erretenak:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Aplikazioaren ikonoa"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth bidez mezuak partekatzeko ezarpenak"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Ezin da hautatu kontua. Ez da erretenik geratzen."</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Konektatu da Bluetooth bidezko audioa"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Deskonektatu da Bluetooth bidezko audioa"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth bidezko audioa"</string>
 </resources>
diff --git a/res/values-eu-rES/strings_pbap_client.xml b/res/values-eu-rES/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-eu-rES/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index e07689753..afba73dc5 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_bluetoothWhitelist" msgid="7091552898592306386">"دسترسی دستگاه موجود در فهرست سفید بلوتوث."</string>
+    <string name="permdesc_bluetoothWhitelist" 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>
@@ -99,14 +99,14 @@
     <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"‏هیچ کارت SD موجود نیست. برای ذخیره فایل‌های منتقل شده، یک کارت SD در گوشی قرار دهید."</string>
     <string name="status_connection_error" msgid="947681831523219891">"اتصال ناموفق بود."</string>
     <string name="status_protocol_error" msgid="3245444473429269539">"درخواست به درستی انجام نمی‌شود."</string>
-    <string name="status_unknown_error" msgid="8156660554237824912">"خطای ناشناخته."</string>
+    <string name="status_unknown_error" msgid="8156660554237824912">"خطای ناشناس."</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"بلوتوث دریافت شد"</string>
     <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> دریافت کامل شد."</string>
     <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> ارسال کامل شد."</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"انتقال های ورودی"</string>
     <string name="outbound_history_title" msgid="4279418703178140526">"انتقال های خروجی"</string>
     <string name="no_transfers" msgid="3482965619151865672">"سابقه انتقال خالی است."</string>
-    <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"همهٔ موارد از لیست پاک می‌شوند."</string>
+    <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"همهٔ موارد از فهرست پاک می‌شوند."</string>
     <string name="outbound_noti_title" msgid="8051906709452260849">"اشتراک بلوتوث: فایل‌های ارسال شده"</string>
     <string name="inbound_noti_title" msgid="4143352641953027595">"اشتراک بلوتوث: فایل‌های دریافت شده"</string>
     <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
@@ -117,15 +117,18 @@
       <item quantity="one">‏<xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> مورد موفق، %2$s</item>
       <item quantity="other">‏<xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> مورد موفق، %2$s</item>
     </plurals>
-    <string name="transfer_menu_clear_all" msgid="790017462957873132">"پاک کردن لیست"</string>
+    <string name="transfer_menu_clear_all" msgid="790017462957873132">"پاک کردن فهرست"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"باز کردن"</string>
-    <string name="transfer_menu_clear" msgid="5854038118831427492">"پاک کردن از لیست"</string>
+    <string name="transfer_menu_clear" msgid="5854038118831427492">"پاک کردن از فهرست"</string>
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"پاک کردن"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"ذخیره‌"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"لغو"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"حساب‌هایی را انتخاب کنید که می‌خواهید از طریق بلوتوث به اشتراک بگذارید. هنگام اتصال، همچنان باید با هر گونه دسترسی به حساب‌ها موافقت کنید."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"حساب‌هایی را انتخاب کنید که می‌خواهید از طریق بلوتوث به اشتراک بگذارید. هنگام اتصال، همچنان باید با هر گونه دسترسی به حساب‌ها موافقت کنید."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"شیارهای باقی‌مانده:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"نماد برنامه"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"تنظیمات اشتراک‌گذاری پیام بلوتوث"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"انتخاب حساب امکان‌پذیر نیست. ۰ شیار باقی مانده است"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"بلوتوث صوتی متصل شد"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"ارتباط بلوتوث صوتی قطع شد"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"بلوتوث‌ صوتی"</string>
 </resources>
diff --git a/res/values-fa/strings_pbap.xml b/res/values-fa/strings_pbap.xml
index bc68a8924..0667ebbee 100644
--- a/res/values-fa/strings_pbap.xml
+++ b/res/values-fa/strings_pbap.xml
@@ -5,7 +5,7 @@
     <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"به کلید جلسه بلوتوث نیاز است"</string>
     <string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"‏هنگام پذیرش اتصال به %1$s وقفه زمانی ایجاد شده است"</string>
     <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"‏هنگام ورود کلید جلسه با %1$s وقفه زمانی ایجاد شده است"</string>
-    <string name="auth_notif_ticker" msgid="1575825798053163744">"‏درخواست تأیید اعتبار Obex"</string>
+    <string name="auth_notif_ticker" msgid="1575825798053163744">"‏درخواست احراز هویت Obex"</string>
     <string name="auth_notif_title" msgid="7599854855681573258">"کلید جلسه"</string>
     <string name="auth_notif_message" msgid="6667218116427605038">"‏تایپ کلید جلسه برای %1$s"</string>
     <string name="defaultname" msgid="4821590500649090078">"کیت خودرو"</string>
diff --git a/res/values-fa/strings_pbap_client.xml b/res/values-fa/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-fa/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 1279bfd57..9db0a9d93 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Poista"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Tallenna"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Peruuta"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Valitse, mitkä tilit haluat jakaa Bluetoothin kautta. Tilien käyttöoikeus pitää silti hyväksyä yhdistettäessä."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Valitse tilit, jotka haluat jakaa Bluetoothin kautta. Tilien käyttöoikeus pitää silti hyväksyä yhdistettäessä."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Paikkoja jäljellä:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Sovelluskuvake"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetoothin viestinjakoasetukset"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Tilin valinta epäonnistui. 0 paikkaa jäljellä"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth-ääni liitetty"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth-ääni katkaistu"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth-ääni"</string>
 </resources>
diff --git a/res/values-fi/strings_pbap_client.xml b/res/values-fi/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-fi/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index a71e73c9c..c17b6be1b 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Effacer"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Enregistrer"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Annuler"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Sélectionnez les comptes que vous souhaitez partager par Bluetooth. Vous devez toujours accepter l\'accès à ces comptes lors de la connexion."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Sélectionnez les comptes que vous souhaitez partager par Bluetooth. Vous devez toujours accepter l\'accès à ces comptes lors de la connexion."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Espaces libres :"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Icône de l\'application"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Paramètres de partage des messages par Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Impossible de sélectionner le compte : aucun espace libre."</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Audio Bluetooth connecté"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Audio Bluetooth déconnecté"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Audio Bluetooth"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings_pbap_client.xml b/res/values-fr-rCA/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-fr-rCA/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c58c4d72e..c8f408480 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Effacer"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Enregistrer"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Annuler"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Sélectionnez les comptes que vous voulez partager via le Bluetooth. Vous devez toujours accepter l\'accès à ces comptes lors de la connexion."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Sélectionnez les comptes que vous voulez partager via le Bluetooth. Vous devez toujours accepter l\'accès à ces comptes lors de la connexion."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Espaces libres :"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Icône de l\'application"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Paramètres de partage de la messagerie via le Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Impossible de sélectionner le compte : aucun espace libre."</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Audio Bluetooth connecté"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Audio Bluetooth déconnecté"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Audio Bluetooth"</string>
 </resources>
diff --git a/res/values-fr/strings_pbap_client.xml b/res/values-fr/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-fr/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 5cb579eb9..e836678ab 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Borrar"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Gardar"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Cancelar"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Selecciona as contas que queres compartir a través de Bluetooth. Tes que aceptar o acceso ás contas cando te conectes."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Selecciona as contas que queres compartir a través de Bluetooth. Aínda así, tes que aceptar o acceso ás contas cando te conectes."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Rañuras restantes:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Icona da aplicación"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Configuración de mensaxes compartidas por Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Non se pode seleccionar a conta. Quedan 0 rañuras"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Conectouse o audio por Bluetooth"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Desconectouse o audio por Bluetooth"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Audio por Bluetooth"</string>
 </resources>
diff --git a/res/values-gl-rES/strings_pbap_client.xml b/res/values-gl-rES/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-gl-rES/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 8ec1a53cf..a7d3c017a 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -34,7 +34,7 @@
     <string name="incoming_file_confirm_content" msgid="2752605552743148036">"આવનારી ફાઇલ સ્વીકારીએ?"</string>
     <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_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_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>
@@ -59,21 +59,21 @@
     <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>
     <string name="upload_line3" msgid="4920689672457037437">"ફાઇલ પ્રકાર: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"ફાઇલ મોકલી રહ્યું છે…"</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"ફાઇલ મોકલી"</string>
-    <string name="upload_succ_ok" msgid="7705428476405478828">"ઑકે"</string>
+    <string name="upload_succ_ok" msgid="7705428476405478828">"ઓકે"</string>
     <string name="upload_fail_line1" msgid="7899394672421491701">"ફાઇલ \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" ને મોકલાઈ નહોતી."</string>
     <string name="upload_fail_line1_2" msgid="2108129204050841798">"ફાઇલ: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"ફરી પ્રયાસ કરો"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"બંધ કરો"</string>
-    <string name="bt_error_btn_ok" msgid="5965151173011534240">"ઑકે"</string>
+    <string name="bt_error_btn_ok" msgid="5965151173011534240">"ઓકે"</string>
     <string name="unknown_file" msgid="6092727753965095366">"અજાણી ફાઇલ"</string>
-    <string name="unknown_file_desc" msgid="480434281415453287">"આ પ્રકારની ફાઇલ હેન્ડલ કરવા માટે કોઈ એપ્લિકેશન નથી. \n"</string>
+    <string name="unknown_file_desc" msgid="480434281415453287">"આ પ્રકારની ફાઇલ હેન્ડલ કરવા માટે કોઈ ઍપ્લિકેશન નથી. \n"</string>
     <string name="not_exist_file" msgid="3489434189599716133">"કોઈ ફાઇલ નથી"</string>
     <string name="not_exist_file_desc" msgid="4059531573790529229">"આ ફાઇલ અસ્તિત્વમાં નથી. \n"</string>
     <string name="enabling_progress_title" msgid="436157952334723406">"કૃપા કરીને રાહ જુઓ..."</string>
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"સાફ કરો"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"સાચવો"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"રદ કરો"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"તમે Bluetooth મારફતે શેર કરવા માગતા હો તે એકાઉન્ટ્સ પસંદ કરો. તમારે હજી પણ કનેક્ટ કરતી વખતે એકાઉન્ટ્સ પરની કોઈપણ અ‍ૅક્સેસ સ્વીકારવી પડશે."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"તમે Bluetooth મારફતે શેર કરવા માગતા હો તે એકાઉન્ટ્સ પસંદ કરો. તમારે હજી પણ કનેક્ટ કરતી વખતે એકાઉન્ટ્સ પરની કોઈપણ અ‍ૅક્સેસ સ્વીકારવી પડશે."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"સ્લોટ્સ બાકી:"</string>
-    <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"એપ્લિકેશન આયકન"</string>
+    <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"ઍપ્લિકેશન આયકન"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth સંદેશ શેરિંગ સેટિંગ્સ"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"એકાઉન્ટ પસંદ કરી શકાતું નથી. 0 સ્લોટ્સ બાકી"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth ઑડિઓ કનેક્ટ થયું"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth ઑડિઓ ડિસ્કનેક્ટ થયું"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth ઑડિઓ"</string>
 </resources>
diff --git a/res/values-gu-rIN/strings_pbap_client.xml b/res/values-gu-rIN/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-gu-rIN/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-gu-rIN/test_strings.xml b/res/values-gu-rIN/test_strings.xml
index 7ca72cca6..63d58cc58 100644
--- a/res/values-gu-rIN/test_strings.xml
+++ b/res/values-gu-rIN/test_strings.xml
@@ -7,7 +7,7 @@
     <string name="update_record" msgid="2480425402384910635">"રેકોર્ડની પુષ્ટિ કરો"</string>
     <string name="ack_record" msgid="6716152390978472184">"Ack રેકોર્ડ"</string>
     <string name="deleteAll_record" msgid="4383349788485210582">"તમામ રેકોર્ડ કાઢી નાખો"</string>
-    <string name="ok_button" msgid="6519033415223065454">"ઑકે"</string>
+    <string name="ok_button" msgid="6519033415223065454">"ઓકે"</string>
     <string name="delete_record" msgid="4645040331967533724">"રેકોર્ડ કાઢી નાખો"</string>
     <string name="start_server" msgid="9034821924409165795">"TCP સર્વર પ્રારંભ કરો"</string>
     <string name="notify_server" msgid="4369106744022969655">"TCP સર્વરને સૂચિત કરો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 587d534d7..40d16b73b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"साफ़ करें"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"सहेजें"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"अभी नहीं"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"वे खाते चुनें जिन्हें आप ब्लूटूथ के द्वारा साझा करना चाहते हैं. आपको अभी भी कनेक्ट करते समय खातों की सभी ऐक्सेस को स्वीकार करना होगा."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"वे खाते चुनें जिन्हें आप ब्लूटूथ के माध्यम से साझा करना चाहते हैं. आपको अभी भी कनेक्ट करते समय खातों के किसी भी एक्सेस को स्वीकार करना होगा."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"शेष स्लॉट:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"ऐप्लिकेशन आइकन"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"ब्लूटूथ संदेश साझाकरण सेटिंग"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"खाता नहीं चुना जा सकता. 0 स्लॉट शेष"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"ब्लूटूथ ऑडियो कनेक्ट किया गया"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"ब्लूटूथ ऑडियो डिस्कनेक्ट किया गया"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"ब्लूटूथ ऑडियो"</string>
 </resources>
diff --git a/res/values-hi/strings_pbap_client.xml b/res/values-hi/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-hi/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 4c7ebc3c2..a8d06a09b 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -125,9 +125,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Brisanje"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Spremi"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Odustani"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Odaberite račune koje želite dijeliti putem Bluetootha. I dalje morate prihvatiti svako pristupanje računima prilikom povezivanja."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Odaberite račune koje želite dijeliti putem Bluetootha. I dalje morate prihvatiti svako pristupanje računima prilikom povezivanja."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Preostala mjesta:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Ikona aplikacije"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Postavke dijeljenja poruka putem Bluetootha"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Račun nije moguće odabrati. Nema više nijednog mjesta"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth Audio povezan"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Veza Bluetooth Audija prekinuta"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth Audio"</string>
 </resources>
diff --git a/res/values-hr/strings_pbap_client.xml b/res/values-hr/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-hr/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index d9645d91e..1de5e1eb5 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Törlés"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Mentés"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Mégse"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Válassza ki a Bluetooth használatával megosztani kívánt fiókokat. Kapcsolódásnál még mindig el kell fogadnia a fiókokhoz való hozzáférést."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Válassza ki a Bluetooth használatával megosztani kívánt fiókokat. Kapcsolódásnál el kell fogadnia a fiókokhoz való hozzáférést is."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Szabadon maradt helyek száma:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Alkalmazás ikonja"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth-kapcsolaton keresztüli üzenetmegosztás beállításai"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"A fiók kiválasztása sikertelen. 0 hely maradt"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth audió csatlakoztatva"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth audió leválasztva"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth audió"</string>
 </resources>
diff --git a/res/values-hu/strings_pbap_client.xml b/res/values-hu/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-hu/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 06faaeccd..dd1c53d69 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -23,8 +23,8 @@
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</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">"Դուք չեք կարող օգտվել Bluetooth-ից ինքնաթիռային ռեժիմում:"</string>
+    <string name="airplane_error_title" msgid="2683839635115739939">"Ինքնաթիռի ռեժիմ"</string>
+    <string name="airplane_error_msg" msgid="8698965595254137230">"Դուք չեք կարող օգտվել Bluetooth-ից Ինքնաթիռի ռեժիմում:"</string>
     <string name="bt_enable_title" msgid="8657832550503456572"></string>
     <string name="bt_enable_line1" msgid="7203551583048149">"Bluetooth ծառայություններից օգտվելու համար նախ պետք է միացնեք Bluetooth-ը:"</string>
     <string name="bt_enable_line2" msgid="4341936569415937994">"Միացնե՞լ Bluetooth-ը հիմա:"</string>
@@ -50,7 +50,7 @@
     <string name="download_line2" msgid="5876973543019417712">"Ֆայլ՝ <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="download_line3" msgid="4384821622908676061">"Ֆայլի չափը՝ <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
-    <string name="download_line5" msgid="3069560415845295386">"Ֆայլը ստացվում է..."</string>
+    <string name="download_line5" msgid="3069560415845295386">"Ֆայլի ստացում..."</string>
     <string name="download_cancel" msgid="9177305996747500768">"Դադարեցնել"</string>
     <string name="download_ok" msgid="5000360731674466039">"Թաքցնել"</string>
     <string name="incoming_line1" msgid="2127419875681087545">"Ումից"</string>
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Ջնջել"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Պահել"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Չեղարկել"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Ընտրեք հաշիվները, որոնք ցանկանում եք համօգտագործել Bluetooth-ի միջոցով: Ամեն դեպքում, կապակցվելիս պետք է ընդունեք հաշիվներն օգտագործելու թույլտվությունը:"</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Ընտրեք հաշիվները, որոնք ցանկանում եք հասանելի դարձնել Bluetooth-ի միջոցով: Ամեն դեպքում, կապակցվելիս պետք է ընդունեք հաշիվներն օգտագործելու թույլտվությունը:"</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Մնացած տողերի քանակը՝"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Հավելվածի պատկերակը"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Հաղորդագրությունների համօգտագործման Bluetooth-ի կարգավորումներ"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Հնարավոր չէ ընտրել հաշիվը: Տող չի մնացել"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth աուդիոն կապակցված է"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth աուդիոն անջատված է"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth աուդիո"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings_pbap_client.xml b/res/values-hy-rAM/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-hy-rAM/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 8918ea531..4f83aecdd 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Hapus"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Simpan"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Batal"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Pilih akun yang ingin Anda bagikan melalui Bluetooth. Anda harus menerima akses apa pun ke akun saat menyambungkan."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Pilih akun yang ingin Anda bagikan melalui Bluetooth. Anda masih harus menerima akses apa pun ke akun saat menghubungkan."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Sisa Slot:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Ikon Aplikasi"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Setelan Berbagi Pesan Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Tidak dapat memilih akun. Sisa 0 slot"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth audio terhubung"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth audio terputus"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth Audio"</string>
 </resources>
diff --git a/res/values-in/strings_pbap_client.xml b/res/values-in/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-in/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 9a4a3b46c..802e86028 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Hreinsa"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Vista"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Hætta við"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Veldu reikningana sem þú vilt deila í gegnum Bluetooth. Þú þarft samt að samþykkja allan aðgang að reikningunum við tengingu."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Veldu reikningana sem þú vilt deila í gegnum Bluetooth. Þú þarft samt að samþykkja allan aðgang að reikningunum við tengingu."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Hólf eftir:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Forritstákn"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Deilingarstillingar Bluetooth-skilaboða"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Ekki er hægt að velja reikning. Engin hólf eftir"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth-hljóð tengt"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth-hljóð aftengt"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth-hljóð"</string>
 </resources>
diff --git a/res/values-is-rIS/strings_pbap_client.xml b/res/values-is-rIS/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-is-rIS/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d7a2037db..76557fb34 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Cancella"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Salva"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Annulla"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Seleziona gli account che desideri condividere tramite Bluetooth. Devi comunque accettare tutti gli accessi agli account durante la connessione."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Seleziona gli account che desideri condividere tramite Bluetooth. Devi comunque accettare tutti gli accessi agli account durante la connessione."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Slot rimanenti:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Icona applicazione"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Impostazioni di condivisione dei messaggi Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Impossibile selezionare l\'account. Nessuno slot rimanente"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Audio Bluetooth connesso"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Audio Bluetooth disconnesso"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Audio Bluetooth"</string>
 </resources>
diff --git a/res/values-it/strings_pbap_client.xml b/res/values-it/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-it/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 863d43faf..c8fe3bbec 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -127,9 +127,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"נקה"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"שמור"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"בטל"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"‏בחר את חשבונות שברצונך לשתף באמצעות Bluetooth. עדיין יהיה עליך לאשר גישה אל החשבונות בעת החיבור."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"‏בחר בחשבונות שברצונך לשתף באמצעות Bluetooth. עדיין יהיה עליך לאשר גישה אל החשבונות בעת החיבור."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"מקומות נותרים:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"סמל אפליקציה"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"‏הגדרות לשיתוף הודעות ב-Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"לא ניתן לבחור חשבון. נותרו 0 מקומות"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"‏אודיו Bluetooth מחובר"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"‏אודיו Bluetooth מנותק"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"‏אודיו Bluetooth"</string>
 </resources>
diff --git a/res/values-iw/strings_pbap_client.xml b/res/values-iw/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-iw/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3ccd3940b..b735e436a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -21,7 +21,7 @@
     <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Bluetooth端末によるアクセスを許可します。"</string>
     <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Bluetooth端末によるアクセスを一時的に許可して、ユーザーの確認を受けずにその端末からこの端末にファイルを送信することをアプリに許可します。"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
-    <string name="unknown_device" msgid="9221903979877041009">"不明な携帯端末"</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">"機内モードではBluetoothを使用できません。"</string>
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"消去"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"保存"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"キャンセル"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Bluetoothを介して共有するアカウントを選択してください。接続中はアカウントへのアクセスをすべて承認する必要があります。"</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Bluetooth を介して共有するアカウントを選択してください。接続中はアカウントへのアクセスをすべて承認する必要があります。"</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"残りスロット数:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"アプリアイコン"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetoothメッセージ共有の設定"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"アカウントを選択できません。残りスロット数が0です"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth オーディオは接続されています"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth オーディオは接続を解除されています"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth オーディオ"</string>
 </resources>
diff --git a/res/values-ja/strings_pbap_client.xml b/res/values-ja/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-ja/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index f12401a2c..cef7a3382 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"ამოშლა"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"შენახვა"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"გაუქმება"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"აირჩიეთ ანგარიშები, რომელთა გაზიარებაც გსურთ Bluetooth-ის მეშვეობით. ანგარიშებზე ნებისმიერი წვდომის დადასტურება მაინც მოგიწევთ დაკავშირებისას."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"აირჩიეთ ანგარიშები, რომელთა გაზიარებაც Bluetooth-ის მეშვეობით გსურთ. დაკავშირებისას ანგარიშებზე წვდომის დადასტურება მაინც მოგიწევთ."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"დარჩენილი სლოტი:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"აპლიკაციის ხატულა"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth შეტყობინების გაზიარების პარამეტრები"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"ანგარიშის არჩევა ვერ ხერხდება. დარჩენილია 0 სლოტი"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth აუდიო დაკავშირებულია"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth აუდიო გათიშულია"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth აუდიო"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings_pbap_client.xml b/res/values-ka-rGE/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-ka-rGE/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index b6f59fdea..16190538c 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -28,7 +28,7 @@
     <string name="bt_enable_title" msgid="8657832550503456572"></string>
     <string name="bt_enable_line1" msgid="7203551583048149">"Bluetooth қызметтерін қолдану үшін, алдымен Bluetooth байланысын қосу қажет."</string>
     <string name="bt_enable_line2" msgid="4341936569415937994">"Bluetooth байланысы қазір қосылсын ба?"</string>
-    <string name="bt_enable_cancel" msgid="1988832367505151727">"Өшіру"</string>
+    <string name="bt_enable_cancel" msgid="1988832367505151727">"Жабу"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"Қосу"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Файл жіберу"</string>
     <string name="incoming_file_confirm_content" msgid="2752605552743148036">"Кіріс файлды қабылдау керек пе?"</string>
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Өшіру"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Сақтау"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Бас тарту"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Bluetooth арқылы бөлісетін есептік жазбаларды таңдаңыз. Бұл жолы да қосылу кезінде есептік жазбаларға кіру мүмкіндігі болатынын қабылдау керек."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Bluetooth арқылы бөлісетін есептік жазбаларды таңдаңыз. Әлі де қосылу кезінде есептік жазбаларға кез келген қатынасуды қабылдау керек."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Қалған слоттар:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Қолданба белгішесі"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth арқылы хабар бөлісу параметрлері"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Есептік жазбаны таңдау мүмкін емес. 0 слот қалды"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth дыбысы қосылды"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth дыбысы ажыратылды"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth aудиосы"</string>
 </resources>
diff --git a/res/values-kk-rKZ/strings_pbap_client.xml b/res/values-kk-rKZ/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-kk-rKZ/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index e5270d55c..cc0c02e29 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"សម្អាត"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"រក្សាទុក"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"បោះបង់"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"ជ្រើសគណនីដែលអ្នកចង់ចែករំលែកតាមរយៈប៊្លូធូស។ អ្នកនៅតែត្រូវទទួលការចូលដំណើរការទាំងឡាយទៅកាន់គណនីនេះដដែល នៅពេលភ្ជាប់។"</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"ជ្រើសគណនីដែលអ្នកចង់ចែករំលែកតាមរយៈប៊្លូធូស។ អ្នកនៅតែត្រូវទទួលយកលទ្ធភាពចូលដំណើរការទាំងឡាយទៅកាន់គណនីនេះដដែល នៅពេលភ្ជាប់។"</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"រន្ធនៅសល់៖"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"រូបតំណាងកម្មវិធី"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"កំណត់ការចែករំលែកសារតាមប៊្លូធូស"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"មិនអាចជ្រើសគណនីទេ អស់រន្ធនៅសល់ហើយ។"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"សំឡេងប៊្លូធូសត្រូវបានភ្ជាប់"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"សំឡេងប៊្លូធូសត្រូវបានផ្តាច់"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"សំឡេងប៊្លូធូស"</string>
 </resources>
diff --git a/res/values-km-rKH/strings_pbap_client.xml b/res/values-km-rKH/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-km-rKH/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index ef0071d05..19b1189e9 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -21,14 +21,14 @@
     <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"ಶ್ವೇತಪಟ್ಟಿ ಬ್ಲೂಟೂತ್‌ ಸಾಧನವನ್ನು ಪ್ರವೇಶಿಸಿ."</string>
     <string name="permdesc_bluetoothWhitelist" 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="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="bt_enable_title" msgid="8657832550503456572"></string>
     <string name="bt_enable_line1" msgid="7203551583048149">"ಬ್ಲೂಟೂತ್‌ ಸೇವೆಗಳನ್ನು ಬಳಸಲು, ಮೊದಲು ನೀವದನ್ನು ಆನ್‌ ಮಾಡಬೇಕು."</string>
     <string name="bt_enable_line2" msgid="4341936569415937994">"ಇದೀಗ ಬ್ಲೂಟೂತ್‌ ಆನ್‌ ಮಾಡುವುದೇ?"</string>
-    <string name="bt_enable_cancel" msgid="1988832367505151727">"ರದ್ದುಮಾಡು"</string>
+    <string name="bt_enable_cancel" msgid="1988832367505151727">"ರದ್ದುಮಾಡಿ"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"ಆನ್ ಮಾಡು"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"ಫೈಲ್ ವರ್ಗಾವಣೆ"</string>
     <string name="incoming_file_confirm_content" msgid="2752605552743148036">"ಒಳಬರುವ ಫೈಲ್‌ಗಳನ್ನು ಸ್ವೀಕರಿಸುವುದೇ?"</string>
@@ -69,7 +69,7 @@
     <string name="upload_succ_ok" msgid="7705428476405478828">"ಸರಿ"</string>
     <string name="upload_fail_line1" msgid="7899394672421491701">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" ಇವರಿಗೆ ಫೈಲ್‌ ಕಳುಹಿಸಲಾಗಲಿಲ್ಲ."</string>
     <string name="upload_fail_line1_2" msgid="2108129204050841798">"ಫೈಲ್‌: <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <string name="upload_fail_ok" msgid="5807702461606714296">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸು"</string>
+    <string name="upload_fail_ok" msgid="5807702461606714296">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"ಮುಚ್ಚು"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"ಸರಿ"</string>
     <string name="unknown_file" msgid="6092727753965095366">"ಅಪರಿಚಿತ ಫೈಲ್"</string>
@@ -99,7 +99,7 @@
     <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"ಯಾವುದೇ SD ಕಾರ್ಡ್‌ಗಳಿಲ್ಲ. ವರ್ಗಾವಣೆ ಮಾಡಲಾದ ಫೈಲ್‌ಗಳನ್ನು ಉಳಿಸಲು SD ಕಾರ್ಡ್‌ವೊಂದನ್ನು ಸೇರಿಸಿ."</string>
     <string name="status_connection_error" msgid="947681831523219891">"ಸಂಪರ್ಕವು ವಿಫಲವಾಗಿದೆ."</string>
     <string name="status_protocol_error" msgid="3245444473429269539">"ವಿನಂತಿಯನ್ನು ಸರಿಯಾಗಿ ನಿರ್ವಹಿಸಲಾಗುವುದಿಲ್ಲ."</string>
-    <string name="status_unknown_error" msgid="8156660554237824912">"ಅಜ್ಞಾತ ದೋಷ."</string>
+    <string name="status_unknown_error" msgid="8156660554237824912">"ಅಪರಿಚಿತ ದೋಷ."</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"ಬ್ಲೂಟೂತ್‌ ಸ್ವೀಕರಿಸಲಾಗಿದೆ"</string>
     <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> ಸ್ವೀಕರಿಸುವುದು ಪೂರ್ಣಗೊಂಡಿದೆ."</string>
     <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> ಕಳುಹಿಸುವುದು ಪೂರ್ಣಗೊಂಡಿದೆ."</string>
@@ -122,10 +122,13 @@
     <string name="transfer_menu_clear" msgid="5854038118831427492">"ಪಟ್ಟಿಯಿಂದ ತೆರವುಗೊಳಿಸಿ"</string>
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"ತೆರವುಗೊಳಿಸು"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"ಉಳಿಸು"</string>
-    <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"ರದ್ದುಮಾಡು"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"ಬ್ಲೂಟೂತ್‌ ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳಲು ಬಯಸುವ ಖಾತೆಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ. ಸಂಪರ್ಕಿಸುವಾಗ ಖಾತೆಗಳಿಗೆ ಯಾವುದೇ ಪ್ರವೇಶವನ್ನು ನೀವು ಈಗಲೂ ಒಪ್ಪಿಕೊಳ್ಳಬೇಕಾಗುತ್ತದೆ."</string>
+    <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"ರದ್ದುಮಾಡಿ"</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"ಬ್ಲೂಟೂತ್‌ ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳಲು ಬಯಸುವ ಖಾತೆಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ. ಸಂಪರ್ಕಪಡಿಸುವಾಗ ಖಾತೆಗಳಿಗೆ ಯಾವುದೇ ಪ್ರವೇಶವನ್ನು ನೀವು ಈಗಲೂ ಸಮ್ಮತಿಸಬೇಕಾಗುತ್ತದೆ."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"ಉಳಿದಿರುವ ಸ್ಲಾಟ್‌ಗಳು:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"ಅಪ್ಲಿಕೇಶನ್‌ ಐಕಾನ್‌"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"ಬ್ಲೂಟೂತ್ ಸಂದೇಶ ಹಂಚಿಕೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. 0 ಸ್ಲಾಟ್‌ಗಳು ಉಳಿದಿವೆ"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"ಬ್ಲೂಟೂತ್‌ ಆಡಿಯೊ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"ಬ್ಲೂಟೂತ್‌ ಆಡಿಯೊ ಸಂಪರ್ಕ ಕಡಿತಗೊಂಡಿದೆ"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"ಬ್ಲೂಟೂತ್‌ ಆಡಿಯೊ"</string>
 </resources>
diff --git a/res/values-kn-rIN/strings_pbap_client.xml b/res/values-kn-rIN/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-kn-rIN/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 9a17e2e4f..5337138c2 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"지우기"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"저장"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"취소"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"블루투스를 통해 공유하려는 계정을 선택하세요. 연결할 때 계정에 대한 모든 액세스를 수락해야 합니다."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"블루투스를 통해 공유하려는 계정을 선택하세요. 연결할 때 계정에 대한 모든 액세스를 수락해야 합니다."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"남은 슬롯:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"애플리케이션 아이콘"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"블루투스 메시지 공유 설정"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"계정을 선택할 수 없습니다. 남은 슬롯이 없습니다."</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"블루투스 오디오가 연결됨"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"블루투스 오디오가 연결 해제됨"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"블루투스 오디오"</string>
 </resources>
diff --git a/res/values-ko/strings_pbap_client.xml b/res/values-ko/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-ko/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 94d7f3481..9a0099257 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Тазалоо"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Сактоо"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Жокко чыгаруу"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Bluetooth аркылуу бөлүшө турган каттоо эсептерин тандаңыз. Туташып жатканда, каттоо эсептерине кирүү мүмкүнчүлүгүн кабыл алышыңыз керек."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Bluetooth аркылуу бөлүшө турган каттоо эсептерин тандаңыз. Туташкан сайын каттоо эсептерине кирүү мүмкүнчүлүгүн ырастап турушуңуз керек."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Калган көзөнөктөр:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Колдонмонун сөлөкөтү"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth билдирүү бөлүшүү жөндөөлөрү"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Каттоо эсебин тандоо мүмкүн эмес. 0 көзөнөк калды"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth аудио туташты"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth аудио ажыратылды"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth аудио"</string>
 </resources>
diff --git a/res/values-ky-rKG/strings_pbap_client.xml b/res/values-ky-rKG/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-ky-rKG/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 01a9c25ce..b76983619 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"ລຶບ"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"ບັນທຶກ"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"ຍົກເລີກ"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"ເລືອກບັນຊີທີ່ທ່ານຕ້ອງການແບ່ງປັນຜ່ານ Bluetooth. ທ່ານຍັງຄົງຕ້ອງຍອມຮັບການເຂົ້າເຖິງໃດໆຕໍ່ບັນຊີຕ່າງໆເມື່ອທຳການເຊື່ອມຕໍ່."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"ເລືອກບັນຊີທີ່ທ່ານຕ້ອງການແບ່ງປັນຜ່ານ Bluetooth. ທ່ານຍັງຈຳເປັນຕ້ອງຍອມຮັບທຸກການເຂົ້າເຖິງບັນຊີຕ່າງໆໃນເວລາເຊື່ອມຕໍ່."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"ຊ່ອງຊ້າຍ:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"ໄອຄອນແອັບພລິເຄຊັນ"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"ການຕັ້ງຄ່າແບ່ງປັນຂໍ້ຄວາມ Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"ບໍ່ສາມາດເລືອກບັນຊີໄດ້. ເຫຼືອ 0 ຊ່ອງ"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"ເຊື່ອມຕໍ່ສຽງ Bluetooth ແລ້ວ"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"ຕັດການເຊື່ອມຕໍ່ສຽງ Bluetooth ແລ້ວ"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"ສຽງ Bluetooth"</string>
 </resources>
diff --git a/res/values-lo-rLA/strings_pbap_client.xml b/res/values-lo-rLA/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-lo-rLA/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index e7ae8eea7..3e98b5398 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Pasiekti atsisiuntimo tvarkyklę."</string>
+    <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>
@@ -127,9 +127,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Išvalyti"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Išsaugoti"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Atšaukti"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Pasirinkite paskyras, kurias norite bendrinti per „Bluetooth“. Jungiantis vis tiek reikės suteikti prieigą prie paskyrų."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Pasirinkite o paskyras, kurias norite bendrinti per „Bluetooth“. Jungiantis vis tiek reikės suteikti prieigą prie paskyrų."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Liko sričių:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Programos piktograma"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"„Bluetooth“ pranešimų bendrinimo nustatymai"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Negalima pasirinkti paskyros. Neliko jokių sričių"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"„Bluetooth“ garsas prijungtas"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"„Bluetooth“ garsas atjungtas"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"„Bluetooth“ garsas"</string>
 </resources>
diff --git a/res/values-lt/strings_pbap_client.xml b/res/values-lt/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-lt/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index ee4fff364..6ff4a163a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -125,9 +125,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Notīrīšana"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Saglabāt"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Atcelt"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Atlasiet kontus, kurus vēlaties koplietot, izmantojot Bluetooth. Kad tiks izveidots savienojums, jums būs arī jāapstiprina piekļuve kontiem."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Atlasiet kontus, kurus vēlaties koplietot, izmantojot Bluetooth. Kad tiks izveidots savienojums, jums būs arī jāapstiprina piekļuve kontiem."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Atlikušie sloti:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Lietojumprogrammas ikona"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth ziņojumu kopīgošanas iestatījumi"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Nevar atlasīt kontu. Atlicis 0 slotu."</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Izveidots savienojums ar Bluetooth audio"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Pārtraukts savienojums ar Bluetooth audio"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth audio"</string>
 </resources>
diff --git a/res/values-lv/strings_pbap_client.xml b/res/values-lv/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-lv/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 68ab220ac..37f15b0ad 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Исчисти"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Зачувај"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Откажи"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Изберете ги сметките што сакате да ги споделите преку Bluetooth. Сепак, ќе мора да го прифаќате секој пристап до сметките при поврзувањето."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Изберете ги сметките што сакате да ги споделите преку Bluetooth. Сепак, ќе мора да го прифаќате секој пристап до сметките при поврзување."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Слободни отвори:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Икона на апликацијата"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Поставки за споделување пораки преку Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Не може да се избере сметка. 0 слободни отвори"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Аудиото преку Bluetooth е поврзано"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Аудиото преку Bluetooth е исклучено"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Аудио преку Bluetooth"</string>
 </resources>
diff --git a/res/values-mk-rMK/strings_pbap_client.xml b/res/values-mk-rMK/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-mk-rMK/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 522afe9d0..9a2b6a115 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -121,9 +121,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"മായ്‌ക്കുക"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"സംരക്ഷിക്കുക"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"റദ്ദാക്കുക"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"നിങ്ങൾക്ക് Bluetooth മുഖേന പങ്കിടേണ്ട അക്കൗണ്ടുകൾ തിരഞ്ഞെടുക്കുക. കണക്‌റ്റുചെയ്യുമ്പോൾ അക്കൗണ്ടുകളിലേക്കുള്ള ഏത് ആക്‌സസ്സും നിങ്ങൾ തുടർന്നും അംഗീകരിക്കേണ്ടതാണ്."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"നിങ്ങൾക്ക് Bluetooth വഴി പങ്കിടേണ്ട അക്കൗണ്ടുകൾ തിരഞ്ഞെടുക്കുക. കണക്‌റ്റുചെയ്യുമ്പോൾ അക്കൗണ്ടുകളിലേക്കുള്ള ഏത് ആക്‌സസും നിങ്ങൾ തുടർന്നും അംഗീകരിക്കേണ്ടതാണ്."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"ശേഷിക്കുന്ന സ്ലോട്ടുകൾ:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"അപ്ലിക്കേഷൻ ഐക്കൺ"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth സന്ദേശ പങ്കിടൽ ക്രമീകരണം"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"അക്കൗണ്ട് തിരഞ്ഞെടുക്കാനാകില്ല. 0 സ്ലോട്ടുകൾ ശേഷിക്കുന്നു"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth ഓഡിയോ കണക്‌റ്റുചെയ്തു"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth ഓഡിയോ വിച്ഛേദിച്ചു"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth ഓഡിയോ"</string>
 </resources>
diff --git a/res/values-ml-rIN/strings_pbap_client.xml b/res/values-ml-rIN/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-ml-rIN/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 1e906eec5..d7b34dff8 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -34,7 +34,7 @@
     <string name="incoming_file_confirm_content" msgid="2752605552743148036">"Ирж байгаа файлыг авах уу?"</string>
     <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_ok" msgid="1414676773249857278">"OK"</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>
@@ -59,19 +59,19 @@
     <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">"OK"</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>
     <string name="upload_line3" msgid="4920689672457037437">"Файлын хэлбэр: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"Файл илгээж байна…"</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"Файлыг илгээсэн"</string>
-    <string name="upload_succ_ok" msgid="7705428476405478828">"Тийм"</string>
+    <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
     <string name="upload_fail_line1" msgid="7899394672421491701">"Файл \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" руу илгээгдсэнгүй."</string>
     <string name="upload_fail_line1_2" msgid="2108129204050841798">"Файл: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"Дахин оролдоно уу"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Хаах"</string>
-    <string name="bt_error_btn_ok" msgid="5965151173011534240">"Тийм"</string>
+    <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
     <string name="unknown_file" msgid="6092727753965095366">"Үл мэдэгдэх файл"</string>
     <string name="unknown_file_desc" msgid="480434281415453287">"Ийм төрлийн файлыг нээх апп байхгүй байна. \n"</string>
     <string name="not_exist_file" msgid="3489434189599716133">"Файл байхгүй"</string>
@@ -91,7 +91,7 @@
     <string name="status_pending" msgid="2503691772030877944">"Файл дамжуулалт хараахан эхлээгүй байна."</string>
     <string name="status_running" msgid="6562808920311008696">"Файл дамжуулалт үргэлжилж байна."</string>
     <string name="status_success" msgid="239573225847565868">"Файл дамжуулалт амжилттай дууслаа."</string>
-    <string name="status_not_accept" msgid="1695082417193780738">"Контент дэмжигдэхгүй байна."</string>
+    <string name="status_not_accept" msgid="1695082417193780738">"Агуулга дэмжигдэхгүй байна."</string>
     <string name="status_forbidden" msgid="613956401054050725">"Дамжуулалтыг хүлээн авагч төхөөрөмжөөс хориглосон."</string>
     <string name="status_canceled" msgid="6664490318773098285">"Дамжуулалтыг хэрэглэгч цуцалсан."</string>
     <string name="status_file_error" msgid="3671917770630165299">"Хадгалах сангийн асуудал."</string>
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Арилгах"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Хадгалах"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Цуцлах"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Bluetooth-ээр дамжуулан хуваалцахыг хүсч буй дансаа сонго. Та холбогдож байх үедээ ч данс руу нэвтрэх ямар ч хандалтуудыг хүлээн авах боломжтой."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Bluetooth-ээр хуваалцахыг хүсч буй дансаа сонго. Холболт хийх үед данс руу нэвтрэх аливаа хандалтыг хүлээн зөвшөөрөх хэрэгтэй болно."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Үлдсэн слот:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Аппликешний дүрс"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth мессеж хуваалцах тохиргоо"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Дансыг сонгох боломжгүй. 0 слот үлдсэн"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth аудиог холбосон"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth аудиог салгасан"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth Аудио"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings_pbap_client.xml b/res/values-mn-rMN/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-mn-rMN/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-mn-rMN/test_strings.xml b/res/values-mn-rMN/test_strings.xml
index 43e8d2e09..8a89e5aff 100644
--- a/res/values-mn-rMN/test_strings.xml
+++ b/res/values-mn-rMN/test_strings.xml
@@ -7,7 +7,7 @@
     <string name="update_record" msgid="2480425402384910635">"Бичлэгийг баталгаажуулах"</string>
     <string name="ack_record" msgid="6716152390978472184">"Ack бичлэг"</string>
     <string name="deleteAll_record" msgid="4383349788485210582">"Бүх бичлэгийг устгах"</string>
-    <string name="ok_button" msgid="6519033415223065454">"Тийм"</string>
+    <string name="ok_button" msgid="6519033415223065454">"OK"</string>
     <string name="delete_record" msgid="4645040331967533724">"Бичлэгийг устгах"</string>
     <string name="start_server" msgid="9034821924409165795">"TCP серверийг эхлүүлэх"</string>
     <string name="notify_server" msgid="4369106744022969655">"TCP серверт мэдэгдэх"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index ac0961049..5b8ae8376 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"साफ करा"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"जतन करा"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"रद्द करा"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"आपण ब्लूटुथद्वारे सामायिक करू इच्छित असलेली खाती निवडा. कनेक्‍ट करताना अद्याप आपल्‍याला खात्यांमधील कोणताही प्रवेश स्वीकारण्‍याची आवश्‍यकता आहे."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"आपण ब्लूटुथद्वारे सामायिक करू इच्छित असलेली खाती निवडा. कनेक्ट करताना अद्याप आपल्याला खात्यांमधील कोणताही प्रवेश स्वीकारण्याची आवश्यकता आहे."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"स्लॉट शिल्लक:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"अनुप्रयोग चिन्ह"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"ब्लूटुथ संदेश सामायिकरण सेटिंग्ज"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"खाते निवडू शकत नाही. 0 स्लॉट शिल्लक"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"ब्लूटुथ ऑडिओ कनेक्ट केला"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"ब्लूटुथ ऑडिओ डिस्कनेक्ट केला"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"ब्लूटुथ ऑडिओ"</string>
 </resources>
diff --git a/res/values-mr-rIN/strings_pbap_client.xml b/res/values-mr-rIN/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-mr-rIN/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 4f6c012ac..7f42b35cf 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Padam bersih"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Simpan"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Batal"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Pilih akaun yang ingin anda kongsikan melalui Bluetooth. Anda masih perlu menerima sebarang akses kepada akaun semasa menyambung."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Pilih akaun yang anda ingin kongsikan melalui Bluetooth. Anda masih perlu menerima sebarang akses kepada akaun semasa menyambung."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Slot yang tinggal:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Ikon Aplikasi"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Tetapan Perkongsian Mesej Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Tidak boleh memilih akaun. 0 slot yang tinggal"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Audio Bluetooth disambungkan"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Audio Bluetooth diputuskan sambungannya"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Audio Bluetooth"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings_pbap_client.xml b/res/values-ms-rMY/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-ms-rMY/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index df0803f09..49681747a 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -19,7 +19,7 @@
     <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="permdesc_bluetoothWhitelist" 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>
@@ -28,13 +28,13 @@
     <string name="bt_enable_title" msgid="8657832550503456572"></string>
     <string name="bt_enable_line1" msgid="7203551583048149">"ဘလူးတုသ်ဆားဗစ်ကိုအသုံးပြုရန် ပထမဦးစွာ ဘလူးတုသ်ကိုဖွင့်ပါ"</string>
     <string name="bt_enable_line2" msgid="4341936569415937994">"ယခုပင် ဘလူးတုသ်ကိုဖွင့်မည်လား?"</string>
-    <string name="bt_enable_cancel" msgid="1988832367505151727">"ထားတော့"</string>
+    <string name="bt_enable_cancel" msgid="1988832367505151727">"မလုပ်တော့"</string>
     <string name="bt_enable_ok" msgid="3432462749994538265">"ဖွင့်မည်"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"ဖိုင်လွှဲပြောင်းခြင်း"</string>
     <string name="incoming_file_confirm_content" msgid="2752605552743148036">"ဝင်လာသည့် ဖိုင်ကို လက်ခံမလား?"</string>
     <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_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_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>
@@ -59,19 +59,19 @@
     <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>
     <string name="upload_line3" msgid="4920689672457037437">"ဖိုင်အမျိုးအစား - <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
     <string name="upload_line5" msgid="7759322537674229752">"ဖိုင်ပို့နေပါသည်"</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"ဖိုင်ပို့ပြီး"</string>
-    <string name="upload_succ_ok" msgid="7705428476405478828">"ကောင်းပြီ"</string>
+    <string name="upload_succ_ok" msgid="7705428476405478828">"အိုကေ"</string>
     <string name="upload_fail_line1" msgid="7899394672421491701">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"ထံသို့ ဖိုင်ကို မပို့ပါ"</string>
     <string name="upload_fail_line1_2" msgid="2108129204050841798">"ဖိုင် - <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"ပြန်ကြိုးစားပါ"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"ပိတ်ရန်"</string>
-    <string name="bt_error_btn_ok" msgid="5965151173011534240">"ကောင်းပြီ"</string>
+    <string name="bt_error_btn_ok" msgid="5965151173011534240">"အိုကေ"</string>
     <string name="unknown_file" msgid="6092727753965095366">"အမျိုးအမည် မသိသောဖိုင်"</string>
     <string name="unknown_file_desc" msgid="480434281415453287">"ဤဖိုင်အမျိုးအစားကို ကိုင်တွယ်ရန် အပလီကေးရှင်းမရှိပါ\n"</string>
     <string name="not_exist_file" msgid="3489434189599716133">"ဖိုင်မရှိပါ"</string>
@@ -117,15 +117,18 @@
       <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> အောင်မြင်ပါသည်၊ %2$s</item>
       <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> အောင်မြင်ပါသည်၊ %2$s</item>
     </plurals>
-    <string name="transfer_menu_clear_all" msgid="790017462957873132">"စာရင်းကို ရှင်းလင်းရန်"</string>
+    <string name="transfer_menu_clear_all" msgid="790017462957873132">"စာရင်းကို ဖယ်ရှားရန်"</string>
     <string name="transfer_menu_open" msgid="3368984869083107200">"ဖွင့်ရန်"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"စာရင်းမှ ရှင်းပစ်မည်"</string>
-    <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"ရှင်းလင်းရန်"</string>
-    <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"သိမ်းဆည်းရန်"</string>
-    <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"ဖျက်သိမ်းရန်"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"သင် ဘလူးတုသ်မှတဆင့် မျှဝေလိုသော အကောင့်အသစ်များအား ရွေးချယ်ပါ။ ချိတ်ဆက်နေစဉ် အကောင့်များအား ဝင်ရောက်သုံးခွင့်များကို သင်လက်ခံရန် လိုအပ်ပါဦးမည်။"</string>
+    <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"ရှင်းရန်"</string>
+    <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"သိမ်းရန်"</string>
+    <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"မလုပ်တော့"</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"ဘလူးတုသ်မှ မျှဝေလိုသော အကောင့်များကို ရွေးပါ။ ချိတ်ဆက်သည့်အခါ အကောင့်များအား ဝင်ခွင့်ပြုဖို့ လက်ခံပေးရပါလိမ့်ဦးမည်။"</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"ကျန်နေသည့် အပေါက်များ:"</string>
-    <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"အပလီကေးရှင်း အိုင်ကွန်"</string>
+    <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"အပလီကေးရှင်း သင်္ကေတ"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"ဘလူးတုသ် စာ မျှဝေရေး ဆက်တင်များ"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"ရွေးထားသည့် အကောင့်ကို မရွေးနိုင်ပါ။ သုည အပေါက်များ ကျန်နေ"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"ဘလူးတုသ်အသံ ချိတ်ဆက်ပြီးပါပြီ"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"ဘလူးတုသ်အသံ မချိတ်ဆက်ထားပါ"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"ဘလူးတုသ် အသံ"</string>
 </resources>
diff --git a/res/values-my-rMM/strings_pbap_client.xml b/res/values-my-rMM/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-my-rMM/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-my-rMM/test_strings.xml b/res/values-my-rMM/test_strings.xml
index b615a5d63..02d200d97 100644
--- a/res/values-my-rMM/test_strings.xml
+++ b/res/values-my-rMM/test_strings.xml
@@ -7,7 +7,7 @@
     <string name="update_record" msgid="2480425402384910635">"မှတ်တမ်းအတည်ပြုရန်"</string>
     <string name="ack_record" msgid="6716152390978472184">"အသိအမှတ်ပြု မှတ်တမ်း"</string>
     <string name="deleteAll_record" msgid="4383349788485210582">"မှတ်တမ်းအားလုံးကို ဖျက်ရန်"</string>
-    <string name="ok_button" msgid="6519033415223065454">"ကောင်းပြီ"</string>
+    <string name="ok_button" msgid="6519033415223065454">"အိုကေ"</string>
     <string name="delete_record" msgid="4645040331967533724">"မှတ်တမ်းကို ဖျက်ရန်"</string>
     <string name="start_server" msgid="9034821924409165795">"TCP ဆာဗာ စတင်ရန်"</string>
     <string name="notify_server" msgid="4369106744022969655">"TCP ဆာဗာကို အကြောင်းကြားရန်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9b535f14f..fce608d73 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Tøm"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Lagre"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Avbryt"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Velg kontoene du vil dele via Bluetooth. Du må fortsatt godta eventuell tilgang til kontoene når du kobler til."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Velg kontoene du vil dele via Bluetooth. Du må fortsatt godta eventuell tilgang til kontoene når du kobler til."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Plasser igjen:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Appikon"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Innstillinger for meldingsdeling via Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Kan ikke velge kontoen. Det er 0 plasser igjen"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth-lyd er tilkoblet"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth-lyd er frakoblet"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth-lyd"</string>
 </resources>
diff --git a/res/values-nb/strings_pbap_client.xml b/res/values-nb/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-nb/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index a780ab5b1..8edfa1ed2 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"हटाउनुहोस्"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"सुरक्षित गर्नुहोस्"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"रद्द गर्नुहोस्"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"तपाईंले ब्लुटुथ मार्फत साझेदारी गर्न चाहेको खाता चयन गर्नुहोस्। तपाईंले अझै पनि खातामा जडान गर्दा कुनै पनि पहुँच स्वीकार गर्नुपर्छ।"</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"तपाईंले ब्लुटुथ मार्फत साझेदारी गर्न चाहेका खाताहरू चयन गर्नुहोस्। तपाईंले अझै पनि खाताहरूमा जडान गर्दा कुनै पनि पहुँच स्वीकार गर्नुपर्छ।"</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"स्लटहरू बाँकी:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"अनुप्रयोग आइकन"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"ब्लुटुथ सन्देश साझेदारी सेटिङहरू"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"खाता चयन गर्न सक्दैन। ० स्लटहरू बाँकी"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"ब्लुटुथ सम्बन्धी अडियो यन्त्रलाई जडान गरियो"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"ब्लुटुथ सम्बन्धी अडियो यन्त्रलाई विच्छेद गरियो"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"ब्लुटुथको अडियो"</string>
 </resources>
diff --git a/res/values-ne-rNP/strings_pbap_client.xml b/res/values-ne-rNP/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-ne-rNP/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b81ebaff2..3165a2448 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -91,7 +91,7 @@
     <string name="status_pending" msgid="2503691772030877944">"Bestandsoverdracht nog niet gestart."</string>
     <string name="status_running" msgid="6562808920311008696">"Bestandsoverdracht wordt uitgevoerd."</string>
     <string name="status_success" msgid="239573225847565868">"Bestandsoverdracht is voltooid."</string>
-    <string name="status_not_accept" msgid="1695082417193780738">"Inhoud wordt niet ondersteund."</string>
+    <string name="status_not_accept" msgid="1695082417193780738">"Content wordt niet ondersteund."</string>
     <string name="status_forbidden" msgid="613956401054050725">"Overdracht wordt niet toegestaan door het doelapparaat."</string>
     <string name="status_canceled" msgid="6664490318773098285">"Overdracht geannuleerd door gebruiker."</string>
     <string name="status_file_error" msgid="3671917770630165299">"Probleem met opslagruimte."</string>
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Wissen"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Opslaan"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Annuleren"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Selecteer de accounts die je wilt delen via Bluetooth. Je moet nog steeds elke toegang tot de accounts accepteren wanneer er verbinding wordt gemaakt."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Selecteer de accounts die je wilt delen via Bluetooth. Je moet nog steeds elke toegang tot de accounts accepteren wanneer er verbinding wordt gemaakt."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Plaatsen over:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"App-pictogram"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Instellingen voor delen van berichten via Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Kan account niet selecteren. 0 plaatsen over"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth-audio gekoppeld"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth-audio ontkoppeld"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth-audio"</string>
 </resources>
diff --git a/res/values-nl/strings_pbap_client.xml b/res/values-nl/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-nl/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 936a261c1..370612af5 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -18,10 +18,10 @@
     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_bluetoothWhitelist" msgid="7091552898592306386">"ਵਾਈਟਲਿਸਟ bluetooth ਡੀਵਾਈਸ ਪਹੁੰਚ।"</string>
+    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"ਐਪ ਨੂੰ ਇਹ ਆਗਿਆ ਦਿੰਦੇ ਹੋਏ ਕਿ ਡੀਵਾਈਸ ਉਪਭੋਗਤਾ ਦੀ ਪੁਸ਼ਟੀ ਤੋਂ ਬਿਨਾਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਫਾਈਲਾਂ ਭੇਜੇ, ਇੱਕ Bluetooth ਡੀਵਾਈਸ ਨੂੰ ਅਸਥਾਈ ਤੌਰ ਤੇ ਵਾਈਟਲਿਸਟ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
     <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
-    <string name="unknown_device" msgid="9221903979877041009">"ਅਗਿਆਤ ਡਿਵਾਈਸ"</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">"ਤੁਸੀਂ ਏਅਰਪਲੇਨ ਮੋਡ ਵਿੱਚ Bluetooth ਨਹੀਂ ਵਰਤ ਸਕਦੇ।"</string>
@@ -92,7 +92,7 @@
     <string name="status_running" msgid="6562808920311008696">"ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਜਾਰੀ ਹੈ।"</string>
     <string name="status_success" msgid="239573225847565868">"ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਸਫਲਤਾਪੂਰਵਕ ਪੂਰੀ ਹੋਈ।"</string>
     <string name="status_not_accept" msgid="1695082417193780738">"ਸਮੱਗਰੀ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ।"</string>
-    <string name="status_forbidden" msgid="613956401054050725">"ਟੀਚਾ ਡਿਵਾਈਸ ਵੱਲੋਂ ਟ੍ਰਾਂਸਫਰ ਵਰਜਿਤ।"</string>
+    <string name="status_forbidden" msgid="613956401054050725">"ਟੀਚਾ ਡੀਵਾਈਸ ਵੱਲੋਂ ਟ੍ਰਾਂਸਫਰ ਵਰਜਿਤ।"</string>
     <string name="status_canceled" msgid="6664490318773098285">"ਉਪਭੋਗਤਾ ਵੱਲੋਂ ਟ੍ਰਾਂਸਫਰ ਰੱਦ ਕੀਤਾ ਗਿਆ।"</string>
     <string name="status_file_error" msgid="3671917770630165299">"ਸਟੋਰੇਜ ਸਮੱਸਿਆ।"</string>
     <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"ਕੋਈ USB ਸਟੋਰੇਜ ਨਹੀਂ।"</string>
@@ -121,11 +121,14 @@
     <string name="transfer_menu_open" msgid="3368984869083107200">"ਖੋਲ੍ਹੋ"</string>
     <string name="transfer_menu_clear" msgid="5854038118831427492">"ਸੂਚੀ ਵਿੱਚੋਂ ਹਟਾਓ"</string>
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"ਹਟਾਓ"</string>
-    <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"ਸੁਰੱਖਿਅਤ ਕਰੋ"</string>
+    <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"ਰੱਖਿਅਤ ਕਰੋ"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"ਰੱਦ ਕਰੋ"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"ਉਹ ਖਾਤੇ ਚੁਣੋ ਜਿਹਨਾਂ ਨੂੰ ਤੁਸੀਂ ਬਲੂਟੁੱਥ ਰਾਹੀਂ ਸ਼ੇਅਰ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ। ਤੁਹਾਨੂੰ ਤਦ ਵੀ ਕਨੈਕਟ ਕਰਨ ਵੇਲੇ ਖਾਤਿਆਂ ਤੱਕ ਕਿਸੇ ਵੀ ਪਹੁੰਚ ਨੂੰ ਸਵੀਕਾਰ ਕਰਨਾ ਪਵੇਗਾ।"</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"ਉਹਨਾਂ ਖਾਤਿਆਂ ਨੂੰ ਚੁਣੋ ਜਿਨ੍ਹਾਂ ਨੂੰ ਤੁਸੀਂ ਬਲੂਟੁੱਥ ਦੇ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ। ਤੁਹਾਨੂੰ ਹਾਲੇ ਵੀ ਕਨੈਕਟ ਕਰਨ ਦੌਰਾਨ ਖਾਤਿਆਂ \'ਤੇ ਕਿਸੇ ਵੀ ਪਹੁੰਚ ਨੂੰ ਸਵੀਕਾਰ ਕਰਨਾ ਹੋਵੇਗਾ।"</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"ਸਲੌਟ ਬਾਕੀ:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"ਐਪਲੀਕੇਸ਼ਨ ਆਈਕਨ"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"ਬਲੂਟੁੱਥ ਸੁਨੇਹਾ ਸ਼ੇਅਰਿੰਗ ਸੈੱਟਿੰਗਜ਼"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"ਖਾਤਾ ਨਹੀਂ ਚੁਣ ਸਕਦਾ। 0 ਸਲੌਟ ਬਾਕੀ"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"ਬਲੂਟੁੱਥ ਔਡੀਓ ਕਨੈਕਟ ਕੀਤੀ ਗਈ"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"ਬਲੂਟੁੱਥ ਔਡੀਓ ਡਿਸਕਨੈਕਟ ਕੀਤੀ ਗਈ"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"ਬਲੂਟੁੱਥ ਔਡੀਓ"</string>
 </resources>
diff --git a/res/values-pa-rIN/strings_pbap_client.xml b/res/values-pa-rIN/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-pa-rIN/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-pa-rIN/test_strings.xml b/res/values-pa-rIN/test_strings.xml
index b3f587987..d8e6c7678 100644
--- a/res/values-pa-rIN/test_strings.xml
+++ b/res/values-pa-rIN/test_strings.xml
@@ -3,7 +3,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="hello" msgid="1740533743008967039">"ਹੈਲੋ ਦੁਨੀਆ, TestActivity"</string>
     <string name="app_name" msgid="1203877025577761792">"Bluetooth ਸ਼ੇਅਰ"</string>
-    <string name="insert_record" msgid="1450997173838378132">"ਰਿਕਾਰਡ ਦਰਜ ਕਰੋ"</string>
+    <string name="insert_record" msgid="1450997173838378132">"ਰਿਕਾਰਡ ਦਾਖਲ ਕਰੋ"</string>
     <string name="update_record" msgid="2480425402384910635">"ਰਿਕਾਰਡ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
     <string name="ack_record" msgid="6716152390978472184">"Ack ਰਿਕਾਰਡ"</string>
     <string name="deleteAll_record" msgid="4383349788485210582">"ਸਾਰੇ ਰਿਕਾਰਡ ਮਿਟਾਓ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index cfc504ab0..29ffc6f4b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -127,9 +127,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Wyczyść"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Zapisz"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Anuluj"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Wybierz konta, które chcesz udostępnić przez Bluetooth. Przy łączeniu trzeba zgodzić się na dostęp do kont."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Wybierz konta, które chcesz udostępnić przez Bluetooth. Wymagana jest zgoda na dostęp do kont."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Wolne miejsca:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Ikona aplikacji"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Ustawienia udostępniania wiadomości przez Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Nie można wybrać konta. Pozostało 0 miejsc."</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Dźwięk Bluetooth podłączony"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Dźwięk Bluetooth odłączony"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Dźwięk Bluetooth"</string>
 </resources>
diff --git a/res/values-pl/strings_pbap_client.xml b/res/values-pl/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-pl/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 1629b619c..48ec5126d 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Limpar"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Guardar"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Cancelar"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Selecione as contas que pretende partilhar através de Bluetooth. Ao ligar, ainda tem de aceitar eventuais acessos às contas."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Selecione as contas que pretende partilhar através de Bluetooth. Ao ligar, ainda tem de aceitar eventuais acessos às contas."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Ranhuras restantes:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Ícone de aplicação"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Definições de partilha de mensagens por Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Não é possível selecionar a conta. Não há ranhuras restantes"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Áudio Bluetooth ligado"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Áudio Bluetooth desligado"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Áudio Bluetooth"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings_pbap_client.xml b/res/values-pt-rPT/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-pt-rPT/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d3227f0cd..2163eaff0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Limpar"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Salvar"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Cancelar"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Selecione as contas que você deseja compartilhar via Bluetooth. Você ainda precisa aceitar qualquer acesso às contas ao conectar."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Selecione as contas que você deseja compartilhar via Bluetooth. Você ainda precisa aceitar qualquer acesso às contas ao se conectar."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Espaços disponíveis:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Ícone do app"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Configurações de compartilhamento de mensagens Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Não é possível selecionar conta. 0 espaços disponíveis"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Áudio Bluetooth conectado"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Áudio Bluetooth desconectado"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Áudio Bluetooth"</string>
 </resources>
diff --git a/res/values-pt/strings_pbap_client.xml b/res/values-pt/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-pt/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 675f97b67..0097d8d28 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -19,7 +19,7 @@
     <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="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="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
     <string name="unknown_device" msgid="9221903979877041009">"Dispozitiv necunoscut"</string>
     <string name="unknownNumber" msgid="4994750948072751566">"Necunoscut"</string>
@@ -32,42 +32,42 @@
     <string name="bt_enable_ok" msgid="3432462749994538265">"Activați"</string>
     <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Transfer de fișier"</string>
     <string name="incoming_file_confirm_content" msgid="2752605552743148036">"Acceptați fișierul primit?"</string>
-    <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Refuzaţi"</string>
-    <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Acceptaţi"</string>
+    <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Refuzați"</string>
+    <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Acceptați"</string>
     <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>
     <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"A fost atins timpul limită pentru acceptarea unui fișier primit de la „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
     <string name="incoming_file_confirm_Notification_title" msgid="5573329005298936903">"Fișier primit"</string>
     <string name="incoming_file_confirm_Notification_content" msgid="3359694069319644738">"<xliff:g id="SENDER">%1$s</xliff:g> este gata să trimită <xliff:g id="FILE">%2$s</xliff:g>"</string>
-    <string name="notification_receiving" msgid="4674648179652543984">"Distribuire prin Bluetooth: se primeşte <xliff:g id="FILE">%1$s</xliff:g>"</string>
+    <string name="notification_receiving" msgid="4674648179652543984">"Distribuire prin Bluetooth: se primește <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="notification_received" msgid="3324588019186687985">"Distribuire prin Bluetooth: s-a primit <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <string name="notification_received_fail" msgid="3619350997285714746">"Distribuire prin Bluetooth: fişierul <xliff:g id="FILE">%1$s</xliff:g> nu s-a primit"</string>
+    <string name="notification_received_fail" msgid="3619350997285714746">"Distribuire prin Bluetooth: fișierul <xliff:g id="FILE">%1$s</xliff:g> nu s-a primit"</string>
     <string name="notification_sending" msgid="3035748958534983833">"Distribuire prin Bluetooth: se trimite <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="notification_sent" msgid="9218710861333027778">"Distribuire prin Bluetooth: s-a trimis <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="notification_sent_complete" msgid="302943281067557969">"100 % finalizat"</string>
-    <string name="notification_sent_fail" msgid="6696082233774569445">"Distribuire prin Bluetooth: fişierul <xliff:g id="FILE">%1$s</xliff:g> nu a fost trimis"</string>
+    <string name="notification_sent_fail" msgid="6696082233774569445">"Distribuire prin Bluetooth: fișierul <xliff:g id="FILE">%1$s</xliff:g> nu a fost trimis"</string>
     <string name="download_title" msgid="3353228219772092586">"Transfer de fișier"</string>
     <string name="download_line1" msgid="4926604799202134144">"De la: „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
     <string name="download_line2" msgid="5876973543019417712">"Fișier: <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <string name="download_line3" msgid="4384821622908676061">"Dimensiunea fişierului: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="download_line3" msgid="4384821622908676061">"Dimensiunea fișierului: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="download_line4" msgid="8535996869722666525"></string>
-    <string name="download_line5" msgid="3069560415845295386">"Se primeşte fişierul..."</string>
+    <string name="download_line5" msgid="3069560415845295386">"Se primește fișierul..."</string>
     <string name="download_cancel" msgid="9177305996747500768">"Opriți"</string>
-    <string name="download_ok" msgid="5000360731674466039">"Ascundeţi"</string>
+    <string name="download_ok" msgid="5000360731674466039">"Ascundeți"</string>
     <string name="incoming_line1" msgid="2127419875681087545">"De la"</string>
     <string name="incoming_line2" msgid="3348994249285315873">"Numele fișierului"</string>
     <string name="incoming_line3" msgid="7954237069667474024">"Dimensiunea"</string>
-    <string name="download_fail_line1" msgid="3846450148862894552">"Fişierul nu este primit"</string>
+    <string name="download_fail_line1" msgid="3846450148862894552">"Fișierul nu este primit"</string>
     <string name="download_fail_line2" msgid="8950394574689971071">"Fișier: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="download_fail_line3" msgid="3451040656154861722">"Motiv: <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="download_fail_ok" msgid="1521733664438320300">"OK"</string>
     <string name="download_succ_line5" msgid="4509944688281573595">"Fișier primit"</string>
-    <string name="download_succ_ok" msgid="7053688246357050216">"Deschideţi"</string>
+    <string name="download_succ_ok" msgid="7053688246357050216">"Deschideți"</string>
     <string name="upload_line1" msgid="2055952074059709052">"Către: „<xliff:g id="RECIPIENT">%1$s</xliff:g>”"</string>
     <string name="upload_line3" msgid="4920689672457037437">"Tip de fișier: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
-    <string name="upload_line5" msgid="7759322537674229752">"Se trimite fişierul..."</string>
+    <string name="upload_line5" msgid="7759322537674229752">"Se trimite fișierul..."</string>
     <string name="upload_succ_line5" msgid="5687317197463383601">"Fișier trimis"</string>
     <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
-    <string name="upload_fail_line1" msgid="7899394672421491701">"Fişierul nu a fost trimis la „<xliff:g id="RECIPIENT">%1$s</xliff:g>”."</string>
+    <string name="upload_fail_line1" msgid="7899394672421491701">"Fișierul nu a fost trimis la „<xliff:g id="RECIPIENT">%1$s</xliff:g>”."</string>
     <string name="upload_fail_line1_2" msgid="2108129204050841798">"Fișier: <xliff:g id="FILE">%1$s</xliff:g>"</string>
     <string name="upload_fail_ok" msgid="5807702461606714296">"Încercați din nou"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Închideți"</string>
@@ -75,39 +75,39 @@
     <string name="unknown_file" msgid="6092727753965095366">"Fișier necunoscut"</string>
     <string name="unknown_file_desc" msgid="480434281415453287">"Nu există nicio aplicație care să gestioneze acest tip de fișier. \n"</string>
     <string name="not_exist_file" msgid="3489434189599716133">"Niciun fișier"</string>
-    <string name="not_exist_file_desc" msgid="4059531573790529229">"Fişierul nu există. \n"</string>
-    <string name="enabling_progress_title" msgid="436157952334723406">"Aşteptaţi..."</string>
+    <string name="not_exist_file_desc" msgid="4059531573790529229">"Fișierul nu există. \n"</string>
+    <string name="enabling_progress_title" msgid="436157952334723406">"Așteptați..."</string>
     <string name="enabling_progress_content" msgid="4601542238119927904">"Se activează Bluetooth..."</string>
-    <string name="bt_toast_1" msgid="972182708034353383">"Se va primi fişierul. Verificaţi progresul în panoul de notificări."</string>
-    <string name="bt_toast_2" msgid="8602553334099066582">"Fişierul nu poate fi primit."</string>
-    <string name="bt_toast_3" msgid="6707884165086862518">"Primirea fişierului de la „<xliff:g id="SENDER">%1$s</xliff:g>” a fost anulată"</string>
-    <string name="bt_toast_4" msgid="4678812947604395649">"Se trimite fişierul către „<xliff:g id="RECIPIENT">%1$s</xliff:g>”"</string>
-    <string name="bt_toast_5" msgid="2846870992823019494">"Se trimit <xliff:g id="NUMBER">%1$s</xliff:g> (de) fişiere către „<xliff:g id="RECIPIENT">%2$s</xliff:g>”"</string>
-    <string name="bt_toast_6" msgid="1855266596936622458">"Trimiterea fişierului către „<xliff:g id="RECIPIENT">%1$s</xliff:g>” a fost anulată"</string>
-    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"Nu există spațiu suficient pe stocarea USB pentru a salva fişierul de la „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
-    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"Nu există suficient spațiu pe cardul SD pentru a salva fişierul de la „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
-    <string name="bt_sm_2_2" msgid="2965243265852680543">"Spaţiu necesar: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="bt_toast_1" msgid="972182708034353383">"Se va primi fișierul. Verificați progresul în panoul de notificări."</string>
+    <string name="bt_toast_2" msgid="8602553334099066582">"Fișierul nu poate fi primit."</string>
+    <string name="bt_toast_3" msgid="6707884165086862518">"Primirea fișierului de la „<xliff:g id="SENDER">%1$s</xliff:g>” a fost anulată"</string>
+    <string name="bt_toast_4" msgid="4678812947604395649">"Se trimite fișierul către „<xliff:g id="RECIPIENT">%1$s</xliff:g>”"</string>
+    <string name="bt_toast_5" msgid="2846870992823019494">"Se trimit <xliff:g id="NUMBER">%1$s</xliff:g>   fișiere către „<xliff:g id="RECIPIENT">%2$s</xliff:g>”"</string>
+    <string name="bt_toast_6" msgid="1855266596936622458">"Trimiterea fișierului către „<xliff:g id="RECIPIENT">%1$s</xliff:g>” a fost anulată"</string>
+    <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"Nu există spațiu suficient pe stocarea USB pentru a salva fișierul de la „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
+    <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"Nu există suficient spațiu pe cardul SD pentru a salva fișierul de la „<xliff:g id="SENDER">%1$s</xliff:g>”"</string>
+    <string name="bt_sm_2_2" msgid="2965243265852680543">"Spațiu necesar: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Există prea multe solicitări în curs de procesare. Încercați din nou mai târziu."</string>
-    <string name="status_pending" msgid="2503691772030877944">"Transferul fişierului nu a început încă."</string>
-    <string name="status_running" msgid="6562808920311008696">"Transferul fişierului este în curs de desfăşurare."</string>
-    <string name="status_success" msgid="239573225847565868">"Transferul fişierului s-a încheiat."</string>
-    <string name="status_not_accept" msgid="1695082417193780738">"Conţinutul nu este acceptat."</string>
-    <string name="status_forbidden" msgid="613956401054050725">"Transfer interzis de dispozitivul de destinaţie."</string>
+    <string name="status_pending" msgid="2503691772030877944">"Transferul fișierului nu a început încă."</string>
+    <string name="status_running" msgid="6562808920311008696">"Transferul fișierului este în curs de desfășurare."</string>
+    <string name="status_success" msgid="239573225847565868">"Transferul fișierului s-a încheiat."</string>
+    <string name="status_not_accept" msgid="1695082417193780738">"Conținutul nu este acceptat."</string>
+    <string name="status_forbidden" msgid="613956401054050725">"Transfer interzis de dispozitivul de destinație."</string>
     <string name="status_canceled" msgid="6664490318773098285">"Transfer anulat de către utilizator."</string>
     <string name="status_file_error" msgid="3671917770630165299">"Problemă de stocare."</string>
     <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"Nu există spațiu de stocare USB."</string>
-    <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Nu există card SD. Introduceţi un card SD pentru a salva fişierele transferate."</string>
-    <string name="status_connection_error" msgid="947681831523219891">"Conectare eşuată."</string>
+    <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"Nu există card SD. Introduceți un card SD pentru a salva fișierele transferate."</string>
+    <string name="status_connection_error" msgid="947681831523219891">"Conectare eșuată."</string>
     <string name="status_protocol_error" msgid="3245444473429269539">"Solicitarea nu poate fi gestionată corect."</string>
     <string name="status_unknown_error" msgid="8156660554237824912">"Eroare necunoscută."</string>
     <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth recepționat"</string>
     <string name="download_success" msgid="7036160438766730871">"Primire finalizată: <xliff:g id="FILE_SIZE">%1$s</xliff:g>."</string>
     <string name="upload_success" msgid="4014469387779648949">"Trimitere finalizată: <xliff:g id="FILE_SIZE">%1$s</xliff:g>."</string>
     <string name="inbound_history_title" msgid="6940914942271327563">"Transferuri de intrare"</string>
-    <string name="outbound_history_title" msgid="4279418703178140526">"Transferuri de ieşire"</string>
+    <string name="outbound_history_title" msgid="4279418703178140526">"Transferuri de ieșire"</string>
     <string name="no_transfers" msgid="3482965619151865672">"Istoricul de transferuri este gol."</string>
     <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Toate elementele din listă vor fi eliminate."</string>
-    <string name="outbound_noti_title" msgid="8051906709452260849">"Distribuire prin Bluetooth: fişiere trimise"</string>
+    <string name="outbound_noti_title" msgid="8051906709452260849">"Distribuire prin Bluetooth: fișiere trimise"</string>
     <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth: fișiere primite"</string>
     <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
       <item quantity="few"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> fișiere netransferate.</item>
@@ -119,15 +119,18 @@
       <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> de fișiere transferate, %2$s</item>
       <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> fișier transferat, %2$s</item>
     </plurals>
-    <string name="transfer_menu_clear_all" msgid="790017462957873132">"Ștergeţi lista"</string>
-    <string name="transfer_menu_open" msgid="3368984869083107200">"Deschideţi"</string>
-    <string name="transfer_menu_clear" msgid="5854038118831427492">"Ștergeţi din listă"</string>
-    <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Ștergeţi"</string>
+    <string name="transfer_menu_clear_all" msgid="790017462957873132">"Ștergeți lista"</string>
+    <string name="transfer_menu_open" msgid="3368984869083107200">"Deschideți"</string>
+    <string name="transfer_menu_clear" msgid="5854038118831427492">"Ștergeți din listă"</string>
+    <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Ștergeți"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Salvați"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Anulați"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Selectați conturile la care doriți să permiteți accesul prin Bluetooth. Va trebui să acceptați accesul la conturi la conectare."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Selectați conturile la care doriți să permiteți accesul prin Bluetooth. Va trebui să acceptați accesul la conturi la conectare."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Sloturi rămase:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Pictograma aplicației"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Setări de permitere a accesului la mesajele prin Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Nu se poate selecta contul. 0 sloturi rămase"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Audio prin Bluetooth conectat"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Audio prin Bluetooth deconectat"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Audio prin Bluetooth"</string>
 </resources>
diff --git a/res/values-ro/strings_pbap.xml b/res/values-ro/strings_pbap.xml
index cc84114b7..e5119f07d 100644
--- a/res/values-ro/strings_pbap.xml
+++ b/res/values-ro/strings_pbap.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"Introduceţi cheia de sesiune pentru %1$s"</string>
+    <string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"Introduceți cheia de sesiune pentru %1$s"</string>
     <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Cheie de sesiune Bluetooth solicitată"</string>
     <string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"A expirat timpul pentru acceptarea conexiunii cu %1$s"</string>
     <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"A expirat timpul de introducere a cheii de sesiune cu %1$s"</string>
     <string name="auth_notif_ticker" msgid="1575825798053163744">"Cerere de autentificare pentru protocolul OBEX"</string>
     <string name="auth_notif_title" msgid="7599854855681573258">"Cheia sesiunii"</string>
-    <string name="auth_notif_message" msgid="6667218116427605038">"Introduceţi cheia de sesiune pentru %1$s"</string>
-    <string name="defaultname" msgid="4821590500649090078">"Set de maşină"</string>
+    <string name="auth_notif_message" msgid="6667218116427605038">"Introduceți cheia de sesiune pentru %1$s"</string>
+    <string name="defaultname" msgid="4821590500649090078">"Set de mașină"</string>
     <string name="unknownName" msgid="2841414754740600042">"Nume necunoscut"</string>
     <string name="localPhoneName" msgid="2349001318925409159">"Numele meu"</string>
     <string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
diff --git a/res/values-ro/strings_pbap_client.xml b/res/values-ro/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-ro/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-ro/test_strings.xml b/res/values-ro/test_strings.xml
index 773db8dfe..4221e93ce 100644
--- a/res/values-ro/test_strings.xml
+++ b/res/values-ro/test_strings.xml
@@ -6,9 +6,9 @@
     <string name="insert_record" msgid="1450997173838378132">"Inserați o înregistrare"</string>
     <string name="update_record" msgid="2480425402384910635">"Confirmați înregistrarea"</string>
     <string name="ack_record" msgid="6716152390978472184">"Înregistrare Ack"</string>
-    <string name="deleteAll_record" msgid="4383349788485210582">"Ștergeţi toate înregistrările"</string>
+    <string name="deleteAll_record" msgid="4383349788485210582">"Ștergeți toate înregistrările"</string>
     <string name="ok_button" msgid="6519033415223065454">"OK"</string>
-    <string name="delete_record" msgid="4645040331967533724">"Ștergeţi înregistrarea"</string>
-    <string name="start_server" msgid="9034821924409165795">"Porniţi serverul TCP"</string>
-    <string name="notify_server" msgid="4369106744022969655">"Notificaţi serverul TCP"</string>
+    <string name="delete_record" msgid="4645040331967533724">"Ștergeți înregistrarea"</string>
+    <string name="start_server" msgid="9034821924409165795">"Porniți serverul TCP"</string>
+    <string name="notify_server" msgid="4369106744022969655">"Notificați serverul TCP"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ed209dddc..bb3340d3e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -127,9 +127,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Очистить"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Сохранить"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Отменить"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Выберите аккаунты, к которым нужно открыть доступ через Bluetooth. Доступ необходимо подтверждать при каждом подключении."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Выберите аккаунты, к которым нужно открыть доступ через Bluetooth. Доступ необходимо подтверждать при каждом подключении."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Осталось мест:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Значок приложения"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Настройки доступа к сообщениям через Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Не удалось выбрать аккаунт: не осталось мест."</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Звук через Bluetooth включен"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Звук через Bluetooth отключен"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Звук через Bluetooth"</string>
 </resources>
diff --git a/res/values-ru/strings_pbap_client.xml b/res/values-ru/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-ru/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index e0a56bc46..881b1b71e 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"හිස් කරන්න"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"සුරකින්න"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"අවලංගු කරන්න"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"බ්ලූටූත් හරහා ඔබට බෙදාගැනීමට අවශ්‍ය ගිණුම් තෝරන්න. සම්බන්ධ වන විට ගිණුම් වෙත ඕනෑම ප්‍රවේශයක් ඔබ තවමත් පිළිගත යුතුයි."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"ඔබට බ්ලූටූත් හරහා බෙදා ගැනීමට අවශ්‍ය ගිණුම් තෝරන්න. සම්බන්ධ වන විට ඔබට තවම ගිණුම් වෙත ඕනෑම ප්‍රවේශයක් පිළිගැනීමට සිදු වේ."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"ඉතිරිව ඇති විවර:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"යෙදුම් නිරූපකය"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"බ්ලූටූත් පණිවිඩ බෙදාගැනීමේ සැකසීම්"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"ගිණුමක් තේරිය නොහැක. විවර 0 ක් ඉතිරිව තිබේ"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"බ්ලූටූත් ශ්‍රව්‍යය සම්බන්ධ කරන ලදී"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"බ්ලූටූත් ශ්‍රව්‍යය විසන්ධි කරන ලදී"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"බ්ලූටූත් ශ්‍රව්‍යය"</string>
 </resources>
diff --git a/res/values-si-rLK/strings_pbap_client.xml b/res/values-si-rLK/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-si-rLK/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index abfd82475..223256320 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -127,9 +127,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Vymazať"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Uložiť"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Zrušiť"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Vyberte účty, ktoré chcete zdieľať prostredníctvom rozhrania Bluetooth. Počas pripájania budete musieť aj tak prijať akékoľvek prístupy k účtom."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Vyberte účty, ktoré chcete zdieľať prostredníctvom rozhrania Bluetooth. Počas pripájania budete musieť aj tak prijať akékoľvek prístupy k účtom."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Počet zostávajúcich slotov:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Ikona aplikácie"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Nastavenia zdieľania správ prostredníctvom rozhrania Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Účet sa nedá vybrať. Nie sú k dispozícii žiadne ďalšie sloty."</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Rozhranie Bluetooth Audio je pripojené"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Rozhranie Bluetooth Audio je odpojené"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth Audio"</string>
 </resources>
diff --git a/res/values-sk/strings_pbap_client.xml b/res/values-sk/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-sk/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 26dcdd6ef..9f55a0dd3 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -127,9 +127,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Počisti"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Shrani"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Prekliči"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Izberite račune, ki jih želite dati v skupno rabo prek Bluetootha. Pri vzpostavljanju povezave morate še vedno sprejeti morebiten dostop do računov."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Izberite račune, ki jih želite dati v skupno rabo prek Bluetootha. Pri vzpostavljanju povezave morate še vedno sprejeti morebiten dostop do računov."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Preostala mesta:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Ikona aplikacije"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Nastavitve skupne rabe sporočil prek Bluetootha"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Ni mogoče izbrati računa. Na voljo je 0 mest."</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Zvok prek Bluetootha je povezan"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Zvok prek Bluetootha ni povezan"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Zvok prek Bluetootha"</string>
 </resources>
diff --git a/res/values-sl/strings_pbap_client.xml b/res/values-sl/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-sl/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index d64e385dc..d5fb0e5d2 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Pastro"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Ruaj"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Anulo"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Zgjidh llogaritë që dëshiron të ndash nëpërmjet Bluetooth-it. Duhet të pranosh përsëri çdo qasje te llogaritë kur të lidhesh."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Zgjidh llogaritë që dëshiron të ndash me Bluetooth. Duhet të pranosh përsëri çdo qasje te llogaritë kur të lidhesh."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Fole të mbetura:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Ikona e aplikacionit"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Cilësimet e ndarjes së mesazheve me Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Llogaria nuk mund të zgjidhet. 0 fole të mbetura"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Audioja e \"bluetooth-it\" e lidhur"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Audioja e \"bluetooth-it\" e shkëputur"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Audioja e \"bluetooth-it\""</string>
 </resources>
diff --git a/res/values-sq-rAL/strings_pbap_client.xml b/res/values-sq-rAL/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-sq-rAL/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 0bd54d988..b31605ef9 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -69,7 +69,7 @@
     <string name="upload_succ_ok" msgid="7705428476405478828">"Потврди"</string>
     <string name="upload_fail_line1" msgid="7899394672421491701">"Датотека није послата на <xliff:g id="RECIPIENT">%1$s</xliff:g>."</string>
     <string name="upload_fail_line1_2" msgid="2108129204050841798">"Датотека: <xliff:g id="FILE">%1$s</xliff:g>"</string>
-    <string name="upload_fail_ok" msgid="5807702461606714296">"Покушај поново"</string>
+    <string name="upload_fail_ok" msgid="5807702461606714296">"Пробај поново"</string>
     <string name="upload_fail_cancel" msgid="9118496285835687125">"Затвори"</string>
     <string name="bt_error_btn_ok" msgid="5965151173011534240">"Потврди"</string>
     <string name="unknown_file" msgid="6092727753965095366">"Непозната датотека"</string>
@@ -87,7 +87,7 @@
     <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"Нема довољно простора у USB меморији да би се сачувала датотека пошиљаоца „<xliff:g id="SENDER">%1$s</xliff:g>“"</string>
     <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"Нема довољно простора на SD картици да би се сачувала датотека пошиљаоца „<xliff:g id="SENDER">%1$s</xliff:g>“"</string>
     <string name="bt_sm_2_2" msgid="2965243265852680543">"Потребан простор: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
-    <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Превише захтева се обрађује. Покушајте поново касније."</string>
+    <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Превише захтева се обрађује. Пробајте поново касније."</string>
     <string name="status_pending" msgid="2503691772030877944">"Пренос датотеке још није почео."</string>
     <string name="status_running" msgid="6562808920311008696">"Пренос датотеке је у току."</string>
     <string name="status_success" msgid="239573225847565868">"Пренос датотеке је довршен."</string>
@@ -125,9 +125,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Брисање"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Сачувај"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Откажи"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Изаберите налоге које желите да делите преко Bluetooth-а. И даље морате да прихватите било какав приступ налозима при повезивању."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Изаберите налоге које желите да делите преко Bluetooth-а. И даље морате да прихватите било какав приступ налозима при повезивању."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Преосталих места:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Икона апликације"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Подешавања Bluetooth дељења порука"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Није могуће изабрати налог. Нема преосталих места"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth аудио је повезан"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Веза са Bluetooth аудијом је прекинута"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth аудио"</string>
 </resources>
diff --git a/res/values-sr/strings_pbap_client.xml b/res/values-sr/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-sr/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 4fb5ec54d..66a7ab18a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Rensa"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Spara"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Avbryt"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Välj de konton du vill dela via Bluetooth. Du måste fortfarande godkänna åtkomsten till kontona vid anslutning."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Välj de konton du vill dela via Bluetooth. Du måste fortfarande godkänna åtkomsten till kontona vid anslutning."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Platser kvar:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Appikon"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Inställningar för meddelandedelning via Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Det gick inte att välja konton. 0 platser kvar"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth-ljud är anslutet"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth-ljud är frånkopplat"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth-ljud"</string>
 </resources>
diff --git a/res/values-sv/strings_pbap_client.xml b/res/values-sv/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-sv/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 9d04391d4..264848455 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Futa"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Hifadhi"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Ghairi"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Chagua akaunti unazotaka kushiriki kupitia Bluetooth. Bado unatakiwa kukubali ufikiaji wowote kwenye akaunti yako wakati unaunganisha."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Chagua akaunti unazotaka kushiriki kupitia Bluetooth. Bado unatakiwa kutoa idhini ya ufikiaji wowote kwenye akaunti yako wakati unaunganisha."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Nafasi zilizosalia:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Aikoni ya programu"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Mipangilio ya Kushiriki Ujumbe wa Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Haiwezi kuchagua akaunti. Nafasi 0 zimesalia"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Imeunganisha sauti ya Bluetooth"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Imeondoa sauti ya Bluetooth"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Sauti ya Bluetooth"</string>
 </resources>
diff --git a/res/values-sw/strings_pbap_client.xml b/res/values-sw/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-sw/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 1124aaa2a..bb5f6f2aa 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"அழி"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"சேமி"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"ரத்துசெய்"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"புளுடூத் வழியாகப் பகிர விரும்பும் மின்னஞ்சல் கணக்குகளைத் தேர்வுசெய்யவும். இணைக்கும்போது கணக்கிற்கான எந்த அணுகல்களையும் ஏற்க வேண்டும்."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"புளூடூத் வழியாகப் பகிர விரும்பும் கணக்குகளைத் தேர்ந்தெடுக்கவும். இணைக்கும் போது கணக்குகளுக்கான அணுகலை மீண்டும் ஏற்க வேண்டும்."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"மீதமுள்ள ஸ்லாட்கள்:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"பயன்பாட்டு ஐகான்"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"புளூடூத் செய்தி பகிர்தல் அமைப்புகள்"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"கணக்கைத் தேர்வுசெய்ய முடியாது. ஸ்லாட்கள் எதுவுமில்லை"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"புளூடூத் ஆடியோ இணைக்கப்பட்டது"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"புளூடூத் ஆடியோ துண்டிக்கப்பட்டது"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"புளூடூத் ஆடியோ"</string>
 </resources>
diff --git a/res/values-ta-rIN/strings_pbap_client.xml b/res/values-ta-rIN/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-ta-rIN/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 9ca474f7e..8cc6aba1f 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"క్లియర్ చేయి"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"సేవ్ చేయి"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"రద్దు చేయి"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"మీరు బ్లూటూత్ ద్వారా భాగస్వామ్యం చేయాలనుకునే ఖాతాలను ఎంచుకోండి. మీరు ఇప్పటికీ కనెక్ట్ చేస్తున్నప్పుడు ఖాతాలకు అందించే ఏ ప్రాప్యతనైనా ఆమోదించాలి."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"మీరు బ్లూటూత్ ద్వారా భాగస్వామ్యం చేయాలనుకునే ఖాతాలను ఎంచుకోండి. మీరు ఇప్పటికీ కనెక్ట్ చేస్తున్నప్పుడు ఖాతాలకు అందించే ఏ ప్రాప్యతనైనా ఆమోదించాల్సి ఉంటుంది."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"మిగిలిన స్లాట్‌లు:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"అనువర్తన చిహ్నం"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"బ్లూటూత్ సందేశ భాగస్వామ్య సెట్టింగ్‌లు"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"ఖాతాను ఎంచుకోవడం సాధ్యపడదు. 0 స్లాట్‌లు మిగిలి ఉన్నాయి"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"బ్లూటూత్ ఆడియో కనెక్ట్ చేయబడింది"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"బ్లూటూత్ ఆడియో డిస్‌కనెక్ట్ చేయబడింది"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"బ్లూటూత్ ఆడియో"</string>
 </resources>
diff --git a/res/values-te-rIN/strings_pbap_client.xml b/res/values-te-rIN/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-te-rIN/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index c4c9eb43c..5ba391d26 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"ล้าง"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"บันทึก"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"ยกเลิก"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"เลือกบัญชีที่คุณต้องการแชร์ผ่านบลูทูธ คุณยังคงต้องยอมรับการเข้าถึงบัญชีทั้งหมดเมื่อเชื่อมต่อ"</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"เลือกบัญชีที่คุณต้องการแชร์ผ่านบลูทูธ คุณยังคงต้องยอมรับการเข้าถึงบัญชีทั้งหมดเมื่อเชื่อมต่อ"</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"ช่องที่เหลือ:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"ไอคอนแอปพลิเคชัน"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"การตั้งค่าการแชร์ข้อความผ่านบลูทูธ"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"ไม่สามารถเลือกบัญชีได้ ช่องเหลือ 0 ช่อง"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"เชื่อมต่อ Bluetooth Audio แล้ว"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"ยกเลิกการเชื่อมต่อ Bluetooth Audio แล้ว"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth Audio"</string>
 </resources>
diff --git a/res/values-th/strings_pbap_client.xml b/res/values-th/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-th/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 10a9d4bb6..b511d48af 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"I-clear"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"I-save"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Kanselahin"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Piliin ang mga account na gusto mong ibahagi sa pamamagitan ng Bluetooth. Kailangan mo pa ring tumanggap ng access sa mga account kapag kumokonekta."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Piliin ang mga account na gusto mong ibahagi sa pamamagitan ng Bluetooth. Kailangan mo pa ring tanggapin ang anumang pag-access sa mga account kapag kumokonekta."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Mga slot na natitira:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Icon ng Application"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Mga Setting ng Pagbabahagi ng Mensahe sa Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Hindi mapili ang account. 0 slot ang natitira"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Nakakonekta ang Bluetooth audio"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Nadiskonekta ang Bluetooth audio"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth Audio"</string>
 </resources>
diff --git a/res/values-tl/strings_pbap_client.xml b/res/values-tl/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-tl/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-tl/test_strings.xml b/res/values-tl/test_strings.xml
index 5fd26652e..1feb0321b 100644
--- a/res/values-tl/test_strings.xml
+++ b/res/values-tl/test_strings.xml
@@ -6,9 +6,9 @@
     <string name="insert_record" msgid="1450997173838378132">"Ipasok ang tala"</string>
     <string name="update_record" msgid="2480425402384910635">"Kumpirmahin ang tala"</string>
     <string name="ack_record" msgid="6716152390978472184">"Ack na tala"</string>
-    <string name="deleteAll_record" msgid="4383349788485210582">"Tanggalin ang lahat ng tala"</string>
+    <string name="deleteAll_record" msgid="4383349788485210582">"I-delete ang lahat ng tala"</string>
     <string name="ok_button" msgid="6519033415223065454">"OK"</string>
-    <string name="delete_record" msgid="4645040331967533724">"Tanggalin ang tala"</string>
+    <string name="delete_record" msgid="4645040331967533724">"I-delete ang tala"</string>
     <string name="start_server" msgid="9034821924409165795">"Simulan ang TCP server"</string>
     <string name="notify_server" msgid="4369106744022969655">"I-notify ang TCP server"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 90ec76124..e3bbe80e3 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Temizle"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Kaydet"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"İptal"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Bluetooth üzerinden paylaşmak istediğiniz hesapları seçin. Bağlanırken yine de hesaplara erişimi kabul etmeniz gerekmektedir."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Bluetooth üzerinden paylaşmak istediğiniz hesapları seçin. Bağlanırken yine de hesaplara erişimi kabul etmeniz gerekmektedir."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Kalan yuva sayısı:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Uygulama Simgesi"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth İleti Paylaşımı Ayarları"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Hesap seçilemiyor. 0 yuva kaldı."</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth ses bağlandı"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth ses bağlantısı kesildi"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth Ses"</string>
 </resources>
diff --git a/res/values-tr/strings_pbap_client.xml b/res/values-tr/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-tr/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4f002e258..1e5fa5382 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -127,9 +127,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Очистити"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Зберегти"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Скасувати"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Виберіть облікові записи, до яких ви хочете надати доступ через Bluetooth. Під час підключення все одно потрібно буде схвалити доступ до облікових записів."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Виберіть облікові записи, до яких ви хочете надати доступ через Bluetooth. Під час підключення все одно потрібно буде схвалити доступ до облікових записів."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Залишилося місць:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Значок додатка"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Параметри надсилання повідомлень через Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Обліковий запис не вибрано. Залишилося 0 місць"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Аудіо Bluetooth під’єднано"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Аудіо Bluetooth від’єднано"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth Audio"</string>
 </resources>
diff --git a/res/values-uk/strings_pbap_client.xml b/res/values-uk/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-uk/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 937e8aee7..56f63b38f 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"صاف کریں"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"محفوظ کریں"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"منسوخ کریں"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"ان اکاؤنٹس کو منتخب کریں جن کا آپ بلوٹوتھ کے ذریعے اشتراک کرنا چاہتے ہیں۔ آپ کو ابھی بھی منسلک ہوتے وقت اکاؤنٹس تک کسی رسائی کو قبول کرنا ہوگا۔"</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"ان اکاؤنٹس کو منتخب کریں جن کا آپ بلوٹوتھ کے ذریعے اشتراک کرنا چاہتے ہیں۔ آپ کو ابھی بھی منسلک ہوتے وقت اکاؤنٹس تک کسی بھی رسائی کو قبول کرنا ہوگا۔"</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"بچے ہوئے سلاٹس:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"ایپلیکیشن کا آئیکن"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"بلوٹوتھ پیغام کے اشتراک کی ترتیبات"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"اکاؤنٹ کو منتخب نہیں کیا جا سکتا ہے۔ 0 سلاٹس باقی ہیں"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"بلوٹوتھ آڈیو منسلک ہے"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"بلوٹوتھ آڈیو غیر منسلک ہے"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"بلوٹوتھ آڈیو"</string>
 </resources>
diff --git a/res/values-ur-rPK/strings_pbap_client.xml b/res/values-ur-rPK/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-ur-rPK/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 0006e5a43..f3e288281 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Tozalash"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Saqlash"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Bekor qilish"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Bluetooth orqali o‘tkazmoqchi bo‘lgan hisoblarni tanlang. Har safar ulanishda so‘rovni tasdiqlash talab qilinadi."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Bluetooth orqali narsa o‘tkazmoqchi bo‘lgan hisoblarni tanlang. Har safar ulanishda so‘rovni tasdiqlash talab qilinadi."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Qolgan joylar:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Ilova ikonkasi"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth orqali xabar ulashish sozlamalari"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Hisobni tanlab bo‘lmadi: bo‘sh joy qolmadi"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Bluetooth orqali ovoz yoqildi"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Bluetooth orqali ovoz o‘chirildi"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Bluetooth orqali ovoz"</string>
 </resources>
diff --git a/res/values-uz-rUZ/strings_pbap_client.xml b/res/values-uz-rUZ/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-uz-rUZ/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 416167ba1..a4d0fcc7c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Xóa"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Lưu"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Hủy"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Chọn tài khoản mà bạn muốn chia sẻ qua Bluetooth. Bạn vẫn phải chấp nhận mọi quyền truy cập vào tài khoản khi kết nối."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Chọn tài khoản mà bạn muốn chia sẻ qua Bluetooth. Bạn vẫn phải chấp nhận mọi quyền truy cập vào tài khoản khi kết nối."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Số khe cắm còn lại:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Biểu tượng ứng dụng"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Cài đặt chia sẻ thư qua Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Không chọn được tài khoản. Còn lại 0 khe cắm"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Đã kết nối âm thanh Bluetooth"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Đã ngắt kết nối âm thanh Bluetooth"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Âm thanh Bluetooth"</string>
 </resources>
diff --git a/res/values-vi/strings_pbap_client.xml b/res/values-vi/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-vi/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 509eb64ba..fd9402a83 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"清除"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"保存"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"取消"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"选中您要通过蓝牙共享的帐号。建立连接后，您仍需接受对这些帐号的所有访问请求。"</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"选择您要通过蓝牙共享的帐号。连接时，您仍必须接受所有帐号访问请求。"</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"剩余空档数："</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"应用图标"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"蓝牙消息共享设置"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"无法选择帐号，目前没有任何空档"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"蓝牙音频已连接"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"蓝牙音频已断开连接"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"蓝牙音频"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings_pbap_client.xml b/res/values-zh-rCN/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-zh-rCN/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 2bcd1436f..595480ca5 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"清除"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"儲存"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"取消"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"選取您要透過藍牙分享的帳戶。連線時，您仍然必須接受所有帳戶存取要求。"</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"選取您要透過藍牙分享的帳戶。連線時，您仍然必須接受所有帳戶存取要求。"</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"剩餘插槽數："</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"應用程式圖示"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"藍牙訊息分享設定"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"無法選取帳戶 (剩餘插槽數為 0)"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"已與藍牙音訊連接"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"已與藍牙音訊解除連接"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"藍牙音訊"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings_pbap_client.xml b/res/values-zh-rHK/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-zh-rHK/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 88e45e256..a4e723b10 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"清除"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"儲存"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"取消"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"選取您要透過藍牙分享的帳戶。連線時，您仍須接受所有帳戶存取要求。"</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"選取您要透過藍牙分享的帳戶。連線時，您仍須接受所有帳戶存取要求。"</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"剩餘插槽數："</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"應用程式圖示"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"藍牙郵件分享設定"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"無法選取帳戶 (剩餘插槽數為 0)"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"已與藍牙音訊連線"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"已中斷與藍牙音訊的連線"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"藍牙音訊"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings_pbap_client.xml b/res/values-zh-rTW/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-zh-rTW/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index e4df4036c..26b941af9 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -123,9 +123,12 @@
     <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Sula"</string>
     <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Londoloza"</string>
     <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Khansela"</string>
-    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Khetha ama-akhawunti ofuna ukwabelana ngawo nge-Bluetooth. Kusazomele wamukele noma yikuphi ukufinyelela kuma-akhawunti uma uxhumeka."</string>
+    <string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"Khetha ama-akhawunti ofuna ukwabelana nawo nge-Bluetooth. Kusazomele wamukele noma yikuphi ukufinyelelwa kuma-akhawunti uma kuxhunywa."</string>
     <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Izikhala ezisele:"</string>
     <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Isithonjana sohlelo lokusebenza"</string>
     <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Izilungiselelo zokwabelana ngomlayezo we-Bluetooth"</string>
     <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Ayikwazi ukukhetha i-akhawunti. 0 izikhala ezisele"</string>
+    <string name="bluetooth_connected" msgid="6718623220072656906">"Umsindo we-Bluetooth uxhunyiwe"</string>
+    <string name="bluetooth_disconnected" msgid="3318303728981478873">"Umsindo we-Bluetooth unqanyuliwe"</string>
+    <string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"Umsindo we-Bluetooth"</string>
 </resources>
diff --git a/res/values-zu/strings_pbap_client.xml b/res/values-zu/strings_pbap_client.xml
new file mode 100644
index 000000000..186b23ae3
--- /dev/null
+++ b/res/values-zu/strings_pbap_client.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
+</resources>
author	Bill Yi <byi@google.com>	2016-11-20 16:31:06 -0800
committer	Bill Yi <byi@google.com>	2016-11-20 16:31:06 -0800
commit	3d24c0a0ebf596e260cd54b119b1b5a2fa98892a (patch)
tree	4b531d6b94d7169ffa46a6ac7a7398b1a01d1d21
parent	04c04e7e9804dd77317c063d4c2ca93bf077aa62 (diff)
download	android_packages_apps_Bluetooth-3d24c0a0ebf596e260cd54b119b1b5a2fa98892a.tar.gz android_packages_apps_Bluetooth-3d24c0a0ebf596e260cd54b119b1b5a2fa98892a.tar.bz2 android_packages_apps_Bluetooth-3d24c0a0ebf596e260cd54b119b1b5a2fa98892a.zip