Merge "Don't keep screen on during read tag on locked screen"
am: b5bc349c88

Change-Id: I4c63d405741168517d14be2631941e0c407d90a8
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 44d8e65..ab3e244 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -3,7 +3,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"‏خدمة NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"‏تم تفعيل NFC."</string>
+    <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"‏تم تمكين NFC."</string>
     <string name="tap_to_beam" msgid="5819197866281059878">"Tap to beam"</string>
     <string name="beam_progress" msgid="7453634884807323920">"بيانات واردة..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"إرسال لاسلكي..."</string>
@@ -23,7 +23,7 @@
     <string name="disconnected_peripheral" msgid="4470578100296504366">"تم إلغاء الاتصال بـ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="pairing_peripheral" msgid="6983626861540899365">"جارٍ إقران <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="pairing_peripheral_failed" msgid="6087643307743264679">"تعذر إقران <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <string name="failed_to_enable_bt" msgid="7229153323594758077">"تعذر تفعيل بلوتوث"</string>
+    <string name="failed_to_enable_bt" msgid="7229153323594758077">"تعذر تمكين بلوتوث"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"هل تريد فعلًا إقران جهاز بلوتوث <xliff:g id="DEVICE_NAME">%1$s</xliff:g>؟"</string>
     <string name="pair_yes" msgid="3525614878559994448">"نعم"</string>
     <string name="pair_no" msgid="5022308368904055020">"لا"</string>
@@ -40,7 +40,7 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"تم الاتصال"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"الاتصال بالشبكة"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"هل تريد الاتصال بالشبكة <xliff:g id="NETWORK_SSID">%1$s</xliff:g>؟"</string>
-    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"‏يتطلب شعاع Android تفعيل ميزة NFC. هل تريد تفعيلها؟"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"‏يتطلب شعاع Android تمكين ميزة NFC. هل تريد تمكينها؟"</string>
     <string name="android_beam" msgid="1666446406999492763">"‏شعاع Android"</string>
     <string name="beam_requires_external_storage_permission" msgid="8798337545702206901">"لا يحتوي التطبيق على إذن سعة تخزين خارجية، إلا أنه مطلوب لإرسال هذا الملف"</string>
     <string name="title_confirm_url_open" msgid="8069968913244794478">"هل تريد فتح الرابط؟"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ae983a7..865c191 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -25,7 +25,7 @@
     <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Koppeln mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nicht möglich"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth konnte nicht aktiviert werden."</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Möchtest du das Bluetooth-Gerät <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wirklich koppeln?"</string>
-    <string name="pair_yes" msgid="3525614878559994448">"\"Ja\""</string>
+    <string name="pair_yes" msgid="3525614878559994448">"Ja"</string>
     <string name="pair_no" msgid="5022308368904055020">"Nein"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"Halte dein Gerät erneut ans Terminal, um mit <xliff:g id="APP">%1$s</xliff:g> zu bezahlen."</string>
     <string name="tap_again_to_complete" msgid="5423640945118279123">"Halte dein Gerät erneut ans Terminal, um den Vorgang mit <xliff:g id="APP">%1$s</xliff:g> durchzuführen."</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 7e731f9..d3857c0 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -24,7 +24,7 @@
     <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի զուգավորում"</string>
     <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Չհաջողվեց զուգավորել <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքը"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Չհաջողվեց միացնել Bluetooth-ը"</string>
-    <string name="confirm_pairing" msgid="4112568077038265363">"Իսկապե՞ս ուզում եք զուգավորել <xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth սարքը:"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"Վստա՞հ եք, որ ցանկանում եք զուգավորել <xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth սարքը:"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Այո"</string>
     <string name="pair_no" msgid="5022308368904055020">"Ոչ"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"Կրկին հպեք՝ <xliff:g id="APP">%1$s</xliff:g> հավելվածով վճարելու համար"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d70fb19..bccc3b3 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -11,7 +11,7 @@
     <string name="beam_failed" msgid="5116241718189888630">"Beam tidak lengkap"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Beam dibatalkan"</string>
     <string name="cancel" msgid="61873902552555096">"Batal"</string>
-    <string name="beam_tap_to_view" msgid="7430394753262448349">"Tap untuk melihat"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Ketuk untuk melihat"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Perangkat penerima tidak mendukung transfer file besar melalui beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Kumpulkan lagi perangkatnya"</string>
     <string name="beam_busy" msgid="5253335587620612576">"Beam sedang sibuk. Coba lagi jika transfer sebelumnya telah selesai."</string>
