NFC: Merge tag 'android-7.0.0_r1' into nfc.lnx.2.0-dev

* tag 'android-7.0.0_r1':(82 commits) Allow system_server access to NFC reader mode API. Allow system_server access to NFC reader mode API. Allow peripheral/WiFi handover in provision mode. Import translations. DO NOT MERGE Verify setForegroundDispatch caller is in foreground. (DO NOT MERGE) Verify setForegroundDispatch caller is in foreground. Verify setForegroundDispatch caller is in foreground. Import translations. DO NOT MERGE Import translations. DO NOT MERGE Fix API review comments, add remove callback. Only add service when object is complete initialized. Don't use UserHandle.CURRENT when fetching user restrictions. Nfc shouldn't initiate bluetooth connection if disallowed. Allow foreground override in provision mode. Don't disable NFC in airplane mode. Keyboard Shortcuts: remove unnecessary method Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Fix reference to renamed string. ... Change-Id: I1762185248176a989a0fc2902229eb8daed0685b
author: Gaurav Singhal <gsinghal@codeaurora.org> 2016-08-25 18:50:55 +0530
committer: Gaurav Singhal <gsinghal@codeaurora.org> 2016-08-30 07:27:31 +0530
commit: 9fc4df3bf03e72751a4326a947c9bf23ec992e03 (patch)
tree: 9476bb46b6e61e24e4c101f8d9209273a1a0732c /res
parent: 9ea151570d6d1ff1d4bd5772bb49b547cbc48f5c (diff)
parent: 2bccb8f3681351441b7714e1373619bc88923d03 (diff)
download: android_vendor_nxp_opensource_packages_apps_Nfc-9fc4df3bf03e72751a4326a947c9bf23ec992e03.tar.gz
android_vendor_nxp_opensource_packages_apps_Nfc-9fc4df3bf03e72751a4326a947c9bf23ec992e03.tar.bz2
android_vendor_nxp_opensource_packages_apps_Nfc-9fc4df3bf03e72751a4326a947c9bf23ec992e03.zip
163 files changed, 404 insertions, 592 deletions
diff --git a/res/layout/screenshot.xml b/res/layout/screenshot.xml
index 6c5bfc31..8c1b1f9f 100644
--- a/res/layout/screenshot.xml
+++ b/res/layout/screenshot.xml
@@ -32,7 +32,7 @@
             android:layout_width="match_parent"
             android:layout_height="0dip"
             android:layout_weight="1"
-            android:text="@string/touch"
+            android:text="@string/tap_to_beam"
             android:gravity="center"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:visibility="gone"
diff --git a/res/values-af/provisioning.xml b/res/values-af/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-af/provisioning.xml
+++ b/res/values-af/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 12139c77..ef3acc55 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFC-diens"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontak ontvang via NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Raak om hierdie persoon as \'n kontak by te voeg."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC-interaksie voltooi"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Raak om aan hierdie persoon jou kontakinligting te gee."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC geaktiveer."</string>
-    <string name="touch" msgid="4727218133711188355">"Raak en straal"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Tik om te straal"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Inkomende straal..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Stralend…"</string>
     <string name="beam_complete" msgid="477026736424637435">"Straling voltooi"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Straal het nie voltooi nie"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Straal gekanselleer"</string>
     <string name="cancel" msgid="61873902552555096">"Kanselleer"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Raak om te bekyk"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Tik om te bekyk"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Die ontvanger se toestel ondersteun nie groot lêeroordrag via \'n straal nie."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Bring toestelle weer bymekaar"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Straal is tans besig. Probeer weer wanneer die vorige oordrag voltooid is."</string>
diff --git a/res/values-am/provisioning.xml b/res/values-am/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-am/provisioning.xml
+++ b/res/values-am/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 49cd2af4..33a7d346 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc አገልግሎት"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC የተቀበላቸው ዕውቂያዎች"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"ይሄን ሰው እንደ ዕውቅያ ለማከል ነካ አድርግ፡፡"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC ልውውጥ ተጠናቋል"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"ለእዚህ ሰው የአንተን ዕውቅያ መረጃ ለመስጠት መታ አድርግ"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC ነቅቷል፡፡"</string>
-    <string name="touch" msgid="4727218133711188355">"ለማብራት ንካ"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"በሞገድ ለመልቀቅ መታ ያድርጉ"</string>
     <string name="beam_progress" msgid="7453634884807323920">"ገቢ ሞገድ..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"ሞገድ በማመንጨት ላይ..."</string>
     <string name="beam_complete" msgid="477026736424637435">"አመልማሎ ተጠናቅቋል"</string>
     <string name="beam_failed" msgid="5116241718189888630">"ሞገድ አልተጠናቀቀም"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"ሞገድ ተሰርዧል"</string>
     <string name="cancel" msgid="61873902552555096">"ይቅር"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"ለማየት ንካ"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"ለመመልከት መታ ያድርጉ"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"የተቀባዩ መሣሪያ ትልቅ ፋይል በሞገድ በኩል ማስተላለፍ አይደግፍም።"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"መሣሪያዎችን ዳግም አንድ ላይ አሰባስብ"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam አሁን ላይ ባተሌ ነው። ቀዳሚው ዝውውር ሲጠናቀቅ እንደገና ይሞክሩ።"</string>
diff --git a/res/values-ar/provisioning.xml b/res/values-ar/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-ar/provisioning.xml
+++ b/res/values-ar/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1e5db50c..9baee183 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"‏خدمة NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"‏تم استلام جهة اتصال عبر NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"المس لإضافة هذا الشخص كجهة اتصال."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"‏اكتمل تفاعل NFC"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"المس لمنح هذا الشخص معلومات اتصالك."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"‏تم تمكين NFC."</string>
-    <string name="touch" msgid="4727218133711188355">"المس لتبادل البيانات"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Tap to beam"</string>
     <string name="beam_progress" msgid="7453634884807323920">"بيانات واردة..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"إرسال لاسلكي..."</string>
     <string name="beam_complete" msgid="477026736424637435">"اكتمل تبادل البيانات"</string>
     <string name="beam_failed" msgid="5116241718189888630">"لم يكتمل تبادل البيانات"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"تم إلغاء تبادل البيانات"</string>
     <string name="cancel" msgid="61873902552555096">"إلغاء"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"المس ليتم العرض"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"انقر للعرض"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"جهاز المستلم لا يوفر نقل ملفات كبيرة عبر تبادل البيانات."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"تجميع الأجهزة معًا من جديد"</string>
     <string name="beam_busy" msgid="5253335587620612576">"الشعاع مشغول حاليًا. يمكنك إعادة المحاولة عند اكتمال عملية النقل السابقة."</string>
diff --git a/res/values-az-rAZ/provisioning.xml b/res/values-az-rAZ/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-az-rAZ/provisioning.xml
+++ b/res/values-az-rAZ/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 0fc6031b..1b06454a 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc Xidməti"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontakt NFC üzərindən alınıb"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Bu şəxsi kontakt kimi əlavə etmək üçün toxunun."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC qarşılıqlı əlaqə tamamlandı"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Bu şəxsə kontakt məlumatınızı vermək üçün toxunun."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC aktivləşdirilib."</string>
-    <string name="touch" msgid="4727218133711188355">"Beam üçün toxunun"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Şüaya tıklayın"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Gələn beam..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Beaming..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Beam tamamlandı"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Beam tamamlanmadı"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Beam ləğv edilib"</string>
     <string name="cancel" msgid="61873902552555096">"Ləğv et"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Görüntüləmək üçün toxunun"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Baxmaq üçün tıklayın"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Qəbul edənin cihazı beam vasitəsilə böyük fayl ötürülməsini dəstəkləmir."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Cihazları yenidən bir yerə gətir"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam hazırda məşğuldur. Əvvəlki ötürmə tamamlandıqda yenidən cəhd edin."</string>
diff --git a/res/values-b+sr+Latn/provisioning.xml b/res/values-b+sr+Latn/provisioning.xml
new file mode 100644
index 00000000..efcee844
--- /dev/null
+++ b/res/values-b+sr+Latn/provisioning.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<!--  NFC resources that may need to be customized
+     for different hardware or product builds.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="provisioning_mime_types">
+    <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+  </string-array>
+</resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 00000000..298a6fd7
--- /dev/null
+++ b/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,45 @@
+<?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="78565911793142902">"Nfc Service"</string>
+    <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
+    <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC je omogućen."</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Dodirnite da biste prebacili"</string>
+    <string name="beam_progress" msgid="7453634884807323920">"Dolazno prebacivanje..."</string>
+    <string name="beam_outgoing" msgid="4679536649779123495">"Prebacivanje..."</string>
+    <string name="beam_complete" msgid="477026736424637435">"Prebacivanje je dovršeno"</string>
+    <string name="beam_failed" msgid="5116241718189888630">"Prebacivanje se nije završilo"</string>
+    <string name="beam_canceled" msgid="5425192751826544741">"Prebacivanje je otkazano"</string>
+    <string name="cancel" msgid="61873902552555096">"Otkaži"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Dodirnite da biste pregledali"</string>
+    <string name="beam_handover_not_supported" msgid="4083165921751489015">"Uređaj prijemnika ne podržava prenos velikih datoteka prebacivanjem."</string>
+    <string name="beam_try_again" msgid="3364677301009783455">"Ponovo približite uređaje"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Prebacivanje je trenutno zauzeto. Pokušajte ponovo kada se prethodni prenos završi."</string>
+    <string name="device" msgid="4459621591392478151">"uređaj"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Povezivanje sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je povezan"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Povezivanje sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nije uspelo"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Prekidanje veze sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Veza sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je prekinuta"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Uparivanje uređaja <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Uparivanje uređaja <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nije uspelo"</string>
+    <string name="failed_to_enable_bt" msgid="7229153323594758077">"Nije moguće omogućiti Bluetooth"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"Da li ste sigurni da želite da uparite Bluetooth uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+    <string name="pair_yes" msgid="3525614878559994448">"Da"</string>
+    <string name="pair_no" msgid="5022308368904055020">"Ne"</string>
+    <string name="tap_again_to_pay" msgid="5754988005412859897">"Dodirnite ponovo da biste platili pomoću aplikacije <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="tap_again_to_complete" msgid="5423640945118279123">"Dodirnite ponovo da biste dovršili pomoću aplikacije <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="transaction_failure" msgid="7828102078637936513">"Ovu transakciju nije moguće dovršiti pomoću aplikacije <xliff:g id="APP">%1$s</xliff:g>."</string>
+    <string name="could_not_use_app" msgid="8137587876138569083">"Nije moguće koristiti <xliff:g id="APP">%1$s</xliff:g>."</string>
+    <string name="pay_with" msgid="5531545488795798945">"Plaćanje pomoću aplikacija"</string>
+    <string name="complete_with" msgid="6797459104103012992">"Dovršavanje pomoću aplikacija"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"Izabrana usluga za funkciju Dodirni i plati je uklonjena. Želite li da izaberete drugu?"</string>
+    <string name="ask_nfc_tap" msgid="2925239870458286340">"Dodirnite drugi uređaj da biste završili"</string>
+    <string name="wifi_connect" msgid="6250727951843550671">"Poveži"</string>
+    <string name="status_unable_to_connect" msgid="9183908200295307657">"Povezivanje sa mrežom nije moguće"</string>
+    <string name="status_wifi_connected" msgid="5893022897732105739">"Povezana je"</string>
+    <string name="title_connect_to_network" msgid="2474034615817280146">"Povežite se sa mrežom"</string>
+    <string name="prompt_connect_to_network" msgid="8511683573657516114">"Želite li da se povežete sa mrežom <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android prebacivanje zahteva NFC da biste mogli da ga omogućite. Želite li da ga omogućite?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android prebacivanje"</string>
+</resources>
diff --git a/res/values-be-rBY/provisioning.xml b/res/values-be-rBY/provisioning.xml
new file mode 100644
index 00000000..efcee844
--- /dev/null
+++ b/res/values-be-rBY/provisioning.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<!--  NFC resources that may need to be customized
+     for different hardware or product builds.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="provisioning_mime_types">
+    <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+  </string-array>
+</resources>
diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
new file mode 100644
index 00000000..ba0f5fa3
--- /dev/null
+++ b/res/values-be-rBY/strings.xml
@@ -0,0 +1,45 @@
+<?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="78565911793142902">"Служба Nfc"</string>
+    <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
+    <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC ўключаны."</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Краніце, каб перадаць"</string>
+    <string name="beam_progress" msgid="7453634884807323920">"Уваходная перадача beam..."</string>
+    <string name="beam_outgoing" msgid="4679536649779123495">"Ззяючы (Beaming)..."</string>
+    <string name="beam_complete" msgid="477026736424637435">"Працэс перадачы Beam завершаны"</string>
+    <string name="beam_failed" msgid="5116241718189888630">"Перадача Beam не завершана"</string>
+    <string name="beam_canceled" msgid="5425192751826544741">"Перадача Beam адменена"</string>
+    <string name="cancel" msgid="61873902552555096">"Скасаваць"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Краніце для прагляду"</string>
+    <string name="beam_handover_not_supported" msgid="4083165921751489015">"Прылада атрымальніка не падтрымлівае перадачу вялікіх файлаў праз Beam."</string>
+    <string name="beam_try_again" msgid="3364677301009783455">"Зноў аб\'яднаць прылады"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam зараз заняты. Паспрабуйце яшчэ раз пасля завяршэння папярэдняй перадачы."</string>
+    <string name="device" msgid="4459621591392478151">"прылада"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Падлучаецца <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Падлучана прылада <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Не атрымалася падлучыць <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Адлучаецца <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Адлучана прылада <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Спалучэнне з <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Не атрымалася спалучыцца з <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="failed_to_enable_bt" msgid="7229153323594758077">"Не атрымалася ўключыць Bluetooth"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"Вы ўпэўнены, што жадаеце падлучыць прыладу Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+    <string name="pair_yes" msgid="3525614878559994448">"Так"</string>
+    <string name="pair_no" msgid="5022308368904055020">"Не"</string>
+    <string name="tap_again_to_pay" msgid="5754988005412859897">"Краніце яшчэ раз, каб аплаціць з дапамогай <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="tap_again_to_complete" msgid="5423640945118279123">"Краніце яшчэ раз, каб завяршыць з дапамогай <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="transaction_failure" msgid="7828102078637936513">"Гэту трансакцыю не атрымалася завяршыць з дапамогай <xliff:g id="APP">%1$s</xliff:g>."</string>
+    <string name="could_not_use_app" msgid="8137587876138569083">"Не атрымалася выкарыстаць праграму <xliff:g id="APP">%1$s</xliff:g>."</string>
+    <string name="pay_with" msgid="5531545488795798945">"Аплаціць з дапамогай"</string>
+    <string name="complete_with" msgid="6797459104103012992">"Завяршыць з дапамогай"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"Ваша прыярытэтная служба аплаты доыткам была выдалена. Выбраць іншую?"</string>
+    <string name="ask_nfc_tap" msgid="2925239870458286340">"Для завяршэння краніце іншую прыладу"</string>
+    <string name="wifi_connect" msgid="6250727951843550671">"Падлучыцца"</string>
+    <string name="status_unable_to_connect" msgid="9183908200295307657">"Немагчыма падлучыцца да сеткі"</string>
+    <string name="status_wifi_connected" msgid="5893022897732105739">"Падлучана"</string>
+    <string name="title_connect_to_network" msgid="2474034615817280146">"Падлучыцца да сеткі"</string>
+    <string name="prompt_connect_to_network" msgid="8511683573657516114">"Падлучыцца да сеткі <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Каб выкарыстоўваць Android Beam, трэба ўключыць NFC. Уключыць?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
+</resources>
diff --git a/res/values-bg/provisioning.xml b/res/values-bg/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-bg/provisioning.xml
+++ b/res/values-bg/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 1b4cd272..f2f2536d 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc Service"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"КБП"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Контактът е получен чрез КБП"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Докоснете, за да добавите този човек като контакт."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Взаимодействието чрез КБП завърши"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Докоснете, за да дадете на този човек информацията си за връзка."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"КБП е активирана."</string>
-    <string name="touch" msgid="4727218133711188355">"Докоснете, за да излъчите"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Докоснете за излъчване"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Входящо излъчване..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Излъчва се..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Излъчването завърши"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Излъчването не завърши"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Излъчването бе анулирано"</string>
     <string name="cancel" msgid="61873902552555096">"Отказ"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Докоснете, за да видите"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Докоснете за преглед"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Устройството на получателя не поддържа прехвърляне на големи файлове чрез излъчване."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Приближете отново устройствата едно до друго"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Понастоящем Android Лъч работи. Опитайте отново, когато предишното прехвърляне завърши."</string>
