Snap for 5450365 from 6e7a55d02a8735e1cea871d863669140b29ff1d2 to pi-platform-release
Change-Id: I6fba3e70c768cae6131bc64ee1d1a6ad66e5a27a
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index a67ceaa..bfb3168 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/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">"ডাউনল\'ড মেনেজাৰ ব্যৱহাৰ কৰিব পাৰে।"</string>
+ <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"ডাউনল’ড মেনেজাৰ ব্যৱহাৰ কৰিব পাৰে।"</string>
<string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"এপটোক BluetoothShare মেনেজাৰ ব্যৱহাৰ কৰি ফাইল স্থানান্তৰ কৰিবলৈ অনুমতি দিয়ে।"</string>
<string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"ব্লুটুথ ডিভাইচ ব্যৱাহৰ কৰিবলৈ স্বীকৃতি দিয়ক।"</string>
<string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"ব্যৱহাৰকাৰীৰ অনুমতি অবিহনে এই ডিভাইচক ফাইলবোৰ পঠিয়াবলৈ দি এপটোক ব্লুটুথ ডিভাইচক কিছু সময়ৰ বাবে স্বীকৃতি দিয়ে।"</string>
@@ -39,11 +39,11 @@
<string name="incoming_file_confirm_Notification_title" msgid="5573329005298936903">"অন্তৰ্গামী ফাইল"</string>
<string name="incoming_file_confirm_Notification_content" msgid="3359694069319644738">"<xliff:g id="SENDER">%1$s</xliff:g> <xliff:g id="FILE">%2$s</xliff:g> পঠাবলৈ সাজু"</string>
<string name="notification_receiving" msgid="4674648179652543984">"ব্লুটুথ শ্বেয়াৰ: <xliff:g id="FILE">%1$s</xliff:g> লাভ কৰি থকা হৈছে"</string>
- <string name="notification_received" msgid="3324588019186687985">"ব্লুটুথ শ্বেয়াৰ: <xliff:g id="FILE">%1$s</xliff:g> লাভ কৰা হ\'ল"</string>
+ <string name="notification_received" msgid="3324588019186687985">"ব্লুটুথ শ্বেয়াৰ: <xliff:g id="FILE">%1$s</xliff:g> লাভ কৰা হ’ল"</string>
<string name="notification_received_fail" msgid="3619350997285714746">"ব্লুটুথ শ্বেয়াৰ: ফাইল <xliff:g id="FILE">%1$s</xliff:g> লাভ কৰা নহ\'ল"</string>
<string name="notification_sending" msgid="3035748958534983833">"ব্লুটুথ শ্বেয়াৰ: <xliff:g id="FILE">%1$s</xliff:g> প্ৰেৰণ কৰি থকা হৈছে"</string>
- <string name="notification_sent" msgid="9218710861333027778">"ব্লুটুথ শ্বেয়াৰ: <xliff:g id="FILE">%1$s</xliff:g> প্ৰেৰণ কৰা হ\'ল"</string>
- <string name="notification_sent_complete" msgid="302943281067557969">"১০০% সম্পূৰ্ণ হ\'ল"</string>
+ <string name="notification_sent" msgid="9218710861333027778">"ব্লুটুথ শ্বেয়াৰ: <xliff:g id="FILE">%1$s</xliff:g> প্ৰেৰণ কৰা হ’ল"</string>
+ <string name="notification_sent_complete" msgid="302943281067557969">"১০০% সম্পূৰ্ণ হ’ল"</string>
<string name="notification_sent_fail" msgid="6696082233774569445">"ব্লুটুথ শ্বেয়াৰ: ফাইল <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>
@@ -60,12 +60,12 @@
<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_succ_line5" msgid="4509944688281573595">"ফাইল লাভ কৰা হ\'ল"</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_line5" msgid="5687317197463383601">"ফাইল প্ৰেৰণ কৰা হ’ল"</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>
@@ -80,17 +80,17 @@
<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>
+ <string name="bt_toast_3" msgid="6707884165086862518">"\"<xliff:g id="SENDER">%1$s</xliff:g>\"ৰ ফাইল লাভ কৰা বন্ধ কৰা হ’ল"</string>
<string name="bt_toast_4" msgid="4678812947604395649">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"লৈ ফাইল প্ৰেৰণ কৰি থকা হৈছে"</string>
<string name="bt_toast_5" msgid="2846870992823019494">"\"<xliff:g id="RECIPIENT">%2$s</xliff:g>\"লৈ <xliff:g id="NUMBER">%1$s</xliff:g>টা ফাইল পঠিয়াই থকা হৈছে"</string>
- <string name="bt_toast_6" msgid="1855266596936622458">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"লৈ ফাইল পঠিওৱা বন্ধ কৰা হ\'ল"</string>
+ <string name="bt_toast_6" msgid="1855266596936622458">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"লৈ ফাইল পঠিওৱা বন্ধ কৰা হ’ল"</string>
<string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"\"<xliff:g id="SENDER">%1$s</xliff:g>\"ৰ পৰা লাভ কৰা ফাইলটো ছেভ কৰিবলৈ ইউএছবি সঞ্চয়াগাৰত পৰ্যাপ্ত খালী ঠাই নাই"</string>
<string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"\"<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="status_pending" msgid="2503691772030877944">"ফাইলৰ স্থানান্তৰণ এতিয়ালৈকে আৰম্ভ হোৱা নাই।"</string>
<string name="status_running" msgid="6562808920311008696">"ফাইলৰ স্থানান্তৰণ চলি আছে।"</string>
- <string name="status_success" msgid="239573225847565868">"ফাইলৰ স্থানান্তৰণৰ কাৰ্য সফলতাৰে সম্পন্ন কৰা হ\'ল।"</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_canceled" msgid="6664490318773098285">"ব্যৱহাৰকাৰীয়ে স্থানান্তৰণ বাতিল কৰিছে।"</string>
@@ -100,10 +100,10 @@
<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">"ব্লুটুথ লাভ কৰা হ\'ল"</string>
+ <string name="btopp_live_folder" msgid="7967791481444474554">"ব্লুটুথ লাভ কৰা হ’ল"</string>
<string name="opp_notification_group" msgid="3486303082135789982">"ব্লুটুথ শ্বেয়াৰ"</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="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>
@@ -111,12 +111,12 @@
<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">
- <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>
+ <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>
</plurals>
<plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <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>
+ <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_open" msgid="3368984869083107200">"খোলক"</string>
@@ -129,8 +129,8 @@
<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="bluetooth_connected" msgid="6718623220072656906">"ব্লুটুথ অডিঅ’ সংযুক্ত কৰা হ’ল"</string>
+ <string name="bluetooth_disconnected" msgid="3318303728981478873">"ব্লুটুথ অডিঅ\'ৰ সৈতে সংযোগ বিচ্ছিন্ন কৰা হ’ল"</string>
<string name="a2dp_sink_mbs_label" msgid="7566075853395412558">"ব্লুটুথ অডিঅ\'"</string>
<string name="bluetooth_opp_file_limit_exceeded" msgid="8894450394309084519">"৪ জি. বি. তকৈ ডাঙৰ ফাইল স্থানান্তৰ কৰিব নোৱাৰি"</string>
</resources>
diff --git a/res/values-bs/strings_pbap.xml b/res/values-bs/strings_pbap.xml
index 5f35408..55bbe3c 100644
--- a/res/values-bs/strings_pbap.xml
+++ b/res/values-bs/strings_pbap.xml
@@ -5,7 +5,7 @@
<string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Neophodan je ključ za Bluetooth sesiju"</string>
<string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"Isteklo je vrijeme za prihvatanje veze sa uređajem %1$s"</string>
<string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"Isteklo je vrijeme za unošenje ključa sesije sa uređajem %1$s"</string>
- <string name="auth_notif_ticker" msgid="1575825798053163744">"Zahtjev za Obex provjeru vjerodostojnosti"</string>
+ <string name="auth_notif_ticker" msgid="1575825798053163744">"Zahtjev za Obex autentifikaciju"</string>
<string name="auth_notif_title" msgid="7599854855681573258">"Ključ sesije"</string>
<string name="auth_notif_message" msgid="6667218116427605038">"Unesite ključ sesije za %1$s"</string>
<string name="defaultname" msgid="4821590500649090078">"Komplet za automobil"</string>
diff --git a/res/values-da/strings_pbap.xml b/res/values-da/strings_pbap.xml
index f0802f5..4837260 100644
--- a/res/values-da/strings_pbap.xml
+++ b/res/values-da/strings_pbap.xml
@@ -12,5 +12,5 @@
<string name="unknownName" msgid="2841414754740600042">"Ukendt navn"</string>
<string name="localPhoneName" msgid="2349001318925409159">"Mit navn"</string>
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
- <string name="pbap_notification_group" msgid="8487669554703627168">"Deling af kontaktpersoner via Bluetooth"</string>
+ <string name="pbap_notification_group" msgid="8487669554703627168">"Deling af kontakter via Bluetooth"</string>
</resources>
diff --git a/res/values-en-rXC/config.xml b/res/values-en-rXC/config.xml
index c77a0a4..5653f1d 100644
--- a/res/values-en-rXC/config.xml
+++ b/res/values-en-rXC/config.xml
@@ -15,5 +15,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="pairing_ui_package" msgid="6399948348712579121">"com.android.settings"</string>
+ <string name="pairing_ui_package" msgid="6399948348712579121">"com.android.settings"</string>
</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 9821b62..47646b1 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -16,121 +16,121 @@
<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">"Access download manager."</string>
- <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Allows the app to access the BluetoothShare manager and use it to transfer files."</string>
- <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Whitelist bluetooth device access."</string>
- <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Allows the app to temporarily whitelist a Bluetooth device, allowing that device to send files to this device without user confirmation."</string>
- <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
- <string name="unknown_device" msgid="9221903979877041009">"Unknown device"</string>
- <string name="unknownNumber" msgid="4994750948072751566">"Unknown"</string>
- <string name="airplane_error_title" msgid="2683839635115739939">"Airplane mode"</string>
- <string name="airplane_error_msg" msgid="8698965595254137230">"You can\'t use Bluetooth in Airplane mode."</string>
+ <string name="permlab_bluetoothShareManager" msgid="311492132450338925">"Access download manager."</string>
+ <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Allows the app to access the BluetoothShare manager and use it to transfer files."</string>
+ <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Whitelist bluetooth device access."</string>
+ <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Allows the app to temporarily whitelist a Bluetooth device, allowing that device to send files to this device without user confirmation."</string>
+ <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>
+ <string name="unknown_device" msgid="9221903979877041009">"Unknown device"</string>
+ <string name="unknownNumber" msgid="4994750948072751566">"Unknown"</string>
+ <string name="airplane_error_title" msgid="2683839635115739939">"Airplane mode"</string>
+ <string name="airplane_error_msg" msgid="8698965595254137230">"You can\'t use Bluetooth in Airplane mode."</string>
<string name="bt_enable_title" msgid="8657832550503456572"></string>
- <string name="bt_enable_line1" msgid="7203551583048149">"To use Bluetooth services, you must first turn on Bluetooth."</string>
- <string name="bt_enable_line2" msgid="4341936569415937994">"Turn on Bluetooth now?"</string>
- <string name="bt_enable_cancel" msgid="1988832367505151727">"Cancel"</string>
- <string name="bt_enable_ok" msgid="3432462749994538265">"Turn on"</string>
- <string name="incoming_file_confirm_title" msgid="8139874248612182627">"File transfer"</string>
- <string name="incoming_file_confirm_content" msgid="2752605552743148036">"Accept incoming file?"</string>
- <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Decline"</string>
- <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Accept"</string>
- <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>
- <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"There was a timeout while accepting an incoming file from \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
- <string name="incoming_file_confirm_Notification_title" msgid="5573329005298936903">"Incoming file"</string>
- <string name="incoming_file_confirm_Notification_content" msgid="3359694069319644738">"<xliff:g id="SENDER">%1$s</xliff:g> is ready to send <xliff:g id="FILE">%2$s</xliff:g>"</string>
- <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth share: Receiving <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_received" msgid="3324588019186687985">"Bluetooth share: Received <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth share: File <xliff:g id="FILE">%1$s</xliff:g> not received"</string>
- <string name="notification_sending" msgid="3035748958534983833">"Bluetooth share: Sending <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_sent" msgid="9218710861333027778">"Bluetooth share: Sent <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_sent_complete" msgid="302943281067557969">"100% complete"</string>
- <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth share: File <xliff:g id="FILE">%1$s</xliff:g> not sent"</string>
- <string name="download_title" msgid="3353228219772092586">"File transfer"</string>
- <string name="download_line1" msgid="4926604799202134144">"From: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
- <string name="download_line2" msgid="5876973543019417712">"File: <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="download_line3" msgid="4384821622908676061">"File size: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+ <string name="bt_enable_line1" msgid="7203551583048149">"To use Bluetooth services, you must first turn on Bluetooth."</string>
+ <string name="bt_enable_line2" msgid="4341936569415937994">"Turn on Bluetooth now?"</string>
+ <string name="bt_enable_cancel" msgid="1988832367505151727">"Cancel"</string>
+ <string name="bt_enable_ok" msgid="3432462749994538265">"Turn on"</string>
+ <string name="incoming_file_confirm_title" msgid="8139874248612182627">"File transfer"</string>
+ <string name="incoming_file_confirm_content" msgid="2752605552743148036">"Accept incoming file?"</string>
+ <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Decline"</string>
+ <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Accept"</string>
+ <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>
+ <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"There was a timeout while accepting an incoming file from \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+ <string name="incoming_file_confirm_Notification_title" msgid="5573329005298936903">"Incoming file"</string>
+ <string name="incoming_file_confirm_Notification_content" msgid="3359694069319644738">"<xliff:g id="SENDER">%1$s</xliff:g> is ready to send <xliff:g id="FILE">%2$s</xliff:g>"</string>
+ <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth share: Receiving <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_received" msgid="3324588019186687985">"Bluetooth share: Received <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth share: File <xliff:g id="FILE">%1$s</xliff:g> not received"</string>
+ <string name="notification_sending" msgid="3035748958534983833">"Bluetooth share: Sending <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_sent" msgid="9218710861333027778">"Bluetooth share: Sent <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_sent_complete" msgid="302943281067557969">"100% complete"</string>
+ <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth share: File <xliff:g id="FILE">%1$s</xliff:g> not sent"</string>
+ <string name="download_title" msgid="3353228219772092586">"File transfer"</string>
+ <string name="download_line1" msgid="4926604799202134144">"From: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+ <string name="download_line2" msgid="5876973543019417712">"File: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="download_line3" msgid="4384821622908676061">"File size: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
<string name="download_line4" msgid="8535996869722666525"></string>
- <string name="download_line5" msgid="3069560415845295386">"Receiving file…"</string>
- <string name="download_cancel" msgid="9177305996747500768">"Stop"</string>
- <string name="download_ok" msgid="5000360731674466039">"Hide"</string>
- <string name="incoming_line1" msgid="2127419875681087545">"From"</string>
- <string name="incoming_line2" msgid="3348994249285315873">"Filename"</string>
- <string name="incoming_line3" msgid="7954237069667474024">"Size"</string>
- <string name="download_fail_line1" msgid="3846450148862894552">"File not received"</string>
- <string name="download_fail_line2" msgid="8950394574689971071">"File: <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="download_fail_line3" msgid="3451040656154861722">"Reason: <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">"File received"</string>
- <string name="download_succ_ok" msgid="7053688246357050216">"Open"</string>
- <string name="upload_line1" msgid="2055952074059709052">"To: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
- <string name="upload_line3" msgid="4920689672457037437">"File type: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
- <string name="upload_line5" msgid="7759322537674229752">"Sending file…"</string>
- <string name="upload_succ_line5" msgid="5687317197463383601">"File sent"</string>
- <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
- <string name="upload_fail_line1" msgid="7899394672421491701">"The file wasn\'t sent to \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"."</string>
- <string name="upload_fail_line1_2" msgid="2108129204050841798">"File: <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="upload_fail_ok" msgid="5807702461606714296">"Try again"</string>
- <string name="upload_fail_cancel" msgid="9118496285835687125">"Close"</string>
- <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
- <string name="unknown_file" msgid="6092727753965095366">"Unknown file"</string>
- <string name="unknown_file_desc" msgid="480434281415453287">"There\'s no app to handle this type of file. \n"</string>
- <string name="not_exist_file" msgid="3489434189599716133">"No file"</string>
- <string name="not_exist_file_desc" msgid="4059531573790529229">"The file doesn\'t exist. \n"</string>
- <string name="enabling_progress_title" msgid="436157952334723406">"Please wait…"</string>
- <string name="enabling_progress_content" msgid="4601542238119927904">"Turning on Bluetooth…"</string>
- <string name="bt_toast_1" msgid="972182708034353383">"The file will be received. Check progress in the Notifications panel."</string>
- <string name="bt_toast_2" msgid="8602553334099066582">"The file can\'t be received."</string>
- <string name="bt_toast_3" msgid="6707884165086862518">"Stopped receiving file from \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
- <string name="bt_toast_4" msgid="4678812947604395649">"Sending file to \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
- <string name="bt_toast_5" msgid="2846870992823019494">"Sending <xliff:g id="NUMBER">%1$s</xliff:g> files to \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\""</string>
- <string name="bt_toast_6" msgid="1855266596936622458">"Stopped sending file to \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
- <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"There isn\'t enough space in USB storage to save the file from \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
- <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"There isn\'t enough space on the SD card to save the file from \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
- <string name="bt_sm_2_2" msgid="2965243265852680543">"Space needed: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
- <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Too many requests are being processed. Try again later."</string>
- <string name="status_pending" msgid="2503691772030877944">"File transfer not started yet."</string>
- <string name="status_running" msgid="6562808920311008696">"File transfer is ongoing."</string>
- <string name="status_success" msgid="239573225847565868">"File transfer completed successfully."</string>
- <string name="status_not_accept" msgid="1695082417193780738">"Content isn\'t supported."</string>
- <string name="status_forbidden" msgid="613956401054050725">"Transfer forbidden by target device."</string>
- <string name="status_canceled" msgid="6664490318773098285">"Transfer canceled by user."</string>
- <string name="status_file_error" msgid="3671917770630165299">"Storage issue."</string>
- <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"No USB storage."</string>
- <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"No SD card. Insert an SD card to save transferred files."</string>
- <string name="status_connection_error" msgid="947681831523219891">"Connection unsuccessful."</string>
- <string name="status_protocol_error" msgid="3245444473429269539">"Request can\'t be handled correctly."</string>
- <string name="status_unknown_error" msgid="8156660554237824912">"Unknown error."</string>
- <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth received"</string>
- <string name="opp_notification_group" msgid="3486303082135789982">"Bluetooth Share"</string>
- <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Received complete."</string>
- <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Sent complete."</string>
- <string name="inbound_history_title" msgid="6940914942271327563">"Inbound transfers"</string>
- <string name="outbound_history_title" msgid="4279418703178140526">"Outbound transfers"</string>
- <string name="no_transfers" msgid="3482965619151865672">"Transfer history is empty."</string>
- <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"All items will be cleared from the list."</string>
- <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth share: Sent files"</string>
- <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth share: Received files"</string>
+ <string name="download_line5" msgid="3069560415845295386">"Receiving file…"</string>
+ <string name="download_cancel" msgid="9177305996747500768">"Stop"</string>
+ <string name="download_ok" msgid="5000360731674466039">"Hide"</string>
+ <string name="incoming_line1" msgid="2127419875681087545">"From"</string>
+ <string name="incoming_line2" msgid="3348994249285315873">"Filename"</string>
+ <string name="incoming_line3" msgid="7954237069667474024">"Size"</string>
+ <string name="download_fail_line1" msgid="3846450148862894552">"File not received"</string>
+ <string name="download_fail_line2" msgid="8950394574689971071">"File: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="download_fail_line3" msgid="3451040656154861722">"Reason: <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">"File received"</string>
+ <string name="download_succ_ok" msgid="7053688246357050216">"Open"</string>
+ <string name="upload_line1" msgid="2055952074059709052">"To: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+ <string name="upload_line3" msgid="4920689672457037437">"File type: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>
+ <string name="upload_line5" msgid="7759322537674229752">"Sending file…"</string>
+ <string name="upload_succ_line5" msgid="5687317197463383601">"File sent"</string>
+ <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>
+ <string name="upload_fail_line1" msgid="7899394672421491701">"The file wasn\'t sent to \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"."</string>
+ <string name="upload_fail_line1_2" msgid="2108129204050841798">"File: <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="upload_fail_ok" msgid="5807702461606714296">"Try again"</string>
+ <string name="upload_fail_cancel" msgid="9118496285835687125">"Close"</string>
+ <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>
+ <string name="unknown_file" msgid="6092727753965095366">"Unknown file"</string>
+ <string name="unknown_file_desc" msgid="480434281415453287">"There\'s no app to handle this type of file. \n"</string>
+ <string name="not_exist_file" msgid="3489434189599716133">"No file"</string>
+ <string name="not_exist_file_desc" msgid="4059531573790529229">"The file doesn\'t exist. \n"</string>
+ <string name="enabling_progress_title" msgid="436157952334723406">"Please wait…"</string>
+ <string name="enabling_progress_content" msgid="4601542238119927904">"Turning on Bluetooth…"</string>
+ <string name="bt_toast_1" msgid="972182708034353383">"The file will be received. Check progress in the Notifications panel."</string>
+ <string name="bt_toast_2" msgid="8602553334099066582">"The file can\'t be received."</string>
+ <string name="bt_toast_3" msgid="6707884165086862518">"Stopped receiving file from \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+ <string name="bt_toast_4" msgid="4678812947604395649">"Sending file to \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+ <string name="bt_toast_5" msgid="2846870992823019494">"Sending <xliff:g id="NUMBER">%1$s</xliff:g> files to \"<xliff:g id="RECIPIENT">%2$s</xliff:g>\""</string>
+ <string name="bt_toast_6" msgid="1855266596936622458">"Stopped sending file to \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
+ <string name="bt_sm_2_1" product="nosdcard" msgid="352165168004521000">"There isn\'t enough space in USB storage to save the file from \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+ <string name="bt_sm_2_1" product="default" msgid="1989018443456803630">"There isn\'t enough space on the SD card to save the file from \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
+ <string name="bt_sm_2_2" msgid="2965243265852680543">"Space needed: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+ <string name="ErrorTooManyRequests" msgid="8578277541472944529">"Too many requests are being processed. Try again later."</string>
+ <string name="status_pending" msgid="2503691772030877944">"File transfer not started yet."</string>
+ <string name="status_running" msgid="6562808920311008696">"File transfer is ongoing."</string>
+ <string name="status_success" msgid="239573225847565868">"File transfer completed successfully."</string>
+ <string name="status_not_accept" msgid="1695082417193780738">"Content isn\'t supported."</string>
+ <string name="status_forbidden" msgid="613956401054050725">"Transfer forbidden by target device."</string>
+ <string name="status_canceled" msgid="6664490318773098285">"Transfer canceled by user."</string>
+ <string name="status_file_error" msgid="3671917770630165299">"Storage issue."</string>
+ <string name="status_no_sd_card" product="nosdcard" msgid="1112125377088421469">"No USB storage."</string>
+ <string name="status_no_sd_card" product="default" msgid="5760944071743325592">"No SD card. Insert an SD card to save transferred files."</string>
+ <string name="status_connection_error" msgid="947681831523219891">"Connection unsuccessful."</string>
+ <string name="status_protocol_error" msgid="3245444473429269539">"Request can\'t be handled correctly."</string>
+ <string name="status_unknown_error" msgid="8156660554237824912">"Unknown error."</string>
+ <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth received"</string>
+ <string name="opp_notification_group" msgid="3486303082135789982">"Bluetooth Share"</string>
+ <string name="download_success" msgid="7036160438766730871">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Received complete."</string>
+ <string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> Sent complete."</string>
+ <string name="inbound_history_title" msgid="6940914942271327563">"Inbound transfers"</string>
+ <string name="outbound_history_title" msgid="4279418703178140526">"Outbound transfers"</string>
+ <string name="no_transfers" msgid="3482965619151865672">"Transfer history is empty."</string>
+ <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"All items will be cleared from the list."</string>
+ <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth share: Sent files"</string>
+ <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth share: Received files"</string>
<plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
- <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> unsuccessful.</item>
- <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> unsuccessful.</item>
+ <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> unsuccessful.</item>
+ <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> unsuccessful.</item>
</plurals>
<plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
- <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> successful, %2$s</item>
- <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> successful, %2$s</item>
+ <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> successful, %2$s</item>
+ <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> successful, %2$s</item>
</plurals>
- <string name="transfer_menu_clear_all" msgid="790017462957873132">"Clear list"</string>
- <string name="transfer_menu_open" msgid="3368984869083107200">"Open"</string>
- <string name="transfer_menu_clear" msgid="5854038118831427492">"Clear from list"</string>
- <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="6482369468223987562">"Select the accounts 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>
- <string name="bluetooth_opp_file_limit_exceeded" msgid="8894450394309084519">"Files bigger than 4GB cannot be transferred"</string>
+ <string name="transfer_menu_clear_all" msgid="790017462957873132">"Clear list"</string>
+ <string name="transfer_menu_open" msgid="3368984869083107200">"Open"</string>
+ <string name="transfer_menu_clear" msgid="5854038118831427492">"Clear from list"</string>
+ <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="6482369468223987562">"Select the accounts 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>
+ <string name="bluetooth_opp_file_limit_exceeded" msgid="8894450394309084519">"Files bigger than 4GB cannot be transferred"</string>
</resources>
diff --git a/res/values-en-rXC/strings_pbap.xml b/res/values-en-rXC/strings_pbap.xml
index fee6dbd..e820513 100644
--- a/res/values-en-rXC/strings_pbap.xml
+++ b/res/values-en-rXC/strings_pbap.xml
@@ -1,16 +1,16 @@
<?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">"Type session key for %1$s"</string>
- <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Bluetooth session key required"</string>
- <string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"There was time out to accept connection with %1$s"</string>
- <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"There was time out to input session key with %1$s"</string>
- <string name="auth_notif_ticker" msgid="1575825798053163744">"Obex authentication request"</string>
- <string name="auth_notif_title" msgid="7599854855681573258">"Session Key"</string>
- <string name="auth_notif_message" msgid="6667218116427605038">"Type session key for %1$s"</string>
- <string name="defaultname" msgid="4821590500649090078">"Carkit"</string>
- <string name="unknownName" msgid="2841414754740600042">"Unknown name"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"My name"</string>
- <string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
- <string name="pbap_notification_group" msgid="8487669554703627168">"Bluetooth Contact share"</string>
+ <string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"Type session key for %1$s"</string>
+ <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Bluetooth session key required"</string>
+ <string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"There was time out to accept connection with %1$s"</string>
+ <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"There was time out to input session key with %1$s"</string>
+ <string name="auth_notif_ticker" msgid="1575825798053163744">"Obex authentication request"</string>
+ <string name="auth_notif_title" msgid="7599854855681573258">"Session Key"</string>
+ <string name="auth_notif_message" msgid="6667218116427605038">"Type session key for %1$s"</string>
+ <string name="defaultname" msgid="4821590500649090078">"Carkit"</string>
+ <string name="unknownName" msgid="2841414754740600042">"Unknown name"</string>
+ <string name="localPhoneName" msgid="2349001318925409159">"My name"</string>
+ <string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
+ <string name="pbap_notification_group" msgid="8487669554703627168">"Bluetooth Contact share"</string>
</resources>
diff --git a/res/values-en-rXC/strings_pbap_client.xml b/res/values-en-rXC/strings_pbap_client.xml
index 5d7540f..6a0780a 100644
--- a/res/values-en-rXC/strings_pbap_client.xml
+++ b/res/values-en-rXC/strings_pbap_client.xml
@@ -1,5 +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>
+ <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
</resources>
diff --git a/res/values-en-rXC/strings_sap.xml b/res/values-en-rXC/strings_sap.xml
index 0b0524f..c838e6f 100644
--- a/res/values-en-rXC/strings_sap.xml
+++ b/res/values-en-rXC/strings_sap.xml
@@ -1,10 +1,10 @@
<?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 access"</string>
- <string name="bluetooth_sap_notif_ticker" msgid="6807778527893726699">"Bluetooth SIM Access"</string>
- <string name="bluetooth_sap_notif_message" msgid="7138657801087500690">"Request client to disconnect?"</string>
- <string name="bluetooth_sap_notif_disconnecting" msgid="819150843490233288">"Waiting for client to disconnect"</string>
- <string name="bluetooth_sap_notif_disconnect_button" msgid="3678476872583356919">"Disconnect"</string>
- <string name="bluetooth_sap_notif_force_disconnect_button" msgid="8144086340185532030">"Force disconnect"</string>
+ <string name="bluetooth_sap_notif_title" msgid="6877860822993195074">"Bluetooth SIM access"</string>
+ <string name="bluetooth_sap_notif_ticker" msgid="6807778527893726699">"Bluetooth SIM Access"</string>
+ <string name="bluetooth_sap_notif_message" msgid="7138657801087500690">"Request client to disconnect?"</string>
+ <string name="bluetooth_sap_notif_disconnecting" msgid="819150843490233288">"Waiting for client to disconnect"</string>
+ <string name="bluetooth_sap_notif_disconnect_button" msgid="3678476872583356919">"Disconnect"</string>
+ <string name="bluetooth_sap_notif_force_disconnect_button" msgid="8144086340185532030">"Force disconnect"</string>
</resources>
diff --git a/res/values-en-rXC/test_strings.xml b/res/values-en-rXC/test_strings.xml
index c0638ff..d1df1fc 100644
--- a/res/values-en-rXC/test_strings.xml
+++ b/res/values-en-rXC/test_strings.xml
@@ -1,13 +1,13 @@
<?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="app_name" msgid="6006644116867509664">"Bluetooth"</string>
- <string name="insert_record" msgid="1450997173838378132">"Insert record"</string>
- <string name="update_record" msgid="2480425402384910635">"Confirm record"</string>
- <string name="ack_record" msgid="6716152390978472184">"Ack record"</string>
- <string name="deleteAll_record" msgid="4383349788485210582">"Delete all record"</string>
- <string name="ok_button" msgid="6519033415223065454">"OK"</string>
- <string name="delete_record" msgid="4645040331967533724">"Delete record"</string>
- <string name="start_server" msgid="9034821924409165795">"Start TCP server"</string>
- <string name="notify_server" msgid="4369106744022969655">"Notify TCP server"</string>
+ <string name="app_name" msgid="6006644116867509664">"Bluetooth"</string>
+ <string name="insert_record" msgid="1450997173838378132">"Insert record"</string>
+ <string name="update_record" msgid="2480425402384910635">"Confirm record"</string>
+ <string name="ack_record" msgid="6716152390978472184">"Ack record"</string>
+ <string name="deleteAll_record" msgid="4383349788485210582">"Delete all record"</string>
+ <string name="ok_button" msgid="6519033415223065454">"OK"</string>
+ <string name="delete_record" msgid="4645040331967533724">"Delete record"</string>
+ <string name="start_server" msgid="9034821924409165795">"Start TCP server"</string>
+ <string name="notify_server" msgid="4369106744022969655">"Notify TCP server"</string>
</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 143219a..00b4c1d 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -122,7 +122,7 @@
<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="6482369468223987562">"ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳಲು ಬಯಸುವ ಖಾತೆಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ. ಸಂಪರ್ಕಿಸುವಾಗ ಖಾತೆಗಳಿಗೆ ಯಾವುದೇ ಪ್ರವೇಶವನ್ನು ನೀವು ಈಗಲೂ ಸಮ್ಮತಿಸಬೇಕಾಗುತ್ತದೆ."</string>
<string name="bluetooth_map_settings_count" msgid="4557473074937024833">"ಉಳಿದಿರುವ ಸ್ಲಾಟ್ಗಳು:"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index d63d230..345f44f 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -73,7 +73,7 @@
<string name="upload_fail_cancel" msgid="9118496285835687125">"बंद करा"</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>
diff --git a/src/com/android/bluetooth/map/BluetoothMapService.java b/src/com/android/bluetooth/map/BluetoothMapService.java
index c00b39b..bfb1d3f 100644
--- a/src/com/android/bluetooth/map/BluetoothMapService.java
+++ b/src/com/android/bluetooth/map/BluetoothMapService.java
@@ -348,9 +348,7 @@
updateMasInstancesHandler();
break;
case START_LISTENER:
- if (mAdapter.isEnabled()) {
- startSocketListeners(msg.arg1);
- }
+ startSocketListeners(msg.arg1);
break;
case MSG_MAS_CONNECT:
onConnectHandler(msg.arg1);
@@ -606,7 +604,6 @@
IntentFilter filter = new IntentFilter();
filter.addAction(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY);
- filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
filter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
filter.addAction(BluetoothDevice.ACTION_SDP_RECORD);
filter.addAction(ACTION_SHOW_MAPS_SETTINGS);
@@ -988,30 +985,11 @@
private class MapBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
- if (DEBUG) {
- Log.d(TAG, "onReceive");
- }
String action = intent.getAction();
if (DEBUG) {
Log.d(TAG, "onReceive: " + action);
}
- if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
- int state =
- intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR);
- if (state == BluetoothAdapter.STATE_TURNING_OFF) {
- if (DEBUG) {
- Log.d(TAG, "STATE_TURNING_OFF");
- }
- sendShutdownMessage();
- } else if (state == BluetoothAdapter.STATE_ON) {
- if (DEBUG) {
- Log.d(TAG, "STATE_ON");
- }
- // start ServerSocket listener threads
- sendStartListenerMessage(-1);
- }
-
- } else if (action.equals(USER_CONFIRM_TIMEOUT_ACTION)) {
+ if (action.equals(USER_CONFIRM_TIMEOUT_ACTION)) {
if (DEBUG) {
Log.d(TAG, "USER_CONFIRM_TIMEOUT ACTION Received.");
}