@@ -27,14 +27,14 @@
     <string name="confirm_pairing" msgid="4112568077038265363">"Yakin ingin menyandingkan perangkat Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Ya"</string>
     <string name="pair_no" msgid="5022308368904055020">"Tidak"</string>
-    <string name="tap_again_to_pay" msgid="5754988005412859897">"Tap lagi untuk membayar dengan <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="tap_again_to_complete" msgid="5423640945118279123">"Tap lagi untuk menyelesaikan dengan <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="tap_again_to_pay" msgid="5754988005412859897">"Ketuk lagi untuk membayar dengan <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="tap_again_to_complete" msgid="5423640945118279123">"Ketuk lagi untuk menyelesaikan dengan <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="transaction_failure" msgid="7828102078637936513">"Transaksi ini tidak dapat diselesaikan dengan <xliff:g id="APP">%1$s</xliff:g>."</string>
     <string name="could_not_use_app" msgid="8137587876138569083">"Tidak dapat menggunakan <xliff:g id="APP">%1$s</xliff:g>."</string>
     <string name="pay_with" msgid="5531545488795798945">"Bayar dengan"</string>
     <string name="complete_with" msgid="6797459104103012992">"Selesaikan dengan"</string>
-    <string name="default_pay_app_removed" msgid="4108250545457437360">"Layanan pilihan Anda untuk tap &amp; bayar telah dihapus. Pilih yang lain?"</string>
-    <string name="ask_nfc_tap" msgid="2925239870458286340">"Tap perangkat lain untuk menyelesaikan"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"Layanan pilihan Anda untuk ketuk &amp; bayar telah dihapus. Pilih yang lain?"</string>
+    <string name="ask_nfc_tap" msgid="2925239870458286340">"Ketuk perangkat lain untuk menyelesaikan"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"Sambungkan"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"Tidak dapat menyambung ke jaringan"</string>
     <string name="status_wifi_connected" msgid="5893022897732105739">"Tersambung"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index de500db..ea14b06 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -33,14 +33,14 @@
     <string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g> वापरू शकलो नाही."</string>
     <string name="pay_with" msgid="5531545488795798945">"यासह देय द्या"</string>
     <string name="complete_with" msgid="6797459104103012992">"यासह पूर्ण करा"</string>
-    <string name="default_pay_app_removed" msgid="4108250545457437360">"टॅप आणि पे साठीची तुमची अग्रमानांकित सेवा काढली. दुसरी निवडायची?"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"टॅप आणि पे साठीची आपली अग्रमानांकित सेवा काढली. दुसरी निवडायची?"</string>
     <string name="ask_nfc_tap" msgid="2925239870458286340">"पूर्ण करण्यासाठी दुसरे डिव्हाइस टॅप करा"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"कनेक्ट करा"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"नेटवर्कशी कनेक्‍ट करण्‍यात अक्षम"</string>
     <string name="status_wifi_connected" msgid="5893022897732105739">"कनेक्ट केले"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"नेटवर्कवर कनेक्ट करा"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> नेटवर्कशी कनेक्ट करायचे?"</string>
-    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam ला सक्षम करण्यासाठी NFC आवश्यक आहे. तुम्ही हे सक्षम करू इच्छिता?"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam ला सक्षम करण्यासाठी NFC आवश्यक आहे. आपण हे सक्षम करू इच्छिता?"</string>
     <string name="android_beam" msgid="1666446406999492763">"Android बीम"</string>
     <string name="beam_requires_external_storage_permission" msgid="8798337545702206901">"अॅप्लिकेशनला बाह्य स्टोरेज परवानगी नाही. ही फाइल बीम करण्यासाठी हे आवश्यक आहे"</string>
     <string name="title_confirm_url_open" msgid="8069968913244794478">"लिंक उघडायची का?"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 4d34571..5119190 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -4,7 +4,7 @@
     <string name="app_name" msgid="78565911793142902">"Nfc सेवा"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC सक्षम"</string>
-    <string name="tap_to_beam" msgid="5819197866281059878">"बिम गर्नाका लागि ट्याप गर्नुहोस्"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"बिम गर्नका लागि ट्याप गर्नुहोस्"</string>
     <string name="beam_progress" msgid="7453634884807323920">"आगमन बिम..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"बिम गर्दै..."</string>
     <string name="beam_complete" msgid="477026736424637435">"बिम पुरा भयो"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2b3733d..09d6f98 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="78565911793142902">"Dịch vụ NFC"</string>
+    <string name="app_name" msgid="78565911793142902">"Dịch vụ Nfc"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"Đã bật NFC."</string>
     <string name="tap_to_beam" msgid="5819197866281059878">"Nhấn để truyền"</string>