diff --git a/res/values-bn-rBD/provisioning.xml b/res/values-bn-rBD/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-bn-rBD/provisioning.xml
+++ b/res/values-bn-rBD/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 9b5a7f5f..cf5474a9 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc পরিষেবা"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC এর মাধ্যমে পরিচিতি প্রাপ্ত হয়েছে"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"এই ব্যক্তিকে একটি পরিচিতি হিসাবে জুড়তে স্পর্শ করুন।"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC পারস্পরিক ক্রিয়া সম্পূর্ণ"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"এই ব্যক্তিকে আপনার পরিচিতি তথ্য দিতে স্পর্শ করুন।"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC সক্ষম হয়েছে।"</string>
-    <string name="touch" msgid="4727218133711188355">"বীম করতে স্পর্শ করুন"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"বীম করতে আলতো চাপ দিন"</string>
     <string name="beam_progress" msgid="7453634884807323920">"আগত বীম..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"বীম হচ্ছে..."</string>
     <string name="beam_complete" msgid="477026736424637435">"বীম সম্পূর্ণ"</string>
     <string name="beam_failed" msgid="5116241718189888630">"বীম সস্পূর্ণ হয়নি"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"বীম বাতিল হয়েছে"</string>
     <string name="cancel" msgid="61873902552555096">"বাতিল"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"দেখতে স্পর্শ করুন"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"দেখতে আলতো চাপ দিন"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"রিসিভার এর ডিভাইস বীমের মাধ্যমে বড় ফাইল স্থানান্তর সমর্থন করে না।"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"ডিভাইসগুলিকে আবার একত্র করুন"</string>
     <string name="beam_busy" msgid="5253335587620612576">"বীম বর্তমানে ব্যস্ত রয়েছে৷ পূর্ববর্তী স্থানন্তরণটি সম্পূর্ণ হলে আবার চেষ্টা করুন৷"</string>
@@ -27,8 +23,8 @@
     <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> থেকে সংযোগ বিচ্ছিন্ন হয়েছে"</string>
     <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> যুক্ত করা হচ্ছে"</string>
     <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> যুক্ত করা যায়নি"</string>
-    <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth সক্ষম করা যায়নি"</string>
-    <string name="confirm_pairing" msgid="4112568077038265363">"আপনি কি <xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth ডিভাইসটি যুক্ত করার ব্যাপারে নিশ্চিত?"</string>
+    <string name="failed_to_enable_bt" msgid="7229153323594758077">"ব্লুটুথ সক্ষম করা যায়নি"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"আপনি কি <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ব্লুটুথ ডিভাইসটি যুক্ত করার ব্যাপারে নিশ্চিত?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"হ্যাঁ"</string>
     <string name="pair_no" msgid="5022308368904055020">"না"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> এর মাধ্যমে অর্থ প্রদানের জন্য আবার আলতো চাপুন"</string>
diff --git a/res/values-bs-rBA/provisioning.xml b/res/values-bs-rBA/provisioning.xml
new file mode 100644
index 00000000..efcee844
--- /dev/null
+++ b/res/values-bs-rBA/provisioning.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<!--  NFC resources that may need to be customized
+     for different hardware or product builds.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="provisioning_mime_types">
+    <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+  </string-array>
+</resources>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
new file mode 100644
index 00000000..77347fc7
--- /dev/null
+++ b/res/values-bs-rBA/strings.xml
@@ -0,0 +1,45 @@
+<?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="78565911793142902">"Usluga Nfc"</string>
+    <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
+    <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC je omogućen."</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Dodirnite za prijenos"</string>
+    <string name="beam_progress" msgid="7453634884807323920">"Dolazni prijenos..."</string>
+    <string name="beam_outgoing" msgid="4679536649779123495">"Prenošenje..."</string>
+    <string name="beam_complete" msgid="477026736424637435">"Prijenos je završen."</string>
+    <string name="beam_failed" msgid="5116241718189888630">"Prijenos nije završen."</string>
+    <string name="beam_canceled" msgid="5425192751826544741">"Prijenos je otkazan."</string>
+    <string name="cancel" msgid="61873902552555096">"Otkaži"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Dodirnite za prikaz"</string>
+    <string name="beam_handover_not_supported" msgid="4083165921751489015">"Uređaj primaoca ne podržava prijenos velikih datoteka putem emitiranja."</string>
+    <string name="beam_try_again" msgid="3364677301009783455">"Opet spojite uređaje"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Prijenos je trenutno zauzet. Pokušajte ponovo kada se prethodni transfer završi."</string>
+    <string name="device" msgid="4459621591392478151">"uređaj"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Povezivanje <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> povezan"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se ne može povezati"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Prekidanje veze <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> je diskonektovan."</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Uparivanje <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Ne može upariti <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth se ne može omogućiti"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"Da li ste sigurni da želite upariti Bluetooth uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+    <string name="pair_yes" msgid="3525614878559994448">"Da"</string>
+    <string name="pair_no" msgid="5022308368904055020">"Ne"</string>
+    <string name="tap_again_to_pay" msgid="5754988005412859897">"Dodirnite o pet da platite pomoću <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="tap_again_to_complete" msgid="5423640945118279123">"Dodirnite o pet da završite pomoću <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="transaction_failure" msgid="7828102078637936513">"Ova  transakcija se nije mogla završiti putem <xliff:g id="APP">%1$s</xliff:g>."</string>
+    <string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g> se ne može koristiti."</string>
+    <string name="pay_with" msgid="5531545488795798945">"Platite upotrebom"</string>
+    <string name="complete_with" msgid="6797459104103012992">"Dovrši pomoću"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"Vaša preferirana usluga za kucni i plati je uklonjena. Izabrati drugu?"</string>
+    <string name="ask_nfc_tap" msgid="2925239870458286340">"Dodirnite još jedan uređaj da završite"</string>
+    <string name="wifi_connect" msgid="6250727951843550671">"Poveži se"</string>
+    <string name="status_unable_to_connect" msgid="9183908200295307657">"Ne može se povezati na mrežu"</string>
+    <string name="status_wifi_connected" msgid="5893022897732105739">"Povezano"</string>
+    <string name="title_connect_to_network" msgid="2474034615817280146">"Spoji se na mrežu"</string>
+    <string name="prompt_connect_to_network" msgid="8511683573657516114">"Povezati se na mrežu <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android prenošnje zahtijeva da NFC bude omogućen. Da li ga želite omogućiti?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
+</resources>
diff --git a/res/values-ca/provisioning.xml b/res/values-ca/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-ca/provisioning.xml
+++ b/res/values-ca/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ce34a070..1a243a8b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Servei Nfc"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Contacte per NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Toca aquesta opció per afegir aquesta persona com a contacte."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Interacció completa de NFC"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Toca per donar la teva informació de contacte a aquesta persona."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC activat."</string>
-    <string name="touch" msgid="4727218133711188355">"Toca per fer brillar"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Toca per compartir-ho"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Transferència entrant..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"S\'està compartint..."</string>
-    <string name="beam_complete" msgid="477026736424637435">"Sensor completat"</string>
-    <string name="beam_failed" msgid="5116241718189888630">"El sensor no s\'ha executat"</string>
-    <string name="beam_canceled" msgid="5425192751826544741">"S\'ha desactivat el sensor"</string>
+    <string name="beam_complete" msgid="477026736424637435">"S\'ha compartit"</string>
+    <string name="beam_failed" msgid="5116241718189888630">"No s\'ha compartit"</string>
+    <string name="beam_canceled" msgid="5425192751826544741">"S\'ha cancel·lat la compartició de contingut"</string>
     <string name="cancel" msgid="61873902552555096">"Cancel·la"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Toca per visualitzar"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Toca per veure-ho"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"El dispositiu del receptor no és compatible amb la transferència de fitxers grans mitjançant sensors."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Torna a apropar els dispositius"</string>
     <string name="beam_busy" msgid="5253335587620612576">"En aquest moment Beam està ocupat. Prova-ho de nou quan acabi la transferència anterior."</string>
diff --git a/res/values-cs/provisioning.xml b/res/values-cs/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-cs/provisioning.xml
+++ b/res/values-cs/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0b35ed81..b4168762 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Služba Nfc"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontakt přijatý prostřednictvím komunikace NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Klepnutím přidáte tuto osobu mezi kontakty"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Interakce NFC byla dokončena"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Klepnutím této osobě předáte své kontaktní údaje."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"Funkce NFC povolena."</string>
-    <string name="touch" msgid="4727218133711188355">"Přenos zahájíte dotykem"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Přenos klepnutím"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Příchozí přenos..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Přenášení..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Přenos dokončen"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Přenos nebyl dokončen"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Přenos byl zrušen"</string>
     <string name="cancel" msgid="61873902552555096">"Zrušit"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Zobrazte dotykem"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Zobrazení klepnutím"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Zařízení příjemce nepodporuje přenos velkých souborů prostřednictvím funkce Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Znovu přibližte zařízení"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Aplikace Beam je momentálně zaneprázdněná. Opakujte akci po dokončení předchozího přenosu."</string>
@@ -37,7 +33,7 @@
     <string name="could_not_use_app" msgid="8137587876138569083">"Aplikaci <xliff:g id="APP">%1$s</xliff:g> nelze použít."</string>
     <string name="pay_with" msgid="5531545488795798945">"Platební metoda"</string>
     <string name="complete_with" msgid="6797459104103012992">"Dokončit pomocí"</string>
-    <string name="default_pay_app_removed" msgid="4108250545457437360">"Preferovaná služba pro platbu mobilem byla odstraněna. Chcete vybrat jinou?"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"Preferovaná služba pro platbu dotykem telefonu byla odstraněna. Chcete vybrat jinou?"</string>
     <string name="ask_nfc_tap" msgid="2925239870458286340">"Akci dokončíte tím, že se zařízením dotknete jiného zařízení"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"Připojit"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"K síti se nelze připojit."</string>
diff --git a/res/values-da/provisioning.xml b/res/values-da/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-da/provisioning.xml
+++ b/res/values-da/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5b811b78..78756451 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc Service"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontakt via NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Tryk for at tilføje denne person som kontaktperson."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC-interaktion er komplet"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Tryk for at give denne person dine kontaktoplysninger."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC er aktiveret."</string>
-    <string name="touch" msgid="4727218133711188355">"Tryk for at overføre"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Tryk for at overføre"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Indgående overførsel..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Overfører..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Overførsel fuldført"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Overførslen blev ikke fuldført"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Overførslen blev annulleret"</string>
     <string name="cancel" msgid="61873902552555096">"Annuller"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Tryk for at se"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Tryk for at se"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Modtagerens enhed understøtter ikke overførsel af store filer via Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Før enhederne sammen igen"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam er optaget i øjeblikket. Prøv igen, når den forrige overførsel er gennemført."</string>
diff --git a/res/values-de/provisioning.xml b/res/values-de/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-de/provisioning.xml
+++ b/res/values-de/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index beb17b7b..d77c1d5c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -3,22 +3,18 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFC-Dienst"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontakt per NFC erhalten"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Zum Hinzufügen dieser Person als Kontakt tippen"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC-Interaktion abgeschlossen"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Zum Weitergeben Ihrer Kontaktinformationen an diese Person tippen"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC aktiviert"</string>
-    <string name="touch" msgid="4727218133711188355">"Zum Beamen berühren"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Zum Übertragen tippen"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Beam wird empfangen..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Beamen..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Beamen abgeschlossen"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Beam wurde nicht abgeschlossen."</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Beam abgebrochen"</string>
     <string name="cancel" msgid="61873902552555096">"Abbrechen"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Zum Anzeigen berühren"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Zum Ansehen tippen"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Das Gerät des Empfängers unterstützt die Übertragung großer Dateien durch Beamen nicht."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Geräte erneut nebeneinander platzieren"</string>
-    <string name="beam_busy" msgid="5253335587620612576">"Android Beam ist momentan ausgelastet. Bitte versuchen Sie es erneut, wenn die vorherige Übertragung abgeschlossen ist."</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Android Beam ist momentan ausgelastet. Bitte versuche es erneut, wenn die vorherige Übertragung abgeschlossen ist."</string>
     <string name="device" msgid="4459621591392478151">"Gerät"</string>
     <string name="connecting_peripheral" msgid="1296182660525660935">"Verbindung zu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird hergestellt"</string>
     <string name="connected_peripheral" msgid="20748648543160091">"Mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> verbunden"</string>
@@ -28,22 +24,22 @@
     <string name="pairing_peripheral" msgid="6983626861540899365">"Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird durchgeführt"</string>
     <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nicht möglich"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth konnte nicht aktiviert werden."</string>
-    <string name="confirm_pairing" msgid="4112568077038265363">"Möchten Sie das Bluetooth-Gerät <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wirklich koppeln?"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"Möchtest du das Bluetooth-Gerät <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wirklich koppeln?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Ja"</string>
     <string name="pair_no" msgid="5022308368904055020">"Nein"</string>
-    <string name="tap_again_to_pay" msgid="5754988005412859897">"Halten Sie Ihr Gerät erneut ans Terminal, um mit <xliff:g id="APP">%1$s</xliff:g> zu bezahlen."</string>
-    <string name="tap_again_to_complete" msgid="5423640945118279123">"Halten Sie Ihr Gerät erneut ans Terminal, um den Vorgang mit <xliff:g id="APP">%1$s</xliff:g> durchzuführen."</string>
+    <string name="tap_again_to_pay" msgid="5754988005412859897">"Halte dein Gerät erneut ans Terminal, um mit <xliff:g id="APP">%1$s</xliff:g> zu bezahlen."</string>
+    <string name="tap_again_to_complete" msgid="5423640945118279123">"Halte dein Gerät erneut ans Terminal, um den Vorgang mit <xliff:g id="APP">%1$s</xliff:g> durchzuführen."</string>
     <string name="transaction_failure" msgid="7828102078637936513">"Diese Transaktion konnte nicht mit <xliff:g id="APP">%1$s</xliff:g> durchgeführt werden."</string>
     <string name="could_not_use_app" msgid="8137587876138569083">"Fehler bei der Verwendung von <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pay_with" msgid="5531545488795798945">"Zahlen mit"</string>
     <string name="complete_with" msgid="6797459104103012992">"Durchführen mit"</string>
-    <string name="default_pay_app_removed" msgid="4108250545457437360">"Der von Ihnen bevorzugte Dienst für das mobile Bezahlen wurde entfernt. Möchten Sie einen anderen auswählen?"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"Der von dir bevorzugte Dienst für das mobile Bezahlen wurde entfernt. Möchtest du einen anderen auswählen?"</string>
     <string name="ask_nfc_tap" msgid="2925239870458286340">"Zum Abschluss auf ein anderes Gerät tippen"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"Verbinden"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"Verbindung zum Netzwerk konnte nicht hergestellt werden."</string>
     <string name="status_wifi_connected" msgid="5893022897732105739">"Verbunden"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Mit Netzwerk verbinden"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Verbindung zum Netzwerk <xliff:g id="NETWORK_SSID">%1$s</xliff:g> herstellen?"</string>
-    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam erfordert zur Aktivierung die Nahfeldkommunikation (NFC). Möchten Sie sie aktivieren?"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam erfordert zur Aktivierung die Nahfeldkommunikation (NFC). Möchtest du sie aktivieren?"</string>
     <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-el/provisioning.xml b/res/values-el/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-el/provisioning.xml
+++ b/res/values-el/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ce1fc72c..50389b9e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Υπηρεσία ΕΚΠ"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"ΕΚΠ"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Λήψη επαφής μέσω ΕΚΠ"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Αγγίξτε για να προσθέσετε αυτό το άτομο ως επαφή."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Η αλληλεπίδραση ΕΚΠ ολοκληρώθηκε"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Αγγίξτε  για να δώσετε σε αυτό το άτομο τα στοιχεία επικοινωνίας σας."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"Ενεργοποίηση ΕΚΠ."</string>
-    <string name="touch" msgid="4727218133711188355">"Αγγίξτε για μετάδοση"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Πατήστε για ζεύξη"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Εισερχόμενη ζεύξη…"</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Αποστολή…"</string>
     <string name="beam_complete" msgid="477026736424637435">"Ολοκλήρωση ζεύξης"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Η ζεύξη δεν ολοκληρώθηκε"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Ακύρωση ζεύξης"</string>
     <string name="cancel" msgid="61873902552555096">"Άκυρο"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Αγγίξτε για προβολή"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Πατήστε για προβολή"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Η συσκευή του παραλήπτη δεν υποστηρίζει τη μεταφορά μεγάλων αρχείων μέσω ζεύξης."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Φέρτε ξανά τις συσκευές σας σε επαφή"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Η λειτουργία ζεύξης είναι απασχολημένη αυτήν τη στιγμή. Δοκιμάστε ξανά μετά την ολοκλήρωση της προηγούμενης μεταφοράς."</string>
diff --git a/res/values-en-rAU/provisioning.xml b/res/values-en-rAU/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-en-rAU/provisioning.xml
+++ b/res/values-en-rAU/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 307e92c7..bb153d15 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc Service"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Contact received over NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Touch to add this person as a contact."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC interaction complete"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Touch to give this person your contact info."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC enabled."</string>
-    <string name="touch" msgid="4727218133711188355">"Touch to beam"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Tap to beam"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Incoming beam..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Beaming..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Beam complete"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Beam did not complete"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Beam cancelled"</string>
     <string name="cancel" msgid="61873902552555096">"Cancel"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Touch to view"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Tap to view"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"The receiver\'s device doesn\'t support large file transfer via beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Bring devices together again"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam is currently busy. Try again when the previous transfer completes."</string>
