diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 96b5871..07a086c 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Eienaar se inligting"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktiveer legstukke"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Gedeaktiveer deur administrateur"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC-ontsluit"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Voer teks in om op die sluitskerm te wys"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Wys gebruikerinligting op sluitskerm"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"As jy OK raak, sal <xliff:g id="SERVICE">%1$s</xliff:g> stop."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Geen dienste geïnstalleer nie"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Soek jy \'n skermleser?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack bied gesproke terugvoer om blindes en gebruikers met swak sig te help. Wil jy dit gratis vanaf Android Market installeer?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Geen beskrywing verskaf nie."</string>
     <string name="settings_button" msgid="3006713718908152930">"Instellings"</string>
     <string name="print_settings" msgid="4742428530112487843">"Druk"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Neem foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Kies foto vanuit galery"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC-skermslot-instellings"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Saamgebinde merkers"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Geaktiveer"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Bind met \'n merker saam"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NFC-saambind-aktiwiteit"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Bind nou saam"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Sit die merker plat op \'n tafel en sit die foon bo-op"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Merker en foon suksesvol saamgebind. Jy\'s klaar!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Die merker wat voorsien is, kan nie gebruik word om jou foon te ontsluit nie"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Kon nie met jou merker saambind nie, probeer asseblief weer"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC is nie geaktiveer nie en word vereis vir NFC-ontsluit. Skakel NFC asseblief aan."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC-instellings"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index a601ff2..8e14b8d 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"የባለቤት መረጃ"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"ንዑስ ፕሮግራሞችን አንቃ"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"በአስተዳዳሪ የተሰናከለ"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"የNFC መክፈት"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"በተቆለፈ ማያ ላይ ለማሳየት ፅሁፍ አስገባ"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"የተጠቃሚ መረጃ በመቆለፊያ ማያ ገጹ ላይ አሳይ"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> ይቁም?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"እሺን መንካት <xliff:g id="SERVICE">%1$s</xliff:g>ን ያስቆማል።"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"ምንም አገልግሎቶች አልተጫኑም"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"የማያ ማንበቢያ ያስፈልጋል?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack ማየት ለተሳናቸው እና ዝቅተኛ የማየት አቅም ላላቸው ተጠቃሚዎች የንግግር ግብረ መልስ ያቀርባል። በነጻ ከAndroid Market ለመጫን ይፈልጋሉ?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ምንም መግለጫ አልቀረበም።"</string>
     <string name="settings_button" msgid="3006713718908152930">"ቅንብሮች"</string>
     <string name="print_settings" msgid="4742428530112487843">"ማተም"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"ፎቶ ያንሱ"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"ፎቶ ከማዕከለ ስዕላት ምረጥ"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"የNFC ማያ ገጽ ቁልፍ ቅንብሮች"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"የተጣመሩ መለያዎች"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"ነቅቷል"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"ከአንድ መለያ ጋር አጣምር"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"አሁን አጣምር"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"መለያውን ጠረጴዛው ላይ ያስተኙት እና ስልኩን ከላይ ያስቀምጡት"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"መለያ እና ስልክ በተሳካ ሁኔታ ተጣምረዋል፣ በቃ ጨርሰዋል!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"የቀረበው መለያ ስልክዎን ለማስከፈት ስራ ላይ መዋል አይችልም"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"ከእርስዎ መለያ ጋር የሚደረገው ማጣመር አልተሳካም፣ እባክዎ እንደገና ይሞክሩ"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC አልነቃም፣ እና በNFC ለመክፈት ያስፈልጋል። እባክዎ NFCን ያብሩ።"</string>
+    <string name="ok" msgid="3651563352754792958">"የNFC ቅንብሮች"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 55199d6..5a3d785 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"معلومات المالك"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"تمكين الأدوات"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"معطّلة بواسطة المشرف"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"‏إلغاء قفل NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"اكتب النص الذي سيعرض على شاشة التأمين"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"إظهار معلومات المستخدم في شاشة التأمين"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"هل تريد إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"يؤدي لمس \"موافق\" إلى إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"لم يتم تثبيت أية خدمات"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"هل تحتاج إلى قارئ شاشة؟"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"‏يقدم TalkBack تعليقات منطوقة لمساعدة المستخدمين من المكفوفين وضعاف البصر. هل تريد تثبيته مجانًا من Android Market؟"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"لم يتم تقديم أي وصف."</string>
     <string name="settings_button" msgid="3006713718908152930">"الإعدادات"</string>
     <string name="print_settings" msgid="4742428530112487843">"الطباعة"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"التقاط صورة"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"اختيار صورة من المعرض"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"‏إعدادات قفل الشاشة في NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"العلامات المقترنة"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"تم التمكين"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"الإقران مع علامة"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"الإقران الآن"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"ضع العلامة بشكل مستوٍ على منضدة، ثم ضع الهاتف فوقها"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"تم إقران العلامة والهاتف بنجاح، وبذلك تكون المهمة قد اكتملت!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"لا يمكن استخدام العلامة المقدمة لإلغاء قفل الهاتف"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"أخفق الإقران مع العلامة، والرجاء إعادة المحاولة"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"‏لم يتم تمكين تقنية NFC إلا أنه يجب توفرها للإلغاء تأمين NFC. الرجاء تشغيل تقنية NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"‏إعدادات NFC"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 1798970..83a8f8a 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Инф. за собственика"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Приспособления: Акт."</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Деактивирано от администратора"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Отключване при КБП"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Въведете текст за показване на заключения екран"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Информация за потребителя върху заключен екран"</string>
@@ -1003,7 +1004,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Висока точност"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Запазване на батерията"</string>
-    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Само на устройството"</string>
+    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Само чрез устройството"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Местоположението е изключено"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Скорошни заявки за местопол."</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Нито едно приложение не е заявило достъп до местоположението наскоро"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Да се спре ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"С докосването на „OK“ ще спрете <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Няма инсталирани услуги"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Трябва ли ви екранен четец?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack осигурява устна обратна връзка, за да помогне на потребители с увредено и намалено зрение. Искате ли да го инсталирате безплатно от Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Няма описание."</string>
     <string name="settings_button" msgid="3006713718908152930">"Настройки"</string>
     <string name="print_settings" msgid="4742428530112487843">"Отпечатване"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Правене на снимка"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Избор на снимка от галерията"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Настройки за заключване на екрана при КБП"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Сдвоени маркери за КБП"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Активиранo"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Сдвояване с маркер"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Сдвояване сега"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Сложете маркера за КБП хоризонтално върху маса и поставете отгоре телефона"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Маркерът за КБП и телефонът са сдвоени успешно. Готови сте!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Предоставеният маркер за КБП не може да се използва за отключване на телефона ви"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Сдвояването с маркера ви за КБП не бе успешно. Моля, опитайте отново"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"КБП не е активирана, а това се изисква за отключването й. Моля, включете я."</string>
+    <string name="ok" msgid="3651563352754792958">"Настройки за КБП"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 57272b0..b525ad9 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Informació de propietari"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Activa els widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Opció desactivada per l\'administrador"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Desbloqueig de NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Escriu el text que vulguis mostrar a la pantalla de bloqueig"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostra info. de l\'usuari a la pantalla de bloqueig"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Vols aturar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Si toques D\'acord, s\'aturarà <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No hi ha cap servei instal·lat"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Necessites un lector de pantalla?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack proporciona comentaris per veu per ajudar usuaris invidents i amb visió disminuïda. Vols instal·lar-lo de manera gratuïta des d\'Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No s\'ha proporcionat cap descripció."</string>
     <string name="settings_button" msgid="3006713718908152930">"Configuració"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impressió"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Fes una foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Selecciona una foto de la galeria"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Configuració de bloqueig de pantalla de NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Etiquetes sincronitzades"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Activat"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Sincronitza amb una etiqueta"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Sincronitza ara"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Posa l\'etiqueta plana en una taula i col·loca el telèfon a sobre."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"L\'etiqueta i el telèfon s\'han sincronitzat correctament. Llestos."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"L\'etiqueta que has proporcionat no es pot utilitzar per desbloquejar el telèfon."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"S\'ha produït un error amb la sincronització de l\'etiqueta. Torna-ho a provar."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"L\'NFC no està activada i és necessària per desbloquejar la pantalla mitjançant NFC. Activa-la."</string>
+    <string name="ok" msgid="3651563352754792958">"Configuració de NFC"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 482b352..72f61dd 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info o vlastníkovi"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktivovat widgety"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Zakázáno administrátorem"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Odemknutí NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Zadejte text, který se zobrazí na zamčené obrazovce"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Zobrazovat uživatele na uzamčené obrazovce"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Zastavit službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Klepnutím na tlačítko OK službu <xliff:g id="SERVICE">%1$s</xliff:g> ukončíte."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Žádná služba není nainstalována"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Potřebujete čtečku obrazovky?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack poskytuje mluvenou navigaci nevidomým a slabozrakým uživatelům. Chcete tuto aplikaci stáhnout zdarma ze služby Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"K dispozici není žádný popis."</string>
     <string name="settings_button" msgid="3006713718908152930">"Nastavení"</string>
     <string name="print_settings" msgid="4742428530112487843">"Tisk"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Vyfotit"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Vybrat fotografii z Galerie"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Nastavení zámku obrazovky NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Spárované štítky"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Zapnuto"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Spárovat se štítkem"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Spárovat"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Položte štítek na stůl a navrch umístěte telefon."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Štítek a telefon byly úspěšně spárovány. Hotovo!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Pomocí poskytnutého štítku telefon nelze odemknout."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Spárování štítku se nezdařilo, zkuste to prosím znovu."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Funkce NFC není zapnutá a odemknutí pomocí NFC ji vyžaduje. Zapněte prosím funkci NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Nastavení NFC"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ffa5187..c653f26 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Tekst fra ejer"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktivér widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Deaktiveret af administrator"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Lås NFC op"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Indtast den tekst, der skal vises på låseskærmen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Vis brugeroplysninger ved låst skærm"</string>
@@ -886,11 +887,11 @@
     <string name="storage_other_users" msgid="808708845102611856">"Andre brugere"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batteriniveau"</string>
-    <string name="apn_settings" msgid="3743170484827528406">"APN\'er"</string>
+    <string name="apn_settings" msgid="3743170484827528406">"Adgangspunkter"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Rediger adgangspunkt"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"Ikke angivet"</string>
     <string name="apn_name" msgid="4115580098369824123">"Navn"</string>
-    <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
+    <string name="apn_apn" msgid="2479425126733513353">"Adgangspunkt"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"Proxy"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"Port"</string>
     <string name="apn_user" msgid="455637547356117761">"Brugernavn"</string>
@@ -906,8 +907,8 @@
     <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP eller CHAP"</string>
-    <string name="apn_type" msgid="469613123902220544">"APN-type"</string>
-    <string name="apn_protocol" msgid="3272222921649348640">"APN-protokol"</string>
+    <string name="apn_type" msgid="469613123902220544">"Adgangspunktstype"</string>
+    <string name="apn_protocol" msgid="3272222921649348640">"Adgangspunktets protokol"</string>
     <string name="apn_roaming_protocol" msgid="3386954381510788422">"Adgangspunktets roamingprotokol"</string>
     <string name="carrier_enabled" msgid="407655861175280806">"Aktivér/deaktiver adgangspunkt"</string>
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Adgangspunktet er aktiveret"</string>
@@ -915,8 +916,8 @@
     <string name="bearer" msgid="594270280031923558">"Bærer"</string>
     <string name="mvno_type" msgid="2543253857818336421">"MVNO-type"</string>
     <string name="mvno_match_data" msgid="4560671695220540466">"MVNO-værdi"</string>
-    <string name="menu_delete" msgid="6981294422841124659">"Slet APN"</string>
-    <string name="menu_new" msgid="3014205883303921729">"Ny APN"</string>
+    <string name="menu_delete" msgid="6981294422841124659">"Slet adgangspunkt"</string>
+    <string name="menu_new" msgid="3014205883303921729">"Ny adgangspunkt"</string>
     <string name="menu_save" msgid="8109345640668285399">"Gem"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"Kassér"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
@@ -1424,7 +1425,7 @@
     <string name="captioning_background_color" msgid="9053011212948992570">"Baggrundsfarve"</string>
     <string name="captioning_background_opacity" msgid="6029993616419971202">"Baggrundens gennemsigtighed"</string>
     <string name="captioning_foreground_color" msgid="85623486537640059">"Tekstfarve"</string>
-    <string name="captioning_foreground_opacity" msgid="4370967856995419788">"Tekstens uigennemsigtighed"</string>
+    <string name="captioning_foreground_opacity" msgid="4370967856995419788">"Tekstens gennemsigtighed"</string>
     <string name="captioning_edge_color" msgid="3670094753735263238">"Rammens farve"</string>
     <string name="captioning_edge_type" msgid="5997247394951682154">"Rammetype"</string>
     <string name="captioning_typeface" msgid="1826169240566563259">"Skrifttypefamilie"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Vil du standse <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Når du trykker på OK, standses <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Der er ikke installeret nogen tjenester"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Har du brug for en skærmoplæser?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack giver talefeedback for at hjælpe blinde og svagtseende brugere. Vil du installere det gratis fra Android Marked?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ingen beskrivelse til rådighed."</string>
     <string name="settings_button" msgid="3006713718908152930">"Indstillinger"</string>
     <string name="print_settings" msgid="4742428530112487843">"Udskrivning"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Tag billede"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Vælg billede fra Galleri"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Låseindstillinger for NFC-skærm"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Parrede tags"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Aktiveret"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Par med et tag"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Par nu"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Sæt tagget fladt på et bord, og placer telefonen ovenpå"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Tagget og telefonen blev parret. Du er færdig."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Det angivne tag kan ikke bruges til at låse telefonen op med"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Det lykkedes ikke at parre med dit tag. Prøv igen."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC er ikke aktiveret og er nødvendig for NFC-oplåsning. Slå NFC til."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC-indstillinger"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4532228..89cb8a6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -147,7 +147,7 @@
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth-Pairing-Anfrage"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pairing-Anfrage"</string>
     <string name="bluetooth_notif_message" msgid="5300852675110479862">"Für Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> berühren"</string>
