am 951dad2b: Restore deleted string still referenced from manifest.

* commit '951dad2b5af6be7c1b0490153f5c3f1f727da64f':
  Restore deleted string still referenced from manifest.
diff --git a/jni/com_android_nfc_NativeNfcManager.cpp b/jni/com_android_nfc_NativeNfcManager.cpp
index d0a6ed2..e40f1b9 100644
--- a/jni/com_android_nfc_NativeNfcManager.cpp
+++ b/jni/com_android_nfc_NativeNfcManager.cpp
@@ -23,6 +23,7 @@
 #include <sys/queue.h>
 #include <hardware/hardware.h>
 #include <hardware/nfc.h>
+#include <cutils/properties.h>
 
 #include "com_android_nfc.h"
 
@@ -491,12 +492,28 @@
    TRACE("******  START EEPROM SETTINGS UPDATE ******");
    for (i = 0; i < pn544_dev->num_eeprom_settings; i++)
    {
-      gInputParam.buffer = &(pn544_dev->eeprom_settings[i*4]);
+      char eeprom_property[PROPERTY_KEY_MAX];
+      char eeprom_value[PROPERTY_VALUE_MAX];
+      uint8_t* eeprom_base = &(pn544_dev->eeprom_settings[i*4]);
+      TRACE("> EEPROM SETTING: %d", i);
+
+      // Check for override of this EEPROM value in properties
+      snprintf(eeprom_property, sizeof(eeprom_property), "debug.nfc.eeprom.%02X%02X",
+              eeprom_base[1], eeprom_base[2]);
+      TRACE(">> Checking property: %s", eeprom_property);
+      if (property_get(eeprom_property, eeprom_value, "") == 2) {
+          int eeprom_value_num = (int)strtol(eeprom_value, (char**)NULL, 16);
+          LOGD(">> Override EEPROM addr 0x%02X%02X with value %02X",
+                  eeprom_base[1], eeprom_base[2], eeprom_value_num);
+          eeprom_base[3] = eeprom_value_num;
+      }
+
+      TRACE(">> Addr: 0x%02X%02X set to: 0x%02X", eeprom_base[1], eeprom_base[2],
+              eeprom_base[3]);
+      gInputParam.buffer = eeprom_base;
       gInputParam.length = 0x04;
       gOutputParam.buffer = resp;
 
-      TRACE("> EEPROM SETTING: %d", i);
-
       REENTRANCE_LOCK();
       status = phLibNfc_Mgt_IoCtl(gHWRef, NFC_MEM_WRITE, &gInputParam, &gOutputParam, nfc_jni_ioctl_callback, (void *)&cb_data);
       REENTRANCE_UNLOCK();
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 3ff51a7..556ce01 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -2,11 +2,10 @@
 <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-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="1409138030064787748">"Tik om hierdie persoon as \'n kontak by te voeg"</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="7431318734941861000">"Tik om aan hierdie persoon jou kontakinligting te gee"</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>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 1bcc5ff..7af12b7 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"NFC የተቀበላቸው ዕውቂያዎች"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"ይህን ሰው እንደ ዕውቅያ ለማከል መታ አድርግ"</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="7431318734941861000">"ለዚህ ሰው ያንተን ዕውቅያ መረጃ ለመስጠት መታ አድርግ"</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>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c2911c4..076a913 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"تم استلام جهة اتصال عبر NFC"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"انقر لإضافة هذا الشخص كجهة اتصال"</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="7431318734941861000">"انقر لمنح هذا الشخص معلومات اتصالك"</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>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index abe62d5..80a1be4 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -3,6 +3,8 @@
     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="permlab_nfcAdmin" msgid="5329590200504457455">"кантроль над абароненым апаратным забеспячэннем з падтрымкай сувязi малога радыусу дзеяння"</string>
+    <string name="permdesc_nfcAdmin" msgid="1527271067096288484">"Дазваляе гэтаму прыкладанню кантраляваць абароненае апаратнае забеспячэнне з дапамогай сувязi малога радыусу дзеяння, напрыклад, каб змяняць рэгiстрацыйныя дадзеныя для плацяжу"</string>
     <string name="inbound_me_profile_title" msgid="6146013785225412693">"Кантакт атрыманы праз NFC"</string>
     <string name="inbound_me_profile_text" msgid="1409138030064787748">"Дакраніцеся, каб дадаць гэтага чалавека ў кантакты"</string>
     <string name="outbound_me_profile_title" msgid="2523625031572784769">"Узаемадзеянне NFC завершанае"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index fd56772..242aa41 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -2,11 +2,10 @@
 <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">"КБП"</string>
     <string name="inbound_me_profile_title" msgid="6146013785225412693">"Контактът е получен чрез КБП"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"Докоснете, за да добавите този човек като контакт"</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="7431318734941861000">"Докоснете, за да дадете на този човек информацията си за връзка"</string>
+    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Докоснете, за да дадете на този човек информацията си за връзка."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"КБП е активирана."</string>
     <string name="touch" msgid="4727218133711188355">"Докоснете, за да излъчите"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4217d08..e4440d3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Pica per afegir aquesta persona com a contacte"</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="7431318734941861000">"Pica per donar a aquesta persona la teva informació de contacte"</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>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8e84bc2..e6ad8b3 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Klepnutím tuto osobu přidáte mezi kontakty"</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="7431318734941861000">"Klepnutím této osobě předáte své kontaktní informace"</string>
+    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Klepnutím této osobě předáte své kontaktní informace."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"Funkce NFC povolena."</string>
     <string name="touch" msgid="4727218133711188355">"Přenos zahájíte klepnutím sem"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 3cd4bf3..9aae09a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"Kontakt via NFC"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"Tryk for at tilføje denne person som kontaktperson"</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="7431318734941861000">"Tryk for at give denne person dine kontaktoplysninger"</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>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1784c62..a28e127 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2,11 +2,10 @@
 <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-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="1409138030064787748">"Zum Hinzufügen dieser Person als Kontakt tippen"</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="7431318734941861000">"Zum Weitergeben Ihrer Kontaktinformationen an diese Person tippen"</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>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 904e4da..ccc66bd 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -2,11 +2,10 @@
 <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">"Υπηρεσία ΕΚΠ"</string>
-    <string name="nfcUserLabel" msgid="7708535817084357357">"ΕΚΠ"</string>
     <string name="inbound_me_profile_title" msgid="6146013785225412693">"Λήψη επαφής μέσω ΕΚΠ"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"Πατήστε για να προσθέσετε αυτό το άτομο ως επαφή"</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="7431318734941861000">"Πατήστε για να δώσετε σε αυτό το άτομο τα στοιχεία επικοινωνίας σας"</string>
+    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Αγγίξτε  για να δώσετε σε αυτό το άτομο τα στοιχεία επικοινωνίας σας."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"Ενεργοποίηση ΕΚΠ."</string>
     <string name="touch" msgid="4727218133711188355">"Αγγίξτε για μετάδοση"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e364a43..2e35927 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"Contact received over NFC"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"Tap to add this person as a contact"</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="7431318734941861000">"Tap to give this person your contact info"</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>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b6fa680..8322172 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Toca para agregar a esta persona como contacto."</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="7431318734941861000">"Toca para brindarle a esta persona tu información de contacto."</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>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 99a2ff6..da80564 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Toca para añadir a esta persona como contacto."</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="7431318734941861000">"Toca para compartir tu información de contacto con esta persona."</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>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 9018513..d1eeca7 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -3,6 +3,8 @@
     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="permlab_nfcAdmin" msgid="5329590200504457455">"Lähiväljaside turvalise riistvara juhtimine"</string>
+    <string name="permdesc_nfcAdmin" msgid="1527271067096288484">"Lubab rakendusel juhtida turvalist riistvara, mida kasutatakse lähiväljasideks, nt maksemandaatide muutmiseks."</string>
     <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontakt saadud NFC kaudu"</string>
     <string name="inbound_me_profile_text" msgid="1409138030064787748">"Koputage, et lisada see isik kontaktide hulka"</string>
     <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC koostoime lõpetatud"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 43460af..0694501 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"مخاطب از طریق NFC دریافت شد"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"برای افزودن این فرد بعنوان یک مخاطب، ضربه بزنید"</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="7431318734941861000">"ضربه بزنید تا اطلاعات تماس خود را به این فرد بدهید"</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>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 372e917..4c44967 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"Kontakti saatu NFC:n välityksellä"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"Lisää tämä henkilö yhteystietoihin napauttamalla"</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="7431318734941861000">"Anna tälle henkilölle yhteystietosi napauttamalla"</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">"Kosketa palkkia"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 05c2c2b..01300d2 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Appuyez pour ajouter cette personne à vos contacts."</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="7431318734941861000">"Appuyez pour communiquer vos coordonnées à cette personne."</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>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 3174bbf..51c229c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"NFC पर प्राप्त संपर्क"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"इस व्‍यक्ति को संपर्क के रूप में जोड़ने के लिए टैप करें"</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="7431318734941861000">"इस व्‍यक्ति को अपनी संपर्क जानकारी देने के लिए टैप करें"</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>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index fe5e4a2..610dba3 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"Kontakt primljen NFC-om"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"Dotaknite da biste dodali ovu osobu kao kontakt"</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="7431318734941861000">"Dotaknite da biste toj osobi dali svoje kontaktne podatke"</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>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 5857a29..12e2303 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -2,11 +2,10 @@
 <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-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="1409138030064787748">"Érintse meg, ha hozzá szeretné adni ezt a személyt ismerősként"</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="7431318734941861000">"Érintse meg kapcsolatfelvételi adatainak megosztásához"</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">"Fény bekapcsolásához érintse meg"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 930ec6d..6997302 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -2,11 +2,10 @@
 <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">"Layanan Nfc"</string>
-    <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
     <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kenalan yang diterima lewat NFC"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"Ketuk untuk menambahkan orang ini sebagai kenalan"</string>
+    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Sentuh untuk menambahkan orang ini sebagai kenalan."</string>
     <string name="outbound_me_profile_title" msgid="2523625031572784769">"Interaksi NFC lengkap"</string>
-    <string name="outbound_me_profile_text" msgid="7431318734941861000">"Ketuk untuk memberikan info kenalan Anda kepada orang ini"</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>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index cce9400..ce32bf9 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Tocca per aggiungere questa persona come contatto"</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="7431318734941861000">"Tocca per inviare a questa persona le tue informazioni di contatto"</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>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c50ae17..f3e0af2 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"איש הקשר התקבל באמצעות NFC"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"הקש כדי להוסיף אדם זה כאיש קשר"</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="7431318734941861000">"הקש כדי לתת לאדם זה את פרטי הקשר שלך"</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>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b6869f0..0524c2f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"NFC受信の連絡先"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"このユーザーを連絡先に追加するにはタップします"</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="7431318734941861000">"このユーザーに連絡先情報を提供するにはタップします"</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>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a5d7b99..c7a8cd0 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"NFC를 통해 받은 연락처"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"이 사람을 연락처에 추가하려면 탭하세요."</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="7431318734941861000">"내 연락처 정보를 이 사람에게 제공하려면 탭하세요."</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>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 51ec23b..4a5d595 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Palieskite, kad pridėtumėte šį žmogų kaip kontaktą"</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="7431318734941861000">"Palieskite, kad šiam žmogui suteiktumėte savo kontakt. informac."</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>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 042b342..b49ef87 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -2,11 +2,10 @@
 <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 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="1409138030064787748">"Pieskarieties, lai pievienotu šo personu kā kontaktpersonu."</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="7431318734941861000">"Pieskarieties, lai sniegtu šai personai savu kontaktinformāciju."</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>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 280cb32..93767e8 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Ketik untuk menambah orang ini sebagai kenalan"</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="7431318734941861000">"Ketik untuk memberi orang ini maklumat hubungan anda"</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>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f6dbab2..e8f22ab 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -2,11 +2,10 @@
 <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-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="1409138030064787748">"Trykk for å legge til denne personen som en kontakt"</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="7431318734941861000">"Trykk for å gi denne personen kontaktinformasjonen din"</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>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4dda77e..48eff36 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"Contact ontvangen via NFC"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"Tik om deze persoon toe te voegen als contact"</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="7431318734941861000">"Tik om deze persoon uw contactgegevens te geven"</string>
+    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Raak aan om deze persoon uw 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>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ed22602..041df66 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Dotknij, aby dodać tę osobę jako kontakt"</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="7431318734941861000">"Dotknij, aby przekazać tej osobie swoje dane kontaktowe"</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>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index ce8f0ec..00cd06e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Toque para adicionar esta pessoa como contacto"</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="7431318734941861000">"Toque para dar a esta pessoa as suas informações de contacto"</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">"Toque para transmitir"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ec1d110..46e5cc5 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Toque para adicionar essa pessoa como um contato"</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="7431318734941861000">"Toque para dar a esta pessoa sua informação de contato"</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 iluminar"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index fc92144..b18b723 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Apăsaţi pentru a adăuga această persoană în agendă"</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="7431318734941861000">"Apăsaţi pt. a oferi acestei persoane inform. dvs. de contact"</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>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 20fff1b..ad0ffa9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"Данные контакта получены по NFC"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"Нажмите, чтобы добавить новый контакт"</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="7431318734941861000">"Нажмите, чтобы передать свои контактные данные"</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>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b68551c..9ff777f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Klepnutím pridáte túto osobu do kontaktov"</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="7431318734941861000">"Klepnutím poskytnete tejto osobe svoje kontaktné údaje"</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>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c680b51..081c43b 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Tapnite, če želite to osebo dodati kot stik"</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="7431318734941861000">"Tapnite, če želite osebi poslati svoje podatke za stik"</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>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a649190..a4ec970 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"Контакт је примљен преко NFC-а"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"Додирните да бисте додали ову особу као контакт"</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="7431318734941861000">"Додирните да бисте дали овој особи контакт информације"</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>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d3c4700..0766883 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"Kontakt mottagen via NFC"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"Tryck om du vill lägga till den här personen som en kontakt"</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="7431318734941861000">"Knacka lätt om du vill ge personen dina kontaktuppgifter"</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>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 9c28dd8..1dae713 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Gusa ili kuongeza mtu huyu kama mwasiliani"</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 imekamilisha kuingiliana"</string>
-    <string name="outbound_me_profile_text" msgid="7431318734941861000">"Gusa ili kumpa mtu huyu taarifa yako ya mawasiliano"</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 kwa boriti"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index bdc97d2..f234aec 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"ได้รับข้อมูลที่อยู่ติดต่อทาง NFC"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"แตะเพื่อเพิ่มบุคคลนี้เป็นผู้ติดต่อ"</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="7431318734941861000">"แตะเพื่อให้ข้อมูลที่อยู่ติดต่อของคุณแก่บุคคลนี้"</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>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f49ed9a..e68dfb0 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Tumapik upang idagdag ang taong ito bilang isang contact"</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="7431318734941861000">"Tumapik upang ibigay ang iyong impormasyon ng contact sa taong ito"</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>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index da2abba..362306a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -2,11 +2,10 @@
 <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 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="1409138030064787748">"Bu kullanıcıyı kişi olarak eklemek için hafifçe vurun"</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="7431318734941861000">"Bu kullanıcıya kişi bilgilerinizi vermek için hafifçe vurun"</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>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0128031..88e561c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"Контакт, отриманий через NFC"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"Торкніться, щоб додати цю особу як контакт"</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="7431318734941861000">"Торкніться, щоб надати цій особі свою контактну інформацію"</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>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 58f27d7..c2e73d6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Bấm để thêm người này làm người liên hệ"</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="7431318734941861000">"Bấm để gửi cho người này thông tin liên hệ của bạn"</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>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index be3b13c..fb10111 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"已通过 NFC 收到联系人信息"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"通过点按将此人添加为联系人"</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="7431318734941861000">"通过点按向此人发送您的联系人信息"</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>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9ed06c9..b6ba85e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -2,11 +2,10 @@
 <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="inbound_me_profile_title" msgid="6146013785225412693">"已透過 NFC 收到聯絡人資訊"</string>
-    <string name="inbound_me_profile_text" msgid="1409138030064787748">"輕按即可將這位使用者新增為聯絡人"</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="7431318734941861000">"輕按即可將您的聯絡人資訊傳送給這位使用者"</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>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index b08f2e6..e936f08 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -2,11 +2,10 @@
 <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">"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="1409138030064787748">"Thinta ukuze wengeze lomuntu njengoxhumene naye"</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="7431318734941861000">"Thinta ukuze unike lomuntu imininingwane yakho yokuxhumana"</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>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0963dc7..903103a 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7,13 +7,13 @@
     <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">Tap to add this person as a contact</string>
+    <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">Tap to give this person your contact info</string>
+    <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>
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 03e39c2..07767ac 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -596,7 +596,7 @@
         }
 
         void updateState(int newState) {
-            synchronized (this) {
+            synchronized (NfcService.this) {
                 if (newState == mState) {
                     return;
                 }
@@ -671,7 +671,7 @@
         @Override
         public boolean isNdefPushEnabled() throws RemoteException {
             synchronized (NfcService.this) {
-                return mIsNdefPushEnabled;
+                return mState == NfcAdapter.STATE_ON && mIsNdefPushEnabled;
             }
         }
 
@@ -1229,7 +1229,7 @@
         public Bundle close(String pkg, IBinder b) throws RemoteException {
             NfcService.this.enforceNfceeAdminPerm(pkg);
 
-            synchronized (this) {
+            synchronized (NfcService.this) {
                 if (mOpenEe != null) {
                     b.unlinkToDeath(mOpenEe, 0);
                 }
diff --git a/tests/Android.mk b/tests/Android.mk
index 3ba329b..be8dff1 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -1,4 +1,4 @@
-# Copyright 2008, The Android Open Source Project
+# Copyright 2011, 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.
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index f33d622..fa2380c 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -27,8 +27,8 @@
 
     <!--
     This declares that this app uses the instrumentation test runner targeting
-    the package of com.android.email.  To run the tests use the command:
-    "adb shell am instrument -w com.android.email.tests/android.test.InstrumentationTestRunner"
+    the package of com.android.nfc3.  To run the tests use the command:
+    "adb shell am instrument -w com.android.nfc.tests/android.test.InstrumentationTestRunner"
     -->
     <instrumentation android:name="android.test.InstrumentationTestRunner"
                      android:targetPackage="com.android.nfc"