diff --git a/res/values-en-rGB/provisioning.xml b/res/values-en-rGB/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-en-rGB/provisioning.xml
+++ b/res/values-en-rGB/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 307e92c7..bb153d15 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc Service"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Contact received over NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Touch to add this person as a contact."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC interaction complete"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Touch to give this person your contact info."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC enabled."</string>
-    <string name="touch" msgid="4727218133711188355">"Touch to beam"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Tap to beam"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Incoming beam..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Beaming..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Beam complete"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Beam did not complete"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Beam cancelled"</string>
     <string name="cancel" msgid="61873902552555096">"Cancel"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Touch to view"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Tap to view"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"The receiver\'s device doesn\'t support large file transfer via beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Bring devices together again"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam is currently busy. Try again when the previous transfer completes."</string>
diff --git a/res/values-en-rIN/provisioning.xml b/res/values-en-rIN/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-en-rIN/provisioning.xml
+++ b/res/values-en-rIN/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 307e92c7..bb153d15 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc Service"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Contact received over NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Touch to add this person as a contact."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC interaction complete"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Touch to give this person your contact info."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC enabled."</string>
-    <string name="touch" msgid="4727218133711188355">"Touch to beam"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Tap to beam"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Incoming beam..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Beaming..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Beam complete"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Beam did not complete"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Beam cancelled"</string>
     <string name="cancel" msgid="61873902552555096">"Cancel"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Touch to view"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Tap to view"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"The receiver\'s device doesn\'t support large file transfer via beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Bring devices together again"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam is currently busy. Try again when the previous transfer completes."</string>
diff --git a/res/values-es-rUS/provisioning.xml b/res/values-es-rUS/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-es-rUS/provisioning.xml
+++ b/res/values-es-rUS/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index aa564b0d..5e441f70 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Servicio NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Se recibió el contacto por NFC."</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Toca para agregar a esta persona como un contacto."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Interacción NFC completa"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Toca para que esta persona obtenga tu información de contacto."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"Se habilitó la NFC."</string>
-    <string name="touch" msgid="4727218133711188355">"Tocar para transmitir"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Presionar para transmitir"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Transmisión entrante..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Transmitiendo..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Transmisión completa"</string>
     <string name="beam_failed" msgid="5116241718189888630">"La transmisión no se completó"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Transmisión cancelada"</string>
     <string name="cancel" msgid="61873902552555096">"Cancelar"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Toca para ver"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Presionar para ver"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"El dispositivo del receptor no admite la transferencia de archivos de gran tamaño."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Volver a unir los dispositivos"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam está ocupado en este momento. Vuelve a intentarlo cuando finalice la transferencia anterior."</string>
diff --git a/res/values-es/provisioning.xml b/res/values-es/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-es/provisioning.xml
+++ b/res/values-es/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b05c6cbf..80fa43ab 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Servicio NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Contacto recibido por NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Toca para añadir a esta persona como contacto."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Interacción de NFC completa"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Toca para compartir tu información de contacto con esta persona."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC habilitada"</string>
-    <string name="touch" msgid="4727218133711188355">"Toca para compartir"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Toca para compartir"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Transferencia entrante..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Compartiendo..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Transferencia completada"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Transferencia no completada"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Transferencia cancelada"</string>
     <string name="cancel" msgid="61873902552555096">"Cancelar"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Tocar para ver"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Toca para ver"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"El dispositivo del receptor no admite la transferencia de archivos de gran tamaño."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Vuelve a juntar los dispositivos"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Android Beam está ocupado en este momento. Vuelve a intentarlo cuando se complete la transferencia anterior."</string>
diff --git a/res/values-et-rEE/provisioning.xml b/res/values-et-rEE/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-et-rEE/provisioning.xml
+++ b/res/values-et-rEE/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index f9b8ac89..4bfdd444 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc teenus"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontakt saadud NFC kaudu"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Puudutage, et lisada see inimene kontaktisikute hulka."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC koostoime lõpetatud"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Puudutage, et anda sellele inimesele oma kontaktandmed."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC lubatud."</string>
-    <string name="touch" msgid="4727218133711188355">"Puudutage kiire kasutamiseks"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Puudutage kiirega edastamiseks"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Sissetulev kiir ..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Kiirega edastamine ..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Kiir on valmis"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Kiir ei lõpetanud toimingut"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Kiir on tühistatud"</string>
     <string name="cancel" msgid="61873902552555096">"Tühista"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Puudutage  vaatamiseks"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Puudutage kuvamiseks"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Vastuvõtja seade ei toeta suurte failide edastamist kiire kaudu."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Ühendage seadmed uuesti"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Kiirega edastamise funktsioon on praegu hõivatud. Proovige uuesti, kui ülekandmine on lõppenud."</string>
diff --git a/res/values-eu-rES/provisioning.xml b/res/values-eu-rES/provisioning.xml
index 0c79a063..bc2afcb9 100644
--- a/res/values-eu-rES/provisioning.xml
+++ b/res/values-eu-rES/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"aplikazioa/com.android.kudeatutakohorniketa"</item>
-    <item msgid="9182300251635024136">"aplikazioa/com.android.kudeatutakohorniketa.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 7c3243ad..315dca52 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFC zerbitzua"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontaktua NFC bidez jaso da"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Pertsona hau kontaktu gisa gehitzeko, ukitu hau."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC elkarrekintza osatu da"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Zurekin harremanetan jartzeko informazioa emateko, ukitu hau."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC gaituta."</string>
-    <string name="touch" msgid="4727218133711188355">"NFC bidez partekatzeko, ukitu hau"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Sakatu NFC bidez partekatzeko"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Sarrerako NFC bidez partekatzea…"</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"NFC bidez partekatzen"</string>
     <string name="beam_complete" msgid="477026736424637435">"NFC bidezko partekatzea osatu da"</string>
     <string name="beam_failed" msgid="5116241718189888630">"NFC bidezko partekatzea ez da osatu"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"NFC bidezko partekatzea bertan behera utzi da"</string>
     <string name="cancel" msgid="61873902552555096">"Utzi"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Ukitu ikusteko"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Sakatu ikusteko"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Hartzailearen gailuak ez du onartzen fitxategi handiak NFC bidez transferitzea."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Elkartu gailuak berriro"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam lanpetuta dago. Saiatu berriro abian den transferentzia amaitutakoan."</string>
@@ -37,7 +33,7 @@
     <string name="could_not_use_app" msgid="8137587876138569083">"Ezin izan da <xliff:g id="APP">%1$s</xliff:g> erabili."</string>
     <string name="pay_with" msgid="5531545488795798945">"Ordaindu honekin"</string>
     <string name="complete_with" msgid="6797459104103012992">"Ekintza osatzeko aplikazioak"</string>
-    <string name="default_pay_app_removed" msgid="4108250545457437360">"Sakatu eta ordaindu eginbidea erabiltzeko zerbitzu hobetsia kendu egin da. Beste bat aukeratu nahi duzu?"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"Ukitu eta ordaindu eginbidea erabiltzeko zerbitzu hobetsia kendu egin da. Beste bat aukeratu nahi duzu?"</string>
     <string name="ask_nfc_tap" msgid="2925239870458286340">"Datuak bidaltzeko, ukitu beste gailu bat"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"Konektatu"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"Ezin da sarera konektatu"</string>
diff --git a/res/values-fa/provisioning.xml b/res/values-fa/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-fa/provisioning.xml
+++ b/res/values-fa/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0cf63bf6..d3e80f67 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"‏سرویس Nfc"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"‏مخاطب از طریق NFC دریافت شد"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"برای افزودن این فرد به‌عنوان یک مخاطب، لمس کنید."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"‏تعامل NFC کامل شد"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"لمس کنید تا اطلاعات تماس خود را به این فرد بدهید."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"‏با NFC فعال شده."</string>
-    <string name="touch" msgid="4727218133711188355">"برای پخش، لمس کنید"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"برای ارسال پرتو ضربه بزنید"</string>
     <string name="beam_progress" msgid="7453634884807323920">"در حال دریافت پرتو..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"پرتو…"</string>
     <string name="beam_complete" msgid="477026736424637435">"پرتو ارسال شد"</string>
     <string name="beam_failed" msgid="5116241718189888630">"پرتو کامل نشد"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"پرتو لغو شد"</string>
     <string name="cancel" msgid="61873902552555096">"لغو"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"برای مشاهده لمس کنید"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"برای مشاهده ضربه بزنید"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"دستگاه گیرنده انتقال فایل‌های بزرگ از طریق پرتو را پشتیبانی نمی‌کند."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"مرتبط‌کردن دوباره دستگاه‌ها"</string>
     <string name="beam_busy" msgid="5253335587620612576">"«پرتو» در حال حاضر مشغول است. هنگامی که انتقال قبلی کامل شد دوباره امتحان کنید."</string>
@@ -30,7 +26,7 @@
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"فعال کردن بلوتوث امکانپذیر نیست"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"آیا مطمئنید که می‌خواهید با دستگاه بلوتوث <xliff:g id="DEVICE_NAME">%1$s</xliff:g> مرتبط‌سازی کنید؟"</string>
     <string name="pair_yes" msgid="3525614878559994448">"بله"</string>
-    <string name="pair_no" msgid="5022308368904055020">"خیر"</string>
+    <string name="pair_no" msgid="5022308368904055020">"نه"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"برای پرداخت با <xliff:g id="APP">%1$s</xliff:g>، دوباره ضربه بزنید"</string>
     <string name="tap_again_to_complete" msgid="5423640945118279123">"برای تکمیل از طریق <xliff:g id="APP">%1$s</xliff:g>، دوباره ضربه بزنید"</string>
     <string name="transaction_failure" msgid="7828102078637936513">"این تراکنش با <xliff:g id="APP">%1$s</xliff:g> تکمیل نشد."</string>
@@ -44,6 +40,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"مرتبط شد"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"اتصال به شبکه"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"به شبکه <xliff:g id="NETWORK_SSID">%1$s</xliff:g> متصل می‌شوید؟"</string>
-    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"‏پرتوی Android برای فعال شدن به NFC نیاز دارد. می‌خواهید آن را فعال کنید؟"</string>
-    <string name="android_beam" msgid="1666446406999492763">"‏پرتو Android"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"‏Android Beam برای فعال شدن به NFC نیاز دارد. می‌خواهید آن را فعال کنید؟"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-fi/provisioning.xml b/res/values-fi/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-fi/provisioning.xml
+++ b/res/values-fi/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 609c19d0..2f3d3b50 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc Service"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontakti saatu NFC:n välityksellä"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Lisää tämä henkilö yhteystietoihin koskettamalla."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC-vuorovaikutus suoritettu"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Anna tälle henkilölle yhteystietosi koskettamalla."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC otettu käyttöön."</string>
-    <string name="touch" msgid="4727218133711188355">"Muodosta yhteys"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Jaa koskettamalla"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Saapuva sisällönjakopyyntö..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Jaetaan sisältöä…"</string>
     <string name="beam_complete" msgid="477026736424637435">"Sisältö jaettu"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Jakoa ei suoritettu valmiiksi"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Jako peruutettu"</string>
     <string name="cancel" msgid="61873902552555096">"Peruuta"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Kosketa ja näytä"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Näytä koskettamalla"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Vastaanottajan laite ei tue suurten tiedostojen siirtoa sisällön jakamisen kautta."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Yhdistä laitteet uudelleen"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam on tällä hetkellä varattu. Yritä uudelleen, kun edellinen siirto on valmis."</string>
diff --git a/res/values-fr-rCA/provisioning.xml b/res/values-fr-rCA/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-fr-rCA/provisioning.xml
+++ b/res/values-fr-rCA/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 6d29ed9d..cf0c0538 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Service NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Contact reçu via NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Appuyez pour ajouter cette personne à vos contacts."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Communication NFC terminée."</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Appuyez pour communiquer vos coordonnées à cette personne."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC activée"</string>
-    <string name="touch" msgid="4727218133711188355">"Appuyer pour partager"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Touchez pour partager"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Partage entrant..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Partage en cours…"</string>
     <string name="beam_complete" msgid="477026736424637435">"Partage terminé."</string>
     <string name="beam_failed" msgid="5116241718189888630">"Échec du partage."</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Partage annulé."</string>
     <string name="cancel" msgid="61873902552555096">"Annuler"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Appuyer pour afficher"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Touchez pour afficher"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Le récepteur n\'est pas compatible avec le transfert de fichiers volumineux via le partage."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Mettre de nouveau les appareils côte à côte"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam est actuellement occupé. Essayez de nouveau lorsque le transfert précédent sera terminé."</string>
diff --git a/res/values-fr/provisioning.xml b/res/values-fr/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-fr/provisioning.xml
+++ b/res/values-fr/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5f2de3d6..7dbeb06a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Service NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Contact reçu via NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Appuyez pour ajouter cette personne à vos contacts."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Communication NFC terminée."</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Appuyez pour communiquer vos coordonnées à cette personne."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC activée"</string>
-    <string name="touch" msgid="4727218133711188355">"Appuyer pour partager"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Appuyer pour partager"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Partage entrant..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Partage en cours…"</string>
     <string name="beam_complete" msgid="477026736424637435">"Partage terminé."</string>
     <string name="beam_failed" msgid="5116241718189888630">"Échec du partage."</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Partage annulé."</string>
     <string name="cancel" msgid="61873902552555096">"Annuler"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Appuyer pour afficher"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Appuyer pour afficher"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Le récepteur n\'est pas compatible avec le transfert de fichiers volumineux via le partage."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Mettre de nouveau les appareils côte à côte"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Android Beam est actuellement occupé. Veuillez réessayer une fois le transfert précédent terminé."</string>
diff --git a/res/values-gl-rES/provisioning.xml b/res/values-gl-rES/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-gl-rES/provisioning.xml
+++ b/res/values-gl-rES/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 845ee425..d859005c 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Servizo NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Contacto recibido por NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Toca para engadir esta persoa aos teus contactos."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Completouse a interacción por NFC"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Toca para pasarlle a esta persoa a túa información de contacto."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC activado"</string>
-    <string name="touch" msgid="4727218133711188355">"Toca para transferir"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Tocar aquí para transferir o contido"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Transferencia entrante..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Transferindo..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Completouse a transferencia"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Non se completou a transferencia"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Cancelouse a transferencia"</string>
     <string name="cancel" msgid="61873902552555096">"Cancelar"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Toca para ver"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Tocar aquí para ver o contido"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"O dispositivo do destinatario non é compatible coa transferencia de ficheiros grandes."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Achega os dispositivos de novo"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam está ocupado neste momento. Téntao de novo cando se complete a transferencia anterior."</string>
diff --git a/res/values-gu-rIN/provisioning.xml b/res/values-gu-rIN/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-gu-rIN/provisioning.xml
+++ b/res/values-gu-rIN/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index de7d9015..4b804600 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFC સેવા"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC પર સંપર્ક પ્રાપ્ત"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"આ વ્યક્તિને એક સંપર્ક તરીકે ઉમેરવા માટે ટચ કરો."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC ક્રિયાપ્રતિક્રિયા પૂર્ણ"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"આ વ્યક્તિને તમારી સંપર્ક માહિતી આપવા માટે ટચ કરો."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC સક્ષમ."</string>
-    <string name="touch" msgid="4727218133711188355">"બીમ કરવા ટચ કરો"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"બીમ કરવા માટે ટૅપ કરો"</string>
     <string name="beam_progress" msgid="7453634884807323920">"ઇનકમિંગ બીમ ..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"બીમિંગ..."</string>
     <string name="beam_complete" msgid="477026736424637435">"બીમ પૂર્ણ"</string>
     <string name="beam_failed" msgid="5116241718189888630">"બીમ પૂર્ણ થયું નહોતું"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"બીમ રદ કર્યું"</string>
     <string name="cancel" msgid="61873902552555096">"રદ કરો"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"જોવા માટે ટચ કરો"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"જોવા માટે ટૅપ કરો"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"પ્રાપ્તિકર્તાનું ઉપકરણ બીમ દ્વારા મોટી ફાઇલનાં સ્થાનાંતરણનું સમર્થન કરતું નથી."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"ઉપકરણોને ફરીથી એકસાથે લાવો"</string>
     <string name="beam_busy" msgid="5253335587620612576">"બીમ હાલમાં વ્યસ્ત છે. પહેલાંના સ્થાનાંતરણ પૂર્ણ થાય ત્યારે ફરીથી પ્રયાસ કરો."</string>
diff --git a/res/values-hi/provisioning.xml b/res/values-hi/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-hi/provisioning.xml
+++ b/res/values-hi/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d17db310..7494945e 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc सेवा"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC पर प्राप्त संपर्क"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"इस व्‍यक्ति को संपर्क के रूप में जोड़ने के लिए स्‍पर्श करें."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC सहभागिता पूर्ण"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"इस व्‍यक्ति को अपनी संपर्क जानकारी देने के लिए स्‍पर्श करें."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC सक्षम है."</string>
-    <string name="touch" msgid="4727218133711188355">"बीम करने के लिए स्पर्श करें"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"बीम करने के लिए टैप करें"</string>
     <string name="beam_progress" msgid="7453634884807323920">"इनकमिंग बीम..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"बीम हो रहा है..."</string>
     <string name="beam_complete" msgid="477026736424637435">"बीम करना पूर्ण"</string>
     <string name="beam_failed" msgid="5116241718189888630">"बीम पूर्ण नहीं हुआ"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"बीम रद्द"</string>
     <string name="cancel" msgid="61873902552555096">"अभी नहीं"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"देखने के लिए स्‍पर्श करें"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"देखने के लिए टैप करें"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"प्राप्तकर्ता का डिवाइस, बीम द्वारा बड़ी फ़ाइल के स्थानांतरण का समर्थन नहीं करता."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"डिवाइस को पुन: एक साथ लाएं"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam वर्तमान में व्‍यस्‍त है. पिछला ट्रांसफर पूर्ण हो जाने पर पुन: प्रयास करें."</string>