-    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Erhaltene Dateien anzeigen"</string>
+    <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Empfangene Dateien anzeigen"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth-Geräteauswahl"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-Berechtigungsanfrage"</string>
     <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Eine App versucht, Bluetooth zu aktivieren."</string>
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info zum Eigentümer"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Widgets aktivieren"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Vom Administrator deaktiviert"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC-Entsperrung"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Text für Sperrbildschirm eingeben"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Nutzerinformationen bei Bildschirmsperre anzeigen"</string>
@@ -446,7 +447,7 @@
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Verbindungen, Gerätenamen und Erkennbarkeit verwalten"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth-Pairing-Anfrage"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"Geben Sie zum Pairing mit <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> die erforderliche PIN des Geräts ein:"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"Geben Sie zum Pairing mit <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> die PIN des Geräts ein:"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Geben Sie zum Pairing mit <xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> den erforderlichen Schlüssel des Geräts ein:"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Die PIN enthält Buchstaben oder Symbole."</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"In der Regel 0000 oder 1234"</string>
@@ -1449,8 +1450,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> anhalten?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Durch Berühren von \"OK\" wird <xliff:g id="SERVICE">%1$s</xliff:g> beendet."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Keine Dienste installiert"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Benötigen Sie einen Screenreader?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack bietet blinden Nutzern und Nutzern mit eingeschränktem Sehvermögen gesprochenes Feedback. Möchten Sie diese Funktion kostenlos von Android Market installieren?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Es wurde keine Beschreibung bereitgestellt."</string>
     <string name="settings_button" msgid="3006713718908152930">"Einstellungen"</string>
     <string name="print_settings" msgid="4742428530112487843">"Drucken"</string>
@@ -2063,4 +2062,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Foto aufnehmen"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Foto aus Galerie auswählen"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Einstellungen für NFC-Display-Sperre"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Pairing-Tags"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Aktiviert"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Pairing mit einem Tag durchführen"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Pairing jetzt durchführen"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Legen Sie das Tag flach auf einen Tisch und platzieren Sie das Telefon darüber."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Pairing von Tag und Telefon abgeschlossen"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Mit dem bereitgestellten Tag kann Ihr Telefon nicht entsperrt werden."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Das Pairing mit Ihrem Tag konnte nicht durchgeführt werden. Bitte versuchen Sie es erneut."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC ist nicht aktiviert, aber für die NFC-Entsperrung erforderlich. Bitte aktivieren Sie NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC-Einstellungen"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f93a8c56..fdc68ee 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Στοιχεία κατόχου"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Ενεργ.γραφ.στοιχείων"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Απενεργοποιήθηκε από το διαχειριστή"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Ξεκλείδωμα ΕΚΠ"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Εισάγετε κείμενο για εμφάνιση σε οθόνη κλειδώματος"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Εμφάνιση πληροφοριών χρήστη στην οθόνη κλειδώματος"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Διακοπή <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Αγγίξτε το OK, για να διακοπεί η υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Δεν έχουν εγκατασταθεί υπηρεσίες"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Χρειάζεστε έναν αναγνώστη οθόνης;"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Το TalkBack παρέχει σχόλια σε μορφή ομιλίας για να διευκολύνει χρήστες με προβλήματα όρασης. Θέλετε να το εγκαταστήσετε δωρεάν από το Android Market;"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Δεν υπάρχει περιγραφή."</string>
     <string name="settings_button" msgid="3006713718908152930">"Ρυθμίσεις"</string>
     <string name="print_settings" msgid="4742428530112487843">"Εκτύπωση"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Λήψη φωτογραφίας"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Επιλογή φωτογραφιών από τη Συλλογή"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Ρυθμίσεις κλειδώματος οθόνης ΕΚΠ"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Συζευγμένα τσιπ"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Ενεργοποιημένο"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Συζευγμένο με ετικέτα"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Σύζευξη τώρα"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Τοποθετήστε το τσιπ επίπεδα στο τραπέζι και τοποθετήστε το τηλέφωνο από πάνω"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Έγινε επιτυχής σύζευξη τσιπ και τηλεφώνου. Είστε έτοιμοι!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Το τσιπ που παρέχεται δεν μπορεί να χρησιμοποιηθεί για το ξεκλείδωμα του τηλεφώνου σας"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Η σύζευξη με το τσιπ σας απέτυχε. Δοκιμάστε ξανά"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Το ΕΚΠ δεν είναι ενεργοποιημένο και απαιτείται για το ξεκλείδωμα του ΕΚΠ. Ενεργοποιήστε το ΕΚΠ."</string>
+    <string name="ok" msgid="3651563352754792958">"Ρυθμίσεις ΕΚΠ"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e45f858..e0cb97b 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Owner info"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Enable widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Disabled by administrator"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC unlock"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Type text to display on the lock screen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Show user info on lock screen"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Touching OK will stop <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No services installed"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Need a screen reader?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack provides spoken feedback to help blind and low-vision users. Do you want to install it for free from Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No description provided."</string>
     <string name="settings_button" msgid="3006713718908152930">"Settings"</string>
     <string name="print_settings" msgid="4742428530112487843">"Printing"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Take photo"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Choose photo from Gallery"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC Screen Lock Settings"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Paired Tags"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Enabled"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Pair with a tag"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Pair now"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Put the tag flat on a table and place the phone on top"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Tag and phone successfully paired, you\'ve finished!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"The tag provided cannot be used to unlock your phone"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"The pairing with your tag failed, please try again"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC is not enabled and is required for NFC Unlock. Please turn on NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC Settings"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index e45f858..e0cb97b 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Owner info"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Enable widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Disabled by administrator"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC unlock"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Type text to display on the lock screen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Show user info on lock screen"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Touching OK will stop <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No services installed"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Need a screen reader?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack provides spoken feedback to help blind and low-vision users. Do you want to install it for free from Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No description provided."</string>
     <string name="settings_button" msgid="3006713718908152930">"Settings"</string>
     <string name="print_settings" msgid="4742428530112487843">"Printing"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Take photo"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Choose photo from Gallery"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC Screen Lock Settings"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Paired Tags"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Enabled"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Pair with a tag"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Pair now"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Put the tag flat on a table and place the phone on top"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Tag and phone successfully paired, you\'ve finished!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"The tag provided cannot be used to unlock your phone"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"The pairing with your tag failed, please try again"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC is not enabled and is required for NFC Unlock. Please turn on NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC Settings"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e266eb8..2d3f8c7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Datos de propietario"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Habilitar widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Inhabilitada por el administrador"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Desbloqueo de NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ingresa el texto para la pantalla bloqueada."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar datos de usuario en pantalla bloqueada"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"¿Quieres detener <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Si tocas ACEPTAR, <xliff:g id="SERVICE">%1$s</xliff:g> se detendrá."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No se instaló ningún servicio."</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"¿Necesitas un lector de pantalla?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack permite que los usuarios con baja visión y no videntes oigan en voz alta las acciones que realizan. ¿Deseas instalarlo gratis desde Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No se proporcionó ninguna descripción."</string>
     <string name="settings_button" msgid="3006713718908152930">"Configuración"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impresión"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Tomar una foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Elegir una foto de la galería"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Configuración de bloqueo de pantalla por NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Etiquetas sincronizadas"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Habilitada"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Sincronizar con una etiqueta"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Sincronizar ahora"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Coloca la etiqueta en una mesa y luego coloca el teléfono sobre la etiqueta."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Listo. La etiqueta y el teléfono se sincronizaron correctamente."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"La etiqueta proporcionada no puede utilizarse para desbloquear el teléfono."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Se produjo un error al sincronizar la etiqueta. Vuelve a intentarlo."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Para desbloquear el dispositivo por NFC, se necesita tecnología NFC, que no está habilitada. Actívala."</string>
+    <string name="ok" msgid="3651563352754792958">"Configuración de NFC"</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index fdd6e83..06319f9 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -427,7 +427,7 @@
     <item msgid="1340692776955662664">"Pila de llamadas en glGetError"</item>
   </string-array>
   <string-array name="show_non_rect_clip_entries">
-    <item msgid="993742912147090253">"Desactivado"</item>
+    <item msgid="993742912147090253">"No"</item>
     <item msgid="675719912558941285">"Dibujar región de recorte no rectangular en azul"</item>
     <item msgid="1064373276095698656">"Resaltar comandos de dibujo probados en verde"</item>
   </string-array>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e017a07..b368c73 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Información del propietario"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Habilitar widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Inhabilitado por administrador"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Desbloqueo de NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Introduce el texto que se mostrará en la pantalla de bloqueo."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar información de usuario en la pantalla de bloqueo"</string>
@@ -1413,8 +1414,8 @@
     <string name="daltonizer_mode_protanopia" msgid="1645821472162425420">"Protanopia (rojo)"</string>
     <string name="daltonizer_mode_tritanopia" msgid="6994931013805187675">"Tritanopia (azul)"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ajustes"</string>
-    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activado"</string>
-    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivado"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Sí"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"No"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"Vista previa"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"Opciones estándar"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"Idioma"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"¿Detener <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Si tocas Aceptar, se detendrá <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No se ha instalado ningún servicio."</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"¿Necesitas un lector de pantalla?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack ofrece mensajes de voz para usuarios con discapacidades visuales. ¿Quieres instalarlo de forma gratuita desde Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No se ha especificado ninguna descripción."</string>
     <string name="settings_button" msgid="3006713718908152930">"Ajustes"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impresión"</string>
@@ -1636,8 +1635,8 @@
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Actualizando configuración de la conexión Wi-Fi..."</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualización de la configuración de la conexión Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="gadget_state_on" msgid="6909119593004937688">"activado"</string>
-    <string name="gadget_state_off" msgid="5220212352953066317">"desactivado"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"sí"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"no"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"activando"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"desactivando"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
@@ -1648,7 +1647,7 @@
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automático"</string>
     <string name="gadget_brightness_state_full" msgid="6814570109772137631">"completo"</string>
     <string name="gadget_brightness_state_half" msgid="3696671957608774204">"medio"</string>
-    <string name="gadget_brightness_state_off" msgid="946382262872753084">"desactivado"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"no"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Almacenamiento de credenciales"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar desde almacenamiento"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Hacer foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Seleccionar foto de la galería"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Ajustes de bloqueo de pantalla por NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Etiquetas vinculadas"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Habilitado"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Vincular con una etiqueta"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Vincular ahora"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Coloca la etiqueta sobre una mesa y el teléfono sobre ella"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"La etiqueta y el teléfono se han vinculado correctamente. Ya has terminado."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"La etiqueta proporcionada no se puede utilizar para desbloquear el teléfono"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Se ha producido un error al vincular la etiqueta. Inténtalo de nuevo"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"La tecnología NFC no está habilitada y se necesita para desbloquear el dispositivo por NFC. Activa la tecnología NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Ajustes de NFC"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 409a22e..848ff23 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Teave omaniku kohta"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Luba vidinad"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Administraator on keelanud"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC avamine"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Sisestage lukustusekraanil kuvatav tekst"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Kuva lukustusekraanil teave kasutaja kohta"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Kas peatan teenuse <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Kui puudutate OK, siis teenus <xliff:g id="SERVICE">%1$s</xliff:g> peatub."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ühtki teenust pole installitud"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Kas vajate ekraanilugejat?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack esitab tagasiside suulise kõnena, mis aitab pimedaid ja vaegnägijaid. Kas soovite selle Android Marketist tasuta installida?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Kirjeldust ei ole sisestatud."</string>
     <string name="settings_button" msgid="3006713718908152930">"Seaded"</string>
     <string name="print_settings" msgid="4742428530112487843">"Printimine"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Jäädvusta foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Vali foto galeriist"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC ekraaniluku seaded"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Seotud kiibid"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Lubatud"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Sidumine kiibiga"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Seo nüüd"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Asetage kiip lauale ja pange telefon selle peale"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Valmis! Kiibi ja telefoni sidumine õnnestus."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Seda kiipi ei saa kasutada telefoni avamiseks"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Kiibiga sidumine ebaõnnestus, proovige uuesti"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC pole lubatud ja see on vajalik NFC avamiseks. Lülitage NFC sisse."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC seaded"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 6c223a9..15cdf5e 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"اطلاعات مالک"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"فعال کردن ابزارک‌ها"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"توسط سرپرست غیرفعال شد"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"‏باز کردن قفل NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"متنی را وارد کنید تا در صفحه قفل شده نشان داده شود"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"نمایش اطلاعات کاربر بر روی صفحه قفل"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> متوقف شود؟"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"با لمس کردن تأیید، <xliff:g id="SERVICE">%1$s</xliff:g> متوقف خواهد شد."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"سرویسی نصب نشده است"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"به صفحه‌خوان نیاز دارید؟"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"‏Talkback یک بازخورد شفاهی برای کمک به کاربران نابینا و کم‌بینا ارائه می‌دهد. آیا می‌خواهید آن را به صورت رایگان از Android Market نصب کنید؟"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"توضیحی ارائه نشده است."</string>
     <string name="settings_button" msgid="3006713718908152930">"تنظیمات"</string>
     <string name="print_settings" msgid="4742428530112487843">"چاپ کردن"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"عکس گرفتن"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"انتخاب عکس از گالری"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"‏تنظیمات قفل صفحه نمایش NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"برچسب‌های مرتبط"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"فعال شد"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"مرتبط کردن با یک نشان"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"اکنون مرتبط شود"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"برچسب را صاف روی میز بگذارید و تلفن را در بالای آن قرار دهید"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"برچسب و تلفن با موفقیت مرتبط شدند، شما آماده‌اید!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"برچسب ارائه شده نمی‌تواند برای باز کردن قفل تلفن شما استفاده شود"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"مرتبط کردن با برچسب شما ناموفق بود، لطفاً دوباره امتحان کنید"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"‏NFC فعال نیست و برای بازکردن قفل NFC مورد نیاز است. لطفاً NFC را روشن کنید."</string>