diff --git a/res/values-hr/provisioning.xml b/res/values-hr/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-hr/provisioning.xml
+++ b/res/values-hr/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 863d4b1a..93b8fbe3 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc Service"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontakt primljen NFC-om"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Dodirnite kako biste ovu osobu dodali kao kontakt"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC interakcija dovršena"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Dodirnite kako biste ovoj osobi dali svoje podatke za kontakt."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC omogućen."</string>
-    <string name="touch" msgid="4727218133711188355">"Dodirnite za emitiranje"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Dodirnite za emitiranje"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Dolazno emitiranje..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Emitiranje..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Emitiranje je završeno"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Emitiranje nije dovršeno"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Emitiranje otkazano"</string>
     <string name="cancel" msgid="61873902552555096">"Odustani"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Dodirnite za prikaz"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Dodirnite za prikaz"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Uređaj prijamnika ne podržava prijenos velikih datoteka emitiranjem."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Opet povežite uređaje"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam je trenutačno zauzet. Pokušajte ponovo po dovršetku prethodnog prijenosa."</string>
diff --git a/res/values-hu/provisioning.xml b/res/values-hu/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-hu/provisioning.xml
+++ b/res/values-hu/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 28b02f52..3274ed85 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFC-szolgáltatás"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC-n kapott névjegy"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Érintse meg, ha hozzá szeretné adni ezt a személyt ismerősként."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Az NFC-kapcsolat befejeződött"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Érintse meg kapcsolatfelvételi adatok megosztásához."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC bekapcsolva"</string>
-    <string name="touch" msgid="4727218133711188355">"Érintse meg a sugárzáshoz"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Koppintson rá sugárzáshoz"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Bejövő sugár..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Sugárzás..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Átvitel befejezve."</string>
     <string name="beam_failed" msgid="5116241718189888630">"A sugárzás nem fejeződött be"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Sugárzás megszakítva"</string>
     <string name="cancel" msgid="61873902552555096">"Mégse"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"A megtekintéshez érintse meg."</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Koppintson rá a megtekintéshez"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"A fogadó eszköz nem támogatja a nagyméretű fájlok átvitelét adatsugárzás útján."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Eszközök újbóli összekapcsolása"</string>
     <string name="beam_busy" msgid="5253335587620612576">"A Beam jelenleg elfoglalt. Próbálja újra, ha az előző átvitel már befejeződött."</string>
diff --git a/res/values-hy-rAM/provisioning.xml b/res/values-hy-rAM/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-hy-rAM/provisioning.xml
+++ b/res/values-hy-rAM/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 2b32b458..46b3a0a1 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFC ծառայություն"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC-ով ստացված կոնտակտ"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Հպեք՝ այս անձին որպես կոնտակտ ավելացնելու համար:"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC-ով տվյալների փոխանցման գործընթացն ավարտված է"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Հպեք՝ այս անձին ձեր կոնտակտային տվյալները փոխանցելու համար:"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC-ն միացված է:"</string>
-    <string name="touch" msgid="4727218133711188355">"Սեղմեք՝ տվյալները փոխանցելու համար"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Հպեք՝ ճառագայթելու համար"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Մուտքային փոխանցում..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Փոխանցվում է..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Ռադիոհաղորդմամբ գործընթացն ավարտված է"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Ռադիոհաղորդմամբ գործընթացն ավարտված չէ"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Ռադիոհաղորդմամբ գործընթացը չեղարկված է"</string>
     <string name="cancel" msgid="61873902552555096">"Չեղարկել"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Հպեք՝ դիտելու համար"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Հպեք՝ դիտելու համար"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Ընդունողի սարքը չի աջակցում ռադիոհաղորդմամբ մեծ ֆայլերի փոխանցումը:"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Սարքերը կրկին միմյանց հետ կցել"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Այս պահին տվյալների փոխանցումը զբաղված է: Փորձեք կրկին նախորդ փոխանցումը ավարտելուց հետո:"</string>
diff --git a/res/values-in/provisioning.xml b/res/values-in/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-in/provisioning.xml
+++ b/res/values-in/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f1cf98c2..1d3b0a14 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Layanan Nfc"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontak yang diterima lewat NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Sentuh untuk menambahkan orang ini sebagai kontak."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Interaksi NFC lengkap"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Sentuh untuk memberikan orang ini info kontak Anda."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC diaktifkan."</string>
-    <string name="touch" msgid="4727218133711188355">"Sentuh untuk menyorot"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Ketuk untuk memancarkan"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Pancaran yang masuk..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Memancarkan..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Beam selesai"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Beam tidak lengkap"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Beam dibatalkan"</string>
     <string name="cancel" msgid="61873902552555096">"Batal"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Sentuh untuk melihat"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Ketuk untuk melihat"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Perangkat penerima tidak mendukung transfer file besar melalui beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Kumpulkan lagi perangkatnya"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam sedang sibuk. Coba lagi jika transfer sebelumnya telah selesai."</string>
diff --git a/res/values-is-rIS/provisioning.xml b/res/values-is-rIS/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-is-rIS/provisioning.xml
+++ b/res/values-is-rIS/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 96eb6d7a..3165e158 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFC-þjónusta"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Tengiliður móttekinn um NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Snertu til að bæta þessum aðila við sem tengilið."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC-samskiptum lokið"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Snertu til að senda þessum aðila samskiptaupplýsingarnar þínar."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"Kveikt á NFC."</string>
-    <string name="touch" msgid="4727218133711188355">"Snertu til að senda"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Ýttu til að senda"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Sending berst..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Sendir..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Sendingu lokið"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Sendingu lauk ekki"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Hætt við sendingu"</string>
     <string name="cancel" msgid="61873902552555096">"Hætta við"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Snertu til að skoða"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Ýttu til að skoða"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Tæki viðtakandans styður ekki flutning stórra skráa með NFC."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Settu tækin hvort upp að öðru aftur"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam er upptekið. Reyndu aftur þegar fyrri flutningi er lokið."</string>
diff --git a/res/values-it/provisioning.xml b/res/values-it/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-it/provisioning.xml
+++ b/res/values-it/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 161cfa6d..50978615 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Servizio NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Contatto ricevuto via NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Tocca per aggiungere questa persona come contatto."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Interazione NFC completa"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Tocca per inviare a questa persona le informazioni di contatto"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"Comunicazione NFC abilitata."</string>
-    <string name="touch" msgid="4727218133711188355">"Tocca per trasmettere"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Tocca per trasmettere"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Trasmissione in arrivo..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Trasmissione..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Trasmissione completata"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Trasmissione non completata"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Trasmissione annullata"</string>
     <string name="cancel" msgid="61873902552555096">"Annulla"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Tocca per visualizzare"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Tocca per visualizzare"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Il dispositivo del destinatario non supporta il trasferimento di file di grandi dimensioni tramite Android Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Avvicina di nuovo i dispositivi"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam è occupato al momento. Riprova al termine del trasferimento precedente."</string>
diff --git a/res/values-iw/provisioning.xml b/res/values-iw/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-iw/provisioning.xml
+++ b/res/values-iw/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 936d1b09..d7eeb3a6 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"‏שירות Nfc"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"‏איש הקשר התקבל באמצעות NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"גע כדי להוסיף משתמש זה כאיש קשר"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"‏האינטראקציה עם NFC הושלמה"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"גע כדי לתת למשתמש זה את פרטי הקשר שלך"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"‏NFC מופעל."</string>
-    <string name="touch" msgid="4727218133711188355">"גע כדי להקרין"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"הקש כדי להקרין"</string>
     <string name="beam_progress" msgid="7453634884807323920">"קרן נכנסת..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"מעביר תוכן..."</string>
     <string name="beam_complete" msgid="477026736424637435">"הקרנה הושלמה"</string>
     <string name="beam_failed" msgid="5116241718189888630">"הקרן לא הושלמה"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"הקרן בוטלה"</string>
     <string name="cancel" msgid="61873902552555096">"ביטול"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"גע כדי להציג"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"הקש כדי להציג"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"המכשיר המקבל אינו תומך בהעברת קובץ גדול באמצעות קרן."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"קרב שוב את המכשירים"</string>
     <string name="beam_busy" msgid="5253335587620612576">"‏Beam אינו פנוי כעת. נסה שוב לאחר השלמת ההעברה הקודמת."</string>
diff --git a/res/values-ja/provisioning.xml b/res/values-ja/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-ja/provisioning.xml
+++ b/res/values-ja/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 88d193ad..58d5177e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFCサービス"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC受信の連絡先"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"このユーザーを連絡先に追加するにはタッチします。"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFCの双方向処理が完了しました"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"このユーザーに連絡先情報を提供するにはタッチします。"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFCは有効です。"</string>
-    <string name="touch" msgid="4727218133711188355">"タップしてビーム"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"タップしてビーム"</string>
     <string name="beam_progress" msgid="7453634884807323920">"ビームを受信しています..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"ビームしています..."</string>
     <string name="beam_complete" msgid="477026736424637435">"ビーム完了"</string>
     <string name="beam_failed" msgid="5116241718189888630">"ビームが完了しませんでした"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"ビームをキャンセルしました"</string>
     <string name="cancel" msgid="61873902552555096">"キャンセル"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"タップして表示"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"タップして表示"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"受信側の端末は、ビーム経由のサイズの大きなファイルの転送をサポートしていません。"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"端末同士をもう一度近づける"</string>
     <string name="beam_busy" msgid="5253335587620612576">"ビームは現在使用中です。前回の転送が完了したら、もう一度お試しください。"</string>
diff --git a/res/values-ka-rGE/provisioning.xml b/res/values-ka-rGE/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-ka-rGE/provisioning.xml
+++ b/res/values-ka-rGE/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 8b06c0dd..733d39c6 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFC სერვისი"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC-თ მიღებული კონტაქტი"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"შეეხეთ, რათა დაამატოთ ეს პიროვნება კონტაქტად."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC ინტერაქცია დასრულდა"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"შეეხეთ, რომ მიაწოდოთ ამ პიროვნებას თქვენი საკონტაქტო ინფორმაცია."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC-გააქტიურებული."</string>
-    <string name="touch" msgid="4727218133711188355">"შეეხეთ სხივით გადასაცემად"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"შეეხეთ სხივით გადასაცემად"</string>
     <string name="beam_progress" msgid="7453634884807323920">"შემომავალი სხივი..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"სხივით გადაცემა..."</string>
     <string name="beam_complete" msgid="477026736424637435">"სხივით გადაცემა დასრულდა"</string>
     <string name="beam_failed" msgid="5116241718189888630">"სხივით გადაცემა დასრულდა"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"სხივით გადაცემა გაუქმდა"</string>
     <string name="cancel" msgid="61873902552555096">"გაუქმება"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"შეეხეთ სანახავად"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"შეეხეთ სანახავად"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"მიმღების მოწყობილობას დიდი ფაილების სხივით გადაცემის მხარდაჭერა არ გააჩნია."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"ისევ მიაახლოვეთ მოწყობილობები ერთმანეთს"</string>
     <string name="beam_busy" msgid="5253335587620612576">"სხივი ამჟამად დაკავებულია. სცადეთ ხელახლა, როდესაც წინა გადაცემა დასრულდება."</string>
diff --git a/res/values-kk-rKZ/provisioning.xml b/res/values-kk-rKZ/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-kk-rKZ/provisioning.xml
+++ b/res/values-kk-rKZ/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index e09ae03b..151cfc17 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc қызметі"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Контакт NFC арқылы алынды."</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Бұл адамды контакт ретінде қосу үшін оны түртіңіз."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC әрекеттесу аяқталды"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Бұл адамға байланыс деректеріңізді беру үшін оны түртіңіз."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC (жақын өріс байланысы) қосулы."</string>
-    <string name="touch" msgid="4727218133711188355">"Хабар тарату үшін түртіңіз"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Жіберу үшін түртіңіз"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Келген сигналдар..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Хабар таратылуда..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Бим (хабар тарату) аяқталды"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Бим (хабар тарату) аяқталмады"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Бим (хабар тарату) тоқтатылды"</string>
     <string name="cancel" msgid="61873902552555096">"Бас тарту"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Көру үшін түрту"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Көру үшін түртіңіз"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Хабар алушының құрылғысы бим арқылы үлкен файл жіберуді қолдамайды."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Құрылғыларды қайта біріктіру"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Тарату қазіргі уақытта бос емес. Алдыңғы тасымалдау аяқталғанда әрекетті қайталаңыз."</string>
diff --git a/res/values-km-rKH/provisioning.xml b/res/values-km-rKH/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-km-rKH/provisioning.xml
+++ b/res/values-km-rKH/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index f6d46255..061d7d57 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"សេវា NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"ទំនាក់ទំនងដែលបានទទួលតាម NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"ប៉ះដើម្បីបន្ថែមមនុស្សនេះជាទំនាក់ទំនង។"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"អន្តរកម្ម NFC ពេញលេញ"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"ប៉ះដើម្បីផ្ដល់ព័ត៌មានទំនាក់ទំនងរបស់អ្នកទៅមនុស្សនេះ។"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"បានបើក NFC ។"</string>
-    <string name="touch" msgid="4727218133711188355">"ប៉ះដើម្បីផ្ទេរ"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"ប៉ះដើម្បីផ្ទេរ"</string>
     <string name="beam_progress" msgid="7453634884807323920">"ការផ្ទេរចូល..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"កំពុងផ្ទេរ..."</string>
     <string name="beam_complete" msgid="477026736424637435">"បញ្ចប់ការផ្ទេរ"</string>
     <string name="beam_failed" msgid="5116241718189888630">"ការផ្ទេរមិនបានបញ្ចប់"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"បានបោះបង់ការផ្ទេរ"</string>
     <string name="cancel" msgid="61873902552555096">"បោះបង់"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"ប៉ះដើម្បីមើល"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"ប៉ះដើម្បីមើល"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"ឧបករណ៍របស់អ្នកទទួលមិនគាំទ្រការផ្ទេរឯកសារដែលមានទំហំធំតាមការផ្ទេរឡើយ។"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"នាំឧបករណ៍ជាមួយគ្នាម្ដងទៀត"</string>
     <string name="beam_busy" msgid="5253335587620612576">"ប៊ីមកំពុងជាប់រវល់។ សាកល្បងម្តងទៀតនៅពេលដែលការផ្ទេរពីមុនបញ្ចប់។"</string>
diff --git a/res/values-kn-rIN/provisioning.xml b/res/values-kn-rIN/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-kn-rIN/provisioning.xml
+++ b/res/values-kn-rIN/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 9dfe6d38..f106662f 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc ಸೇವೆ"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC ಮೂಲಕ ಸಂಪರ್ಕವನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"ಈ ವ್ಯಕ್ತಿಯನ್ನು ಸಂಪರ್ಕದ ರೂಪದಲ್ಲಿ ಸೇರಿಸಿಕೊಳ್ಳಲು ಸ್ಪರ್ಶಿಸಿ."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC ಪರಸ್ಪರ ಸಂವಹನ ಪೂರ್ಣಗೊಂಡಿದೆ"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"ಈ ವ್ಯಕ್ತಿಗೆ ನಿಮ್ಮ ಸಂಪರ್ಕ ಮಾಹಿತಿಯನ್ನು ನೀಡಲು ಸ್ಪರ್ಶಿಸಿ."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC ಸಕ್ರಿಯಗೊಂಡಿದೆ."</string>
-    <string name="touch" msgid="4727218133711188355">"ಬೀಮ್ ಮಾಡಲು ಸ್ಪರ್ಶಿಸಿ"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"ಬೀಮ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="beam_progress" msgid="7453634884807323920">"ಒಳಬರುತ್ತಿರುವ ಬೀಮ್..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"ಬೀಮ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
     <string name="beam_complete" msgid="477026736424637435">"ಬೀಮ್ ಪೂರ್ಣಗೊಂಡಿದೆ"</string>
     <string name="beam_failed" msgid="5116241718189888630">"ಬೀಮ್ ಪೂರ್ಣಗೊಂಡಿಲ್ಲ"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"ಬೀಮ್ ರದ್ದುಗೊಂಡಿದೆ"</string>
     <string name="cancel" msgid="61873902552555096">"ರದ್ದುಮಾಡು"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"ವೀಕ್ಷಿಸಲು ಸ್ಪರ್ಶಿಸಿ"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"ವೀಕ್ಷಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"ಸ್ವೀಕರಿಸುವವರ ಸಾಧನವು ಬೀಮ್ ಮೂಲಕ ಮಾಡಲಾಗುವ ವರ್ಗಾವಣೆಯನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"ಸಾಧನಗಳನ್ನು ಮತ್ತೆ ಒಟ್ಟಿಗೆ ತನ್ನಿ"</string>
     <string name="beam_busy" msgid="5253335587620612576">"ಬೀಮ್ ಪ್ರಸ್ತುತ ಕಾರ್ಯನಿರತವಾಗಿದೆ. ಹಿಂದಿನ ವರ್ಗಾವಣೆ ಪೂರ್ಣಗೊಂಡ ಬಳಿಕ ಮತ್ತೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."</string>