+    <string name="ok" msgid="3651563352754792958">"‏تنظیمات NFC"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 9fbb7fd..b67c571 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Omistajan tiedot"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Käytä widgetejä"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Järjestelmänvalvojan käytöstä poistama"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC-lukituksen avaus"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Kirjoita tekstiä näytettäväksi lukitusruudulla."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Näytä käyttäjän tiedot lukitusruudulla"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Pysäytetäänkö palvelu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Valinta OK pysäyttää palvelun <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ei asennettuja palveluita"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Tarvitsetko näytönlukuohjelman?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack auttaa sokeita ja näkörajoitteisia käyttäjiä puhepalautteen avulla. Haluatko asentaa sovelluksen ilmaiseksi Android Marketista?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ei kuvausta."</string>
     <string name="settings_button" msgid="3006713718908152930">"Asetukset"</string>
     <string name="print_settings" msgid="4742428530112487843">"Tulostetaan"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Ota kuva"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Valitse kuva galleriasta"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC-ruudunlukitusasetukset"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Tunnistinparit"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Käytössä"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Muodosta pari tunnistimen kanssa"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Muodosta pari"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Aseta tunnistin makaamaan pöydälle ja aseta puhelin sen päälle."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Tunnistimen ja puhelimen pari on muodostettu. Valmista tuli!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Puhelimen lukitusta ei voi avata tällä tunnistimella."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Parin muodostus tunnistimen kanssa epäonnistui. Yritä uudelleen."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC ei ole käytössä, mutta lukituksen avaaminen edellyttää sitä. Ota NFC käyttöön."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC-asetukset"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 278853e..e3604bb 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Infos propriétaire"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Activer les widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Désactivé par l\'administrateur"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Déverrouillage CCP"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Saisir texte à afficher sur écran de verrouillage"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Afficher infos utilisateur sur écran verrouillage"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Arrêter <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Si vous appuyez sur \"OK\", cela interrompt <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Aucun service installé"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Vous avez besoin d\'un lecteur d\'écran?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack fournit des commentaires audio aux personnes malvoyantes. Voulez-vous l\'installer gratuitement depuis l\'Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Aucune description fournie"</string>
     <string name="settings_button" msgid="3006713718908152930">"Paramètres"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impression"</string>
@@ -2064,4 +2063,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Prendre une photo"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Sélectionner une photo dans la galerie"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Paramètres CCP de verrouillage de l\'écran"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Balises associées"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Activée"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Associer à une étiquette"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"Activité d\'association par CCP"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Associer"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Placez la balise à plat sur une table, puis placez le téléphone dessus"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"La balise et le téléphone sont associés. Vous avez terminé."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Impossible d\'utiliser la balise fournie pour déverrouiller votre téléphone"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Échec de l\'association avec la balise. Veuillez réessayer."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"La CCP n\'est pas activée, mais elle est nécessaire pour le déverrouillage CCP. Veuillez l\'activer."</string>
+    <string name="ok" msgid="3651563352754792958">"Paramètres CCP"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index efcb927..4a82391 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Infos propriétaire"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Activer les widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Désactivé par l\'administrateur"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Déverrouillage NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Saisir texte à afficher sur écran de verrouillage"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Afficher infos utilisateur sur écran verrouillage"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Arrêter <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Si vous appuyez sur \"OK\", cela interrompt <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Aucun service installé"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Vous avez besoin d\'un lecteur d\'écran ?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack fournit des commentaires audio aux personnes malvoyantes. Voulez-vous l\'installer gratuitement depuis l\'Android Market ?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Aucune description fournie"</string>
     <string name="settings_button" msgid="3006713718908152930">"Paramètres"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impression"</string>
@@ -2064,4 +2063,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Prendre une photo"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Sélectionner une photo dans la galerie"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Paramètres NFC de verrouillage de l\'écran"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Puces associées"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Activé"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Associer à un tag"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Associer"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Placez la puce à plat sur une table, puis positionnez votre téléphone au-dessus de celle-ci."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"La puce et le téléphone sont bien associés. Vous avez terminé."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Impossible d\'utiliser la puce fournie pour le déverrouillage de votre téléphone."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Échec de l\'association avec la puce. Veuillez réessayer."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"La technologie NFC n\'est pas activée alors qu\'elle est nécessaire pour le déverrouillage NFC. Veuillez l\'activer."</string>
+    <string name="ok" msgid="3651563352754792958">"Paramètres NFC"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e4b3d21..2c34ef3 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"अपनी जानकारी"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"विजेट सक्षम करें"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"व्यवस्थापक के द्वारा अक्षम किया गया"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC अनलॉक"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"लॉक स्‍क्रीन पर दिखाई देने के लिए पाठ लिखें"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"लॉक स्क्रीन पर उपयोगकर्ता जानकारी दिखाएं"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> को रोकें?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"ठीक स्‍पर्श करने से <xliff:g id="SERVICE">%1$s</xliff:g> बंद हो जाएगी."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"कोई सेवा इंस्‍टॉल नहीं है"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"किसी स्‍क्रीन रीडर की आवश्‍यकता है?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack नेत्रहीन और कम-दृष्टि वाले उपयोगकर्ताओं के लिए बोलकर फ़ीडबैक प्रदान करता है. क्‍या आप इसे Android Market से निशुल्‍क इंस्‍टॉल करना चाहते हैं?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"कोई विवरण नहीं दिया गया."</string>
     <string name="settings_button" msgid="3006713718908152930">"सेटिंग"</string>
     <string name="print_settings" msgid="4742428530112487843">"प्रिंटिंग"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"फ़ोटो लें"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"गैलरी से फ़ोटो चुनें"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC स्क्रीन लॉक सेटिंग"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"युग्मित टैग"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"सक्षम किया गया"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"टैग के साथ युग्मित करें"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"अब युग्मित करें"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"टैग को किसी टेबल पर सीधा रखें और फ़ोन को सबसे ऊपर रखें"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"टैग और फ़ोन सफलतापूर्वक युग्मित किए गए, आपका काम हो गया!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"प्रदान किए गए टैग का उपयोग आपके फ़ोन को अनलॉक करने के लिए नहीं किया जा सकता"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"आपके टैग के साथ युग्मन विफल हो गया, कृपया पुन: प्रयास करें"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC सक्षम नहीं है और यह NFC अनलॉक के लिए आवश्यक है. कृपया NFC चालू करें."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC सेटिंग"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 9e2b695..d2fa17f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info o vlasniku"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Omogući widgete"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Onemogućio administrator"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Otključavanje NFC-a"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Unesite tekst za prikaz na zaključanom zaslonu"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Prikaži podatke o korisniku na zaključanom zaslonu"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Želite li zaustaviti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Ako dodirnete \"U redu\", usluga <xliff:g id="SERVICE">%1$s</xliff:g> zaustavit će se."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nema instaliranih usluga"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Trebate čitač zaslona?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack daje govorne povratne informacije kao pomoć slijepim i slabovidnim korisnicima. Želite li ga besplatno instalirati s usluge Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nije dan opis."</string>
     <string name="settings_button" msgid="3006713718908152930">"Postavke"</string>
     <string name="print_settings" msgid="4742428530112487843">"Ispis"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Snimite fotografiju"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Odaberite fotografiju iz Galerije"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Postavke zaključavanja zaslona za NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Uparene oznake"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Omogućeno"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Upari s oznakom"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"Aktivnost NFC uparivanja"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Upari sad"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Položite oznaku na stol i stavite telefon na nju"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Oznaka i telefon uspješno su upareni, gotovi ste!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Vaš se telefon ne može otključati pomoću pružene oznake"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Uparivanje s oznakom nije uspjelo, pokušajte ponovo"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC nije omogućen, a potreban je za NFC otključavanje. Uključite NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Postavke NFC-a"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 77fef4d..e27200d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Tulajdonosi adatok"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Modulengedélyezés"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Letiltva a rendszergazda által"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC-feloldás"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Írja be a lezárt képernyőn megjelenítendő szöveget"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Felhasználói adatok megjelenítése zárolt képernyőn"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Leállítja a következőt: <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Az OK gomb megérintésével leállítja a következőt: <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nincs telepített szolgáltatás"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Képernyőolvasóra van szüksége?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"A TalkBack beszéddel történő visszajelzést kínál vak és gyengénlátó felhasználók számára. Szeretné ingyen telepíteni az Android Marketről?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nincs leírás."</string>
     <string name="settings_button" msgid="3006713718908152930">"Beállítások"</string>
     <string name="print_settings" msgid="4742428530112487843">"Nyomtatás"</string>
@@ -2064,4 +2063,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Fotó készítése"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Fotó kiválasztása a Galériából"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC-képernyőzár beállításai"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Párosított címkék"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Engedélyezve"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Párosítás címkével"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Párosítás most"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Fektesse a címkét az asztalra, majd helyezze rá a telefont."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Címke és telefon sikeresen párosítva, elkészültünk."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"A megadott címkét nem lehet használni a telefon feloldásához"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"A címkével való párosítás sikertelen, próbálja újra."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Az NFC nincs engedélyezve, és szükséges az NFC-alapú feloldás használatához. Kérjük, engedélyezze az NFC-t."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC-beállítások"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index a140f8f..18637d1 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Սեփականատիրոջ տվյալներ"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Միացնել վիջեթները"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Կասեցված է վարիչի կողմից"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC-ով ապակողպում"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Մուտքագրեք տեքստը՝ կողպէկրանին ցուցադրելու համար"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Ցույց տալ օգտվողի մասին տեղեկությունները կողպէկրանին"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Դադարեցնե՞լ <xliff:g id="SERVICE">%1$s</xliff:g>-ը:"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Լավ հրահանգին հպումը կդադարեցնի <xliff:g id="SERVICE">%1$s</xliff:g>-ը:"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Տեղադրված ծառայաթյուններ չկան"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Անհրաժե՞շտ է էկրանի ընթերցիչ:"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack-ը տրամադրում է խոսող արձագանք` կույր կամ վատ տեսողությամբ մարդկանց օգնելու համար: Ցանկանու՞մ եք ներբեռնել այն Android շուկայից:"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Որևէ նկարագրություն չկա:"</string>
     <string name="settings_button" msgid="3006713718908152930">"Կարգավորումներ"</string>
     <string name="print_settings" msgid="4742428530112487843">"Տպում"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Լուսանկարել"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Ընտրել լուսանկար Պատկերասրահից"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC-ով Էկրանի կողպման կարգավորումներ"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Զուգավորված պիտակներ"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Միացված է"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Զուգավորել պիտակով"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Զուգավորել հիմա"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Պիտակը ուղիղ դրեք սեղանին և վերևից՝ հեռախոսը"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Պիտակը և հեռախոսը հաջողությամբ զուգավորվեցին:"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Տվյալ պիտակը չի կարող օգտագործվել ձեր հեռախոսն ապակողպելու համար"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Ձեր պիտակի հետ զուգավորումը ձախողվեց, փորձեք նորից"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC-ն միացված չէ, իսկ NFC ապակողպման համար այն անհրաժեշտ է: Միացրեք NFC-ն:"</string>