diff --git a/res/values-ko/provisioning.xml b/res/values-ko/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-ko/provisioning.xml
+++ b/res/values-ko/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e495e30e..07df7249 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFC 서비스"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC를 통해 받은 연락처"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"이 사람을 연락처에 추가하려면 터치하세요."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC 통신 완료"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"이 사람에게 내 연락처 정보를 제공하려면 터치하세요."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC 사용"</string>
-    <string name="touch" msgid="4727218133711188355">"공유하기"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"탭하여 공유하기"</string>
     <string name="beam_progress" msgid="7453634884807323920">"수신 빔..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"공유 중..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Beam 완료"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Beam이 완료되지 않음"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Beam 취소됨"</string>
     <string name="cancel" msgid="61873902552555096">"취소"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"터치하여 보기"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"탭하여 보기"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"수신자의 기기는 빔을 통한 대용량 파일 전송을 지원하지 않습니다."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"기기 다시 공유"</string>
     <string name="beam_busy" msgid="5253335587620612576">"현재 공유 작업을 진행 중입니다. 기존 전송 작업이 완료되면 다시 시도하세요."</string>
diff --git a/res/values-ky-rKG/provisioning.xml b/res/values-ky-rKG/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-ky-rKG/provisioning.xml
+++ b/res/values-ky-rKG/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index bb14bcf8..0134189c 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc Кызматы"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC аркылуу алынган байланыш"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Бул кишини байланыш катары кошуш үчүн, тийиңиз."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC алмашуу аяктады"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Бул кишиге байланыш маалыматтарыңызды бериш үчүн тийиңиз."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC жандырылган."</string>
-    <string name="touch" msgid="4727218133711188355">"beam кылыш үчүн тийиңиз"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Дайындарды өткөрүү үчүн таптаңыз"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Кириш beam..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Beam өткөрүүдө..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Beam аяктады"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Beam аягына чыккан жок"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Beam жокко чыгарылды"</string>
     <string name="cancel" msgid="61873902552555096">"Жокко чыгаруу"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Көрүш үчүн тийиңиз"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Көрүү үчүн таптаңыз"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Алуучунун түзмөгү beam аркылуу чоң файлдарды кабылдабайт."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Түзмөктөрдү кайрадан бириктириңиз"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Учурда өткөрүү бош эмес. Мурунку өткөрүү аяктаганда кайра аракет кылыңыз."</string>
diff --git a/res/values-lo-rLA/provisioning.xml b/res/values-lo-rLA/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-lo-rLA/provisioning.xml
+++ b/res/values-lo-rLA/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 5746e9e3..d95cc121 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"ບໍລິການ NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"ລາຍຊື່ຜູ່ຕິດຕໍ່ທີ່ໄດ້ຮັບຜ່ານ NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"ແຕະເພື່ອເພີ່ມບຸກຄົນນີ້ເຂົ້າໄປໃນລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"ການປະຕິສຳພັນ NFC ສຳເລັດແລ້ວ"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"ແຕະເພື່ອເອົາຂໍ້ມູນການຕິດຕໍ່ຂອງທ່ານໃຫ້ກັບບຸກຄົນນີ້"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC ເປີດແລ້ວ."</string>
-    <string name="touch" msgid="4727218133711188355">"ແຕະເພື່ອ Beam"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"ແຕະເພື່ອສົ່ງສັນຍານ"</string>
     <string name="beam_progress" msgid="7453634884807323920">"ມີ beam ເຂົ້າມາ..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Beaming..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Beam ສຳເລັດແລ້ວ"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Beam ບໍ່ສຳເລັດ"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Beam ຍົກເລີກແລ້ວ"</string>
     <string name="cancel" msgid="61873902552555096">"ຍົກເລີກ"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"ແຕະເພື່ອເບິ່ງ"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"ແຕະເພື່ອເບິ່ງ"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"ອຸປະກອນຂອງຜູ່ຮັບບໍ່ສາມາດຮອງຮັບການໂອນໄຟລ໌ຂະຫນາດໃຫຍ່ໂດຍຜ່ານ beam ໄດ້."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"ນຳອຸປະກອນເຂົ້າມາຫາກັນໃໝ່ອີກຄັ້ງ"</string>
     <string name="beam_busy" msgid="5253335587620612576">"ປະຈຸບັນ Beam ບໍ່ວ່າງ. ລອງໃໝ່ອີກເມື່ອການໂອນທີ່ຜ່ານມາສຳເລັດແລ້ວ."</string>
diff --git a/res/values-lt/provisioning.xml b/res/values-lt/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-lt/provisioning.xml
+++ b/res/values-lt/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index a00419c1..cb84b897 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"ALR paslauga"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"ALR"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Gauta per ALR"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Palieskite, kad pridėtumėte šį asmenį kaip kontaktą."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC sąveika baigta"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Palieskite, kad šiam asmeniui suteiktumėte savo kontakt. inf."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"ALR įgalinta."</string>
-    <string name="touch" msgid="4727218133711188355">"Jei norite perduoti, palieskite"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Palieskite, kad perduotumėte"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Gaunamas perdavimas..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Perduodama..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Perdavimas baigtas"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Perdavimas nebuvo užbaigtas"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Perdavimas atšauktas"</string>
     <string name="cancel" msgid="61873902552555096">"Atšaukti"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Jei norite peržiūrėti, palieskite"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Palieskite, kad peržiūrėtumėte"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Gavėjo įrenginyje nepalaikomas didelio failo perdavimas naudojant perdavimo funkciją."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Vėl susiekite įrenginius"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Perdavimo paslauga šiuo metu užimta. Bandykite dar kartą, kai bus baigtas ankstesnis perkėlimas."</string>
diff --git a/res/values-lv/provisioning.xml b/res/values-lv/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-lv/provisioning.xml
+++ b/res/values-lv/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 944757f1..55c2cf0e 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFC pakalpojums"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontaktinformācija saņemta, izmantojot NFC."</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Pieskarieties, lai pievienotu šo personu kā kontaktpersonu."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC mijiedarbība ir pabeigta."</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Pieskarieties, lai sniegtu šai personai savu kontaktinformāciju."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC ir iespējoti."</string>
-    <string name="touch" msgid="4727218133711188355">"Pieskarties, lai projicētu"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Pieskarties, lai kopīgotu, izmantojot funkciju Beam"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Ienākošie vienumi, izmantojot funkciju Beam..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Notiek kopīgošana, izmantojot funkciju Beam..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Kopīgošana, izmantojot funkciju Beam, ir pabeigta."</string>
     <string name="beam_failed" msgid="5116241718189888630">"Kopīgošana, izmantojot funkciju Beam, netika pabeigta"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Kopīgošana, izmantojot funkciju Beam, atcelta"</string>
     <string name="cancel" msgid="61873902552555096">"Atcelt"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Pieskarieties, lai skatītu."</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Pieskarties, lai skatītu"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Saņēmēja ierīce neatbalsta lielu failu pārsūtīšanu, izmantojot funkciju Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Vēlreiz novietojiet ierīces blakus."</string>
     <string name="beam_busy" msgid="5253335587620612576">"Funkcija Beam šobrīd ir noslogota. Mēģiniet vēlreiz, tiklīdz ir pabeigta iepriekšējā pārsūtīšana."</string>
diff --git a/res/values-mk-rMK/provisioning.xml b/res/values-mk-rMK/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-mk-rMK/provisioning.xml
+++ b/res/values-mk-rMK/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 36c8b9bc..b600691a 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFC услуга"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Контакт примен преку NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Допри за да го додадеш ова лице како контакт."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Интеракцијата со NFC е целосна"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Допрете да ги дадете вашите информации за контакт на ова лице."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC е овозможена."</string>
-    <string name="touch" msgid="4727218133711188355">"Допри за зрак"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Допри за пренесување"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Дојдовен зрак..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Зрачење..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Зракот е целосен"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Зракот не се заврши"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Зракот е откажан"</string>
     <string name="cancel" msgid="61873902552555096">"Откажи"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Допри за да видиш"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Допри за приказ"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Уредот на примачот не поддржува пренос на големи датотеки преку зрак."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Повторно спој ги уредите"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam е моментално зафатен. Обидете се повторно кога ќе заврши претходниот пренос."</string>
@@ -44,6 +40,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Поврзано"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Поврзи се на мрежа"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Да се поврзе со мрежата <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam бара да се овозможи НФЦ. Дали сакате да го овозможите?"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam бара да се овозможи NFC. Дали сакате да го овозможите?"</string>
     <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-ml-rIN/provisioning.xml b/res/values-ml-rIN/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-ml-rIN/provisioning.xml
+++ b/res/values-ml-rIN/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 6b9a83b2..90d3aefd 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc സേവനം"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC മുഖേന ലഭിച്ച കോൺടാക്റ്റ്"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"ഈ വ്യക്തിയെ ഒരു കോൺടാക്‌റ്റ് ആയി ചേർക്കുന്നതിന് സ്‌പർശിക്കുക."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC ഇടപെടൽ പൂർത്തിയായി"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"നിങ്ങളുടെ കോൺടാക്റ്റ് വിവരം ഈ വ്യക്തിയ്ക്ക് നൽകുന്നതിന് സ്‌പർശിക്കുക."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC പ്രവർത്തനക്ഷമമാക്കി."</string>
-    <string name="touch" msgid="4727218133711188355">"ബീം സ്‌പർശിക്കുക"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"ബീം ചെയ്യാൻ ടാപ്പുചെയ്യുക"</string>
     <string name="beam_progress" msgid="7453634884807323920">"ഇൻകമിംഗ് ബീം..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"ബീമിംഗ്..."</string>
     <string name="beam_complete" msgid="477026736424637435">"ബീം പൂർത്തിയായി"</string>
     <string name="beam_failed" msgid="5116241718189888630">"ബീം പൂർത്തിയായില്ല"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"ബീം റദ്ദാക്കി"</string>
     <string name="cancel" msgid="61873902552555096">"റദ്ദാക്കുക"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"കാണാൻ സ്‌പർശിക്കുക"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"കാണാൻ ടാപ്പുചെയ്യുക"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"ബീം മുഖേന വലിയ ഫയൽ കൈമാറുന്നതിനെ സ്വീകർത്താവിന്റെ ഉപകരണം പിന്തുണയ്ക്കുന്നില്ല."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"ഉപകരണങ്ങൾ വീണ്ടും ഒരുമിച്ചുകൊണ്ടുവരുക"</string>
     <string name="beam_busy" msgid="5253335587620612576">"ബീം നിലവിൽ തിരക്കിലാണ്. മുമ്പുള്ള കൈമാറ്റം പൂർത്തിയാക്കുമ്പോൾ വീണ്ടും ശ്രമിക്കുക."</string>
diff --git a/res/values-mn-rMN/provisioning.xml b/res/values-mn-rMN/provisioning.xml
index 7b21b72e..efcee844 100644
--- a/res/values-mn-rMN/provisioning.xml
+++ b/res/values-mn-rMN/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"аппликэйшн/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index bb94efbd..438ba6aa 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc Үйлчилгээ"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC-р хүлээн авсан харилцагч"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Энэ хүнийг харилцагчаар нэмэхийн тулд хүрнэ үү."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC интерактив харилцаа бүрэн"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Энэ хүнд өөрийн харилцагчийн мэдээллийг өгөхийн тулд товшино уу"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC идэвхжүүлсэн."</string>
-    <string name="touch" msgid="4727218133711188355">"Бийм явуулахын тулд хүрнэ"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Илгээхийн тулд дарна уу"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Орж ирж буй бийм..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Бийм цацруулж байна..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Бийм бүрэн"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Бийм бүрдээгүй"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Бийм цуцлагдсан"</string>
     <string name="cancel" msgid="61873902552555096">"Цуцлах"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Харахын тулд хүрнэ үү"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Харахын тулд товшино уу"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Хүлээн авагч төхөөрөмж том файлыг бийм-ээр дамжуулахыг дэмждэггүй."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Төхөөрөмжүүдийг дахин хамтад нь байлгах"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam одоохондоо завгүй байна. Өмнөх шилжүүлэг дууссан үед дахин оролдоно уу."</string>
@@ -28,7 +24,7 @@
     <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-г хослуулан холбож байна"</string>
     <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-г хослуулан холбож чадсангүй"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Блютүүтийг идэвхжүүлж чадсангүй"</string>
-    <string name="confirm_pairing" msgid="4112568077038265363">"Та Блютүүт төхөөрөмж <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-тэй хослуулахдаа итгэлтэй байна уу?"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"Та Bluetooth төхөөрөмж <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-тэй хослуулахдаа итгэлтэй байна уу?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Тийм"</string>
     <string name="pair_no" msgid="5022308368904055020">"Үгүй"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> ашиглан төлбөр хийхийн тулд товшино уу"</string>
diff --git a/res/values-mr-rIN/provisioning.xml b/res/values-mr-rIN/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-mr-rIN/provisioning.xml
+++ b/res/values-mr-rIN/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 0863e320..8175f3a1 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc सेवा"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC वर संपर्क प्राप्त केला"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"संपर्क म्हणून या व्यक्तीस जोडण्यासाठी स्पर्श करा."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC परस्पर संवाद पूर्ण"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"आपली संपर्क माहिती या व्यक्तीस देण्यासाठी स्पर्श करा."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC सक्षम."</string>
-    <string name="touch" msgid="4727218133711188355">"बीम ला स्पर्श करा"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"बीमवर टॅप करा"</string>
     <string name="beam_progress" msgid="7453634884807323920">"येणारे बीम..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"बीम करत आहे..."</string>
     <string name="beam_complete" msgid="477026736424637435">"बीम पूर्ण"</string>
     <string name="beam_failed" msgid="5116241718189888630">"बीम पूर्ण केले नाही"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"बीम रद्द"</string>
     <string name="cancel" msgid="61873902552555096">"रद्द करा"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"पाहण्यासाठी स्पर्श करा"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"पाहण्यासाठी टॅप करा"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"प्राप्तकर्त्याचे डिव्हाइस बीमद्वारे मोठी फाईल स्थानांतरीत करण्यास समर्थन देत नाही."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"डिव्हाइसेस पुन्हा एकत्र आणा"</string>
     <string name="beam_busy" msgid="5253335587620612576">"बीम करणे सध्या व्यस्त आहे. मागील स्थानांतरीत करणे पूर्ण झाल्यानंतर पुन्हा प्रयत्न करा."</string>
diff --git a/res/values-ms-rMY/provisioning.xml b/res/values-ms-rMY/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-ms-rMY/provisioning.xml
+++ b/res/values-ms-rMY/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index caed039f..5774775b 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Perkhidmatan Nfc"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kenalan diterima melalui NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Sentuh untuk menambah orang ini sebagai kenalan."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Interaksi NFC lengkap"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Sentuh untuk memberi orang ini maklumat hubungan anda."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC didayakan."</string>
-    <string name="touch" msgid="4727218133711188355">"Sentuh untuk memancarkan"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Ketik untuk pancar"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Pancar sedang masuk..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Memancar..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Pancar selesai"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Pancar tidak lengkap"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Pancar dibatalkan"</string>
     <string name="cancel" msgid="61873902552555096">"Batal"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Sentuh untuk melihat"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Ketik untuk lihat"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Peranti penerima tidak menyokong pemindahan fail besar melalui pancaran."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Dekatkan peranti semula"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Pancaran sibuk pada masa ini. Cuba lagi apabila pemindahan sebelumnya selesai."</string>
diff --git a/res/values-my-rMM/provisioning.xml b/res/values-my-rMM/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-my-rMM/provisioning.xml
+++ b/res/values-my-rMM/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 6908d833..7ffb711b 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc ဆားဗစ်"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFCမှရသောလိပ်စာ"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"ဤပုဂ္ဂိုလ်အား လိပ်စာတွင်ထည့်ရန် တို့ထိပါ"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC ကြားတုံ့ပြန်မှု ပြီးဆုံးပါပြီ"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"ဤပုဂ္ဂိုလ်အား သင့်လိပ်စာပေးရန် တို့ထိပါ"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC ရရှိသည်"</string>
-    <string name="touch" msgid="4727218133711188355">"လှိုင်းလွှင့်ရန်အတွက် ထိပါ"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"ဘင်းမ်လုပ်ရန် တို့ပါ"</string>
     <string name="beam_progress" msgid="7453634884807323920">"အဝင် လှိုင်းလွှင့်ခြင်း..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"လှိုင်းလွှင့်နေစဥ်..."</string>
     <string name="beam_complete" msgid="477026736424637435">"လှိုင်းလွှင့်မှု ပြီးဆုံးပါပြီ"</string>
     <string name="beam_failed" msgid="5116241718189888630">"လှိုင်းလွှင့်မှု မပြီးဆုံးပါ"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"လှိုင်းလွှင့်မှု ပယ်ဖျက်မည်"</string>