+    <string name="ok" msgid="3651563352754792958">"NFC կարգավորումներ"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 9ea03da..e203ce5 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info pemilik"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktifkan widget"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Dinonaktifkan oleh administrator"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Buka kunci NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ketikkan teks untuk ditampilkan pada layar kunci"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Tampilkan info pengguna pada layar pengunci"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Hentikan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Menyentuh Oke akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Tidak ada layanan terpasang"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Perlu pembaca layar?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack menyediakan masukan lisan untuk membantu pengguna yang buta dan tidak terlalu baik penglihatannya. Apakah Anda ingin memasangnya secara gratis dari Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tidak tersedia deskripsi."</string>
     <string name="settings_button" msgid="3006713718908152930">"Setelan"</string>
     <string name="print_settings" msgid="4742428530112487843">"Pencetakan"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Ambil foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Pilih foto dari Galeri"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Setelan Kunci Layar NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Tag Tersanding"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Aktif"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Sandingkan dengan tag"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Sandingkan sekarang"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Atur tag rata di atas meja dan taruh telepon di atasnya"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Tag dan telepon berhasil disandingkan, selesai!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Tag yang diberikan tidak dapat digunakan untuk membuka kunci telepon Anda"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Gagal menyandingkan dengan tag Anda, harap coba lagi"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC tidak diaktifkan dan dibutuhkan untuk Membuka Kunci NFC. Harap aktifkan NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Setelan NFC"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 222bda4..d1befb5 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info proprietario"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Abilita widget"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Disattivati dall\'amministratore"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Sblocco NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Digita testo da visualizzare su blocco schermo"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostra info utente in schermata blocco"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Interrompere <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Se tocchi OK <xliff:g id="SERVICE">%1$s</xliff:g> verrà interrotto."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nessun servizio installato"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Hai bisogno di uno screen reader?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack fornisce commenti vocali per utenti non vedenti o con problemi di vista. Vuoi installare gratuitamente l\'applicazione da Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nessuna descrizione fornita."</string>
     <string name="settings_button" msgid="3006713718908152930">"Impostazioni"</string>
     <string name="print_settings" msgid="4742428530112487843">"Stampa"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Scatta foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Scegli la foto dalla Galleria"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Impostazioni di blocco dello schermo NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Dispositivi tag accoppiati"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Attivo"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Accoppia con un tag"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Accoppia ora"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Posiziona il dispositivo tag in orizzontale su un piano e poggia sopra il telefono"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Dispositivo tag e telefono accoppiati correttamente. Operazione completata."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Il dispositivo tag indicato non può essere utilizzato per sbloccare il telefono"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Accoppiamento con il dispositivo tag non riuscito, riprova"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"La comunicazione NFC non è attiva ed è necessaria per la funzione Sblocco NFC. Attiva NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Impostazioni NFC"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f714a9c..7b5b466 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"פרטי בעלים"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"הפעל יישומי ווידג\'ט"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"הושבת על ידי מנהל המערכת"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"‏ביטול נעילת NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"הקלד טקסט להצגה בנעילת המסך"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"הצג פרטי משתמש במסך הנעילה"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"האם לעצור את <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"נגיעה ב\'אישור\' תפסיק את <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"אין שירותים מותקנים"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"זקוק לקורא מסך?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"‏TalkBack מספק משוב מוקרא בקול רם כדי לעזור למשתמשים עיוורים ולקויי ראייה. האם ברצונך להתקין אותו ללא תשלום מ\'חנות Android\'?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"לא סופק תיאור."</string>
     <string name="settings_button" msgid="3006713718908152930">"הגדרות"</string>
     <string name="print_settings" msgid="4742428530112487843">"הדפסה"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"צלם תמונה"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"בחר תמונה מתוך \'גלריה\'"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"‏הגדרות נעילת המסך של NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"תגים מותאמים"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"מופעל"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"התאם באמצעות תג"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"התאם עכשיו"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"הנח את התג באופן שטוח על שולחן ומקם את הטלפון מעליו"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"התג והטלפון הותאמו בהצלחה. סיימת!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"לא ניתן להשתמש בתג שסופק על מנת לבטל את נעילת הטלפון"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"ההתאמה לתג שלך נכשלה. נסה שוב."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"‏NFC לא הופעל ויש בו צורך עבור ביטול נעילת NFC. הפעל את ה-NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"‏הגדרות NFC"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 6169b78..9dd4c01 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -318,6 +318,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"所有者情報"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"ウィジェットの有効化"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"管理者によって無効にされています"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFCロック解除"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"ロック画面に表示するテキストを入力します"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"ロック画面にユーザー情報を表示"</string>
@@ -1450,8 +1451,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g>を停止しますか？"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"[OK]をタップすると<xliff:g id="SERVICE">%1$s</xliff:g>が停止します。"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"インストールされているサービスはありません"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"スクリーンリーダーをご利用になりますか？"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Talkbackは音声で応答するアプリで、目の不自由なユーザーや低視力のユーザーを支援します。Androidマーケットから無料でインストールできます。"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"説明はありません。"</string>
     <string name="settings_button" msgid="3006713718908152930">"設定"</string>
     <string name="print_settings" msgid="4742428530112487843">"印刷"</string>
@@ -2068,4 +2067,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"写真を撮影"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"ギャラリーから画像を選ぶ"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC画面ロック設定"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"ペア設定したタグ"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"有効"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"タグをペアに設定"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"今すぐペア設定を行う"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"タグをテーブルの上に水平に配置し、端末を上部に置いてください"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"タグと端末のペア設定が完了しました。"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"このタグは端末のロック解除には使用できません"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"タグをペアに設定できませんでした。もう一度お試しください。"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFCは無効になっていますが、NFCロック解除に必要です。NFCをONにしてください。"</string>
+    <string name="ok" msgid="3651563352754792958">"NFC設定"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 2a8be37..34eee45 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"მფლობელის ინფორმაცია"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"ვიჯეტების ჩართვა"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"გამორთულია ადმინისტრატორის მიერ"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC განბლოკვა"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"აკრიფეთ ტექსტი დაბლოკვის ეკრანზე საჩვენებლად"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"მომხმარებლის ინფორმაციის დაბლოკილ ეკრანზე ჩვენება"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"გაითიშოს <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"ღილაკზე OK შეხებით <xliff:g id="SERVICE">%1$s</xliff:g> გაჩერდება."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"სერვისები დაყენებული არ არის"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"გჭირდებათ ეკრანის წამკითხავი?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack უზრუნველყოფს გახმოვანებულ უკუკავშირს უსინათლო და მცირე მხედველობის მომხმარებლისთვის. გსურთ მისი უფასო ინსტალაცია Android Market-იდან?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"აღწერა არ არის მოწოდებული."</string>
     <string name="settings_button" msgid="3006713718908152930">"პარამეტრები"</string>
     <string name="print_settings" msgid="4742428530112487843">"ბეჭდვა"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"ფოტოს გადაღება"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"გალერეიდან სურათის არჩევა"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC ეკრანის ჩაკეტვის პარამეტრები"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"დაწყვილებული თეგები"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"ჩართული"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"თეგთან დაწყვილება"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"ახლა დაწყვილება"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"დააყენეთ თეგი ბრტყლად მაგიდაზე და მოათავსეთ ტელეფონი მასზე"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"თეგი და ტელეფონი წარმატებით დაწყვილდა. პროცესი დასრულებულია!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"მოწოდებული თეგით თქვენი ტელეფონის განბლოკვა ვერ ხერხდება"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"თქვენი თეგით დაწყვილება ვერ განხორციელდა. გთხოვთ, სცადოთ ისევ"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC არ არის ჩართული, თუმცა აუცილებელია NFC განბლოკისთვის. გთხოვთ, ჩართოთ NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC პარამეტრები"</string>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index dcb7359..96ae8b4 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"ព័ត៌មាន​អំពី​ម្ចាស់"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"បើក​ធាតុ​ក្រាហ្វិក"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"បាន​បិទ​ដោយ​អ្នក​គ្រប់គ្រង"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"ដោះ​សោ NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"បញ្ចូល​អត្ថបទ​ ដើម្បី​បង្ហាញ​លើ​អេក្រង់​ចាក់សោ"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"បង្ហាញ​ព័ត៌មាន​អ្នក​ប្រើ​លើអេក្រង់ចាក់សោ"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"បញ្ឈប់ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"ការ​ប៉ះ​យល់ព្រម នឹង​បញ្ឈប់ <xliff:g id="SERVICE">%1$s</xliff:g> ។"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"គ្មាន​សេវាកម្ម​បាន​ដំឡើង"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"ត្រូវការ​កម្មវិធី​អាន​​អេក្រង់?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"សម្ដី​ត្រឡប់​ផ្ដល់​មតិ​ជា​សំឡេង ដើម្បី​ជួយ​មនុស្ស​ពិការ​ភ្នែក ឬ​ខ្សោយ​ផ្នែក។ តើ​អ្នក​ចង់​ដំឡើង​វា​ពី​ឃ្លាំង​កម្មវិធី Android?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"គ្មាន​ការ​ពណ៌នា​បាន​ផ្ដល់។"</string>
     <string name="settings_button" msgid="3006713718908152930">"ការ​កំណត់"</string>
     <string name="print_settings" msgid="4742428530112487843">"ការ​បោះពុម្ព"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"ថតរូប"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"ជ្រើស​រូបថត​ពី​វិចិត្រសាល"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"កំណត់​ការ​ចាក់​សោ​អេក្រង់ NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"ស្លាក​បាន​ផ្គូផ្គង"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"បាន​បើក"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"ផ្គូ​ជា​មួយ​ស្លាក"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"ផ្គូ​ឥឡូវ"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"កំណត់​ស្លាក​​ផ្ដេក​លើ​តារាង និង​ដាក់​ទូរស័ព្ទ​នៅ​ផ្នែក​ខាង​លើ"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"បាន​ផ្គូផ្គង​ស្លាក និង​ទូរស័ព្ទ​ដោយ​ជោគជ័យ អ្នក​បាន​ធ្វើ​រួចរាល់​ហើយ!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"ស្លាក​បាន​ផ្ដល់​មិន​អាច​ត្រូវ​បាន​ប្រើ​ ដើម្បី​ដោះ​សោ​ទូរស័ព្ទ​របស់​អ្នក​បាន​ទេ"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"បាន​បរាជ័យ​ក្នុង​ការ​ផ្គូផ្គង​ជា​មួយ​ស្លាក​របស់​អ្នក សូម​ព្យាយាម​ម្ដង​ទៀត"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"មិន​បាន​បើក NFC ហើយ​ត្រូវ​បាន​ទាមទារ​សម្រាប់​ដោះ​សោ NFC ។ សូម​បើក NFC ។"</string>
+    <string name="ok" msgid="3651563352754792958">"ការ​កំណត់ NFC"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index bf0022f..b2248f7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"소유자 정보"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"위젯 사용"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"관리자가 사용 중지함"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC 잠금 해제"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"화면 잠금에 표시할 텍스트를 입력하세요."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"잠금 화면에 사용자 정보 표시"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 중지하시겠습니까?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"확인을 터치하면 <xliff:g id="SERVICE">%1$s</xliff:g>이(가) 중지됩니다."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"설치된 서비스가 없습니다."</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"스크린 리더가 필요하십니까?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"음성 안내 지원은 시각 장애인을 위한 음성 피드백을 제공합니다. Android 마켓에서 무료로 설치하시겠습니까?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"제공된 설명이 없습니다."</string>
     <string name="settings_button" msgid="3006713718908152930">"설정"</string>
     <string name="print_settings" msgid="4742428530112487843">"인쇄"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"사진 촬영"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"갤러리에서 사진 선택"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC 화면 잠금 설정"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"페어링된 태그"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"사용 설정됨"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"태그와 페어링"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"페어링"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"태그를 테이블에 평평하게 놓고 그 위에 휴대전화를 올려놓습니다."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"태그와 휴대전화가 페어링되었습니다."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"제공된 태그로는 휴대전화를 잠금 해제할 수 없습니다."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"태그와 페어링하지 못했습니다. 다시 시도해 주세요."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC를 사용하도록 설정하지 않았습니다. NFC 잠금해제를 위해 NFC를 사용하도록 설정해 주세요."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC 설정"</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 89c218e..1b5f9e5 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"ຂໍ້ມູນເຈົ້າຂອງເຄື່ອງ"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"ເປີດນຳໃຊ້ວິດເຈັດ"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"ຖືກປິດນຳໃຊ້ໂດຍຜູ່ເບິ່ງແຍງລະບົບ"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC ປົດລັອກ"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"ພິມຂໍ້ຄວາມເພື່ອສະແດງຜົນໃນໜ້າຈໍລັອກ"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"ສະແດງຂໍ້ມູນຜູ່ໃຊ້ໃນໜ້າຈໍລັອກ"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"ຢຸດການເຮັດວຽກຂອງ <xliff:g id="SERVICE">%1$s</xliff:g> ບໍ່?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"ການແຕະປຸ່ມ ຕົກລົງ ຈະຢຸດການເຮັດວຽກຂອງ <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"ບໍ່ມີບໍລິການຖືກຕິດຕັ້ງເທື່ອ"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"ຕ້ອງການໂຕອ່ານໜ້າຈໍ?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack ຕອບສະໜອງດ້ວຍສຽງ ເພື່ອຊ່ວຍເຫຼືອຜູ່ພິການທາງສາຍຕາ ແລະຜູ່ມີບັນຫາທາງສາຍຕາ. ທ່ານຕ້ອງການຕິດຕັ້ງຟຣີຈາກ Android Market ຫຼືບໍ່?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ບໍ່ມີລາຍລະອຽດລະບຸໄວ້."</string>
     <string name="settings_button" msgid="3006713718908152930">"ການຕັ້ງຄ່າ"</string>
     <string name="print_settings" msgid="4742428530112487843">"ການ​ພິມ"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"ຖ່າຍຮູບ"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"ເລືອກຮູບຈາກແກເລີຣີ"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"ການຕັ້ງຄ່າລັອກໜ້າຈໍ NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"ແທັກທີ່ຈັບຄູ່ແລ້ວ"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"ເປີດໃຊ້ແລ້ວ"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"ຈັບຄູ່ກັບແທັກໃດນຶ່ງ"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"ຈັບຄູ່ດຽວນີ້"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"ຕັ້ງແທັກໃຫ້ພຽງຢູ່ເທິງໂຕະ ແລ້ວ ວາງໂທລະສັບໄວ້ເທິງ"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"ແທັກ ແລະ ໂທລະສັບ ຈັບຄູ່ກັນແລ້ວ, ທ່ານເຮັດສຳເລັດແລ້ວ!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"ແທັກທີ່ໃຫ້ມາບໍ່ສາມາດໃຊ້ເພື່ອປົດລັອກໂທລະສັບຂອງທ່ານໄດ້"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"ການຈັບຄູ່ກັບແທັກຂອງທ່ານລົ້ມເຫຼວ, ກະລຸນາລອງໃໝ່ອີກເທື່ອນຶ່ງ"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"ບໍ່ໄດ້ເປີດນຳໃຊ້ NFC ແລະ ມັນຈຳເປັນສຳລັບການປົດລັອກ NFC. ກະລຸນາເປີດ NFC ກ່ອນ."</string>