-    <string name="cancel" msgid="61873902552555096">"ထားတော့"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"ကြည့်ရန် တို့ထိပါ"</string>
+    <string name="cancel" msgid="61873902552555096">"မလုပ်တော့ပါ"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"ကြည့်ရှုရန် တို့ပါ"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"လက်ခံစက်သည် လှိုင်းလွှင့်ခြင်းမှတစ်ဆင့် ကြီးမားသောဖိုင်လွဲခြင်းများကို မထောက်ပံ့ပါ"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"ထပ်ပြီး စက်ကို အတူထားပါ"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam လောလောဆယ် အလုပ်များနေ၏။ ယခင် ကူးပြောင်းမှုပြီးမှ ထပ်မံကြိုးစားပါ။"</string>
@@ -30,7 +26,7 @@
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"ဘလူးတုသ်ကို မရရှိနိုင်ပါ"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"ဘလူးတုသ်စက်<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့် တွဲချိတ်ရန် ကျိန်းသေပါသလား?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"မှန်ပါသည်"</string>
-    <string name="pair_no" msgid="5022308368904055020">"ဟင့်အင်း"</string>
+    <string name="pair_no" msgid="5022308368904055020">"No"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g>နှင့် ပေးချေရန် နောက်တစ်ခါ ခေါက်ထိပါ"</string>
     <string name="tap_again_to_complete" msgid="5423640945118279123">"<xliff:g id="APP">%1$s</xliff:g>နှင့် ပြီးဆုံးရန် နောက်တစ်ခါ ခေါက်ထိပါ"</string>
     <string name="transaction_failure" msgid="7828102078637936513">"<xliff:g id="APP">%1$s</xliff:g>နှင့် လုပ်ငန်းစဥ်မပြီးဆုံးနိုင်ပါ"</string>
@@ -45,5 +41,5 @@
     <string name="title_connect_to_network" msgid="2474034615817280146">"ကွန်ယက်ကို ဆက်သွယ်ရန်"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"ကွန်ရက် <xliff:g id="NETWORK_SSID">%1$s</xliff:g>ကို ချိတ်ဆက်ရမလား?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam သင် NFC ဖွင့်ရန်လိုအပ်သည်။ သင်၎င်းအားဖွင့်လိုသလား?"</string>
-    <string name="android_beam" msgid="1666446406999492763">"အန်ဒရွိုက် အလင်းတန်း"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-nb/provisioning.xml b/res/values-nb/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-nb/provisioning.xml
+++ b/res/values-nb/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index cea1dd0d..833a3458 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFC-tjeneste"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontakt mottatt per NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Trykk for å legge til denne personen som en kontakt."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC-samhandling er fullført"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Berør for å gi denne personen kontaktinformasjonen din."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC er aktivert."</string>
-    <string name="touch" msgid="4727218133711188355">"Berør for å overføre trådløst"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Trykk for å overføre"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Innkommende trådløs overføring"</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Sender ..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Overføring fullført"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Overføringen ble ikke fullført"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Overføringen ble avbrutt"</string>
     <string name="cancel" msgid="61873902552555096">"Avbryt"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Trykk for å se"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Trykk for å se"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Mottakerens enhet støtter ikke store filoverføringer via Android Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Før enhetene sammen igjen"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam er opptatt for øyeblikket. Prøv igjen når den forrige overføringen er fullført."</string>
@@ -27,7 +23,7 @@
     <string name="disconnected_peripheral" msgid="4470578100296504366">"Frakoblet <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="pairing_peripheral" msgid="6983626861540899365">"Sammenkobler <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Kunne ikke sammenkoble <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <string name="failed_to_enable_bt" msgid="7229153323594758077">"Kunne ikke aktivere Bluetooth"</string>
+    <string name="failed_to_enable_bt" msgid="7229153323594758077">"Kunne ikke slå på Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Er du sikker på at koble til Bluetooth-enheten <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Ja"</string>
     <string name="pair_no" msgid="5022308368904055020">"Nei"</string>
diff --git a/res/values-ne-rNP/provisioning.xml b/res/values-ne-rNP/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-ne-rNP/provisioning.xml
+++ b/res/values-ne-rNP/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index ebdee3cc..c538bf70 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc सेवा"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC मा प्राप्त सम्पर्क"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"यो व्यक्तिलाई सम्पर्कको रूपमा थप्नको लागि छुनुहोस्"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC कुराकानी पुरा"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"यो व्यक्ति लाई आफ्नो सम्पर्क जानकारी दिन छुनुहोस्"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC सक्षम"</string>
-    <string name="touch" msgid="4727218133711188355">"बिममा छुनुहोस्"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"बिम गर्नका लागि ट्याप गर्नुहोस्"</string>
     <string name="beam_progress" msgid="7453634884807323920">"आगमन बिम..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"बिम गर्दै..."</string>
     <string name="beam_complete" msgid="477026736424637435">"बिम पुरा भयो"</string>
     <string name="beam_failed" msgid="5116241718189888630">"बिमले पुरा गरेन"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"बिम रद्द भयो"</string>
     <string name="cancel" msgid="61873902552555096">"रद्द गर्नुहोस्"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"अवलोकन गर्न छुनुहोस्"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"हेर्नका लागि ट्याप गर्नुहोस्"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"प्राप्तकर्ताको उपकरणले बिम मार्फत ठूलो फाइल ट्रान्सफर गर्न समर्थन गर्दैन।"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"फेरि उपकरणहरू एकै साथ ल्याउनुहोस्"</string>
     <string name="beam_busy" msgid="5253335587620612576">"बीम अहिले व्यस्त छ। अघिल्लो स्थानान्तरण पूरा भएपछि फेरि प्रयास गर्नुहोस्।"</string>
diff --git a/res/values-nl/provisioning.xml b/res/values-nl/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-nl/provisioning.xml
+++ b/res/values-nl/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6822046a..914f760e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFC-service"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Contact ontvangen via NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Raak aan om deze persoon toe te voegen als contact."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC-interactie voltooid"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Raak aan om deze persoon je contactgegevens te geven."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC ingeschakeld."</string>
-    <string name="touch" msgid="4727218133711188355">"Tikken om uit te zenden"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Tik om te beamen"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Inkomende beam..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Beamen..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Beam voltooid"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Beam niet voltooid"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Beam geannuleerd"</string>
     <string name="cancel" msgid="61873902552555096">"Annuleren"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Raak aan om te bekijken"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Tik om weer te geven"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Het apparaat van de ontvanger ondersteunt de overdracht van grote bestanden via beam niet."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Houd de apparaten nogmaals tegen elkaar"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam is momenteel bezet. Probeer het opnieuw zodra de huidige overdracht is voltooid."</string>
diff --git a/res/values-pa-rIN/provisioning.xml b/res/values-pa-rIN/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-pa-rIN/provisioning.xml
+++ b/res/values-pa-rIN/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 1a4975ed..4f937e50 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -3,23 +3,19 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc ਸੇਵਾ"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC ਤੇ ਪ੍ਰਾਪਤ ਕੀਤਾ ਸੰਪਰਕ"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"ਇਸ ਵਿਅਕਤੀ ਨੂੰ ਇੱਕ ਸੰਪਰਕ ਦੇ ਤੌਰ ਤੇ ਜੋੜਨ ਲਈ ਛੋਹਵੋ।"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC ਇੰਟਰੈਕਸ਼ਨ ਪੂਰਾ"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"ਇਸ ਵਿਅਕਤੀ ਨੂੰ ਆਪਣੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਦੇਣ ਲਈ ਛੋਹਵੋ।"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC ਸਮਰਥਿਤ।"</string>
-    <string name="touch" msgid="4727218133711188355">"ਬੀਮ ਕਰਨ ਲਈ ਛੋਹਵੋ"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"ਬੀਮ ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="beam_progress" msgid="7453634884807323920">"ਇਨਕਮਿੰਗ ਬੀਮ..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"ਬੀਮ ਕਰ ਰਿਹਾ ਹੈ..."</string>
     <string name="beam_complete" msgid="477026736424637435">"ਬੀਮ ਪੂਰਾ"</string>
     <string name="beam_failed" msgid="5116241718189888630">"ਬੀਮ ਪੂਰਾ ਨਹੀਂ ਕੀਤਾ"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"ਬੀਮ ਰੱਦ ਕੀਤਾ"</string>
     <string name="cancel" msgid="61873902552555096">"ਰੱਦ ਕਰੋ"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"ਦੇਖਣ ਲਈ ਛੋਹਵੋ"</string>
-    <string name="beam_handover_not_supported" msgid="4083165921751489015">"ਰਿਸੀਵਰ ਦੀ ਡਿਵਾਈਸ ਬੀਮ ਰਾਹੀਂ ਵੱਡੀ ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ।"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"ਵੇਖਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
+    <string name="beam_handover_not_supported" msgid="4083165921751489015">"ਰਿਸੀਵਰ ਦੀ ਡੀਵਾਈਸ ਬੀਮ ਰਾਹੀਂ ਵੱਡੀ ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ।"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"ਡਿਵਾਈਸਾਂ ਨੂੰ ਦੁਬਾਰਾ ਇਕੱਠੇ ਨਾਲ ਲਿਆਓ"</string>
     <string name="beam_busy" msgid="5253335587620612576">"ਬੀਮ ਇਸ ਵੇਲੇ ਰੁੱਝਾ ਹੋਇਆ ਹੈ। ਜਦੋਂ ਪਿਛਲਾ ਟ੍ਰਾਂਸਫਰ ਪੂਰਾ ਹੋ ਜਾਏ ਤਾਂ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="device" msgid="4459621591392478151">"ਡਿਵਾਈਸ"</string>
+    <string name="device" msgid="4459621591392478151">"ਡੀਵਾਈਸ"</string>
     <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
     <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਕਨੈਕਟ ਨਹੀਂ ਕਰ ਸਕਿਆ"</string>
@@ -28,7 +24,7 @@
     <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਪੇਅਰ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਪੇਅਰ ਨਹੀਂ ਕਰ ਸਕਿਆ"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth ਨੂੰ ਸਮਰੱਥ ਨਹੀਂ ਬਣਾ ਸਕਿਆ"</string>
-    <string name="confirm_pairing" msgid="4112568077038265363">"ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ ਤੇ Bluetooth ਡਿਵਾਈਸ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਪੇਅਰ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ ਤੇ Bluetooth ਡੀਵਾਈਸ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਪੇਅਰ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"ਹਾਂ"</string>
     <string name="pair_no" msgid="5022308368904055020">"ਨਹੀਂ"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> ਨਾਲ ਪੇ ਕਰਨ ਲਈ ਦੁਬਾਰਾ ਟੈਪ ਕਰੋ"</string>
@@ -38,12 +34,12 @@
     <string name="pay_with" msgid="5531545488795798945">"ਇਸ ਨਾਲ ਪੇ ਕਰੋ"</string>
     <string name="complete_with" msgid="6797459104103012992">"ਇਸ ਨਾਲ ਪੂਰਾ ਕਰੋ"</string>
     <string name="default_pay_app_removed" msgid="4108250545457437360">"ਟੈਪ ਕਰੋ &amp; ਪੇ ਕਰੋ ਲਈ ਤੁਹਾਡੀ ਤਰਜੀਹੀ ਸੇਵਾ ਹਟਾ ਦਿੱਤੀ ਗਈ ਸੀ। ਕੀ ਦੂਜੀ ਚੁਣਨੀ ਹੈ?"</string>
-    <string name="ask_nfc_tap" msgid="2925239870458286340">"ਪੂਰਾ ਕਰਨ ਲਈ ਦੂਜੀ ਡਿਵਾਈਸ ਨੂੰ ਟੈਪ ਕਰੋ।"</string>
+    <string name="ask_nfc_tap" msgid="2925239870458286340">"ਪੂਰਾ ਕਰਨ ਲਈ ਦੂਜੀ ਡੀਵਾਈਸ ਨੂੰ ਟੈਪ ਕਰੋ।"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="status_unable_to_connect" msgid="9183908200295307657">"ਨੈਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ"</string>
+    <string name="status_unable_to_connect" msgid="9183908200295307657">"ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ"</string>
     <string name="status_wifi_connected" msgid="5893022897732105739">"ਕਨੈਕਟ ਕੀਤਾ"</string>
-    <string name="title_connect_to_network" msgid="2474034615817280146">"ਨੈਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="prompt_connect_to_network" msgid="8511683573657516114">"ਕੀ <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ਨੈਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨਾ ਹੈ?"</string>
+    <string name="title_connect_to_network" msgid="2474034615817280146">"ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="prompt_connect_to_network" msgid="8511683573657516114">"ਕੀ <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨਾ ਹੈ?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android ਬੀਮ ਲਈ NFC ਨੂੰ ਸਮਰਥਿਤ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸਨੂੰ ਸਮਰੱਥ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <string name="android_beam" msgid="1666446406999492763">"Android ਬੀਮ"</string>
 </resources>
diff --git a/res/values-pl/provisioning.xml b/res/values-pl/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-pl/provisioning.xml
+++ b/res/values-pl/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 28510cbc..10314acf 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Usługa NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontakt odebrany przez NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Dotknij, aby dodać tę osobę do kontaktów."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Zakończono interakcję przez NFC"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Dotknij, aby przekazać tej osobie swoje dane kontaktowe."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"Komunikacja NFC włączona."</string>
-    <string name="touch" msgid="4727218133711188355">"Dotknij, aby przesłać"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Kliknij, by przesłać"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Odbieram dane zbliżeniowo..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Przesyłam..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Przesyłanie zbliżeniowe zakończone"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Przesyłanie zbliżeniowe nie udało się"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Przesyłanie zbliżeniowe zostało anulowane"</string>
     <string name="cancel" msgid="61873902552555096">"Anuluj"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Dotknij, by wyświetlić"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Kliknij, by wyświetlić"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Urządzenie odbierające nie pozwala na zbliżeniowe przesyłanie dużych plików."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Zbliż urządzenia do siebie"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Funkcja Beam jest teraz zajęta. Spróbuj ponownie, gdy zakończy się poprzednia transmisja."</string>
diff --git a/res/values-pt-rPT/provisioning.xml b/res/values-pt-rPT/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-pt-rPT/provisioning.xml
+++ b/res/values-pt-rPT/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0c78c9c2..449e12a1 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Serviço NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Contacto recebido através de NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Toque para adicionar esta pessoa como contacto."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Interação NFC completa"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Toque para dar a esta pessoa as suas informações de contacto."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC ativado."</string>
-    <string name="touch" msgid="4727218133711188355">"Tocar para transmitir"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Toque para transmitir"</string>
     <string name="beam_progress" msgid="7453634884807323920">"A receber partilha..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"A transmitir..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Partilha concluída"</string>
     <string name="beam_failed" msgid="5116241718189888630">"A partilha não foi concluída"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Partilha cancelada"</string>
     <string name="cancel" msgid="61873902552555096">"Cancelar"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Tocar para ver"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Toque para ver"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"O dispositivo do recetor não suporta a transferência de ficheiros grandes através de partilha."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Juntar os dispositivos novamente"</string>
     <string name="beam_busy" msgid="5253335587620612576">"O Beam está atualmente ocupado. Tente novamente quando a transferência anterior for concluída."</string>
diff --git a/res/values-pt/provisioning.xml b/res/values-pt/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-pt/provisioning.xml
+++ b/res/values-pt/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index bbf26d06..a3c096aa 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Serviço Nfc"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Contato recebido por NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Toque para adicionar essa pessoa como um contato."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Interação de NFC completa"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Toque para fornecer suas informações de contato para essa pessoa"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC habilitado."</string>
-    <string name="touch" msgid="4727218133711188355">"Toque para enviar"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Tocar para enviar"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Beam chegando..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Enviando..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Envio concluído"</string>
     <string name="beam_failed" msgid="5116241718189888630">"O envio não foi concluído"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Envio cancelado"</string>
     <string name="cancel" msgid="61873902552555096">"Cancelar"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Toque para visualizar"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Tocar para ver"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"O dispositivo receptor não suporta a transferência de arquivos grandes por meio do Android Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Una dispositivos novamente"</string>
     <string name="beam_busy" msgid="5253335587620612576">"O Beam está ocupado no momento. Tente novamente quando a transferência anterior for concluída."</string>
diff --git a/res/values-ro/provisioning.xml b/res/values-ro/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-ro/provisioning.xml
+++ b/res/values-ro/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index fba4ed35..f5a89fd1 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -3,20 +3,16 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Serviciul NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Persoană din agendă primită prin NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Atingeţi pentru a adăuga această persoană în Agendă."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Interacțiune NFC completă"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Atingeţi pentru a oferi acestei persoane datele dvs. de contact"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC activat."</string>
-    <string name="touch" msgid="4727218133711188355">"Atingeţi pentru transmitere"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Atingeți pentru a transmite"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Transmitere primită..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Se transmite..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Transmitere încheiată"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Transmiterea nu este finalizată"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Transmitere anulată"</string>
     <string name="cancel" msgid="61873902552555096">"Anulați"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Atingeţi pentru a afişa"</string>