+    <string name="ok" msgid="3651563352754792958">"ການຕັ້ງຄ່າ NFC"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index ce72d07..c1c448e 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Savininko informac."</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Įgalinti valdiklius"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Išjungė administratorius"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"ALR atrakinimas"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Įveskite tekstą, pateiktiną užrakinimo ekrane"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Rodyti naudotojo informaciją užrakinimo ekrane"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Sustabdyti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Palietus „Gerai“ bus sustabdyta „<xliff:g id="SERVICE">%1$s</xliff:g>“."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nėra įdiegta jokių paslaugų"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Reikia ekrano skaitytuvo?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"„TalkBack“ teikia atsiliepimus žodžiu, kad padėtų akliems ir sutrikusio regėjimo naudotojams. Ar norite nemokamai įdiegti šią funkciją iš „Android“ prekyvietės?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nepateikta jokių aprašų."</string>
     <string name="settings_button" msgid="3006713718908152930">"Nustatymai"</string>
     <string name="print_settings" msgid="4742428530112487843">"Spausdinimas"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Fotografuoti"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Pasirinkti nuotrauką iš galerijos"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"ALR ekrano užrakto nustatymai"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Susietos lustinės etiketės"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Įgalinta"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Susieti su žyma"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Susieti dabar"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Padėkite lustinę etiketę gulsčiai ant stalo ir telefoną ant jos"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Lustinė etiketė ir telefonas sėkmingai susieti. Atlikta!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Nurodyta lustinė etiketė negali būti naudojama telefonui atrakinti"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Susiejimas su lustine etikete nepavyko, bandykite dar kartą"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"ALR neįgalintas ir yra būtinas norint naudoti ALR atrakinimą. Įjunkite ALR."</string>
+    <string name="ok" msgid="3651563352754792958">"ALR nustatymai"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index ab67535..1beb62b 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Informācija par īpašnieku"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Iespējot logrīkus"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Atspējojis administrators"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"TDLS atbloķēšana"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ierakstiet bloķēšanas ekrānā parādāmo tekstu"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Bloķēšanas ekrānā rādīt informāciju par lietotāju"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Vai apturēt <xliff:g id="SERVICE">%1$s</xliff:g> darbību?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Pieskaroties pogai Labi, tiks apturēta pakalpojuma <xliff:g id="SERVICE">%1$s</xliff:g> darbība."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nav instalēts neviens pakalpojums."</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Vai jums ir nepieciešams ekrāna lasītājs?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Lietotne TalkBack par ekrānā notiekošo informē balss komentāru veidā, lai palīdzētu neredzīgiem un vājredzīgiem lietotājiem. Vai vēlaties to instalēt bez maksas no vietnes Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Apraksts nav sniegts."</string>
     <string name="settings_button" msgid="3006713718908152930">"Iestatījumi"</string>
     <string name="print_settings" msgid="4742428530112487843">"Drukāšana"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Uzņemt fotoattēlu"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Izvēlēties fotoattēlu no galerijas"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"TDLS ekrāna bloķēšanas iestatījumi"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Pārī savienotas etiķetes"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Iespējota"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Savienot pārī ar atzīmi"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Savienot pārī tūlīt"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Nolieciet etiķeti uz galda un novietojiet tālruni uz tās."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Etiķete un tālrunis ir veiksmīgi savienoti pārī."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Šo etiķeti nevar izmantot jūsu tālruņa atbloķēšanai."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Neizdevās izveidot savienojumu pārī ar etiķeti. Lūdzu, mēģiniet vēlreiz."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"TDLS funkcija nav iespējota un ir nepieciešama TDLS atbloķēšanai. Lūdzu, ieslēdziet TDLS."</string>
+    <string name="ok" msgid="3651563352754792958">"TDLS iestatījumi"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 92c2acc..df4fcb1 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Эзэмшигчийн мэдээлэл"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Хэрэгсэл идэвхжүүлэх"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Админ идэвхгүй болгосон"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC тайлах"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Түгжих дэлгэцэн дээр харуулах текстийг оруулна уу"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Дэлгэц түгжигдэхэд хэрэглэгчийн мэдээллийг харуулах"</string>
@@ -1039,7 +1040,7 @@
     <string name="license_title" msgid="1990487604356037871">"Лиценз"</string>
     <string name="terms_title" msgid="7697580845616764642">"Ерөнхий нөхцлүүд"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Нээлттэй Эхийн Лиценз"</string>
-    <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Лицензүүдийг ачаалах явцад алдаа гарлаа."</string>
+    <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Лицензүүдийг ачааллах явцад алдаа гарлаа."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Ачаалж байна..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Аюулгүй байдлын мэдээлэл"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Аюулгүй байдлын мэдээлэл"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> зогсоох уу?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Тийм гэсэнд хүрвэл <xliff:g id="SERVICE">%1$s</xliff:g>-г зогсоох болно."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Үйлчилгээ суулгагдаагүй байна"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Дэлгэцийн уншигч хэрэгтэй юу?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack нь сохор буюу хараа муутай хэрэглэгчдэд яриагаар хариу үйлдэл үзүүлдэг. Та үүнийг Андройд Захаас үнэгүйгээр суулгахыг хүсч байна уу?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Тайлбар байхгүй."</string>
     <string name="settings_button" msgid="3006713718908152930">"Тохиргоо"</string>
     <string name="print_settings" msgid="4742428530112487843">"Хэвлэлт"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Зураг авах"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Галерейгаас зураг сонгох"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC дэлгэцийн түгжээний тохиргоо"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Хосолсон таг-ууд"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Идэвхжүүлсэн"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Таг-тай хослуулах"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Одоо хослуулах"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Таг-г ширээн дээр хэвтээгээр байрлуулж дээр нь утсаа тавьна уу"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Таг болон утас амжилттай хосолсон!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Өгөгдсөн таг-г таны утасны түгжээг тайлахад ашиглах боломжгүй"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Таны таг-тай хослуулах амжилтгүй боллоо, дахин оролдоно уу"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC түгжээг тайлахад шаардлагатай NFC идэвхжээгүй байна. NFC-г асаана уу."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC Тохиргоо"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index b531a4a..c61e9e7 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Maklumat pemilik"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Dayakan widget"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Dilumpuhkan oleh pentadbir"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Buka kunci NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Taip teks untuk dipaparkan pada skrin kunci"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Tunjukkan maklumat pengguna pada skrin kunci"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Hentikan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Menyentuh OK akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Tiada perkhidmatan dipasang"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Perlukan pembaca skrin?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack menyediakan maklum balas bersuara untuk membantu pengguna yang buta dan berpenglihatan kabur. Adakah anda ingin memasangnya secara percuma dari Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tiada keterangan disediakan."</string>
     <string name="settings_button" msgid="3006713718908152930">"Tetapan"</string>
     <string name="print_settings" msgid="4742428530112487843">"Pencetakan"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Ambil foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Pilih foto dari Galeri"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Tetapan Kunci Skrin NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Teg yang digandingkan"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Didayakan"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Gandingkan dengan teg"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Gandingkan sekarang"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Letakkan teg secara rata di atas meja dan letakkan telefon di atasnya"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Teg dan telefon berjaya digandingkan, selesai!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Teg yang diberikan tidak boleh digunakan untuk membuka kunci telefon anda"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Gandingan dengan teg anda gagal, sila cuba lagi"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC tidak didayakan dan diperlukan untuk Buka Kunci NFC. Sila hidupkan NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Tetapan NFC"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8bd473d..f3a1f95 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Eierinformasjon"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktiver moduler"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Deaktivert av administratoren"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC-opplåsning"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Skriv inn teksten som skal vises på låseskjermen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Vis brukerinformasjon på låseskjermen"</string>
@@ -968,7 +969,7 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Flyttbar trådløs sone"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-tilknytning"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tilknytning"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tilknytn. og trådløs sone"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tilknytning og trådløs sone"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-tilknytning"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB-tilkoblet, velg for å knytte til"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Vil du stoppe <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Du stopper <xliff:g id="SERVICE">%1$s</xliff:g> ved å trykke på OK."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ingen tjenester er installert"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Trenger du en skjermleser?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Talkback gir muntlig tilbakemelding for å hjelpe blinde og svaksynte brukere. Vil du installere denne appen gratis fra Google Play?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Beskrivelse ble ikke oppgitt."</string>
     <string name="settings_button" msgid="3006713718908152930">"Innstillinger"</string>
     <string name="print_settings" msgid="4742428530112487843">"Utskrift"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Ta et bilde"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Velg bilde fra galleriet"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Innstillinger for NFC-skjermlåsen"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Sammenkoblede brikker"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Aktivert"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Koble sammen med en brikke"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Koble sammen nå"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Legg brikken flatt på et bord og plasser telefonen oppå"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Brikken og telefonen er sammenkoblet – du er ferdig!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Den tilkoblede brikken kan ikke brukes til å låse opp telefonen din"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Sammenkoblingen med brikken mislyktes, prøv på nytt"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Du kan ikke låse opp NFC når NFC er ikke aktivert. Slå NFC på."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC-innstillinger"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6defb7c..1efe00d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Eigenaarsgegevens"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Widgets inschakelen"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Uitgeschakeld door beheerder"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC-ontgrendeling"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Typ tekst voor weergave op vergrendeld scherm"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Gebruikersgegevens weergeven op vergrendeld scherm"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> beëindigen?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Als u \'OK\' aanraakt, wordt <xliff:g id="SERVICE">%1$s</xliff:g> beëindigd."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Geen services geïnstalleerd"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Heeft u een schermlezer nodig?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack levert gesproken feedback om blinde en slechtziende gebruikers te helpen navigeren. Wilt u deze app gratis installeren via Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Geen beschrijving opgegeven."</string>
     <string name="settings_button" msgid="3006713718908152930">"Instellingen"</string>
     <string name="print_settings" msgid="4742428530112487843">"Afdrukken"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Foto maken"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Foto kiezen in Galerij"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Instellingen voor NFC-schermvergrendeling"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Gekoppelde tags"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Ingeschakeld"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Koppelen aan een tag"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Nu koppelen"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Leg de tag vlak op een tafel neer en leg de telefoon erop"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Tag en telefoon zijn gekoppeld. U bent klaar."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"De geleverde tag kan niet worden gebruikt om uw telefoon te ontgrendelen"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"De koppeling met uw tag is mislukt, probeer het opnieuw"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC is niet ingeschakeld en is vereist voor NFC-ontgrendeling. Schakel NFC in."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC-instellingen"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5d7a76d..1a7f04e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Informacje o właścicielu"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Włącz widżety"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Wyłączone przez administratora"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Blokada NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Wpisz tekst do wyświetlenia na ekranie blokady."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Pokaż informacje o użytkowniku na zablokowanym ekranie"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Zatrzymać <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Dotknięcie OK spowoduje zatrzymanie usługi <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Brak zainstalowanych usług"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Potrzebujesz czytnika ekranu?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack odczytuje zawartość ekranu, pomagając użytkownikom niewidomym i niedowidzącym. Czy chcesz zainstalować tę usługę za darmo z Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Brak opisu"</string>
     <string name="settings_button" msgid="3006713718908152930">"Ustawienia"</string>
     <string name="print_settings" msgid="4742428530112487843">"Drukowanie"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Zrób zdjęcie"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Wybierz zdjęcie z galerii"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Ustawienia wyłączania blokady ekranu przez NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Sparowane zawieszki"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Włączona"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Sparuj z tagiem"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Sparuj teraz"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Połóż zawieszkę na płaskiej powierzchni i umieść nad nią telefon"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Zawieszka i telefon zostały sparowane. Gotowe."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Tej zawieszki nie można użyć do odblokowania telefonu"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Parowanie z zawieszką nie udało się. Spróbuj ponownie"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Komunikacja NFC nie jest włączona, a jest wymagana do obsługi funkcji Odblokowanie przez NFC. Włącz ją."</string>
+    <string name="ok" msgid="3651563352754792958">"Ustawienia komunikacji NFC"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 4e0f4d0..ad3ead3 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info do proprietário"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Ativar widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Desativados pelo administrador"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Desbloqueio de NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Introduzir texto a apresentar no ecrã de bloqueio"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar info. utilizador no ecrã de bloqueio"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Parar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Tocar em OK irá parar <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nenhum serviço instalado"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Necessita de um leitor de ecrã?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"O TalkBack fornece respostas faladas para ajudar os utilizadores invisuais e com deficiência visual. Pretende instalá-lo gratuitamente a partir do Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nenhuma descrição fornecida."</string>
     <string name="settings_button" msgid="3006713718908152930">"Definições"</string>
     <string name="print_settings" msgid="4742428530112487843">"Imprimir"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Tirar fotografia"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Escolher fotografia da Galeria"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Definições de bloqueio de ecrã por NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Etiquetas sincronizadas"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Ativado"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Sincronizar com uma etiqueta"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Sincronizar agora"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Estique a etiqueta em cima de uma mesa e coloque o telemóvel por cima"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Etiqueta e telemóvel sincronizados com êxito. Tudo pronto!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"A etiqueta fornecida não pode ser utilizada para desbloquear o telemóvel"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Falha ao sincronizar com a etiqueta. Tente novamente."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"O NFC não está ativado e é necessário para o desbloqueio por NFC. Ative o NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Definições de NFC"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1de3907..736b28a 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -83,7 +83,7 @@
     <string name="battery_info_voltage_label" msgid="8971764146757637863">"Voltagem da bateria:"</string>
     <string name="battery_info_voltage_units" msgid="8658490792208288107">"mV"</string>
     <string name="battery_info_temperature_label" msgid="1968383098818648037">"Temperatura da bateria:"</string>
-    <string name="battery_info_temperature_units" msgid="9098950587249987550">"° C"</string>
+    <string name="battery_info_temperature_units" msgid="9098950587249987550">"°C"</string>
     <string name="battery_info_uptime" msgid="5548545143573527992">"Tempo desde a inicialização:"</string>
     <string name="battery_info_awake_battery" msgid="2557725975486185849">"Tempo ativo da bateria:"</string>
     <string name="battery_info_awake_plugged" msgid="176716874713478188">"Tempo ativo ao carregar:"</string>
@@ -240,7 +240,7 @@
     <string name="band_mode_loading" msgid="548764766363847336">"Carregando a lista de frequências…"</string>
     <string name="band_mode_set" msgid="5730560180249458484">"Definir"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Falha"</string>
-    <string name="band_mode_succeeded" msgid="2701016190055887575">"Êxito"</string>
+    <string name="band_mode_succeeded" msgid="2701016190055887575">"Feito"</string>
     <string name="sdcard_changes_instructions" msgid="4482324130377280131">"As alterações são aplicadas quando o cabo USB é reconectado."</string>
     <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Ativar o armazenamento USB em massa"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Total de bytes:"</string>
@@ -254,7 +254,7 @@
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Armaz. USB removido em uso!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"O cartão SD foi removido enquanto ainda estava em uso!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes usados:"</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Procurando mídia armaz. USB..."</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Procurando arquivos na USB..."</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Procurando mídia no cartão SD…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Armaz. USB somente leitura."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Cartão SD conectado como somente leitura."</string>
@@ -272,7 +272,7 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"Configurações de proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Cancelar"</string>
     <string name="settings_label" msgid="1626402585530130914">"Configurações"</string>
-    <string name="settings_label_launcher" msgid="8344735489639482340">"Config."</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Configurar"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Atalho para as configurações"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo avião"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Mais..."</string>
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info do proprietário"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Ativar widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Desativado pelo administrador"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Desbloqueio NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Digite o texto a ser exibido na tela de bloqueio"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar informações do usuário ao bloquear a tela"</string>
@@ -464,7 +465,7 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Emparelhamento rejeitado por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Não foi possível conectar ao <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Procurar dispositivos"</string>
-    <string name="bluetooth_search_for_devices" msgid="5957007154213560390">"Procurar disposit."</string>
+    <string name="bluetooth_search_for_devices" msgid="5957007154213560390">"Buscar dispositivo"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Pesquisando..."</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Configurações do aparelho"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispositivos pareados"</string>
@@ -762,7 +763,7 @@
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamanho da fonte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
-    <string name="sim_lock_settings_category" msgid="5136244267576697004">"Conf. bloqueio do SIM"</string>
+    <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurar bloqueio do SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueio do cartão SIM"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloquear cartão SIM"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Exigir PIN para usar o tablet"</string>
@@ -837,18 +838,18 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponível (somente leitura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espaço total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicativos (dados de aplic. e conteúdo de mídia)"</string>
+    <string name="memory_apps_usage" msgid="2348501997988663688">"Dados de apps e conteúdo de mídia"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Mídia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imagens, vídeos"</string>
-    <string name="memory_music_usage" msgid="1363785144783011606">"Áudio (música, toques, podcasts etc.)"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">"Áudio (música, toques, podcasts)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Diversos"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dados em cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desconectar armaz. comp."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar cartão SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desconectar armaz. USB interno"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desconecte o cartão SD para poder removê-lo com segurança"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Insira armazen. USB"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Insira cartão USB"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insira um cartão SD para conexão"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Conectar armazenam. USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Conectar cartão SD"</string>
@@ -1005,7 +1006,7 @@
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Economia de bateria"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Somente no dispositivo"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Local desativado"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicit. de localiz. recentes"</string>
+    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitações recentes"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nenhum aplicativo solicitou a localização recentemente"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Serviços de localização"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Uso da bateria elevado"</string>
@@ -1078,7 +1079,7 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"É necessário desenhar o padrão para desbloquear a tela"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Tornar o padrão visível"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrar ao tocar"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloq. c/ botão liga/desliga"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Botão liga/desliga bloqueia"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Padrão de desbloqueio"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Alterar padrão"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Como desenhar um padrão de desbloqueio"</string>
@@ -1098,7 +1099,7 @@
     <string name="verify_applications_summary" msgid="6737505521913263792">"Proibir ou avisar antes da instalação de aplicativos que podem causar danos"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configurações avançadas"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Ativa mais opções de configuração"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"Informações do aplicativo"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"Informações do app"</string>
     <string name="storage_label" msgid="8700867073480107253">"Armazenamento"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Iniciar por padrão"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Padrões"</string>
@@ -1143,7 +1144,7 @@
     <string name="filter_dlg_title" msgid="8693024463731076091">"Selecione as opções de filtro"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Todos"</string>
     <string name="filter_apps_disabled" msgid="5364447573326472890">"Desativados"</string>
-    <string name="filter_apps_third_party" msgid="7786348047690140979">"Descarregados"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Instalados"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Rodando"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Armazenamento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Cartão SD"</string>
@@ -1152,7 +1153,7 @@
     <string name="no_applications" msgid="7336588977497084921">"Nenhum aplicativo."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Armaz. interno"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Armaz. USB"</string>
-    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Armaz. cart. SD"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Cartão SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Recalculando o tamanho…"</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"Excluir os dados do aplicativo?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"Todos os dados deste aplicativo serão excluídos permanentemente. Isso inclui todos os arquivos, configurações, contas, bancos de dados e outros."</string>
@@ -1182,7 +1183,7 @@
     <string name="move_app" msgid="5042838441401731346">"Mover"</string>
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mover para o tablet"</string>
     <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Mover para telefone"</string>
-    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mover para armaz. USB"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mover para USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mover para cartão SD"</string>
     <string name="moving" msgid="6431016143218876491">"Movendo"</string>
     <string name="insufficient_storage" msgid="481763122991093080">"Não há espaço de armazenamento suficiente."</string>
@@ -1250,7 +1251,7 @@
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Substituição automática"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Corrigir palavras digitadas incorretamente"</string>
-    <string name="auto_caps" msgid="6379232078052591265">"Capitaliz. automática"</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Capitalização automática"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Escrever a primeira letra nas sentenças com letra maiúscula"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Pontuação automática"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Configurações de teclado físico"</string>
@@ -1311,7 +1312,7 @@
     <string name="input_method_selector" msgid="4311213129681430709">"Seletor do método de entrada"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automático"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Mostrar sempre"</string>
-    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Sempre ocultar"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Não mostrar"</string>
     <string name="configure_input_method" msgid="1317429869771850228">"Configurar métodos de entrada"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Configurações"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Configurações"</string>
@@ -1395,7 +1396,7 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Botão de ligar encerra a chamada"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Falar senhas"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Atraso ao tocar e pressionar"</string>
-    <string name="accessibility_display_contrast_preference_title" msgid="7349034776349278205">"Aprimoramento de contraste"</string>
+    <string name="accessibility_display_contrast_preference_title" msgid="7349034776349278205">"Melhora do contraste"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Inversão de cores"</string>
     <string name="accessibility_display_daltonizer_preference_title" msgid="4034958017657406631">"Correção do espaço de cores"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar em \"Configurações rápidas\""</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Parar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Toque em \"Ok\" para parar <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nenhum serviço foi instalado"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Precisa de um leitor de tela?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"O TalkBack fornece feedback por voz para ajudar usuários cegos ou com visão reduzida. Deseja instalá-lo gratuitamente do Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nenhuma descrição foi fornecida."</string>
     <string name="settings_button" msgid="3006713718908152930">"Configurações"</string>
     <string name="print_settings" msgid="4742428530112487843">"Impressão"</string>
@@ -1526,7 +1525,7 @@
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tempo ligado"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Horário sem o sinal"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Forçar parada"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"Informações do aplicativo"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"Informações do app"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Configurações do aplicativo"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Configurações da tela"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Configurações de Wi-Fi"</string>
@@ -1587,7 +1586,7 @@
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Configurações para \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Configurações da conversão de texto em voz"</string>
     <string name="tts_settings_title" msgid="1237820681016639683">"Conversão de texto em voz"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usar minhas config."</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usar minhas configurações"</string>
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"As configurações padrão abaixo substituem as configurações do aplicativo"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Configurações padrão"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Mecanismo padrão"</string>
@@ -1802,13 +1801,13 @@
     <string name="select_application" msgid="5156029161289091703">"Selecionar aplicativo"</string>
     <string name="no_application" msgid="2813387563129153880">"Nada"</string>
     <string name="wait_for_debugger" msgid="1202370874528893091">"Aguardar depurador"</string>
-    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Aplic. que sofreu dep. aguarda que depur. seja anex. antes da exec."</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"App depurado espera conexão com debugger antes de ser executado."</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Entrada"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Desenho"</string>
     <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Renderização acelerada por hardware"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitoramento"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Modo rigoroso ativado"</string>
-    <string name="strict_mode_summary" msgid="142834318897332338">"Piscar tela se aplic. demorarem na sequência princ."</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Piscar tela se apps demorarem no processo principal"</string>
     <string name="pointer_location" msgid="6084434787496938001">"Localização do ponteiro"</string>
     <string name="pointer_location_summary" msgid="840819275172753713">"Exibir dados de toque"</string>
     <string name="show_touches" msgid="1356420386500834339">"Mostrar toques"</string>
@@ -1845,7 +1844,7 @@
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir todas as atividades quando o usuário sair"</string>
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limite do proc. 2º plano"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Mostrar todos os ANRS"</string>
-    <string name="show_all_anrs_summary" msgid="641908614413544127">"Exibir \"App não responde\" para aplic. em 2º plano"</string>
+    <string name="show_all_anrs_summary" msgid="641908614413544127">"Exibir \"App não responde\" para app em 2º plano"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de dados"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclo do uso de dados"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming de dados"</string>
@@ -1918,7 +1917,7 @@
     <string name="vpn_name" msgid="4689699885361002297">"Nome"</string>
     <string name="vpn_type" msgid="5435733139514388070">"Tipo"</string>
     <string name="vpn_server" msgid="2123096727287421913">"Endereço do servidor"</string>
-    <string name="vpn_mppe" msgid="6639001940500288972">"criptografia PPP (MPPE)"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Criptografia PPP (MPPE)"</string>
     <string name="vpn_l2tp_secret" msgid="529359749677142076">"Segredo L2TP"</string>
     <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Identificador IPSec"</string>
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Chave pré-compartilhada IPSec"</string>
@@ -2019,7 +2018,7 @@
     <string name="user_delete_button" msgid="5131259553799403201">"Excluir"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicativos e conteúdo"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicativos com restrições"</string>
-    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir config. p/ aplicativo"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir configuração para app"</string>
     <string name="home_app_uninstall_button" msgid="6808453012607962899">"Desinstalar o aplicativo"</string>
     <string name="only_one_home_message" msgid="3538846733750242759">"As configurações da tela inicial ficarão ocultas até que outro aplicativo da tela inicial seja instalado."</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuração afeta todos os usuários do tablet."</string>
@@ -2041,7 +2040,7 @@
     <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmissões por celular"</string>
-    <string name="user_restrictions_title" msgid="7745810037152772035">"Restrições de aplic. e conteúdo"</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Restrições de app e conteúdo"</string>
     <string name="user_rename" msgid="8523499513614655279">"RENOMEAR"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Definir restrições do aplicativo"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controlado por <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Tirar foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Escolher foto da Galeria"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Configurações de bloqueio de tela NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Etiquetas pareadas"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Ativado"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Parear com uma etiqueta"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Parear agora"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Coloque a etiqueta aberta em uma mesa e coloque o telefone em cima"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Etiqueta e telefone pareados com sucesso. Concluído."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"A etiqueta fornecida não pode ser usada para desbloquear o telefone"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"O pareamento com a etiqueta falhou. Tente novamente"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"A NFC não está ativada para o desbloqueio NFC. Ative a NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Configurações da NFC"</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 77e3d9f..14b3ad5 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -448,6 +448,8 @@
     <skip />
     <!-- no translation found for security_enable_widgets_disabled_summary (1557090442377855233) -->
     <skip />
+    <!-- no translation found for nfc_unlock_title (8827035651970841825) -->
+    <skip />
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <!-- no translation found for owner_info_settings_edit_text_hint (4608681417960923911) -->
     <skip />
@@ -2278,10 +2280,6 @@
     <skip />
     <!-- no translation found for accessibility_no_services_installed (7200948194639038807) -->
     <skip />
-    <!-- no translation found for accessibility_service_no_apps_title (5124097563864109821) -->
-    <skip />
-    <!-- no translation found for accessibility_service_no_apps_message (7751662416377046539) -->
-    <skip />
     <!-- no translation found for accessibility_service_default_description (1072730037861494125) -->
     <skip />
     <!-- no translation found for settings_button (3006713718908152930) -->
@@ -3401,4 +3399,28 @@
     <!-- no translation found for user_image_choose_photo (3746334626214970837) -->
     <skip />
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <!-- no translation found for lock_settings_nfc_title (33998875572836425) -->
+    <skip />
+    <!-- no translation found for nfc_unlock_paired_tags_title (3837232675294949824) -->
+    <skip />
+    <!-- no translation found for nfc_unlock_enabled (7306199149460932989) -->
+    <skip />
+    <!-- no translation found for start_nfc_pairing (5363319136364735698) -->
+    <skip />
+    <!-- no translation found for title_activity_nfc_pairing (6821817665260628279) -->
+    <skip />
+    <!-- no translation found for pairing_button_title (7411638037556429744) -->
+    <skip />
+    <!-- no translation found for status_no_ring_detected (838954925249421062) -->
+    <skip />
+    <!-- no translation found for status_device_paired (4916932520416516526) -->
+    <skip />
+    <!-- no translation found for status_error_invalid_device (5045003971535647259) -->
+    <skip />
+    <!-- no translation found for status_error_pairing_failed (8260473909085202868) -->
+    <skip />
+    <!-- no translation found for enable_nfc (5234514241098808766) -->
+    <skip />
+    <!-- no translation found for ok (3651563352754792958) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c228c56..9548ec1 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info. proprietar"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Activați widgeturi"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Setare dezactivată de administrator"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Deblocare NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Introduceţi textul de afişat pe ecranul de blocare"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Informații utilizator pe ecranul de blocare"</string>
@@ -1449,8 +1450,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Opriți <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Atingând OK veți opri <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nu există servicii instalate"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Aveţi nevoie de un cititor de ecran?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Serviciul TalkBack oferă feedback vocal pentru a ajuta utilizatorii nevăzători şi cu probleme de vedere. Doriţi să îl instalaţi în mod gratuit din Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nu a fost furnizată o descriere."</string>
     <string name="settings_button" msgid="3006713718908152930">"Setări"</string>
     <string name="print_settings" msgid="4742428530112487843">"Printare"</string>
@@ -2063,4 +2062,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Faceți o fotografie"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Alegeți o fotografie din Galerie"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Setări NFC de blocare a ecranului"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Etichete conectate"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"S-a activat"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Asociați cu o etichetă"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Asociați acum"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Plasați eticheta în poziție orizontală, pe o masă și așezați telefonul deasupra"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Eticheta și telefonul au fost conectate, ați terminat!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Eticheta furnizată nu poate fi utilizată pentru a debloca telefonul."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Conectarea cu eticheta nu a reușit, încercați din nou."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Funcția NFC nu este activată și este necesară pentru deblocarea NFC. Activați NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Setări NFC"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8b64162..0141d95 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Сведения о владельце"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Включить виджеты"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Отключено администратором"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Разблокировка NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Введите текст для показа на экране блокировки"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Показывать введенный ниже текст на экране блокировки"</string>
@@ -684,7 +685,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Настройка точки доступа Wi-Fi"</string>
     <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Сеть: <xliff:g id="NETWORK_SSID">%1$s</xliff:g>; шифрование: <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Хот-спот Android"</string>
-    <string name="home_settings" msgid="212375129455718176">"Общие"</string>
+    <string name="home_settings" msgid="212375129455718176">"Домашний экран"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Рингтон"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Остановить службу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Чтобы отключить <xliff:g id="SERVICE">%1$s</xliff:g>, нажмите ОК."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Службы не установлены"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Нужна программа чтения с экрана?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Бесплатное приложение TalkBack дает голосовое описание элементов интерфейса для пользователей с нарушением зрения. Установить его из Android Маркета?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Нет описания"</string>
     <string name="settings_button" msgid="3006713718908152930">"Настройки"</string>
     <string name="print_settings" msgid="4742428530112487843">"Печать"</string>
@@ -2064,4 +2063,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Сделать снимок"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Выбрать из Галереи"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Настройки блокировки экрана для связи малого радиуса действия"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Подключенные метки"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Включено"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Подключение NFC-метки"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Подключить"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Положите метку на ровную поверхность и поместите телефон сверху"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Готово!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Этой меткой нельзя разблокировать ваш телефон"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Произошла ошибка. Повторите попытку."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Включите связь малого радиуса действия."</string>
+    <string name="ok" msgid="3651563352754792958">"Настройки связи малого радиуса действия"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6f363c9..e8e71b9 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info o vlastníkovi"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Povoliť miniaplik."</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Zakázané správcom"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Odomknutie NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Zadajte text, ktorý sa zobrazí na uzamknutej obrazovke"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Zobraz. informácie používateľa na uzamk. obrazovke"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Zastaviť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Ak sa dotknete klávesu OK, služba <xliff:g id="SERVICE">%1$s</xliff:g> sa zastaví."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nie sú nainštalované žiadne služby"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Potrebujete čítačku obrazovky?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Aplikácia Talkback poskytuje hovorenú odozvu na pomoc nevidomým a slabozrakým používateľom. Chcete si túto aplikáciu bezplatne nainštalovať zo služby Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"K dispozícii nie je žiadny popis."</string>
     <string name="settings_button" msgid="3006713718908152930">"Nastavenia"</string>
     <string name="print_settings" msgid="4742428530112487843">"Tlač"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Vytvoriť fotografiu"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Vybrať fotografiu z Galérie"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Nastavenia zámky obrazovky NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Spárované štítky"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Povolené"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Spárovať so značkou"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Spárovať"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Štítok položte vodorovne na stôl a potom naň umiestnite telefón"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Štítok a telefón boli úspešne spárované. Hotovo!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Poskytnutý štítok nie je možné použiť na odomknutie vášho telefónu"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Spárovanie so štítkom zlyhalo. Skúste to znova."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Nie je povolená technológia NFC, ktorú funkcia Odomknutie NFC vyžaduje. Zapnite technológiu NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Nastavenia NFC"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 184a7b9..3b42dd3 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Lastnikovi podatki"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Omogoči pripomočke"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Onemogočil skrbnik"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Odklepanje z NFC-jem"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Vnesite besedilo za prikaz na zaslonu za zaklepanje"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Pokaži podatke o uporabniku na zaklenjenem zaslonu"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Ali želite ustaviti storitev <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Če se dotaknete »V redu«, ustavite storitev <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nameščena ni nobena storitev"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Potrebujete bralnik zaslona?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Program TalkBack daje izgovorjene povratne informacije za pomoč slepim in slabovidnim uporabnikom. Ali ga želite brezplačno namestiti iz trgovine Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ni opisa."</string>
     <string name="settings_button" msgid="3006713718908152930">"Nastavitve"</string>
     <string name="print_settings" msgid="4742428530112487843">"Tiskanje"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Posnemi fotografijo"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Izberite fotografijo iz galerije"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Nastavitve zaklepanja zaslona z NFC-jem"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Seznanjene oznake"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Omogočeno"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Seznani z oznako"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Seznani"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Položite oznako na mizo in odložite telefon nanjo"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Seznanjanje oznake in telefona je uspelo, postopek je končan."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Te oznake ni mogoče uporabiti za odklepanje telefona"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Seznanjanje z oznako ni uspelo, poskusite znova"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC ni omogočen in je potreben za odklepanje z NFC-jem. Vklopite NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Nastavitve za NFC"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9888511..1e02e43 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Власник информација"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Омогући виџете"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Онемогућио је администратор"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC откључавање"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Унесите текст за приказ на екрану за закључавање"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Прикажи информације о кориснику на закљ. екрану"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Желите ли да зауставите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Додиром на Потврди онемогућавате <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ниједна услуга није инсталирана"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Потребан вам је читач екрана?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack пружа говорне повратне информације како би помогао слепим корисницима и корисницима са слабим видом. Да ли желите да га бесплатно инсталирате са Android Market-а?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Није наведен опис."</string>
     <string name="settings_button" msgid="3006713718908152930">"Подешавања"</string>
     <string name="print_settings" msgid="4742428530112487843">"Штампање"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Сними слику"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Изабери слику из Галерије"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Подешавања закључавања екрана за NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Упарене ознаке"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Омогућено је"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Упари помоћу ознаке"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Упари одмах"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Поставите ознаку равно на сто и поставите телефон преко ње"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Ознака и телефон су упарени, завршили сте!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Ова ознака не може да се користи за откључавање телефона"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Упаривање са ознаком није успело, покушајте поново"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Нисте омогућили NFC, а он је обавезан за NFC откључавање. Укључите NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC подешавања"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 4282dea..e8e9d95 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Ägaruppgifter"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktivera widgetar"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Har inaktiverats av administratören"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Lås upp NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ange text som ska visas på den låsta skärmen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Visa användarinfo på den låsta skärmen"</string>
@@ -1003,7 +1004,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Läge"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hög precision"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterisparläge"</string>
-    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Endast enhet"</string>
+    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Endast enheten"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Plats av"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nya platsbegäranden"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Inga appar har begärt uppgifter om plats nyligen"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Vill du avbryta <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Om du trycker på OK avbryts <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Inga tjänster är installerade"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Behöver du en skärmläsare?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack ger talad feedback till användare som är blinda eller har nedsatt syn. Vill du installera den gratis från Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ingen beskrivning har angetts."</string>
     <string name="settings_button" msgid="3006713718908152930">"Inställningar"</string>
     <string name="print_settings" msgid="4742428530112487843">"Utskrift"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Ta foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Välj ett foto från galleriet"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Inställningar för NFC-skärmlås"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Kopplade NFC-taggar"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Aktiverad"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Parkoppla med en tagg"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Parkoppla nu"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Lägg NFC-taggen på ett bord och lägg mobilen ovanpå"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Kopplingen mellan NFC-taggen och mobilen är klar."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Denna NFC-tagg kan inte användas till att låsa upp mobilen"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Kopplingen till NFC-taggen misslyckades, försök igen"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Du kan inte låsa upp med NFC när det inte är aktiverat. Aktivera NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC-inställningar"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 38df83f..cc8c65b 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -318,6 +318,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Maelezo ya mmiliki"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Washa wijeti"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Msimamizi ameizima"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Kufungua NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Andika maandishi ya kuonyeshwa kwenye skrini ya kufunga"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Onyesha maelezo ya mtumiaji kwenye skrini ya kufunga"</string>
@@ -1442,8 +1443,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Ungependa kuzima <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Kugusa Sawa kutasimamisha <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Hakuna huduma zilizosanidiwa"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Unahitaji msomaji wa skrini?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack hutoa majibu yaliyosemwa ili kuwasaidia watumiaji vipofu na wenye-kuona kidogo. Je, unataka kuisanidi bure kutoka kwa Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Hakuna maelezo yaliyotolewa."</string>
     <string name="settings_button" msgid="3006713718908152930">"Mipangilio"</string>
     <string name="print_settings" msgid="4742428530112487843">"Kuchapisha"</string>
@@ -1684,10 +1683,10 @@
     <string name="auto_restore_summary" msgid="4235615056371993807">"Wakati wa kusanidi upya programu, rejesha mipangilio na data ambazo zina nakala rudufu"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Nenosiri la hifadhi rudufu ya eneo kazi"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Hifadhi rudufu kamili za eneo kazi hazijalindwa kwa sasa"</string>
-    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Gusa ili kubadilisha au kuondoa nenosiri la chelezo kamili za eneo kazi"</string>
-    <string name="local_backup_password_toast_success" msgid="582016086228434290">"Nenosiri mpya la chelezo limewekwa"</string>
+    <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Gusa ili ubadilishe au uondoe nenosiri la hifadhi rudufu kamili za eneo kazi"</string>
+    <string name="local_backup_password_toast_success" msgid="582016086228434290">"Nenosiri jipya la hifadhi rudufu limewekwa"</string>
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Nenosiri jipya na uthibitisho havioani"</string>
-    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Imeshindwa kuweka nenosiri la chelezo"</string>
+    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Imeshindwa kuweka nenosiri la hifadhi rudufu"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Ungependa kuacha kuhifadhi nakala za manenosiri, alamisho, mipangilio mingine na data ya programu ya Wi-Fi, na ufute nakala zote kwenye seva za Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Mipangilio za usimamizi wa kifaa"</string>
@@ -1953,10 +1952,10 @@
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Lemaza mfumo wa cheti cha CA?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Ondoa cheti cha CA cha  mtumiaji kabisa?"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Kikagua tahajia"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Andika nenosiri lako kamili la sasa la chelezo hapa"</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Andika nenosiri mpya kwa chelezo zote kamili"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Andika nenosiri lako la sasa la hifadhi rudufu kamili hapa"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Andika nenosiri jipya la hifadhi rudufu kamili hapa"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Andika upya nenosiri yako kamili ya kuhifadhi hapa"</string>
-    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Weka nenosiri la chelezo"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Weka nenosiri mbadala"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Ghairi"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"sasisho za ziada za mfumo"</string>
@@ -2056,4 +2055,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Piga picha"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Chagua picha kutoka Matunzio"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Mipangilio ya Kufunga Skrini ya NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Lebo Zilizooanishwa"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Imewashwa"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Oanisha na tagi"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"Shughuli ya Kuoanisha Nfc"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Oanisha sasa"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Weka lebo mezani na uweke simu juu yake"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Lebo na simu zimeoanishwa bila tatizo, umemaliza!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Lebo iliyotolewa haiwezi kutumika kufungua simu yako"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Kuoanisha na lebo yako kulishindikana, tafadhali jaribu tena"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC haijawashwa na inahitajika ili Kufungua NFC. Tafadhali washa NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Mipangilio ya NFC"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index f797911..2926ca7 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"ข้อมูลเจ้าของ"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"เปิดใช้งานวิดเจ็ต"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"ปิดใช้งานโดยผู้ดูแลระบบ"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"การปลดล็อก NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"พิมพ์ข้อความที่ต้องการให้แสดงบนหน้าจอล็อก"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"แสดงข้อมูลผู้ใช้บนหน้าจอล็อก"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"หยุด <xliff:g id="SERVICE">%1$s</xliff:g> ไหม"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"การแตะ \"ตกลง\" จะเป็นการหยุด <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"ไม่ได้ติดตั้งบริการใดไว้"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"ต้องใช้โปรแกรมอ่านหน้าจอหรือไม่"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack มีการตอบสนองด้วยเสียงเพื่อช่วยเหลือผู้พิการทางสายตาและผู้มีปัญหาทางสายตา คุณต้องการติดตั้งแอปพลิเคชันฟรีนี้จาก Android Market หรือไม่"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ไม่มีคำอธิบาย"</string>
     <string name="settings_button" msgid="3006713718908152930">"การตั้งค่า"</string>
     <string name="print_settings" msgid="4742428530112487843">"การพิมพ์"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"ถ่ายภาพ"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"เลือกรูปภาพจากแกลเลอรี"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"การตั้งค่าล็อกหน้าจอด้วย NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"ป้ายที่จับคู่"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"เปิดอยู่"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"จับคู่กับแท็ก"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"จับคู่เลย"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"วางป้ายราบไปกับโต๊ะ และวางโทรศัพท์ไว้ข้างบน"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"จับคู่ป้ายและโทรศัพท์สำเร็จแล้ว ทุกอย่างเรียบร้อย!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"ป้ายที่ระบุไม่สามารถใช้ปลดล็อกโทรศัพท์ของคุณ"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"การจับคู่กับป้ายของคุณล้มเหลว โปรดลองอีกครั้ง"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC ไม่ได้เปิดอยู่ แต่จำเป็นสำหรับการปลดล็อกด้วย NFC โปรดเปิด NFC"</string>
+    <string name="ok" msgid="3651563352754792958">"การตั้งค่า NFC"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 1a7663c..628795a 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Impo ng may-ari"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"I-enable ang widget"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Na-disable ng administrator"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Pag-unlock ng NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Mag-type ng teksto upang maipakita sa lock screen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Ipakita ang impormasyon ng user sa lock screen"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Ihinto ang <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Kapag pinindot ang OK, hihinto ang <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Walang mga serbisyong naka-install"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Kailangan ng screen reader?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Nagbibigay ang TalkBack ng pasalitang feedback upang matulungan ang mga user na bulag at may mahinang paningin. Nais mo ba itong i-install nang libre mula sa Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Walang ibinigay na paglalarawan."</string>
     <string name="settings_button" msgid="3006713718908152930">"Mga Setting"</string>
     <string name="print_settings" msgid="4742428530112487843">"Pag-print"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Kumuha ng larawan"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Pumili ng larawan mula sa Gallery"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Mga Setting ng Lock ng Screen ng NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Mga Magkapares na Tag"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Naka-enable"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Ipares sa isang tag"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Ipares ngayon"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Itakda ang tag nang naka-flat sa lamesa at ilagay ang telepono sa ibabaw"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Matagumpay na naipares ang tag at telepono, tapos ka na!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Hindi maaaring gamitin ang ibinigay na tag upang i-unlock ang iyong telepono"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Hindi naipares ang iyong tag, pakisubukang muli"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Hindi naka-enable ang NFC at kinakailangan para sa Pag-unlock ng NFC. Paki-on ang NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Mga Setting ng NFC"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f578ad7..2a37058 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Cihaz sahibinin bilgileri"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Widget\'ları etkinleştir"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Yönetici tarafından devre dışı bırakıldı"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC ile kilidi açma"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Kilit ekranında görüntülenecek metni yazın"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Kilit ekranında kullanıcı bilgilerini göster"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> durdurulsun mu?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Tamam\'a dokunulduğunda <xliff:g id="SERVICE">%1$s</xliff:g> durdurulur."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Hiçbir hizmet yüklenmedi"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Ekran okuyucusuna ihtiyacınız var mı?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack, görme engelli veya az gören kullanıcılara yardımcı olmak için sesli geri bildirim sağlar. Bu uygulamayı Android Market\'ten ücretsiz olarak yüklemek ister misiniz?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Hiçbir açıklama sağlanmadı."</string>
     <string name="settings_button" msgid="3006713718908152930">"Ayarlar"</string>
     <string name="print_settings" msgid="4742428530112487843">"Yazdırma"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Fotoğraf çek"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Galeri\'den fotoğraf seçin"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC ile Ekran Kilidi Ayarları"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Eşlenen Künyeler"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Etkin"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Bir etiketle eşle"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Şimdi eşle"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Künyeyi masaya düz olarak koyun ve telefonu künyenin üzerine yerleştirin"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Künye ve telefon başarıyla eşlendi. İşlemi tamamladınız!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Sağlanan künye, telefonunuzu açmak için kullanılamıyor"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Künyenizle eşleme başarısız oldu. Lütfen tekrar deneyin"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC etkin değil ve NFC ile Kilit Açma özelliği için gerekiyor. Lütfen NFC\'yi açın."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC Ayarları"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 160d97b..6c840e2 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Інфо про власника"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Увімкнути віджети"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Вимкнено адміністратором"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Розблокування в NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Введіть текст, що відображ. на екрані блокування"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Показувати дані користувача на екрані блокування"</string>
@@ -1003,7 +1004,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Висока точність"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Економія заряду акумулятора"</string>
-    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Лише на пристрої"</string>
+    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Лише датчики пристрою"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Надсилання геоданих вимкнено"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Останні запити геоданих"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Жодна програма не запитувала місцезнаходження останнім часом"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Зупинити <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Торкніться ОК, щоб зупинити <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Не встановлено жодної служби"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Потрібна програма зчитування з екрана?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Функція TalkBack забезпечує мовне голосове відтворення для користувачів із вадами зору. Хочете встановити її безкоштовно з Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Немає опису."</string>
     <string name="settings_button" msgid="3006713718908152930">"Налаштування"</string>
     <string name="print_settings" msgid="4742428530112487843">"Друк"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Зробити фото"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Вибрати фото з галереї"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Параметри блокування екрана через NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Спарені чипи"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Увімкнено"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Створити пару з тегом"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"Створення пари в NFC"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Створити пару зараз"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Розмістіть чип рівно на столі й покладіть зверху телефон"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Пару між чипом і телефоном створено."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Неможливо розблокувати телефон за допомогою цього чипа"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Не вдалося створити пару з чипом. Повторіть спробу"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Зв’язок малого радіуса дії (NFC) не ввімкнено, але він потрібен для розблокування через NFC. Увімкніть NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Параметри NFC"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index aeb0fed..d55f8a8 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Thông tin chủ sở hữu"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Bật tiện ích con"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Bị tắt bởi quản trị viên"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Mở khóa NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Nhập văn bản để hiển thị trên màn hình khóa"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Hiển thị thông tin người dùng trên màn hình khóa"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Dừng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Chạm vào OK sẽ ngừng <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Chưa có dịch vụ nào được cài đặt"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Cần trình đọc màn hình?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack cung cấp phản hồi bằng giọng nói nhằm giúp người dùng bị mù và mắt kém. Bạn có muốn cài đặt ứng dụng này miễn phí từ Android Market không?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Không có mô tả nào được cung cấp."</string>
     <string name="settings_button" msgid="3006713718908152930">"Cài đặt"</string>
     <string name="print_settings" msgid="4742428530112487843">"In"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Chụp ảnh"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Chọn ảnh từ Thư viện"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Cài đặt khóa màn hình NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Thẻ được ghép nối"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Đã bật"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Ghép nối với thẻ"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Ghép nối bây giờ"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Đặt thẻ bằng phẳng lên bàn và đặt điện thoại lên trên"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Đã ghép nối thẻ và điện thoại thành công, bạn đã hoàn tất!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Không thể sử dụng thẻ đã cung cấp để mở khóa điện thoại của bạn"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Không ghép nối với thẻ của bạn được, hãy thử lại"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC chưa được bật và cần có để Mở khóa NFC. Hãy bật NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Cài đặt NFC"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index fc09f55..8f3d861 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"机主信息"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"启用小部件"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"已被管理员停用"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC 解锁"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"输入要在锁定屏幕上显示的文字"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"在锁定屏幕上显示用户信息"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"要停用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"触摸“确定”将会停用<xliff:g id="SERVICE">%1$s</xliff:g>。"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"未安装任何服务"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"需要屏幕阅读器吗？"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"“话语提示”可提供语音反馈以帮助盲人和有视力障碍的用户。您要通过 Play 商店免费安装该服务吗？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"没有提供说明。"</string>
     <string name="settings_button" msgid="3006713718908152930">"设置"</string>
     <string name="print_settings" msgid="4742428530112487843">"打印"</string>
@@ -2062,4 +2061,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"拍照"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"从图库中选择照片"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC屏幕锁定设置"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"配对的标签"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"已启用"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"与标签配对"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"立即配对"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"请将标签平放在桌子上，然后将手机放在标签上"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"标签和手机已成功配对，大功告成了！"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"无法使用相应标签为您的手机解锁"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"与您的标签配对失败，请重试"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC解锁功能需要使用NFC，但NFC尚未启用。请启用NFC。"</string>
+    <string name="ok" msgid="3651563352754792958">"NFC设置"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 5aec358..f5d90f7 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"擁有者資訊"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"啟用小工具"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"已由管理員停用"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC 解鎖"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"輸入要在鎖定畫面上顯示的文字"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"在上鎖的畫面上顯示用戶資訊"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"停止「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"輕觸 [確定] 會停止「<xliff:g id="SERVICE">%1$s</xliff:g>」。"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"未安裝任何服務"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"需要屏幕閱讀器嗎？"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack 提供語音回應功能協助視障或視力不佳的用戶。現在可以免費從 Android Market 安裝這項功能，您要安裝嗎？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"未提供說明。"</string>
     <string name="settings_button" msgid="3006713718908152930">"設定"</string>
     <string name="print_settings" msgid="4742428530112487843">"列印"</string>
@@ -2066,4 +2065,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"拍照"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"從圖片庫選擇相片"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC 螢幕鎖定設定"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"配對標籤"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"已啟用"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"與標籤配對"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NFC 配對活動"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"立即配對"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"請將標籤平放在桌上，然後將手機放在標籤上"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"標籤和手機已成功配對，操作完成！"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"無法使用所提供的標籤為您的手機解鎖"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"無法與您的標籤配對，請再試一次"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"「NFC 解鎖」功能需要使用 NFC 功能，但 NFC 尚未啟用。請啟用 NFC。"</string>
+    <string name="ok" msgid="3651563352754792958">"NFC 設定"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7ef9928..d0551fb 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"擁有者資訊"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"啟用小工具"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"已由管理員停用"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC 解鎖"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"輸入要在鎖定畫面上顯示的文字"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"在鎖定畫面上顯示使用者資訊"</string>
@@ -1448,8 +1449,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"停止「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"輕觸 [確定] 會讓「<xliff:g id="SERVICE">%1$s</xliff:g>」停止。"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"未安裝任何服務"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"需要螢幕閱讀器嗎？"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack 提供語音回應功能協助視障或視力不佳的使用者。現在可以免費從 Android Market 安裝這項功能，您要安裝嗎？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"未提供說明。"</string>
     <string name="settings_button" msgid="3006713718908152930">"設定"</string>
     <string name="print_settings" msgid="4742428530112487843">"列印"</string>
@@ -2066,4 +2065,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"拍攝相片"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"從圖片庫選擇相片"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC 螢幕鎖定設定"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"配對的標記"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"已啟用"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"與標記配對"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"立即配對"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"請將標記平放在桌上，然後將手機放在標記上"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"標記和手機已成功配對，大功告成！"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"無法使用您提供的標記為您的手機解鎖"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"與您的標記配對失敗，請再試一次"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC 解鎖功能需要使用 NFC，但 NFC 尚未啟用。請開啟 NFC。"</string>
+    <string name="ok" msgid="3651563352754792958">"NFC 設定"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index a4bc13b..6d32345 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -316,6 +316,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Imininingwane yomnikazi"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Nika amandla amawijethi"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Ikhutshazwe ngumlawuli"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Ukuvula i-NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Faka umbhalo wokubonisa kwisikrini sokuvala"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Bonisa ulwazi lomsebenzisi esikrinini sokukhiya"</string>
@@ -1455,8 +1456,6 @@
     <string name="disable_service_title" msgid="3624005212728512896">"Misa i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2012273739481042318">"Ukuthinta KULUNGILE kuzomisa i-<xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ayikho isevisi efakiwe"</string>
-    <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Udinga isifundi skrini?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"I-TalkBack inikeza usizo lokuphendula kwezi ukuze kusizakale abangaboni kanye nalabo ababona kancane. Ingabe uyafuna ukuyifaka mahhala uyithola Emaketheni ye-Android?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Akukho ncazelo enikeziwe."</string>
     <string name="settings_button" msgid="3006713718908152930">"Izilungiselelo"</string>
     <string name="print_settings" msgid="4742428530112487843">"Ukuphrinta"</string>
@@ -2069,4 +2068,16 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Thatha isithombe"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Khetha isithombe kusuka kugalari"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Izilungiselelo zokukhiya isikrini se-NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Omaka ababhanqiwe"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Kunikwe amandla"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Bhangqa nomaka"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"Umsebenzi wokumatanisa we-Nfc"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Bhangqa manje"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Lalisa umaka kuthebula bese ubeka ifoni ngaphezulu"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Umaka nefoni kubhanqwe ngempumelelo, usuqedile!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Umaka onikeziwe awukwazi ukusetshenziselwa ukuvula ifoni yakho"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Ukubhanqwa nomaka wakho kuhlulekile, sicela uzame futhi"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"I-NFC ayinikwanga amandla futhi idingelwa ukuvulwa kwe-NFC. Sicela uvule i-NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Izilungiselelo ze-NFC"</string>
 </resources>
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index f097fd6..db473f8 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -168,8 +168,8 @@
                         .setPositiveButton(android.R.string.ok, this)
                         .setNegativeButton(android.R.string.cancel, this)
                         .create();
-                ad.getButton(AlertDialog.BUTTON_POSITIVE)
-                        .setFilterTouchesWhenObscured(true);
+                ad.create();
+                ad.getButton(AlertDialog.BUTTON_POSITIVE).setFilterTouchesWhenObscured(true);
                 return ad;
             }
             case DIALOG_ID_DISABLE_WARNING: {
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
index d687136..a86f15f 100755
--- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
@@ -143,7 +143,10 @@
 
             if (timeout > 0) {
                 BluetoothDiscoverableTimeoutReceiver.setDiscoverableAlarm(mContext, endTimestamp);
+            } else {
+                BluetoothDiscoverableTimeoutReceiver.cancelDiscoverableAlarm(mContext);
             }
+
         } else {
             mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
             BluetoothDiscoverableTimeoutReceiver.cancelDiscoverableAlarm(mContext);