-    <string name="beam_handover_not_supported" msgid="4083165921751489015">"Dispozitivul destinatarului nu acceptă transferul fişierelor mari prin fascicul."</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Atingeți pentru a afișa"</string>
+    <string name="beam_handover_not_supported" msgid="4083165921751489015">"Dispozitivul destinatarului nu acceptă transferul fișierelor mari prin fascicul."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Apropiați dispozitivele din nou"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam este ocupat. Încercați după finalizarea transferului anterior."</string>
     <string name="device" msgid="4459621591392478151">"dispozitiv"</string>
@@ -27,8 +23,8 @@
     <string name="disconnected_peripheral" msgid="4470578100296504366">"S-a deconectat <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="pairing_peripheral" msgid="6983626861540899365">"Se asociază <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Nu s-a putut asocia <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <string name="failed_to_enable_bt" msgid="7229153323594758077">"Activarea Bluetooth a eşuat"</string>
-    <string name="confirm_pairing" msgid="4112568077038265363">"Sigur doriţi să împerecheaţi dispozitivul Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+    <string name="failed_to_enable_bt" msgid="7229153323594758077">"Activarea Bluetooth a eșuat"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"Sigur doriți să împerecheați dispozitivul Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Da"</string>
     <string name="pair_no" msgid="5022308368904055020">"Nu"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"Atingeți din nou pentru a plăti cu <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -45,5 +41,5 @@
     <string name="title_connect_to_network" msgid="2474034615817280146">"Conectați-vă la rețea"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Doriți să vă conectați la rețeaua <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam necesită activarea NFC. Activați?"</string>
-    <string name="android_beam" msgid="1666446406999492763">"Transmitere Android"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-ru/provisioning.xml b/res/values-ru/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-ru/provisioning.xml
+++ b/res/values-ru/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f69fe21f..93c35cd4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Служба NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Данные контакта получены по NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Нажмите, чтобы добавить контакт."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Обмен данными по NFC завершен"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Нажмите, чтобы передать свои контактные данные."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"Служба NFC включена"</string>
-    <string name="touch" msgid="4727218133711188355">"Нажмите, чтобы передать данные"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Нажмите, чтобы передать данные"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Получение данных…"</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Передача данных..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Передача данных завершена"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Передача данных не завершена"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Передача данных отменена"</string>
     <string name="cancel" msgid="61873902552555096">"Отмена"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Нажмите, чтобы просмотреть"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Нажмите, чтобы просмотреть"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Устройство получателя не поддерживает передачу больших объемов данных через Android Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Повторить попытку"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Передавать данные пока нельзя. Повторите попытку после окончания предыдущего сеанса."</string>
diff --git a/res/values-si-rLK/provisioning.xml b/res/values-si-rLK/provisioning.xml
index 55fa3b57..efcee844 100644
--- a/res/values-si-rLK/provisioning.xml
+++ b/res/values-si-rLK/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning"</item>
   </string-array>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 611167ac..d8df88d9 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc සේවාව"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC හරහා සම්බන්ධතාව ලැබුණි"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"මෙම පුද්ගලයා සම්බන්ධතාවයක් ලෙස එක් කිරීමට තට්ටු කරන්න."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC ක්‍රියාකාරකම සම්පූර්ණයි"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"මෙම පුද්ගලයාට ඔබගේ සම්බන්ධතා තොරතුරු දීමට ස්පර්ශ කරන්න."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC සබලයි."</string>
-    <string name="touch" msgid="4727218133711188355">"බීම් කිරීමට ස්පර්ශ කරන්න"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"කදම්බ කිරීමට තට්ටු කරන්න"</string>
     <string name="beam_progress" msgid="7453634884807323920">"එන බීම්..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"බීම් කරමින්..."</string>
     <string name="beam_complete" msgid="477026736424637435">"බීම් සම්පුර්ණයි"</string>
     <string name="beam_failed" msgid="5116241718189888630">"බීම් සම්පූර්ණ වූයේ නැත"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"බීම් අවලංගු කරන ලදි"</string>
     <string name="cancel" msgid="61873902552555096">"අවලංගු කරන්න"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"බැලීමට ස්පර්ශ කරන්න"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"බැලීමට තට්ටු කරන්න"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"බීම් ඔස්සේ ලැබෙන්නාගේ උපාංගය විශාල ගොනු හුවමාරුව සඳහා සහය නොදක්වයි."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"නැවතත් උපාංග එකට ගෙනෙන්න"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam දැනට කාර්ය බහුලය. පෙර මාරුව සම්පූර්ණ වන විට නැවත උත්සාහ කරන්න."</string>
diff --git a/res/values-sk/provisioning.xml b/res/values-sk/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-sk/provisioning.xml
+++ b/res/values-sk/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index f87be62b..7f291fbf 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Služba Nfc"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontakt prijatý cez NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Dotknutím sa túto osobu pridáte medzi kontakty."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Interakcia NFC bola dokončená"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Dotknutím sa tejto osobe odovzdáte svoje kontaktné informácie."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC povolené."</string>
-    <string name="touch" msgid="4727218133711188355">"Dotykom spustíte prenos"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Prenos klepnutím"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Prichádzajúci prenos..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Prenáša sa..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Prenos bol dokončený"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Prenos nebol dokončený"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Prenos bol zrušený"</string>
     <string name="cancel" msgid="61873902552555096">"Zrušiť"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Zobrazte dotykom"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Zobrazenie klepnutím"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Zariadenie príjemcu nepodporuje prenos veľkých súborov prostredníctvom funkcie Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Znova priblížte zariadenia"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Aplikácia Beam je momentálne zaneprázdnená. Skúste to znova, keď sa dokončí predchádzajúci prenos."</string>
diff --git a/res/values-sl/provisioning.xml b/res/values-sl/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-sl/provisioning.xml
+++ b/res/values-sl/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 2fc02a4d..22082e72 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Storitev NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Stik prejet prek NFC-ja"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Tapnite, če želite dodati to osebo kot stik."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Pošiljanje prek NFC-ja končano"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Tapnite, če želite tej osebi poslati svoje podatke za stik."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC omogočen."</string>
-    <string name="touch" msgid="4727218133711188355">"Dotaknite se, da pošljete"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Dotaknite se za prenos"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Dohodni prenos ..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Prenašanje ..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Prenos končan"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Prenos se ni končal"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Prenos je preklican"</string>
     <string name="cancel" msgid="61873902552555096">"Prekliči"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Dotaknite se za prikaz"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Dotaknite se za ogled"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Prejemnikova naprava ne podpira prenosa velikih datotek prek funkcije Android Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Znova združi naprave"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Android Beam je trenutno zaseden. Poskusite znova, ko se konča prejšnji prenos."</string>
diff --git a/res/values-sq-rAL/provisioning.xml b/res/values-sq-rAL/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-sq-rAL/provisioning.xml
+++ b/res/values-sq-rAL/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 180714a5..6fdb400f 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Shërbimi NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontakti u mor nëpërmjet NFC-së"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Prek për ta shtuar këtë person si kontakt."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Ndërveprimi me NFC-në përfundoi"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Prek për t\'i dhënë këtij personi informacionet e tua të kontaktit."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC-ja u aktivizua."</string>
-    <string name="touch" msgid="4727218133711188355">"Prek për të dërguar me rreze"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Trokit për të dërgur me rreze"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Dërgimi me rreze është në ardhje..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Po dërgon me rreze..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Dërgimi me rreze përfundoi"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Dërgimi me rreze nuk përfundoi"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Dërgimi me rreze u anulua"</string>
     <string name="cancel" msgid="61873902552555096">"Anulo"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Prek për të parë"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Trokit për të parë"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Pajisja e marrësit nuk e mbështet transferimin e skedarëve të mëdhenj nëpërmjet dërgimit me rreze."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Bashkoji pajisjet përsëri"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Dërgimi me rreze është i zënë aktualisht. Provo përsëri kur të përfundojë transferimi i mëparshëm."</string>
diff --git a/res/values-sr/provisioning.xml b/res/values-sr/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-sr/provisioning.xml
+++ b/res/values-sr/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index d48f5a64..2d498f1b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc Service"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Контакт је примљен преко NFC-а"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Додирните да бисте додали ову особу као контакт."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC интеракција је довршена"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Додирните да бисте овој особи дали контакт информације."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC је омогућен."</string>
-    <string name="touch" msgid="4727218133711188355">"Додирните за емитовање"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Додирните да бисте пребацили"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Долазно пребацивање..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Пребацивање..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Пребацивање је довршено"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Пребацивање се није завршило"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Пребацивање је отказано"</string>
     <string name="cancel" msgid="61873902552555096">"Откажи"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Додирните да бисте прегледали"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Додирните да бисте прегледали"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Уређај пријемника не подржава пренос великих датотека пребацивањем."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Поново приближите уређаје"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Пребацивање је тренутно заузето. Покушајте поново када се претходни пренос заврши."</string>
diff --git a/res/values-sv/provisioning.xml b/res/values-sv/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-sv/provisioning.xml
+++ b/res/values-sv/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 45455209..56bc2e5f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc Service"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontakt mottagen via NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Tryck om du vill lägga till personen som en kontakt."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC-interaktionen är slutförd"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Tryck om du vill ge personen dina kontaktuppgifter."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC aktiverat."</string>
-    <string name="touch" msgid="4727218133711188355">"Tryck här om du vill överföra"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Överför trådlöst genom att trycka här"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Inkommande trådlös överföring ..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Överför trådlöst ..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Den trådlösa överföringen har slutförts"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Den trådlösa överföringen slutfördes inte"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Den trådlösa överföringen avbröts"</string>
     <string name="cancel" msgid="61873902552555096">"Avbryt"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Tryck och visa"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Visa genom att trycka här"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Mottagarens enheten stöder inte trådlös överföring av stora filer."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"För samman enheterna igen"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam används för närvarande. Försök igen när den pågående överföringen är klar."</string>
diff --git a/res/values-sw/provisioning.xml b/res/values-sw/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-sw/provisioning.xml
+++ b/res/values-sw/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 49ddd867..7d48d3f6 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Huduma ya Nfc"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Anwani imepokewa kupitia NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Gusa ili kuongeza mtu huyu kama mwasiliani"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC imemaliza kushirikiana"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Gusa ili kumpa mtu huyu maelezo yako ya mawasiliano."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC imewezeshwa."</string>
-    <string name="touch" msgid="4727218133711188355">"Gusa ili kusambaza"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Gonga ili usambaze"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Boriti zinazoingia..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Inasambaza..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Kusambaza kumekamilika"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Usambazaji haukukamilika"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Boriti imeghairiwa"</string>
     <string name="cancel" msgid="61873902552555096">"Ghairi"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Gusa ili utazame"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Gonga ili uangalie"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Kifaa cha upokeaji hakihimili uhamishaji wa faili kubwa kupitia kwenye boriti."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Unganisha vifaa tena"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Android Beam inatumika kwa sasa. Jaribu tena itakapokamilisha uhamishaji uliotangulia."</string>
diff --git a/res/values-ta-rIN/provisioning.xml b/res/values-ta-rIN/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-ta-rIN/provisioning.xml
+++ b/res/values-ta-rIN/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 62e9bd06..9394e009 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc சேவை"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC வழியாக தொடர்பு பெறப்பட்டது"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"தொடர்பாக இவரைச் சேர்க்கத் தொடவும்."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC இடைவினை முழுமையடைந்தது"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"இவருக்கு உங்கள் தொடர்புத் தகவலை வழங்கத் தொடவும்."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC இயக்கப்பட்டது."</string>
-    <string name="touch" msgid="4727218133711188355">"பீம் செய்யத் தட்டவும்"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"பீம் செய்ய, தட்டவும்"</string>
     <string name="beam_progress" msgid="7453634884807323920">"உள்வரும் பீம்..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"பரிமாற்றுகிறது..."</string>
     <string name="beam_complete" msgid="477026736424637435">"பீம் முடிந்தது"</string>
     <string name="beam_failed" msgid="5116241718189888630">"பீம் ஐ முடிக்க முடியவில்லை"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"பீம் ரத்து செய்யப்பட்டது"</string>
     <string name="cancel" msgid="61873902552555096">"ரத்துசெய்"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"பார்க்கத் தொடவும்"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"பார்க்க, தட்டவும்"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"பெறுநரின் சாதனம் பீம் வழியான பெரிய கோப்புப் பரிமாற்றத்தை ஆதரிக்கவில்லை."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"மீண்டும் சாதனங்களை ஒன்றாகக் கொண்டுவரவும்"</string>
     <string name="beam_busy" msgid="5253335587620612576">"பீம் தற்போது பணிமிகுதியில் உள்ளது. முந்தைய இடமாற்றம் முடியும்போது, மீண்டும் முயலவும்."</string>
diff --git a/res/values-te-rIN/provisioning.xml b/res/values-te-rIN/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-te-rIN/provisioning.xml
+++ b/res/values-te-rIN/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index bf66fd9b..9d256d30 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc సేవ"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"పరిచయం NFC ద్వారా స్వీకరించబడింది"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"ఈ వ్యక్తిని పరిచయంగా జోడించడానికి తాకండి."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC చర్య పూర్తయింది"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"మీ సంప్రదింపు సమాచారాన్ని ఈ వ్యక్తికి అందించడానికి తాకండి."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC ప్రారంభించబడింది."</string>
-    <string name="touch" msgid="4727218133711188355">"బీమ్ కోసం తాకండి"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"ప్రసారం చేయడానికి నొక్కండి"</string>
     <string name="beam_progress" msgid="7453634884807323920">"ఇన్‌కమింగ్ Beam..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Beam చేస్తోంది..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Beam పూర్తయింది"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Beam పూర్తి కాలేదు"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Beam రద్దు చేయబడింది"</string>
     <string name="cancel" msgid="61873902552555096">"రద్దు చేయండి"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"వీక్షించడానికి తాకండి"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"వీక్షించడానికి నొక్కండి"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"స్వీకర్త పరికరం Beam ద్వారా పెద్ద ఫైల్ బదిలీకి మద్దతు ఇవ్వదు."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"పరికరాలను మళ్లీ సమీపంలోకి తీసుకురండి"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam ప్రస్తుతం బిజీగా ఉంది. మునుపటి బదిలీ పూర్తయిన తర్వాత మళ్లీ ప్రయత్నించండి."</string>
diff --git a/res/values-th/provisioning.xml b/res/values-th/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-th/provisioning.xml
+++ b/res/values-th/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 426a1400..7c151464 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"บริการ NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"ได้รับข้อมูลรายชื่อติดต่อทาง NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"แตะเพื่อเพิ่มคนนี้เป็นผู้ติดต่อ"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"ดำเนินการโต้ตอบกับ NFC ให้เสร็จสมบูรณ์"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"แตะเพื่อให้ข้อมูลรายชื่อติดต่อของคุณแก่คนนี้"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"เปิดใช้งาน NFC แล้ว"</string>
-    <string name="touch" msgid="4727218133711188355">"แตะเพื่อบีม"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"แตะเพื่อบีม"</string>
     <string name="beam_progress" msgid="7453634884807323920">"บีมขาเข้า..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"กำลังบีม..."</string>
     <string name="beam_complete" msgid="477026736424637435">"บีมสำเร็จ"</string>
     <string name="beam_failed" msgid="5116241718189888630">"บีมไม่เสร็จสมบูรณ์"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"ยกเลิกบีมแล้ว"</string>
     <string name="cancel" msgid="61873902552555096">"ยกเลิก"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"แตะเพื่อดู"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"แตะเพื่อดู"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"อุปกรณ์ของผู้รับไม่สนับสนุนการถ่ายโอนไฟล์ขนาดใหญ่ผ่านการบีม"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"นำอุปกรณ์มารวมกันอีกครั้ง"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam ไม่ว่างในขณะนี้ ลองอีกครั้งเมื่อการโอนก่อนหน้าเสร็จสมบูรณ์แล้ว"</string>
diff --git a/res/values-tl/provisioning.xml b/res/values-tl/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-tl/provisioning.xml
+++ b/res/values-tl/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index a37e4b0b..09336a50 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Serbisyo ng Nfc"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Natanggap ang contact sa NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Pindutin upang idagdag ang taong ito bilang isang contact."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Kumpleto na ang pakikipag-ugnayan sa NFC"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Pindutin para ibigay sa taong ito ang impormasyon ng contact mo"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"Pinagana ang NFC."</string>
-    <string name="touch" msgid="4727218133711188355">"Pindutin upang i-beam"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"I-tap upang i-beam"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Dumarating na beam..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Nagbi-beam..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Kumpleto na ang pag-beam"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Hindi nakumpleto ang beam"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Kinansela ang beam"</string>
     <string name="cancel" msgid="61873902552555096">"Kanselahin"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Pindutin upang tingnan"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"I-tap upang tingnan"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Hindi sinusuportahan ng device ng receiver ang malaking paglipat ng file sa pamamagitan ng beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Pagsamahing muli ang mga device"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Kasalukuyang abala ang beam. Subukang muli kapag nakumpleto na ang dating paglilipat."</string>
diff --git a/res/values-tr/provisioning.xml b/res/values-tr/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-tr/provisioning.xml
+++ b/res/values-tr/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 9ba8a1db..9637deec 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc Hizmeti"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kişi NFC ile alındı"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Bu kullanıcıyı kişi olarak eklemek için dokunun."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC etkileşimi tamam"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Bu kullanıcıya kişi bilgilerinizi vermek için dokunun."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC etkin."</string>
-    <string name="touch" msgid="4727218133711188355">"Göndermek için dokunun"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Işınlamak için hafifçe dokunun"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Gelen ışın..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Işınlanıyor..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Işınlama tamamlandı"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Işınlama tamamlanmadı"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Işınlama iptal edildi"</string>
     <string name="cancel" msgid="61873902552555096">"İptal"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Görüntülemek için dokunun"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Görüntülemek için hafifçe dokunun"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Alıcının cihazı yüksek boyutlu dosyaların ışınlamayla aktarılmasını desteklemiyor."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Cihazları tekrar bir araya getirin"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Android Beam şu anda meşgul. Önceki aktarım işlemi tamamlandığında tekrar deneyin."</string>
diff --git a/res/values-uk/provisioning.xml b/res/values-uk/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-uk/provisioning.xml
+++ b/res/values-uk/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 2c7e0b2f..85f0c184 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Служба NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Контакт, отриманий через NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Торкніться, щоб додати цю особу як контакт."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Взаємодію через NFC закінчено"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Торкніться, щоб надати цій особі свою контактну інформацію."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC увімкнено."</string>
-    <string name="touch" msgid="4727218133711188355">"Торкніться, щоб передати дані"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Торкніться, щоб надіслати"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Вхідне передавання даних..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Передавання даних…"</string>
     <string name="beam_complete" msgid="477026736424637435">"Передавання даних виконано"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Передавання даних не завершено"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Передавання даних скасовано"</string>
     <string name="cancel" msgid="61873902552555096">"Скасувати"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Торкніться, щоб переглянути"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Торкніться, щоб переглянути"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Пристрій отримувача не підтримує пересилання великих файлів за допомогою функції Передавання даних Android."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Знову притуліть пристрої один до одного"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Неможливо передати. Повторіть спробу, коли завершиться попереднє передавання."</string>
diff --git a/res/values-ur-rPK/provisioning.xml b/res/values-ur-rPK/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-ur-rPK/provisioning.xml
+++ b/res/values-ur-rPK/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 8622bc0d..2bee31c7 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"‏Nfc سروس"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"‏NFC پر موصولہ رابطہ"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"اس شخص کو ایک رابطہ کے بطور شامل کرنے کیلئے ٹچ کریں۔"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"‏NFC تعامل مکمل ہو گیا"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"اس شخص کو اپنے رابطہ کی معلومات دینے کیلئے ٹچ کریں۔"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"‏NFC فعال ہے۔"</string>
-    <string name="touch" msgid="4727218133711188355">"بیم کیلئے ٹچ کریں"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"بیم کرنے کیلئے تھپتھپائیں"</string>
     <string name="beam_progress" msgid="7453634884807323920">"بیم موصول ہو رہا ہے…"</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"بیم کی جا رہی ہے…"</string>
     <string name="beam_complete" msgid="477026736424637435">"بیم مکمل ہو گیا"</string>
     <string name="beam_failed" msgid="5116241718189888630">"بیم مکمل نہیں ہوا"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"بیم منسوخ ہو گیا"</string>
     <string name="cancel" msgid="61873902552555096">"منسوخ کریں"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"دیکھنے کیلئے ٹچ کریں"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"دیکھنے کیلئے تھپتھپائیں"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"موصول کرنے والے کا آلہ بیم کے ذریعے بڑی فائل کی منتقلی کا تعاون نہیں کرتا ہے۔"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"آلات کو دوبارہ سے ساتھ لائیں"</string>
     <string name="beam_busy" msgid="5253335587620612576">"‏Beam فی الحال مصروف ہے۔ سابقہ منتقلی مکمل ہونے پر دوبارہ کوشش کریں۔"</string>
diff --git a/res/values-uz-rUZ/provisioning.xml b/res/values-uz-rUZ/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-uz-rUZ/provisioning.xml
+++ b/res/values-uz-rUZ/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 1c71337d..081f6e80 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc xizmati"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontakt NFC orqali qabul qilindi"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Bu shaxsni kontakt sifatida qo‘shish uchun ustiga bosing."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC orqali bog‘landi"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Bu shaxsga kontaktingiz ma’lumotini o‘tkazish uchun bosing."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC yoqilgan."</string>
-    <string name="touch" msgid="4727218133711188355">"O‘tkazish uchun bosing"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Ma’lumotlarni uzatish uchun bosing"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Kiruvchi o‘tkazma…"</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"O‘tkazmoqda…"</string>
     <string name="beam_complete" msgid="477026736424637435">"O‘tkazildi"</string>
     <string name="beam_failed" msgid="5116241718189888630">"O‘tkazilmadi"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"O‘tkazish bekor qilindi"</string>
     <string name="cancel" msgid="61873902552555096">"Bekor qilish"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Ko‘rish uchun bosing"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Ko‘rish uchun bosing"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Qabul qiluvchining qurilmasi o‘tkazish xususiyati orqali katta hajmdagi fayllar o‘tkazmasini qo‘llab-quvvatlamaydi."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Qurilmalarni yana jipslashtiring"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam hozirda band. Avvalgi o‘tkazma tugallangach, qaytadan urining."</string>
@@ -37,7 +33,7 @@
     <string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g>dan foydalanib bo‘lmadi."</string>
     <string name="pay_with" msgid="5531545488795798945">"To‘lov usuli:"</string>
     <string name="complete_with" msgid="6797459104103012992">"Quyidagi bilan yakunlash:"</string>
-    <string name="default_pay_app_removed" msgid="4108250545457437360">"Afzal ko‘rgan bosib &amp; to‘lash xizmati ilovasi o‘chirib tashlandi. Boshqasini tanlang?"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"Siz kontaktsiz to‘lov uchun belgilangan asosiy ilovani o‘chirib tashladingiz. Boshqasi tanlansinmi?"</string>
     <string name="ask_nfc_tap" msgid="2925239870458286340">"Ishni yakunlash uchun boshqa qurilmani bosing"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"Ulanish"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"Tarmoqqa ulanib bo‘lmadi"</string>
diff --git a/res/values-vi/provisioning.xml b/res/values-vi/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-vi/provisioning.xml
+++ b/res/values-vi/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 17cfefde..0de9c8c6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Dịch vụ Nfc"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Thông tin liên hệ đã nhận qua NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Chạm để thêm người này làm người liên hệ."</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Hoàn tất tương tác NFC"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Chạm để gửi cho người này thông tin liên hệ của bạn."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"Đã bật NFC."</string>
-    <string name="touch" msgid="4727218133711188355">"Chạm để truyền"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Nhấn để truyền"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Tia đến..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Đang chiếu..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Hoàn tất chiếu"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Chiếu chưa hoàn tất"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Chiếu bị hủy"</string>
     <string name="cancel" msgid="61873902552555096">"Hủy"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Chạm để xem"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Nhấn để xem"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Thiết bị của người nhận không hỗ trợ truyền tệp lớn qua quá trình chiếu."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Nhóm các thiết bị lại với nhau lần nữa"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam hiện đang bận. Hãy thử lại khi quá trình truyền trước đây hoàn tất."</string>
diff --git a/res/values-zh-rCN/provisioning.xml b/res/values-zh-rCN/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-zh-rCN/provisioning.xml
+++ b/res/values-zh-rCN/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 934c1fdd..d917d02e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFC服务"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"通过NFC收到了联系人信息"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"触摸可将此人添加为联系人。"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC互动完成"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"接触可向此人发送您的联系人信息。"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC已开启。"</string>
-    <string name="touch" msgid="4727218133711188355">"触摸即可传输"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"点按即可传输"</string>
     <string name="beam_progress" msgid="7453634884807323920">"正在接收传输内容..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"正在传输信息..."</string>
     <string name="beam_complete" msgid="477026736424637435">"传输完毕"</string>
     <string name="beam_failed" msgid="5116241718189888630">"传输未完成"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"传输已取消"</string>
     <string name="cancel" msgid="61873902552555096">"取消"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"触摸即可查看"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"点按即可查看"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"接收者的设备不支持传输较大的文件。"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"再次让两台设备接触"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam 目前正忙。请在之前的传输任务完成后重试。"</string>
diff --git a/res/values-zh-rHK/provisioning.xml b/res/values-zh-rHK/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-zh-rHK/provisioning.xml
+++ b/res/values-zh-rHK/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index b2d7884e..5e1ce012 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFC 服務"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"已透過 NFC 收到聯絡人資料"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"輕觸即可將這個人新增為聯絡人。"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC 互動完成"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"輕觸即可將您的聯絡人資料傳送給這個人。"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC 已啟用。"</string>
-    <string name="touch" msgid="4727218133711188355">"輕觸即可傳送"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"輕按即可傳送"</string>
     <string name="beam_progress" msgid="7453634884807323920">"正在接收傳送..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"正在傳送..."</string>
     <string name="beam_complete" msgid="477026736424637435">"傳送完畢"</string>
     <string name="beam_failed" msgid="5116241718189888630">"傳送未完成"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"傳送已取消"</string>
     <string name="cancel" msgid="61873902552555096">"取消"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"輕觸即可查看"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"輕按即可查看"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"接收者的裝置不支援經由 Beam 傳送大型檔案。"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"再次把裝置放在一起"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam 目前忙碌中。請在完成上一個傳輸工作後再試一次。"</string>
diff --git a/res/values-zh-rTW/provisioning.xml b/res/values-zh-rTW/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-zh-rTW/provisioning.xml
+++ b/res/values-zh-rTW/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3c336364..4b4b1e2a 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"NFC 服務"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"已透過 NFC 收到聯絡人資訊"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"輕觸即可將這位使用者新增為聯絡人。"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC 互動完成"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"輕觸即可將您的聯絡人資訊傳送給這位使用者。"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC 已啟用。"</string>
-    <string name="touch" msgid="4727218133711188355">"輕觸即可傳輸"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"輕觸即可傳輸"</string>
     <string name="beam_progress" msgid="7453634884807323920">"正在接收傳輸..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"即時傳輸中..."</string>
     <string name="beam_complete" msgid="477026736424637435">"傳輸完成"</string>
     <string name="beam_failed" msgid="5116241718189888630">"傳輸未完成"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"傳輸已取消"</string>
     <string name="cancel" msgid="61873902552555096">"取消"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"輕觸即可查看"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"輕觸即可查看"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"接收者的裝置不支援透過 Beam 傳輸大型檔案。"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"再次將裝置放在一起"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam 目前忙碌中。請等待先前的傳輸作業完成，然後再試一次。"</string>
@@ -31,14 +27,14 @@
     <string name="confirm_pairing" msgid="4112568077038265363">"您確定要與藍牙裝置「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」配對嗎？"</string>
     <string name="pair_yes" msgid="3525614878559994448">"是"</string>
     <string name="pair_no" msgid="5022308368904055020">"否"</string>
-    <string name="tap_again_to_pay" msgid="5754988005412859897">"再輕按一下即可使用「<xliff:g id="APP">%1$s</xliff:g>」付款"</string>
-    <string name="tap_again_to_complete" msgid="5423640945118279123">"再輕按一下即可使用「<xliff:g id="APP">%1$s</xliff:g>」完成付款"</string>
+    <string name="tap_again_to_pay" msgid="5754988005412859897">"再輕觸一下即可使用「<xliff:g id="APP">%1$s</xliff:g>」付款"</string>
+    <string name="tap_again_to_complete" msgid="5423640945118279123">"再輕觸一下即可使用「<xliff:g id="APP">%1$s</xliff:g>」完成付款"</string>
     <string name="transaction_failure" msgid="7828102078637936513">"無法使用「<xliff:g id="APP">%1$s</xliff:g>」完成這項交易作業。"</string>
     <string name="could_not_use_app" msgid="8137587876138569083">"無法使用「<xliff:g id="APP">%1$s</xliff:g>」。"</string>
     <string name="pay_with" msgid="5531545488795798945">"使用以下應用程式完成付款："</string>
     <string name="complete_with" msgid="6797459104103012992">"使用以下應用程式完成操作："</string>
     <string name="default_pay_app_removed" msgid="4108250545457437360">"您偏好的感應付款服務已遭移除，要選擇其他服務嗎？"</string>
-    <string name="ask_nfc_tap" msgid="2925239870458286340">"輕按另一個裝置即可完成"</string>
+    <string name="ask_nfc_tap" msgid="2925239870458286340">"輕觸另一個裝置即可完成"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"連線"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"無法連線至網路"</string>
     <string name="status_wifi_connected" msgid="5893022897732105739">"已連線"</string>
diff --git a/res/values-zu/provisioning.xml b/res/values-zu/provisioning.xml
index 676cad9b..efcee844 100644
--- a/res/values-zu/provisioning.xml
+++ b/res/values-zu/provisioning.xml
@@ -21,6 +21,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
-    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index e69586c4..0d8fe334 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -3,19 +3,15 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Isevisi ye-Nfc"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"i-NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Othintana naye utholakale nge-NFC"</string>
-    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Thinta ukuze wengeze lomuntu njengoxhumene naye"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Ukuxhumana kwe-NFC kuphelile"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Thinta ukuze unike lomuntu imininingwane yakho yokuxhumana"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"I-NFC ivunyelwe."</string>
-    <string name="touch" msgid="4727218133711188355">"Cindezela kwibhimu"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"Thepha ukuze uvumelanise"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Ukuvumelanisa okungenayo..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Ukuvumelanisa..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Ukuvumelanisa kuqedile"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Ukuvumelanisa akuqedile"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Ukuvumelanisa kukhanseliwe"</string>
     <string name="cancel" msgid="61873902552555096">"Khansela"</string>
-    <string name="beam_touch_to_view" msgid="7853129156831642630">"Thinta ukuze ubuke"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Thepha ukuze ubuke"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Idivayisi yomamukeli ayisekeli ukuhanjiswa kwamafayela amakhulu ngokuvumelanisa."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Phinda uhlanganise ndawonye amadivayisi"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Ukuvumelansia okwamanje kumatasa. Zama futhi uma ukuthutha kwangaphambili kuqeda."</string>
diff --git a/res/values/provisioning.xml b/res/values/provisioning.xml
index 98237034..8253b09b 100644
--- a/res/values/provisioning.xml
+++ b/res/values/provisioning.xml
@@ -24,6 +24,5 @@
          Mime-types must be lower case, wildcards are *not* accepted. -->
     <string-array name="provisioning_mime_types">
         <item>application/com.android.managedprovisioning</item>
-        <item>application/com.android.managedprovisioning.v2</item>
     </string-array>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e0e72311..3e2fdd7f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,21 +3,9 @@
     <string name="app_name">Nfc Service</string>
     <string name="nfcUserLabel">Nfc</string>
 
-    <!-- A notification description string informing the user that contact details were received over NFC [CHAR-LIMIT=64] -->
-    <string name="inbound_me_profile_title">Contact received over NFC</string>
-
-    <!-- A notification action string prompting the user to add contact details to the People application [CHAR-LIMIT=64] -->
-    <string name="inbound_me_profile_text">Touch to add this person as a contact.</string>
-
-    <!-- A notification description string asking the user to share their contact details over NFC [CHAR-LIMIT=64] -->
-    <string name="outbound_me_profile_title">NFC interaction complete</string>
-
-    <!-- A notification action string prompting the user to share their contact details over NFC [CHAR-LIMIT=64] -->
-    <string name="outbound_me_profile_text">Touch to give this person your contact info.</string>
-
     <!-- Content description of the NFC enabled notification icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
     <string name="accessibility_nfc_enabled">NFC enabled.</string>
-    <string name="touch">Touch to beam</string>
+    <string name="tap_to_beam">Tap to beam</string>
 
     <string name="beam_progress">Incoming beam...</string>
     <string name="beam_outgoing">Beaming...</string>
@@ -25,7 +13,7 @@
     <string name="beam_failed">Beam did not complete</string>
     <string name="beam_canceled">Beam canceled</string>
     <string name="cancel">Cancel</string>
-    <string name="beam_touch_to_view">Touch to view</string>
+    <string name="beam_tap_to_view">Tap to view</string>
     <string name="beam_handover_not_supported">The receiver\'s device doesn\'t support large file transfer via beam.</string>
     <string name="beam_try_again">Bring devices together again</string>
     <string name="beam_busy">Beam is currently busy. Try again when the previous transfer completes.</string>
author	Gaurav Singhal <gsinghal@codeaurora.org>	2016-08-25 18:50:55 +0530
committer	Gaurav Singhal <gsinghal@codeaurora.org>	2016-08-30 07:27:31 +0530
commit	9fc4df3bf03e72751a4326a947c9bf23ec992e03 (patch)
tree	9476bb46b6e61e24e4c101f8d9209273a1a0732c /res
parent	9ea151570d6d1ff1d4bd5772bb49b547cbc48f5c (diff)
parent	2bccb8f3681351441b7714e1373619bc88923d03 (diff)
download	android_vendor_nxp_opensource_packages_apps_Nfc-9fc4df3bf03e72751a4326a947c9bf23ec992e03.tar.gz android_vendor_nxp_opensource_packages_apps_Nfc-9fc4df3bf03e72751a4326a947c9bf23ec992e03.tar.bz2 android_vendor_nxp_opensource_packages_apps_Nfc-9fc4df3bf03e72751a4326a947c9bf23ec992e03.zip