diff --git a/Android.mk b/Android.mk
index 2f5465c..fbdb14b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,10 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH := $(call my-dir)
+
 include $(CLEAR_VARS)
 
+LOCAL_PACKAGE_NAME := EmergencyInfo
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_MODULE_TAGS := eng
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
+LOCAL_PRIVILEGED_MODULE := true
+
 LOCAL_STATIC_ANDROID_LIBRARIES := \
     android-support-v14-preference \
     android-support-v13 \
@@ -23,25 +30,19 @@
     android-support-v7-preference \
     android-support-v7-recyclerview \
     android-support-v4 \
-    android-support-design \
+    $(ANDROID_SUPPORT_DESIGN_TARGETS) \
     android-support-transition
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
-
 LOCAL_USE_AAPT2 := true
 
-LOCAL_PACKAGE_NAME := EmergencyInfo
-LOCAL_PRIVATE_PLATFORM_APIS := true
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
 LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.emergency.*
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include frameworks/base/packages/SettingsLib/common.mk
 
 include $(BUILD_PACKAGE)
 
-include $(call all-makefiles-under,$(LOCAL_PATH))
+include $(call first-makefiles-under, $(LOCAL_PATH))
diff --git a/res/drawable/ic_account_circle.xml b/res/drawable/ic_account_circle.xml
index a924cd1..5e5fbc5 100644
--- a/res/drawable/ic_account_circle.xml
+++ b/res/drawable/ic_account_circle.xml
@@ -20,6 +20,6 @@
     android:viewportHeight="24.0"
     android:tint="#61000000">
     <path
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"
+        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10,-4.48 10-10S17.52 2 12 2zm0 3c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3zm0 14.2c-2.5 0-4.71-1.28-6-3.22.03-1.99 4-3.08 6-3.08 1.99 0 5.97 1.09 6 3.08-1.29 1.94-3.5 3.22-6 3.22z"
         android:fillColor="#FFFFFFFF"/>
 </vector>
diff --git a/res/drawable/ic_add_24dp.xml b/res/drawable/ic_add_24dp.xml
index 2c92dae..6de5db3 100644
--- a/res/drawable/ic_add_24dp.xml
+++ b/res/drawable/ic_add_24dp.xml
@@ -18,8 +18,8 @@
     android:height="24dp"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0"
-    android:tint="?attr/colorControlNormal">
+    android:tint="#61000000">
     <path
-        android:fillColor="#4285F4"
-        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M18,13h-5v5c0,0.55-0.45,1-1,1h0c-0.55,0-1-0.45-1-1v-5H6c-0.55,0-1-0.45-1-1v0c0-0.55,0.45-1,1-1h5V6c0-0.55,0.45-1,1-1h0 c0.55,0,1,0.45,1,1v5h5c0.55,0,1,0.45,1,1v0C19,12.55,18.55,13,18,13z" />
 </vector>
diff --git a/res/drawable/ic_address_black_24dp.xml b/res/drawable/ic_address_black_24dp.xml
index f5d0209..76176be 100644
--- a/res/drawable/ic_address_black_24dp.xml
+++ b/res/drawable/ic_address_black_24dp.xml
@@ -21,5 +21,5 @@
     android:tint="#61000000">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
+        android:pathData="M10 20v-6h4v6h4c.55 0 1-.45 1-1v-7h1.7c.46 0 .68-.57.33-.87L12.67 3.6c-.38-.34-.96-.34-1.34 0l-8.36 7.53c-.34.3-.13.87.33.87H5v7c0 .55.45 1 1 1h4z" />
 </vector>
diff --git a/res/drawable/ic_allergies_black_24dp.xml b/res/drawable/ic_allergies_black_24dp.xml
index 140dfc3..595cfa2 100644
--- a/res/drawable/ic_allergies_black_24dp.xml
+++ b/res/drawable/ic_allergies_black_24dp.xml
@@ -20,6 +20,6 @@
     android:viewportHeight="24.0"
     android:tint="#61000000">
     <path
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"
+        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zM4 12c0-4.42 3.58-8 8-8 1.85 0 3.55.63 4.9 1.69L5.69 16.9C4.63 15.55 4 13.85 4 12zm8 8c-1.85 0-3.55-.63-4.9-1.69L18.31 7.1C19.37 8.45 20 10.15 20 12c0 4.42-3.58 8-8 8z"
         android:fillColor="#FFFFFFFF"/>
 </vector>
diff --git a/res/drawable/ic_bloodtype_black_24dp.xml b/res/drawable/ic_bloodtype_black_24dp.xml
index dc21cff..6960f0b 100644
--- a/res/drawable/ic_bloodtype_black_24dp.xml
+++ b/res/drawable/ic_bloodtype_black_24dp.xml
@@ -21,5 +21,5 @@
     android:tint="#61000000">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M17.7,7.9L12,2.3L6.3,7.9c-3.1,3.1 -3.1,8.2 0,11.3c1.6,1.6 3.6,2.3 5.7,2.3s4.1,-0.8 5.7,-2.3C20.8,16.1 20.8,11.1 17.7,7.9z"/>
+        android:pathData="M17.7,7.9l-5-4.91c-0.39-0.38-1.01-0.38-1.4,0l-5,4.91c-3.1,3.1-3.1,8.2,0,11.3c1.6,1.6,3.6,2.3,5.7,2.3s4.1-0.8,5.7-2.3 C20.8,16.1,20.8,11.1,17.7,7.9z"/>
 </vector>
diff --git a/res/drawable/ic_heart_black_24dp.xml b/res/drawable/ic_heart_black_24dp.xml
index b675eb8..893337a 100644
--- a/res/drawable/ic_heart_black_24dp.xml
+++ b/res/drawable/ic_heart_black_24dp.xml
@@ -20,6 +20,6 @@
     android:viewportHeight="24.0"
     android:tint="#61000000">
     <path
-        android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"
+        android:pathData="M12.67 20.74c-.38.34-.96.34-1.34 0l-.78-.71C5.3 15.27 1.87 12.16 2 8.28c.06-1.7.93-3.33 2.34-4.29 2.64-1.8 5.9-.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41.96 2.28 2.59 2.34 4.29.14 3.88-3.3 6.99-8.55 11.76l-.78.7z"
         android:fillColor="#FFFFFFFF"/>
 </vector>
diff --git a/res/drawable/ic_medication_24dp.xml b/res/drawable/ic_medication_24dp.xml
index cf399e8..41b18ad 100644
--- a/res/drawable/ic_medication_24dp.xml
+++ b/res/drawable/ic_medication_24dp.xml
@@ -21,8 +21,5 @@
     android:tint="#61000000">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M5,2.8h14v3h-14z"/>
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M6,6.8v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2v-12H6zM16,15.6H8V8.8h8V15.6z"/>
+        android:pathData="M5.71 3h12.57c.95 0 1.72.67 1.72 1.5S19.23 6 18.29 6H5.71C4.77 6 4 5.33 4 4.5S4.77 3 5.71 3zM6 7v12c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6zm10 9H8V9h8v7z"/>
 </vector>
diff --git a/res/drawable/ic_mode_edit_24dp.xml b/res/drawable/ic_mode_edit_24dp.xml
index e54e8e9..275f97b 100644
--- a/res/drawable/ic_mode_edit_24dp.xml
+++ b/res/drawable/ic_mode_edit_24dp.xml
@@ -13,8 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+    android:width="24dp"
+    android:tint="#61000000">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M3 18.08v2.42c0 .28.22.5.5.5h2.42c.53 0 1.04-.21 1.41-.59L17.81 9.94l-3.75-3.75L3.59 16.66c-.38.38-.59.89-.59 1.42zM20.71 7.04a.996.996 0 0 0 0-1.41l-2.34-2.34a.996.996 0 0 0-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"/>
 </vector>
diff --git a/res/drawable/ic_mode_edit_googblue_24dp.xml b/res/drawable/ic_mode_edit_googblue_24dp.xml
deleted file mode 100644
index f6ad246..0000000
--- a/res/drawable/ic_mode_edit_googblue_24dp.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#4285F4" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-</vector>
diff --git a/res/drawable/ic_notes_black_24dp.xml b/res/drawable/ic_notes_black_24dp.xml
index a3c0829..1aa9668 100644
--- a/res/drawable/ic_notes_black_24dp.xml
+++ b/res/drawable/ic_notes_black_24dp.xml
@@ -21,6 +21,6 @@
     android:viewportHeight="24.0"
     android:tint="#61000000">
     <path
-        android:pathData="M19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM14,17L7,17v-2h7v2zM17,13L7,13v-2h10v2zM17,9L7,9L7,7h10v2z"
+        android:pathData="M19 3h-4.18C14.4 1.84 13.3 1 12 1c-1.3 0-2.4.84-2.82 2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-7 0c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm2 14H7v-2h7v2zm3-4H7v-2h10v2zm0-4H7V7h10v2z"
         android:fillColor="#FFFFFFFF"/>
 </vector>
diff --git a/res/layout/custom_preference_category_layout.xml b/res/layout/custom_preference_category_layout.xml
index 9a1dcd4..03dfa00 100644
--- a/res/layout/custom_preference_category_layout.xml
+++ b/res/layout/custom_preference_category_layout.xml
@@ -18,4 +18,4 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:textSize="0pt"/>
-<!-- Use 0pt so that the category title does not show-->
\ No newline at end of file
+<!-- Use 0pt so that the category title does not show-->
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 2dccaa5..fbed451 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Vee alles uit"</string>
     <string name="clear" msgid="3648880442502887163">"Vee uit"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Vee alle inligting en kontakte uit?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"As jy mediese inligting en noodkontakte byvoeg, kan dit diegene help wat eerste in \'n noodsituasie reageer.\n\nEnigeen kan hierdie inligting op jou sluitskerm lees sonder om jou foon te ontsluit."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"As jy mediese inligting en noodkontakte byvoeg, kan dit dié help wat in \'n noodgeval eerste reageer.\n\nEnigiemand kan hierdie inligting op jou sluitskerm lees en jou kontakte bel deur op hul name te tik sonder om jou foon te ontsluit."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Voeg noodinligting by"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Help diegene wat eerste reageer om belangrike inligting te kry"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index e27169f..f7b9b50 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"ሁሉንም አጽዳ"</string>
     <string name="clear" msgid="3648880442502887163">"አጽዳ"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"ሁሉንም መረጃ እና እውቂያዎች ይጸዱ?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"የሕክምና መረጃ እና የድንገተኛ አደጋ ጊዜ ተጠሪን ማከል በድንገተኛ አደጋ ጊዜ ውስጥ በመጀመሪያ ለሚደርሱ ሰዎች ሊያግዛቸው ይችላል።\n\nየእርስዎን ስልክ ሳይከፍት ማንም ሰው ይህን መረጃ ለማንበብ ይችላል።"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"የሕክምና መረጃ እና የድንገተኛ አደጋ ጊዜ ተጠሪን ማከል በድንገተኛ አደጋ ጊዜ ላይ መጀመሪያ ለሚደርሱ ሰዎች ሊያግዛቸው ይችላል።\n\nማንኛውም ሰው የእርስዎን ስልክ ሳይከፍት ይህን መረጃ ከማያ ገጽ ቁልፍዎ ማንበብ እና ስማቸውን እውቂያዎችዎን መታ በማድረግ ሊደውልላቸው ይችላል።"</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"የድንገተኛ አደጋ ጊዜ ተጠሪ መረጃን ያክሉ"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"በመጀመሪያ ለሚደርሱ ሰዎች አስፈላጊ መረጃ እንዲያገኙ ያግዙ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 389542d..1b94385 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -96,14 +96,14 @@
     <string name="fail_add_contact" msgid="6511490846952942291">"يتعذر قراءة معلومات الاتصال على نحو سليم"</string>
     <string name="remove" msgid="1243949503772376064">"إزالة"</string>
     <string name="cancel" msgid="7401575239009060939">"إلغاء"</string>
-    <string name="ok" msgid="163967937451981024">"موافق"</string>
+    <string name="ok" msgid="163967937451981024">"حسنًا"</string>
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"لا تتوفر معلومات حول مالك الهاتف"</string>
     <string name="tap_pencil" msgid="2723698054265296934">"إذا كان هذا هاتفك، فانقر على رمز القلم لإضافة معلومات يتم عرضها هنا في حالة الطوارئ."</string>
     <string name="clear_all" msgid="8899013032870561633">"مسح الكل"</string>
     <string name="clear" msgid="3648880442502887163">"مسح"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"هل تريد مسح جميع المعلومات وجهات الاتصال؟"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"يمكن أن تساعد إضافة المعلومات الطبية وجهات اتصال الطوارئ أول المستجيبين في حالة الطوارئ.\n\nيمكن لأي شخص قراءة هذه المعلومات من شاشة التأمين بدون إلغاء قفل هاتفك."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"يمكن لإضافة المعلومات الطبية وجهات الاتصال أن تساعد فرق الاستجابة الفورية في حالات الطوارئ.\n\nويمكن لأي شخص قراءة هذه المعلومات من شاشة التأمين ومكالمة جهات الاتصال التابعة لك بالنقر على أسمائها من دون الحاجة إلى فتح قفل هاتفك."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"إضافة معلومات الطوارئ"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"مساعدة أول المستجيبين في العثور على المعلومات المهمة"</string>
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index e8ba94d..234c058 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Hamısını silin"</string>
     <string name="clear" msgid="3648880442502887163">"Təmizləyin"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Bütün məlumat və kontaktlar silinsin?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Tibbi məlumat və mühüm kontaktları əlavə etmək fövqəladə hallarda ilk cavab verənlərə kömək edə bilər.\n\nİstənilən şəxs telefonunuzu kiliddən çıxarmadan kilid ekranından bu məlumatı oxuya bilər."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Tibbi məlumat və mühüm kontaktları əlavə etmək fövqəladə hallarda ilk cavab verənlərə kömək edə bilər.\n\nHər kəs telefonunuzu kiliddən çıxarmadan kilid ekranından bu məlumatı oxuya və kontakt adlarına klikləməklə onları yığa bilər."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Mühüm məlumat əlavə edin"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"İlk cavab verənlərə mühüm məlumatı tapmaqda kömək edin"</string>
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 0df504d..a7493f3 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Obriši sve"</string>
     <string name="clear" msgid="3648880442502887163">"Obriši"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Želite li da obrišete sve informacije i kontakte?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Ako dodate medicinske podatke i kontakte za hitne slučajeve, možete da pomognete ekipama hitnih službi u hitnim slučajevima.\n\nSvako može da pročita te podatke sa zaključanog ekrana bez otključavanja telefona."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Ako dodate medicinske podatke i kontakte za hitne slučajeve, možete da pomognete ekipama hitnih službi u hitnim slučajevima.\n\nSvako može da pročita te podatke sa zaključanog ekrana bez otključavanja telefona."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Dodajte informacije za hitne slučajeve"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Pomozite ekipama hitnih službi da pronađu važne informacije"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 2e85a60..7936f32 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Ачысціць усё"</string>
     <string name="clear" msgid="3648880442502887163">"Ачысціць"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Ачысціць усю інфармацыю і кантакты?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Медыцынская інфармацыя і кантакты для экстранных сітуацый, якія вы ўведзяце, могуць быць карыснымі для асоб, якія будуць аказваць першую дапамогу ў выпадку надзвычайнай сітуацыі.\n\nЛюбы чалавек можа прачытаць яе на экране блакіроўкі, не разблакіроўваючы тэлефон."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Медыцынская інфармацыя і кантакты для экстранных сітуацый, якія вы ўведзяце, могуць быць карыснымі для асоб, якія будуць аказваць першую дапамогу ў выпадку надзвычайнай сітуацыі.\n\nЛюбы чалавек можа прачытаць яе на экране блакіроўкі, не разблакіроўваючы тэлефон."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Увядзіце даныя на надзвычайны выпадак"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Дапамажыце тым, хто будзе аказваць першую дапамогу, знайсці важную інфармацыю"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index b2e50b0..7c08868 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -100,10 +100,10 @@
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"Няма информация за собственика на телефона"</string>
     <string name="tap_pencil" msgid="2723698054265296934">"Ако това е вашият телефон, докоснете иконата на молив, за да добавите информация, която ще се показва тук при спешни случаи"</string>
-    <string name="clear_all" msgid="8899013032870561633">"Изчиств. на вс."</string>
+    <string name="clear_all" msgid="8899013032870561633">"Изчиств. на всичко"</string>
     <string name="clear" msgid="3648880442502887163">"Изчистване"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Да се изчистят ли всички данни и контакти?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Добавянето на медицинска информация и контакти за спешни случаи може да помогне на органите за бързо реагиране при необходимост.\n\nВсеки може да прочете тази информация на заключения ви екран, без да отключва телефона ви."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Добавянето на медицинска информация и контакти за спешни случаи може да помогне на органите за бързо реагиране при необходимост.\n\nВсеки може да прочете тази информация на заключения ви екран и да набере контактите ви, като докосне имената им, без да отключва телефона ви."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Добавяне на информация за спешни случаи"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Помогнете на органите за бързо реагиране да намерят важна информация"</string>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 473550e..31b464e 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -71,7 +71,7 @@
     <string name="ab_positive" msgid="1931300033534642005">"এ বি পজেটিভ"</string>
     <string name="ab_negative" msgid="2064555613093591729">"এ বি নেগেটিভ"</string>
     <string name="h_h" msgid="2183333409760379720">"এইচ এইচ"</string>
-    <string name="allergies" msgid="2789200777539258165">"এলার্জি"</string>
+    <string name="allergies" msgid="2789200777539258165">"অ্যালার্জি"</string>
     <string name="unknown_allergies" msgid="4383115953418061237">"অজানা"</string>
     <string name="allergies_hint" msgid="5488918780522184147">"যেমন, চীনাবাদাম"</string>
     <string name="medications" msgid="644428945685557183">"ঔষধ"</string>
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"সবকিছু সাফ করুন"</string>
     <string name="clear" msgid="3648880442502887163">"সাফ করুন"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"সমস্ত তথ্য ও পরিচিতি সাফ করবেন?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"চিকিৎসা বিষয়ক তথ্য এবং জরুরি পরিচিতি যোগ করলে জরুরি অবস্থাতে যারা আপনাকে প্রথম সাহায্য করবে তাদের জন্য সহায়ক হতে পারে।\n\nআপনার ফোন আনলক না করেই লক স্ক্রিন থেকে যেকেউ এই তথ্য পড়তে পারবে।"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"জরুরি পরিস্থিতিতে যারা আপনাকে সাহায্য করতে এগিয়ে আসবেন, মেডিকেল তথ্য এবং আপদকালীন যোগাযোগের নম্বর লেখা থাকলে তাদের সুবিধা হবে।\n\nআপনার ফোন আনলক না করেই যেকেউ আপনার লক স্ক্রিনে এই তথ্য পড়তে এবং আপনার পরিচিতিদের নামে ট্যাপ করে তাদের কল করতে পারবেন।"</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"জরুরি তথ্য যোগ করুন"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"আপনাকে যারা সাহায্য করতে এগিয়ে আসবে তাদের সঠিক তথ্য পেতে সাহায্য করুন"</string>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 208cbec..2d782a3 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -102,8 +102,8 @@
     <string name="tap_pencil" msgid="2723698054265296934">"Ako je ovo vaš telefon, dodirnite ikonu olovke da dodate informacije koje će se ovdje prikazati u hitnom slučaju"</string>
     <string name="clear_all" msgid="8899013032870561633">"Obriši sve"</string>
     <string name="clear" msgid="3648880442502887163">"Obriši"</string>
-    <string name="clear_all_message" msgid="1548432000373861295">"Želite li obrisati sve informacije i kontakte?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Ako dodate informacije o zdravstvenom stanju i kontakte za hitne slučajeve, možete pomoći osobama koje prve reagiraju u hitnim slučajevima.\n\nSvako može pročitati te informacije sa zaključanog ekrana, bez otključavanja uređaja."</string>
+    <string name="clear_all_message" msgid="1548432000373861295">"Obrisati sve informacije i kontakte?"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Dodavanje informacija o zdravstvenom stanju i kontaktima za hitne slučajeve može pomoći osobama koje prve reagiraju u hitnim slučajevima.\n\nSvako može pročitati te informacije s vašeg zaključanog ekrana i bez otključavanja ekrana pozvati vaše kontakte dodirom na njihovo ime."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Dodajte informacije za hitne slučajeve"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Pomozite prvim osobama koje će reagirati da pronađu važne informacije"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 449bc90..24f395e 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Esborra-ho tot"</string>
     <string name="clear" msgid="3648880442502887163">"Esborra"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Vols esborrar tota la informació i tots els contactes?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Afegir informació mèdica i contactes d\'emergència pot ser útil per als serveis d\'emergència.\n\nQualsevol persona pot consultar aquesta informació a la pantalla de bloqueig sense desbloquejar el telèfon."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Afegir informació mèdica i contactes d\'emergència pot ser útil per als serveis d\'emergència.\n\nTothom pot veure aquesta informació des de la pantalla de bloqueig i tocar els noms dels teus contactes per trucar-los sense desbloquejar el telèfon."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Afegeix la informació d\'emergència"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Ajuda els serveis d\'emergència a trobar la informació important"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index dbfb7ef..3980509 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Vymazat vše"</string>
     <string name="clear" msgid="3648880442502887163">"Vymazat"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Vymazat všechny údaje a kontakty?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Přidáním zdravotních údajů a nouzových kontaktů pomůžete osobám zasahujícím v nouzové situaci.\n\nTyto informace si na obrazovce uzamčení může přečíst kdokoliv, aniž by telefon musel odemykat."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Přidáním zdravotních údajů a nouzových kontaktů pomůžete osobám zasahujícím v nouzové situaci.\n\nTyto informace si na obrazovce uzamčení může přečíst kdokoliv, aniž by telefon musel odemykat. Kontakty může vytočit klepnutím na příslušné jméno."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Přidejte nouzové informace"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Pomozte lidem najít v nouzové situaci důležité informace"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 43867b8..f175b8b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -87,11 +87,11 @@
     <!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
-    <string name="emergency_contacts_title" msgid="5462202017417821030">"Kontaktpersoner til nødsituationer"</string>
+    <string name="emergency_contacts_title" msgid="5462202017417821030">"Kontaktpersoner ved nødsituationer"</string>
     <string name="add_emergency_contact" msgid="4063577069613981029">"Tilføj kontaktperson"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"Der kunne ikke findes en kontaktpersonvælger"</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"Kontaktpersonen kan ikke vises"</string>
-    <string name="remove_contact" msgid="6934983445723096759">"Vil du fjerne <xliff:g id="CONTACT_NAME">%1$s</xliff:g> fra kontaktpersoner til nødsituationer?"</string>
+    <string name="remove_contact" msgid="6934983445723096759">"Vil du fjerne <xliff:g id="CONTACT_NAME">%1$s</xliff:g> fra kontaktpersoner ved nødsituationer?"</string>
     <string name="remove_contact_icon_text" msgid="4576641386490101363">"Fjern kontaktperson"</string>
     <string name="fail_add_contact" msgid="6511490846952942291">"Kontaktoplysningerne kunne ikke læses korrekt"</string>
     <string name="remove" msgid="1243949503772376064">"Fjern"</string>
@@ -100,10 +100,10 @@
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"Der er ingen oplysninger om telefonens ejer"</string>
     <string name="tap_pencil" msgid="2723698054265296934">"Hvis dette er din telefon, skal du trykke på blyantikonet for at tilføje information, som vises her, hvis der opstår en nødsituation"</string>
-    <string name="clear_all" msgid="8899013032870561633">"Ryd alle"</string>
+    <string name="clear_all" msgid="8899013032870561633">"Ryd alt"</string>
     <string name="clear" msgid="3648880442502887163">"Ryd"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Vil du rydde alle oplysninger og kontaktpersoner?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Hvis du tilføjer lægeoplysninger og kontaktpersoner til nødsituationer, kan det hjælpe førstehjælpsydere i en nødsituation.\n\nAlle kan læse disse oplysninger på din låseskærm uden at låse telefonen op."</string>
-    <string name="settings_suggestion_title" msgid="2503369576806243476">"Tilføj oplysninger i nødsituationer"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Hvis du tilføjer helbredsoplysninger og kontaktpersoner til brug i nødsituationer, kan det hjælpe førstehjælpsydere i en nødsituation.\n\nAlle kan få adgang til disse oplysninger på din låseskærm og ringe til dine kontaktpersoner ved at trykke på deres navne uden at låse telefonen op."</string>
+    <string name="settings_suggestion_title" msgid="2503369576806243476">"Tilføj info til nødsituationer"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Hjælp førstehjælpsydere med at finde vigtige oplysninger"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5e6a339..7ae9160 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -99,11 +99,11 @@
     <string name="ok" msgid="163967937451981024">"OK"</string>
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"Keine Informationen über den Eigentümer des Smartphones verfügbar"</string>
-    <string name="tap_pencil" msgid="2723698054265296934">"Wenn du der Eigentümer dieses Smartphones bist, tippe auf das Bleistiftsymbol, um Informationen hinzuzufügen, die im Notfall eingeblendet werden"</string>
+    <string name="tap_pencil" msgid="2723698054265296934">"Wenn du der Eigentümer dieses Smartphones bist, tippe auf das Stiftsymbol, um Informationen hinzuzufügen, die im Notfall eingeblendet werden"</string>
     <string name="clear_all" msgid="8899013032870561633">"Alle löschen"</string>
     <string name="clear" msgid="3648880442502887163">"Löschen"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Möchtest du alle Informationen und Kontakte löschen?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Medizinische Informationen und Notfallkontakte können Ersthelfern im Notfall sehr hilfreich sein.\n\nDiese Angaben sind für alle auf dem Sperrbildschirm sichtbar, ohne dass dein Smartphone entsperrt werden muss."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Medizinische Informationen und Kontaktangaben können Ersthelfern im Notfall sehr helfen.\n\nDiese Angaben sind für alle auf dem Sperrbildschirm sichtbar und die Kontakte können durch einfaches Tippen auf den Namen angerufen werden, ohne dass dein Smartphone entsperrt werden muss."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Notfallinformationen hinzufügen"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Ersthelfern wichtige Informationen zur Verfügung stellen"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index d82605e..5c5dca6 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Διαγραφή όλων"</string>
     <string name="clear" msgid="3648880442502887163">"Διαγραφή"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Να διαγραφούν όλες οι πληροφορίες και οι επαφές;"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Η προσθήκη ιατρικών πληροφοριών και επαφών έκτακτης ανάγκης μπορεί να βοηθήσει τα άτομα που ανταποκρίνονται πρώτα σε περίπτωση έκτακτης ανάγκης.\n\nΟποιοσδήποτε μπορεί να διαβάσει αυτές τις πληροφορίες από την οθόνη κλειδώματος χωρίς να ξεκλειδώσει το τηλέφωνό σας."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Η προσθήκη ιατρικών πληροφοριών και επαφών έκτακτης ανάγκης μπορεί να βοηθήσει τα άτομα που ανταποκρίνονται πρώτα σε περίπτωση έκτακτης ανάγκης.\n\nΟποιοσδήποτε μπορεί να διαβάσει αυτές τις πληροφορίες από την οθόνη κλειδώματος και να καλέσει τις επαφές σας πατώντας στα ονόματά τους, χωρίς να ξεκλειδώσει το τηλέφωνό σας."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Προσθήκη πληροφοριών έκτακτης ανάγκης"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Βοηθήστε τα άτομα που ανταποκρίνονται πρώτα σε έκτακτα περιστατικά να βρουν σημαντικές πληροφορίες"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 49b6ae2..fce6ab1 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Clear all"</string>
     <string name="clear" msgid="3648880442502887163">"Clear"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Clear all information and contacts?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Adding medical information and emergency contacts can help first responders in an emergency.\n\nAnyone can read this information from your lock screen without unlocking your phone."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Adding medical information and emergency contacts can help first responders in an emergency.\n\nAnyone can read this information from your lock screen, and dial your contacts by tapping their names, without unlocking your phone."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Add emergency information"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Help first responders find important information"</string>
 </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..fce6ab1
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="1090682794607161063">"Emergency information"</string>
+    <string name="medical_info_title" msgid="3000192781136934887">"Medical information"</string>
+    <string name="edit_medical_info" msgid="6733720353375319476">"Edit information"</string>
+    <string name="edit_info" msgid="5973929805855224805">"Edit emergency information"</string>
+    <string name="tab_title_info" msgid="1402033103294855812">"Info"</string>
+    <string name="tab_title_contacts" msgid="4298341166404791209">"Contacts"</string>
+    <string name="name" msgid="4286267457738861977">"Name"</string>
+    <string name="unknown_name" msgid="2834802479170495056">"Unknown"</string>
+    <string name="address" msgid="6449303483151189969">"Address"</string>
+    <string name="unknown_address" msgid="4212576729941786121">"Unknown"</string>
+    <string name="date_of_birth" msgid="777979232444227891">"Date of birth"</string>
+    <string name="unknown_date_of_birth" msgid="7416355536916066758">"Unknown"</string>
+    <string name="dob" msgid="2813161080307245706">"(<xliff:g id="DATE_OF_BIRTH">%1$s</xliff:g>)"</string>
+    <string name="age" msgid="8327537794752630199">"Age: <xliff:g id="NUMERICAL_AGE">%1$d</xliff:g>"</string>
+    <string name="remove_dob_icon_text" msgid="4413507180967999944">"Remove date of birth"</string>
+    <string name="blood_type" msgid="6947022772999974608">"Blood type"</string>
+    <string name="unknown_blood_type" msgid="6337228278125085668">"Unknown"</string>
+    <string name="oplus" msgid="7759756742377867011">"O+"</string>
+    <string name="ominus" msgid="5227278501191741055">"O-"</string>
+    <string name="aplus" msgid="4982472245421753463">"A+"</string>
+    <string name="aminus" msgid="1469727296074783670">"A-"</string>
+    <string name="bplus" msgid="5395850743718234762">"B+"</string>
+    <string name="bminus" msgid="3813367242072886088">"B-"</string>
+    <string name="abplus" msgid="8061792867513932701">"AB+"</string>
+    <string name="abminus" msgid="2510867828094325481">"AB-"</string>
+    <string name="hh" msgid="3071675674015857183">"H/H"</string>
+    <!-- no translation found for blood_type_entries:0 (5051829403671092348) -->
+    <!-- no translation found for blood_type_entries:1 (5289547171251363498) -->
+    <!-- no translation found for blood_type_entries:2 (1998151664134824279) -->
+    <!-- no translation found for blood_type_entries:3 (8861834946033182783) -->
+    <!-- no translation found for blood_type_entries:4 (3936437251649109847) -->
+    <!-- no translation found for blood_type_entries:5 (891231420183639230) -->
+    <!-- no translation found for blood_type_entries:6 (8911255985148284758) -->
+    <!-- no translation found for blood_type_entries:7 (2352690820681480000) -->
+    <!-- no translation found for blood_type_entries:8 (8050126448069904266) -->
+    <!-- no translation found for blood_type_entries:9 (6638754103385431982) -->
+    <!-- no translation found for blood_type_content_description:0 (6667226742834222579) -->
+    <!-- no translation found for blood_type_content_description:1 (26984754285801844) -->
+    <!-- no translation found for blood_type_content_description:2 (4290187884207566057) -->
+    <!-- no translation found for blood_type_content_description:3 (8729414234644535532) -->
+    <!-- no translation found for blood_type_content_description:4 (1807545222747872988) -->
+    <!-- no translation found for blood_type_content_description:5 (5646845390063186080) -->
+    <!-- no translation found for blood_type_content_description:6 (7419135957542939964) -->
+    <!-- no translation found for blood_type_content_description:7 (6751057832905330075) -->
+    <!-- no translation found for blood_type_content_description:8 (3886106257727561539) -->
+    <!-- no translation found for blood_type_content_description:9 (1362921785855892976) -->
+    <string name="o_positive" msgid="5944181307873488422">"O positive"</string>
+    <string name="o_negative" msgid="5261178297066132923">"O negative"</string>
+    <string name="a_positive" msgid="160635169929713435">"A positive"</string>
+    <string name="a_negative" msgid="6680390511183224469">"A negative"</string>
+    <string name="b_positive" msgid="8225619238000785345">"B positive"</string>
+    <string name="b_negative" msgid="4110646487598488955">"B negative"</string>
+    <string name="ab_positive" msgid="1931300033534642005">"AB positive"</string>
+    <string name="ab_negative" msgid="2064555613093591729">"AB negative"</string>
+    <string name="h_h" msgid="2183333409760379720">"HH"</string>
+    <string name="allergies" msgid="2789200777539258165">"Allergies"</string>
+    <string name="unknown_allergies" msgid="4383115953418061237">"Unknown"</string>
+    <string name="allergies_hint" msgid="5488918780522184147">"For example, peanuts"</string>
+    <string name="medications" msgid="644428945685557183">"Medications"</string>
+    <string name="unknown_medications" msgid="2764171064510423734">"Unknown"</string>
+    <string name="medications_hint" msgid="3221620025945593723">"For example, aspirin"</string>
+    <string name="medical_conditions" msgid="3555690011498283592">"Medical notes"</string>
+    <string name="unknown_medical_conditions" msgid="8051364895172053770">"Unknown"</string>
+    <string name="medical_conditions_hint" msgid="6959152183029062882">"For example, asthma"</string>
+    <string name="organ_donor" msgid="5953509460007124827">"Organ donor"</string>
+    <string name="unknown_organ_donor" msgid="2780515342875494225">"Unknown"</string>
+    <string name="yes" msgid="5829765567799916128">"Yes"</string>
+    <string name="no" msgid="1681689233660683509">"No"</string>
+    <!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
+    <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
+    <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
+    <string name="emergency_contacts_title" msgid="5462202017417821030">"Emergency contacts"</string>
+    <string name="add_emergency_contact" msgid="4063577069613981029">"Add contact"</string>
+    <string name="fail_load_contact_picker" msgid="817205483833876726">"Couldn\'t find a contact picker"</string>
+    <string name="fail_display_contact" msgid="4128854688897045879">"Can\'t display the contact"</string>
+    <string name="remove_contact" msgid="6934983445723096759">"Remove <xliff:g id="CONTACT_NAME">%1$s</xliff:g> from emergency contacts?"</string>
+    <string name="remove_contact_icon_text" msgid="4576641386490101363">"Remove contact"</string>
+    <string name="fail_add_contact" msgid="6511490846952942291">"Unable to read contact information properly"</string>
+    <string name="remove" msgid="1243949503772376064">"Remove"</string>
+    <string name="cancel" msgid="7401575239009060939">"Cancel"</string>
+    <string name="ok" msgid="163967937451981024">"OK"</string>
+    <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
+    <string name="no_info_provided" msgid="716200382010821001">"No information about the phone\'s owner"</string>
+    <string name="tap_pencil" msgid="2723698054265296934">"If this is your phone, tap the pencil icon to add information that will be displayed here in case of emergency"</string>
+    <string name="clear_all" msgid="8899013032870561633">"Clear all"</string>
+    <string name="clear" msgid="3648880442502887163">"Clear"</string>
+    <string name="clear_all_message" msgid="1548432000373861295">"Clear all information and contacts?"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Adding medical information and emergency contacts can help first responders in an emergency.\n\nAnyone can read this information from your lock screen, and dial your contacts by tapping their names, without unlocking your phone."</string>
+    <string name="settings_suggestion_title" msgid="2503369576806243476">"Add emergency information"</string>
+    <string name="settings_suggestion_body" msgid="6623265155762787567">"Help first responders find important information"</string>
+</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 49b6ae2..fce6ab1 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Clear all"</string>
     <string name="clear" msgid="3648880442502887163">"Clear"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Clear all information and contacts?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Adding medical information and emergency contacts can help first responders in an emergency.\n\nAnyone can read this information from your lock screen without unlocking your phone."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Adding medical information and emergency contacts can help first responders in an emergency.\n\nAnyone can read this information from your lock screen, and dial your contacts by tapping their names, without unlocking your phone."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Add emergency information"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Help first responders find important information"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 49b6ae2..fce6ab1 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Clear all"</string>
     <string name="clear" msgid="3648880442502887163">"Clear"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Clear all information and contacts?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Adding medical information and emergency contacts can help first responders in an emergency.\n\nAnyone can read this information from your lock screen without unlocking your phone."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Adding medical information and emergency contacts can help first responders in an emergency.\n\nAnyone can read this information from your lock screen, and dial your contacts by tapping their names, without unlocking your phone."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Add emergency information"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Help first responders find important information"</string>
 </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..40c6355
--- /dev/null
+++ b/res/values-en-rXC/strings.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="1090682794607161063">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎Emergency information‎‏‎‎‏‎"</string>
+    <string name="medical_info_title" msgid="3000192781136934887">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎Medical information‎‏‎‎‏‎"</string>
+    <string name="edit_medical_info" msgid="6733720353375319476">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎Edit information‎‏‎‎‏‎"</string>
+    <string name="edit_info" msgid="5973929805855224805">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎Edit emergency information‎‏‎‎‏‎"</string>
+    <string name="tab_title_info" msgid="1402033103294855812">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎Info‎‏‎‎‏‎"</string>
+    <string name="tab_title_contacts" msgid="4298341166404791209">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎Contacts‎‏‎‎‏‎"</string>
+    <string name="name" msgid="4286267457738861977">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‎Name‎‏‎‎‏‎"</string>
+    <string name="unknown_name" msgid="2834802479170495056">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎Unknown‎‏‎‎‏‎"</string>
+    <string name="address" msgid="6449303483151189969">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‎Address‎‏‎‎‏‎"</string>
+    <string name="unknown_address" msgid="4212576729941786121">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎Unknown‎‏‎‎‏‎"</string>
+    <string name="date_of_birth" msgid="777979232444227891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‏‎Date of birth‎‏‎‎‏‎"</string>
+    <string name="unknown_date_of_birth" msgid="7416355536916066758">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎Unknown‎‏‎‎‏‎"</string>
+    <string name="dob" msgid="2813161080307245706">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‎‎(‎‏‎‎‏‏‎<xliff:g id="DATE_OF_BIRTH">%1$s</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
+    <string name="age" msgid="8327537794752630199">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‎Age: ‎‏‎‎‏‏‎<xliff:g id="NUMERICAL_AGE">%1$d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="remove_dob_icon_text" msgid="4413507180967999944">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‎‎‎‎Remove date of birth‎‏‎‎‏‎"</string>
+    <string name="blood_type" msgid="6947022772999974608">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‎Blood type‎‏‎‎‏‎"</string>
+    <string name="unknown_blood_type" msgid="6337228278125085668">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎Unknown‎‏‎‎‏‎"</string>
+    <string name="oplus" msgid="7759756742377867011">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‎O+‎‏‎‎‏‎"</string>
+    <string name="ominus" msgid="5227278501191741055">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎O-‎‏‎‎‏‎"</string>
+    <string name="aplus" msgid="4982472245421753463">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‎‏‏‏‎A+‎‏‎‎‏‎"</string>
+    <string name="aminus" msgid="1469727296074783670">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‎A-‎‏‎‎‏‎"</string>
+    <string name="bplus" msgid="5395850743718234762">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‎B+‎‏‎‎‏‎"</string>
+    <string name="bminus" msgid="3813367242072886088">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‎B-‎‏‎‎‏‎"</string>
+    <string name="abplus" msgid="8061792867513932701">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‏‎AB+‎‏‎‎‏‎"</string>
+    <string name="abminus" msgid="2510867828094325481">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎AB-‎‏‎‎‏‎"</string>
+    <string name="hh" msgid="3071675674015857183">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎H/H‎‏‎‎‏‎"</string>
+    <!-- no translation found for blood_type_entries:0 (5051829403671092348) -->
+    <!-- no translation found for blood_type_entries:1 (5289547171251363498) -->
+    <!-- no translation found for blood_type_entries:2 (1998151664134824279) -->
+    <!-- no translation found for blood_type_entries:3 (8861834946033182783) -->
+    <!-- no translation found for blood_type_entries:4 (3936437251649109847) -->
+    <!-- no translation found for blood_type_entries:5 (891231420183639230) -->
+    <!-- no translation found for blood_type_entries:6 (8911255985148284758) -->
+    <!-- no translation found for blood_type_entries:7 (2352690820681480000) -->
+    <!-- no translation found for blood_type_entries:8 (8050126448069904266) -->
+    <!-- no translation found for blood_type_entries:9 (6638754103385431982) -->
+    <!-- no translation found for blood_type_content_description:0 (6667226742834222579) -->
+    <!-- no translation found for blood_type_content_description:1 (26984754285801844) -->
+    <!-- no translation found for blood_type_content_description:2 (4290187884207566057) -->
+    <!-- no translation found for blood_type_content_description:3 (8729414234644535532) -->
+    <!-- no translation found for blood_type_content_description:4 (1807545222747872988) -->
+    <!-- no translation found for blood_type_content_description:5 (5646845390063186080) -->
+    <!-- no translation found for blood_type_content_description:6 (7419135957542939964) -->
+    <!-- no translation found for blood_type_content_description:7 (6751057832905330075) -->
+    <!-- no translation found for blood_type_content_description:8 (3886106257727561539) -->
+    <!-- no translation found for blood_type_content_description:9 (1362921785855892976) -->
+    <string name="o_positive" msgid="5944181307873488422">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎O positive‎‏‎‎‏‎"</string>
+    <string name="o_negative" msgid="5261178297066132923">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎O negative‎‏‎‎‏‎"</string>
+    <string name="a_positive" msgid="160635169929713435">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‏‎A, positive‎‏‎‎‏‎"</string>
+    <string name="a_negative" msgid="6680390511183224469">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎A, negative‎‏‎‎‏‎"</string>
+    <string name="b_positive" msgid="8225619238000785345">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‎B positive‎‏‎‎‏‎"</string>
+    <string name="b_negative" msgid="4110646487598488955">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎B negative‎‏‎‎‏‎"</string>
+    <string name="ab_positive" msgid="1931300033534642005">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‏‏‎‏‎‏‎‏‎‏‎A B positive‎‏‎‎‏‎"</string>
+    <string name="ab_negative" msgid="2064555613093591729">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎A B negative‎‏‎‎‏‎"</string>
+    <string name="h_h" msgid="2183333409760379720">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎H H‎‏‎‎‏‎"</string>
+    <string name="allergies" msgid="2789200777539258165">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‎Allergies‎‏‎‎‏‎"</string>
+    <string name="unknown_allergies" msgid="4383115953418061237">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎Unknown‎‏‎‎‏‎"</string>
+    <string name="allergies_hint" msgid="5488918780522184147">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎For example, peanuts‎‏‎‎‏‎"</string>
+    <string name="medications" msgid="644428945685557183">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎Medications‎‏‎‎‏‎"</string>
+    <string name="unknown_medications" msgid="2764171064510423734">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎Unknown‎‏‎‎‏‎"</string>
+    <string name="medications_hint" msgid="3221620025945593723">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‎For example, aspirin‎‏‎‎‏‎"</string>
+    <string name="medical_conditions" msgid="3555690011498283592">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎Medical notes‎‏‎‎‏‎"</string>
+    <string name="unknown_medical_conditions" msgid="8051364895172053770">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎Unknown‎‏‎‎‏‎"</string>
+    <string name="medical_conditions_hint" msgid="6959152183029062882">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‏‎‎‎‏‎‎For example, asthma‎‏‎‎‏‎"</string>
+    <string name="organ_donor" msgid="5953509460007124827">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎Organ donor‎‏‎‎‏‎"</string>
+    <string name="unknown_organ_donor" msgid="2780515342875494225">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‎Unknown‎‏‎‎‏‎"</string>
+    <string name="yes" msgid="5829765567799916128">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎Yes‎‏‎‎‏‎"</string>
+    <string name="no" msgid="1681689233660683509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‎No‎‏‎‎‏‎"</string>
+    <!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
+    <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
+    <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
+    <string name="emergency_contacts_title" msgid="5462202017417821030">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎Emergency contacts‎‏‎‎‏‎"</string>
+    <string name="add_emergency_contact" msgid="4063577069613981029">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎Add contact‎‏‎‎‏‎"</string>
+    <string name="fail_load_contact_picker" msgid="817205483833876726">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎Couldn\'t find a contact picker‎‏‎‎‏‎"</string>
+    <string name="fail_display_contact" msgid="4128854688897045879">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‎‏‏‏‎Can\'t display the contact‎‏‎‎‏‎"</string>
+    <string name="remove_contact" msgid="6934983445723096759">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎Remove ‎‏‎‎‏‏‎<xliff:g id="CONTACT_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ from emergency contacts?‎‏‎‎‏‎"</string>
+    <string name="remove_contact_icon_text" msgid="4576641386490101363">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎Remove contact‎‏‎‎‏‎"</string>
+    <string name="fail_add_contact" msgid="6511490846952942291">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎Unable to read contact information properly‎‏‎‎‏‎"</string>
+    <string name="remove" msgid="1243949503772376064">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎Remove‎‏‎‎‏‎"</string>
+    <string name="cancel" msgid="7401575239009060939">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎Cancel‎‏‎‎‏‎"</string>
+    <string name="ok" msgid="163967937451981024">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‎OK‎‏‎‎‏‎"</string>
+    <string name="phone_type_and_phone_number" msgid="5034188169563878371">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="PHONE_TYPE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ • ‎‏‎‎‏‏‎<xliff:g id="PHONE_NUMBER">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="no_info_provided" msgid="716200382010821001">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎No information about the phone\'s owner‎‏‎‎‏‎"</string>
+    <string name="tap_pencil" msgid="2723698054265296934">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎If this is your phone, tap the pencil icon to add information that will be displayed here in case of emergency‎‏‎‎‏‎"</string>
+    <string name="clear_all" msgid="8899013032870561633">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‎Clear all‎‏‎‎‏‎"</string>
+    <string name="clear" msgid="3648880442502887163">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‎Clear‎‏‎‎‏‎"</string>
+    <string name="clear_all_message" msgid="1548432000373861295">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‎Clear all information and contacts?‎‏‎‎‏‎"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎Adding medical information and emergency contacts can help first responders in an emergency.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Anyone can read this information from your lock screen, and dial your contacts by tapping their names, without unlocking your phone.‎‏‎‎‏‎"</string>
+    <string name="settings_suggestion_title" msgid="2503369576806243476">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‎Add emergency information‎‏‎‎‏‎"</string>
+    <string name="settings_suggestion_body" msgid="6623265155762787567">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‏‏‎Help first responders find important information‎‏‎‎‏‎"</string>
+</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 86ce9cb..33351c6 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Borrar todo"</string>
     <string name="clear" msgid="3648880442502887163">"Borrar"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"¿Quieres borrar toda la información y los contactos?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Agrega información médica y contactos de emergencia para ayudar a los servicios de primeros auxilios durante una urgencia.\n\nCualquier persona puede leer esta información en tu pantalla bloqueada sin desbloquear el teléfono."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Agrega información médica y contactos de emergencia para ayudar a los rescatistas en caso de emergencia.\n\nCualquiera puede leer estos datos en tu pantalla bloqueada y llamar a tus contactos con solo presionar su nombre sin necesidad de desbloquear tu teléfono."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Agrega información de emergencia"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Ayuda a que los servicios de primeros auxilios encuentren información importante"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e999f59..0e633fa 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Borrar todo"</string>
     <string name="clear" msgid="3648880442502887163">"Borrar"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"¿Borrar toda la información y los contactos?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Añadir información médica y contactos de emergencia puede ayudar a los servicios de emergencia en las urgencias.\n\nCualquiera puede leer esta información en tu pantalla de bloqueo sin desbloquear el teléfono."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Añadir información médica y contactos de emergencia puede ayudar a los servicios de emergencia en las urgencias.\n\nCualquiera puede leer esta información en tu pantalla de bloqueo y tocar el nombre de tus contactos para llamarlos sin desbloquear el teléfono."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Añadir información de emergencia"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Ayuda a los servicios de emergencia a encontrar información importante"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 416aad6..8c1006f 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Kustuta kõik"</string>
     <string name="clear" msgid="3648880442502887163">"Kustuta"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Kas kustutada kogu teave ja kõik kontaktid?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Meditsiinilise teabe ja hädaolukorra kontaktide lisamine aitab päästetöötajaid hädaolukorras.\n\nIgaüks saab seda teavet lukustuskuval telefoni avamata vaadata."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Meditsiinilise teabe ja hädaolukorra kontaktide lisamine aitab päästetöötajaid hädaolukorras.\n\nIgaüks saab lugeda teie lukustuskuval olevat teavet ja helistada teie kontaktidele, puudutades kontakti nime ning avamata teie telefoni."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Hädaabiteabe lisamine"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Aidake päästjatel leida tähtsat teavet"</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index c8cccb5..c4ca564 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Larrialdietarako informazioa"</string>
-    <string name="medical_info_title" msgid="3000192781136934887">"Mediku-informazioa"</string>
+    <string name="medical_info_title" msgid="3000192781136934887">"Osasun-informazioa"</string>
     <string name="edit_medical_info" msgid="6733720353375319476">"Editatu informazioa"</string>
     <string name="edit_info" msgid="5973929805855224805">"Editatu larrialdietarako informazioa"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informazioa"</string>
@@ -77,7 +77,7 @@
     <string name="medications" msgid="644428945685557183">"Sendagaiak"</string>
     <string name="unknown_medications" msgid="2764171064510423734">"Ezezaguna"</string>
     <string name="medications_hint" msgid="3221620025945593723">"Adibidez, aspirina"</string>
-    <string name="medical_conditions" msgid="3555690011498283592">"Ohar medikoak"</string>
+    <string name="medical_conditions" msgid="3555690011498283592">"Osasun-oharrak"</string>
     <string name="unknown_medical_conditions" msgid="8051364895172053770">"Ezezaguna"</string>
     <string name="medical_conditions_hint" msgid="6959152183029062882">"Adibidez, asma"</string>
     <string name="organ_donor" msgid="5953509460007124827">"Organo-emailea"</string>
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Garbitu guztiak"</string>
     <string name="clear" msgid="3648880442502887163">"Garbitu"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Informazioa eta kontaktu guztiak garbitu nahi dituzu?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Zure osasunari buruzko informazioa eta larrialdietarako kontaktuak gehituta, lagundu egingo diezu larrialdi-zerbitzuei.\n\nEdonork irakurri ahal izango du informazio hori pantaila blokeatuan, telefonoa desblokeatu beharrik gabe."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Zure osasunari buruzko informazioa eta larrialdietarako kontaktuak gehituta, lagundu egingo diezu larrialdi-zerbitzuei.\n\nEdonork irakurri ahal izango du informazio hori pantaila blokeatuan (eta kontaktuei deitu haien izenak sakatuta), telefonoa desblokeatu beharrik gabe."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Gehitu larrialdietarako informazioa"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Lagundu larrialdi-zerbitzuei informazio garrantzitsua aurkitzen"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f273f86..7b12900 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"پاک کردن همه"</string>
     <string name="clear" msgid="3648880442502887163">"پاک کردن"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"همه اطلاعات و مخاطبین پاک شوند؟"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"افزودن اطلاعات پزشکی و مخاطبین اضطراری می‌تواند در وضعیت اضطراری به اولین فرد پاسخ‌گو کمک کند.\n\nهمه می‌توانند این اطلاعات را بدون باز کردن قفل تلفن، از صفحه در حالت قفل بخوانند."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"افزودن اطلاعات پزشکی و شماره‌های تماس اضطراری می‌تواند به اولین افرادی که در شرایط اضطراری در صحنه حاضر می‌شوند کمک کنند.\n \nهر کسی می‌تواند این اطلاعات را از صفحه در حالت قفل بخواند و بدون باز کردن قفل تلفن و فقط با ضربه زدن روی نام مخاطبین شما با آن‌ها تماس بگیرد."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"افزودن اطلاعات اضطراری"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"به اولین افراد پاسخ‌گو کمک کنید اطلاعات مهم را پیدا کنند"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c5983ce..dd6c274 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Tyhjennä kaikki"</string>
     <string name="clear" msgid="3648880442502887163">"Tyhjennä"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Tyhjennetäänkö kaikki tiedot ja yhteystiedot?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Kun lisäät terveystiedot ja hätäyhteystiedot, ensihoitajien työ helpottuu hätätilanteissa.\n\nKuka tahansa voi lukea nämä tiedot lukitusnäytöltä avaamatta puhelintasi."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Kun lisäät terveystiedot ja hätäyhteystiedot, ensihoitajien työ helpottuu hätätilanteissa.\n\nKuka tahansa voi lukea nämä tiedot lukitusnäytöltä ja soittaa yhteystiedoillesi napauttamalla heidän nimiään avaamatta puhelintasi."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Hätätilannetietojen lisääminen"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Auta ensihoitajia löytämään tärkeät tiedot."</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index cc2d865..c08bbc9 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Effacer tout"</string>
     <string name="clear" msgid="3648880442502887163">"Effacer"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Effacer toutes les données et tous les contacts?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"L\'ajout de données médicales et de contacts d\'urgence peut aider les premiers intervenants en cas d\'urgence.\n\nTout le monde peut voir cette information sur votre écran de verrouillage sans déverrouiller votre téléphone."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"L\'ajout de données médicales et de contacts d\'urgence peut aider les premiers intervenants en cas d\'urgence.\n\nTout le monde peut voir cette information sur votre écran de verrouillage et appeler vos contacts en touchant leur nom sans devoir déverrouiller votre téléphone."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Ajouter des données d\'urgence"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Aidez les premiers intervenants à trouver des renseignements importants"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7874176..1eec189 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Tout effacer"</string>
     <string name="clear" msgid="3648880442502887163">"Effacer"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Effacer toutes les informations et tous les contacts ?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Vous pouvez ajouter des informations médicales et des contacts à joindre en cas d\'urgence. Ces renseignements seront utiles aux personnes qui vous porteront secours, si jamais il vous arrive quelque chose.\n\nN\'importe qui peut avoir accès à ces informations sur l\'écran de verrouillage, sans déverrouiller votre téléphone."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Vous pouvez ajouter des informations médicales et des contacts à joindre en cas d\'urgence. Ces renseignements seront utiles aux personnes qui vous porteront secours, si jamais il vous arrive quelque chose.\n\nN\'importe qui peut avoir accès à ces informations sur l\'écran de verrouillage, et appeler vos contacts en appuyant sur leur nom, sans déverrouiller votre téléphone."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Ajouter des informations d\'urgence"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Ces informations seront utiles aux premiers secours s\'il vous arrive quelque chose"</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 4fa99fe..cd6f371 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -16,10 +16,10 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1090682794607161063">"Información de emerxencia"</string>
+    <string name="app_label" msgid="1090682794607161063">"Información de urxencia"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Información médica"</string>
     <string name="edit_medical_info" msgid="6733720353375319476">"Editar información"</string>
-    <string name="edit_info" msgid="5973929805855224805">"Editar información de emerxencia"</string>
+    <string name="edit_info" msgid="5973929805855224805">"Editar información de urxencia"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Información"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Contactos"</string>
     <string name="name" msgid="4286267457738861977">"Nome"</string>
@@ -87,11 +87,11 @@
     <!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
-    <string name="emergency_contacts_title" msgid="5462202017417821030">"Contactos de emerxencia"</string>
+    <string name="emergency_contacts_title" msgid="5462202017417821030">"Contactos de urxencia"</string>
     <string name="add_emergency_contact" msgid="4063577069613981029">"Engadir contacto"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"Non se puido encontrar un selector de contactos"</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"Non se pode mostrar o contacto"</string>
-    <string name="remove_contact" msgid="6934983445723096759">"Queres eliminar a <xliff:g id="CONTACT_NAME">%1$s</xliff:g> dos contactos de emerxencia?"</string>
+    <string name="remove_contact" msgid="6934983445723096759">"Queres eliminar a <xliff:g id="CONTACT_NAME">%1$s</xliff:g> dos contactos de urxencia?"</string>
     <string name="remove_contact_icon_text" msgid="4576641386490101363">"Eliminar contacto"</string>
     <string name="fail_add_contact" msgid="6511490846952942291">"Non se puido ler correctamente a información de contacto"</string>
     <string name="remove" msgid="1243949503772376064">"Eliminar"</string>
@@ -99,11 +99,11 @@
     <string name="ok" msgid="163967937451981024">"Aceptar"</string>
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"Non hai información sobre o propietario do teléfono"</string>
-    <string name="tap_pencil" msgid="2723698054265296934">"Se este é o teu teléfono, toca a icona do lapis para engadir a información que se mostrará aquí en caso de emerxencia"</string>
+    <string name="tap_pencil" msgid="2723698054265296934">"Se este é o teu teléfono, toca a icona do lapis para engadir a información que se mostrará aquí en caso de urxencia"</string>
     <string name="clear_all" msgid="8899013032870561633">"Borrar todo"</string>
     <string name="clear" msgid="3648880442502887163">"Borrar"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Queres borrar toda a información e os contactos?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Engadir información médica e contactos de emerxencia pode axudar aos servizos de emerxencia.\n\nCalquera pode ler esta información na pantalla de bloqueo sen necesidade de desbloquear o teléfono."</string>
-    <string name="settings_suggestion_title" msgid="2503369576806243476">"Engade información de emerxencia"</string>
-    <string name="settings_suggestion_body" msgid="6623265155762787567">"Axuda aos servizos de emerxencia a atopar información importante"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Engadir contactos de urxencia e información médica pode resultar útil para os servizos de urxencias en caso dunha urxencia.\n\nCalquera persoa pode ler esta información na túa pantalla de bloqueo e tocar os nomes dos contactos para marcar os seus números sen necesidade de desbloquear o teléfono."</string>
+    <string name="settings_suggestion_title" msgid="2503369576806243476">"Engade información de urxencia"</string>
+    <string name="settings_suggestion_body" msgid="6623265155762787567">"Axuda aos servizos de urxencia a atopar información importante"</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 900acea..bf367d9 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"બધું સાફ કરો"</string>
     <string name="clear" msgid="3648880442502887163">"સાફ કરો"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"તમામ માહિતી અને સંપર્કો સાફ કરીએ?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"તબીબી માહિતી તથા કટોકટીના સંપર્કો ઉમેરવાથી કટોકટીમાં પ્રથમ પ્રતિભાવ આપનારને સહાય મળી શકે છે.\n\nકોઈ પણ વ્યક્તિ તમારો ફોન અનલૉક કર્યા વિના તમારી લૉક સ્ક્રીન પરની આ માહિતી વાંચી શકે છે."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"તબીબી માહિતી તથા કટોકટીના સંપર્કો ઉમેરવાથી કટોકટીમાં પ્રથમ પ્રતિભાવ આપનારને સહાય મળી શકે છે.\n\nકોઈ પણ વ્યક્તિ તમારો ફોન અનલૉક કર્યા વિના તમારી લૉક સ્ક્રીન પરની આ માહિતી વાંચીને, તમારા સંપર્કના નામ પર ટૅપ કરીને તેમનો નંબર ડાયલ કરી શકે છે."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"કટોકટીની માહિતી ઉમેરો"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"પ્રથમ પ્રતિભાવ આપનારને મહત્ત્વની માહિતી મેળવવામાં સહાય કરો"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 7341672..e9132c9 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"आपातकालीन जानकारी"</string>
-    <string name="medical_info_title" msgid="3000192781136934887">"चिकित्सा जानकारी"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"जानकारी संपादित करें"</string>
-    <string name="edit_info" msgid="5973929805855224805">"आपातकालीन जानकारी संपादित करें"</string>
+    <string name="medical_info_title" msgid="3000192781136934887">"चिकित्सा संबंधी जानकारी"</string>
+    <string name="edit_medical_info" msgid="6733720353375319476">"जानकारी में बदलाव करें"</string>
+    <string name="edit_info" msgid="5973929805855224805">"आपातकालीन जानकारी में बदलाव करें"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"जानकारी"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"संपर्क"</string>
     <string name="name" msgid="4286267457738861977">"नाम"</string>
@@ -96,14 +96,14 @@
     <string name="fail_add_contact" msgid="6511490846952942291">"संपर्क की जानकारी ठीक से नहीं पढ़ी जा सकी"</string>
     <string name="remove" msgid="1243949503772376064">"निकालें"</string>
     <string name="cancel" msgid="7401575239009060939">"रद्द करें"</string>
-    <string name="ok" msgid="163967937451981024">"ठीक"</string>
+    <string name="ok" msgid="163967937451981024">"ठीक है"</string>
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
-    <string name="no_info_provided" msgid="716200382010821001">"फ़ोन के स्वामी के बारे में कोई जानकारी नहीं है"</string>
-    <string name="tap_pencil" msgid="2723698054265296934">"यदि यह आपका फ़ोन है, तो आपात स्थिति में यहां दिखाई जाने वाली जानकारी जोड़ने के लिए पेंसिल आइकन टैप करें"</string>
+    <string name="no_info_provided" msgid="716200382010821001">"ये जिसका फ़ोन है उसके बारे में कोई जानकारी नहीं है"</string>
+    <string name="tap_pencil" msgid="2723698054265296934">"अगर यह आपका फ़ोन है, तो आपात स्थिति में यहां दिखाई जाने वाली जानकारी जोड़ने के लिए पेंसिल आइकॉन को छूएं"</string>
     <string name="clear_all" msgid="8899013032870561633">"सभी साफ़ करें"</string>
     <string name="clear" msgid="3648880442502887163">"साफ़ करें"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"सभी जानकारी और संपर्क साफ़ करें?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"चिकित्सा जानकारी और आपातकालीन संपर्क जोड़ने से किसी आपातकालीन स्थिति में पहले प्रतिक्रिया देने वालों को सहायता मिल सकती है.\n\nआपके फ़ोन को अनलॉक किए बिना कोई भी आपकी लॉक स्क्रीन से यह जानकारी पढ़ सकता है."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"चिकित्सा (मेडिकल) से जुड़ी जानकारी और आपातकालीन संपर्क जोड़ने से आपातकालीन परिस्थिति में पहली प्रतिक्रिया देने वाले लोगों को मदद मिल सकती है.\n\nकोई भी व्यक्ति आपकी लॉक स्क्रीन से यह जानकारी पढ़ सकते हैं और आपके फ़ोन को अनलॉक किए बिना, आपके संपर्कों के नाम पर टैप करके उन्हें कॉल कर सकते हैं."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"आपातकालीन जानकारी जोड़ें"</string>
-    <string name="settings_suggestion_body" msgid="6623265155762787567">"महत्वपूर्ण जानकारी पाने में पहले प्रतिक्रिया देने वालों की सहायता करें"</string>
+    <string name="settings_suggestion_body" msgid="6623265155762787567">"प्रतिक्रिया देने वालों की अहम जानकारी पाने में पहले मदद करें"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index a166f84..065e625 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Izbriši sve"</string>
     <string name="clear" msgid="3648880442502887163">"Izbriši"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Želite li izbrisati sve podatke i kontakte?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Dodavanje medicinskih informacija i hitnih kontakata može pomoći službama koje prve reagiraju u hitnim slučajevima.\n\nTe informacije može pročitati bilo tko na zaključanom zaslonu bez otključavanja vašeg telefona."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Dodavanje informacija o zdravstvenom stanju i podataka za kontakt u hitnim slučajevima može pomoći osobama koje u slučaju nezgode prve priskoče u pomoć.\n\nBilo tko može pročitati te informacije na zaključanom zaslonu i bez otključavanja telefona nazvati osobe za kontakt dodirom njihova imena."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Dodavanje podataka za hitne slučajeve"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Pomognite službama koje prve reagiraju u hitnim slučajevima da pronađu važne informacije"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2b62d51..4aeac88 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Összes törlése"</string>
     <string name="clear" msgid="3648880442502887163">"Törlés"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Törli az összes információt és névjegyet?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Egészségügyi információk és vészhelyzetben hívható névjegyek hozzáadásával segítheti az elsősegélynyújtók munkáját krízis esetén.\n\nEzeket az információkat bárki elolvashatja a lezárási képernyőn, a telefon feloldása nélkül."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Egészségügyi információk és vészhelyzetben hívható névjegyek hozzáadásával segítheti az elsősegélynyújtók munkáját vészhelyzet esetén.\n\nEzeket az információkat bárki elolvashatja a lezárási képernyőn, valamint a nevekre koppintva felhívhatja névjegyeit a telefon feloldása nélkül."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Segélyhívási információk megadása"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Segítsen az elsősegélynyújtóknak a fontos adatok megtalálásában"</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 04c0cb0..02e3508 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1090682794607161063">"Անձնական բուժտվյալներ"</string>
+    <string name="app_label" msgid="1090682794607161063">"Անհետաձգելի բուժօգնության տվյալներ"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Բժշկական տվյալներ"</string>
     <string name="edit_medical_info" msgid="6733720353375319476">"Խմբագրել տվյալները"</string>
     <string name="edit_info" msgid="5973929805855224805">"Փոփոխել անհետաձգելի բուժօգնության տվյալները"</string>
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Մաքրել բոլորը"</string>
     <string name="clear" msgid="3648880442502887163">"Մաքրել"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Մաքրե՞լ բոլոր տեղեկությունները և կոնտակտները:"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Բժշկական տվյալների և արտակարգ իրավիճակների կոնտակտների ավելացումը կարող է օգնել արտակարգ իրավիճակների դեպքում առաջին օգնություն ցուցաբերող մարդկանց:\n\nԲոլոր կարող են կարդալ այս տեղեկությունները ձեր կողպէկրանից՝ առանց հեռախոսն ապակողպելու անհրաժեշտության:"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Արտակարգ իրավիճակներում ձեր բժշկական տվյալներն ու կոնտակտները կարող են օգտակար լինել առաջին օգնություն ցուցաբերողներին և փրկարարներին:\n\nԱյս տեղեկությունները կցուցադրվեն ձեր սարքի կողպված էկրանին։ Ձեր կոնտակտներին զանգելու համար անհրաժեշտ կլինի պարզապես հպել նրանց անուններին:"</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Ավելացրեք արտակարգ իրավիճակների տվյալներ"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Առաջին օգնություն ցուցաբերող մարդկանց օգնեք գտնել անհրաժեշտ տեղեկությունները"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f63c876..e563b02 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Hapus semua"</string>
     <string name="clear" msgid="3648880442502887163">"Hapus"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Hapus semua informasi dan kontak?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Menambahkan informasi medis dan kontak darurat dapat membantu responden peratama dalam keadaan darurat.\n\nSiapa saja dapat membaca informasi ini dari kunci layar tanpa harus membuka kunci ponsel."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Menambahkan informasi medis dan kontak darurat dapat membantu penolong pertama dalam situasi darurat.\n\nSemua orang dapat membaca informasi ini dari layar kunci dan menelepon kontak dengan menge-tap nama, tanpa harus membuka kunci ponsel."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Menambahkan informasi darurat"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Bantu responden pertama menemukan informasi penting"</string>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index a60f72b..85662ec 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Hreinsa allt"</string>
     <string name="clear" msgid="3648880442502887163">"Hreinsa"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Viltu hreinsa allar upplýsingar og tengiliði?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Með því að bæta við heilsufarsupplýsingum og neyðartengiliðum geturðu hjálpað þeim sem eru fyrstir á svæðið í neyðartilvikum.\n\nHver sem er getur lesið þessar upplýsingar af lásskjánum án þess að taka símann úr lás."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Ef læknisfræðilegum upplýsingum og neyðartengiliðum er bætt við getur það aðstoðað fólk sem kemur fyrst á vettvang í neyðartilfellum.\n\nHver sem er getur lesið þessar upplýsingar af lásskjánum og hringt í tengiliðina þína með því að ýta á nöfn þeirra án þess að taka símann úr lás."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Bættu við upplýsingum fyrir neyðartilvik"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Hjálpaðu þeim sem eru fyrstir á svæðið í neyðartilvikum að finna mikilvægar upplýsingar"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 7467384..0f5d862 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Cancella tutto"</string>
     <string name="clear" msgid="3648880442502887163">"Cancella"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Cancellare tutte le informazioni e i contatti?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Aggiungendo informazioni mediche e contatti di emergenza puoi aiutare i soccorritori in caso di emergenze.\n\nChiunque può leggere queste informazioni dalla schermata di blocco senza sbloccare il telefono."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Aggiungendo informazioni mediche e contatti di emergenza puoi aiutare i soccorritori in caso di emergenze.\n\nChiunque può leggere queste informazioni dalla schermata di blocco e chiamare i tuoi contatti toccandone il nome senza sbloccare il telefono."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Aggiungi informazioni per le emergenze"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Aiuta i soccorritori a trovare informazioni importanti"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 0fccc1e..6a5c37a 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"מידע למקרה חירום"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"מידע רפואי"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"ערוך את המידע"</string>
+    <string name="edit_medical_info" msgid="6733720353375319476">"עריכת המידע"</string>
     <string name="edit_info" msgid="5973929805855224805">"עריכת מידע למקרה חירום"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"מידע"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"אנשי קשר"</string>
@@ -80,7 +80,7 @@
     <string name="medical_conditions" msgid="3555690011498283592">"הערות רפואיות"</string>
     <string name="unknown_medical_conditions" msgid="8051364895172053770">"לא ידוע"</string>
     <string name="medical_conditions_hint" msgid="6959152183029062882">"לדוגמה, אסטמה"</string>
-    <string name="organ_donor" msgid="5953509460007124827">"תורם איברים"</string>
+    <string name="organ_donor" msgid="5953509460007124827">"תרומת איברים"</string>
     <string name="unknown_organ_donor" msgid="2780515342875494225">"לא ידוע"</string>
     <string name="yes" msgid="5829765567799916128">"כן"</string>
     <string name="no" msgid="1681689233660683509">"לא"</string>
@@ -100,10 +100,10 @@
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"אין מידע על הבעלים של הטלפון"</string>
     <string name="tap_pencil" msgid="2723698054265296934">"אם זהו הטלפון שלך, הקש על סמל העיפרון כדי להוסיף מידע שיוצג כאן במקרה חירום"</string>
-    <string name="clear_all" msgid="8899013032870561633">"נקה הכול"</string>
-    <string name="clear" msgid="3648880442502887163">"נקה"</string>
+    <string name="clear_all" msgid="8899013032870561633">"ניקוי הכול"</string>
+    <string name="clear" msgid="3648880442502887163">"ניקוי"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"האם לנקות את כל המידע ואנשי הקשר?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"הוספה של מידע רפואי ואנשי קשר לשעת חירום יכולה לעזור למגישי עזרה ראשונה במקרה חירום.\n\nכל אחד יוכל לקרוא את המידע הזה ממסך הנעילה בלי לבטל את הנעילה של הטלפון."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"מומלץ להוסיף מידע רפואי ואנשי קשר למקרה חירום כדי לעזור למגישי העזרה הראשונה לתפקד ביעילות במצב חירום.\n\nכולם יוכלו לראות את המידע הזה ממסך הנעילה שלך ולחייג לאנשי הקשר שבחרת באמצעות הקשה על השמות שלהם, בלי לבטל את הנעילה של הטלפון."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"הוספת מידע למקרה חירום"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"כדי שמגישי עזרה ראשונה יוכלו למצוא מידע חשוב"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index fd384ef..de8e482 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"すべて消去"</string>
     <string name="clear" msgid="3648880442502887163">"消去"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"すべての情報と連絡先を消去しますか？"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"医療に関する情報と緊急連絡先を追加すると、緊急時の初期対応に役立ちます。\n\nこの情報はスマートフォンをロック解除しなくても、ロック画面から誰でも閲覧できます。"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"医療に関する情報と緊急連絡先を追加すると、緊急時の初期対応に役立ちます。\n\nこの情報はスマートフォンをロック解除しなくても、誰でもロック画面から閲覧でき、連絡先の名前をタップしてダイヤルできます。"</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"緊急時情報を追加する"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"緊急時の初期対応に役立つ重要情報を追加します"</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 53565a0..80002cd 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -70,7 +70,7 @@
     <string name="b_negative" msgid="4110646487598488955">"მესამე ჯგუფის რეზუსუარყოფითი"</string>
     <string name="ab_positive" msgid="1931300033534642005">"მეოთხე ჯგუფის რეზუსდადებითი"</string>
     <string name="ab_negative" msgid="2064555613093591729">"მეოთხე ჯგუფის რეზუსუარყოფითი"</string>
-    <string name="h_h" msgid="2183333409760379720">"ბომბეის ფენომენი"</string>
+    <string name="h_h" msgid="2183333409760379720">"H H ბომბეის ტიპი"</string>
     <string name="allergies" msgid="2789200777539258165">"ალერგია"</string>
     <string name="unknown_allergies" msgid="4383115953418061237">"უცნობია"</string>
     <string name="allergies_hint" msgid="5488918780522184147">"მაგალითად, მიწის თხილი"</string>
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"ყველაფრის გასუფთავება"</string>
     <string name="clear" msgid="3648880442502887163">"გასუფთავება"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"გსურთ ინფორმაციისა და კონტაქტების მთლიანად გასუფთავება?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"სამედიცინო ინფორმაციისა და გადაუდებელი შემთხვევისას საკონტაქტო პირების დამატება საგანგებო ვითარებაში სწრაფი რეაგირების სამსახურებს შეუწყობს ხელს.\n\nამ ინფორმაციის წაკითხვას ნებისმიერი პირი შეძლებს თქვენი ჩაკეტილი ეკრანიდან, ტელეფონის განბლოკვის საჭიროების გარეშე."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"სამედიცინო ინფორმაციისა და გადაუდებელი შემთხვევისას საკონტაქტო პირების დამატება საგანგებო ვითარებაში სწრაფი რეაგირების სამსახურებს შეუწყობს ხელს.\n\nამ ინფორმაციის წაკითხვას ნებისმიერი პირი შეძლებს თქვენი ჩაკეტილი ეკრანიდან, ტელეფონის განბლოკვის საჭიროების გარეშე."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"დაამატეთ საგანგებო ვითარებაში გამოსაყენებელი ინფორმაცია"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"დაეხმარეთ საგანგებო ვითარებაში სწრაფი რეაგირების სამსახურებს მნიშვნელოვანი ინფორმაციის პოვნაში"</string>
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index f3263a1..a9c3fae 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Барлығын тазалау"</string>
     <string name="clear" msgid="3648880442502887163">"Тазалау"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Бүкіл ақпаратты және контактілерді тазалау керек пе?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Медициналық ақпаратты және шұғыл контактілерді енгізіп қойсаңыз, бұл жедел жәрдем қызметкеріне төтенше жағдайда хабарласуға көмектеседі.\n\nКез келген адам бұл ақпаратты телефоныңыздың құлпын ашпай, құлып экранынан оқи алады."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Медициналық ақпарат пен төтенше жағдайда хабарласу мәліметтері төтенше жағдайда алдымен қызметкерлерге көмектеседі.\n\nБұл ақпаратты кез келген адам құлыптау экранынан оқи алады және телефонды құлыптамастан аттарды түрте отырып, контактілерді тере алады."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Төтенше жағдайға арналған ақпаратты енгізу"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Жедел жәрдем қызметкеріне маңызды ақпаратты табуға көмектесу"</string>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index c6610d6..410a4b6 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -100,10 +100,10 @@
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"គ្មានព័ត៌មានអំពីម្ចាស់ទូរសព្ទនេះទេ"</string>
     <string name="tap_pencil" msgid="2723698054265296934">"ប្រសិនបើទូរសព្ទនេះជារបស់អ្នក សូមប៉ះរូបតំណាងខ្មៅដៃដើម្បីបញ្ចូលព័ត៌មានដែលនឹងត្រូវបង្ហាញនៅទីនេះក្នុងករណីសង្គ្រោះបន្ទាន់"</string>
-    <string name="clear_all" msgid="8899013032870561633">"ជម្រះទាំងអស់"</string>
-    <string name="clear" msgid="3648880442502887163">"ជម្រះ"</string>
+    <string name="clear_all" msgid="8899013032870561633">"លុបទាំងអស់"</string>
+    <string name="clear" msgid="3648880442502887163">"លុប"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"លុបព័ត៌មាន និងទំនាក់ទំនងទាំងអស់ឬ?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"ការបញ្ចូល​ទំនាក់ទំនង​វេជ្ជសាស្ត្រ និងសង្គ្រោះបន្ទាន់ អាចជួយអ្នកដែល​ធ្វើការសង្រ្គោះដំបូង​ក្នុងករណីបន្ទាន់។\n\nអ្នករាល់​គ្នា​អាច​អាន​ព័ត៌មាននេះ​ពីអេក្រង់​ចាក់សោរបស់អ្នក ដោយ​មិនចាំ​បាច់​ដោះសោ​ទូរសព្ទរបស់អ្នកទេ។"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"ការបញ្ចូលព័ត៌មានវេជ្ជសាស្ត្រ និងទំនាក់ទំនងសង្គ្រោះបន្ទាន់អាចជួយអ្នកសង្គ្រោះបឋមក្នុងប្រតិបត្តិការសង្គ្រោះបន្ទាន់បាន។\n\nអ្នករាល់គ្នាអាចអានព័ត៌មាននេះពីអេក្រង់ចាក់សោរបស់អ្នក និងហៅទូរសព្ទទៅលេខក្នុងទំនាក់ទំនងរបស់អ្នកដោយចុចឈ្មោះរបស់ពួកគេ ដោយមិនចាំបាច់ដោះសោអេក្រង់ទូរសព្ទរបស់អ្នកនោះទេ។"</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"បញ្ចូល​ព័ត៌មាន​បន្ទាន់"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"ជួយឲ្យ​អ្នកសង្គ្រោះដំបូងៗ​រក​ឃើញ​ព័ត៌មានសំខាន់"</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 505496c..b488569 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"ತೆರವುಗೊಳಿಸಿ"</string>
     <string name="clear" msgid="3648880442502887163">"ತೆರವುಗೊಳಿಸು"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"ಎಲ್ಲ ಮಾಹಿತಿ ಮತ್ತು ಸಂಪರ್ಕಗಳನ್ನು ತೆರವುಗೊಳಿಸುವುದೇ?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"ವೈದ್ಯಕೀಯ ಮಾಹಿತಿ ಮತ್ತು ತುರ್ತು ಸಂಪರ್ಕಗಳನ್ನು ಸೇರಿಸುವುದರಿಂದ ತುರ್ತುಪರಿಸ್ಥಿತಿಯಲ್ಲಿ ಮೊದಲು ಪ್ರತಿಕ್ರಿಯಿಸುವವರಿಗೆ ಸಹಾಯ ಮಾಡಬಹುದು. \n\nನಿಮ್ಮ ಫೋನ್‌ ಅನ್‌ಲಾಕ್ ಮಾಡದೆಯೇ, ನಿಮ್ಮ ಲಾಕ್‌ ಪರದೆಯಿಂದ ಯಾರು ಬೇಕಾದರೂ ಈ ಮಾಹಿತಿಯನ್ನು ಓದಬಹುದು."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"ವೈದ್ಯಕೀಯ ಮಾಹಿತಿಯನ್ನು ಸೇರಿಸುವುದು ಮತ್ತು ತುರ್ತು ಸಂಪರ್ಕಗಳು ತುರ್ತುಸ್ಥಿತಿಯಲ್ಲಿ ಮೊದಲ ಪ್ರಯೋಜನಕಾರಿಯಾಗಿರುತ್ತದೆ\n\n ಯಾರಾದರೂ ನಿಮ್ಮ ಲಾಕ್ ಪರದೆಯಿಂದ ಈ ಮಾಹಿತಿಯನ್ನು ಓದಬಹುದು ಮತ್ತು ನಿಮ್ಮ ಫೋನ್‌ಗಳನ್ನು ಅನ್‌ ಲಾಕ್ ಮಾಡದೆಯೇ ಅವರ ಹೆಸರುಗಳನ್ನು ಟ್ಯಾಪ್ ಮಾಡುವ ಮೂಲಕ ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ಡಯಲ್ ಮಾಡಬಹುದು."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"ತುರ್ತು ಮಾಹಿತಿಯನ್ನು ಸೇರಿಸಿ"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"ಮೊದಲು ಪ್ರತಿಕ್ರಿಯಿಸುವವರಿಗೆ ಪ್ರಮುಖ ಮಾಹಿತಿಯನ್ನು ಹುಡುಕಲು ಸಹಾಯ ಮಾಡಿ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 76fea96..37d15b7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"모두 삭제"</string>
     <string name="clear" msgid="3648880442502887163">"삭제"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"모든 정보 및 연락처를 삭제하시겠습니까?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"의료 정보와 비상 연락처를 추가하면 긴급 상황에서 초기 대처에 도움이 됩니다.\n\n누구든지 내 휴대전화를 잠금 해제하지 않고 잠금 화면에서 이 정보를 볼 수 있습니다."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"의료 정보와 비상 연락처를 추가하면 응급 상황에서 초기 대처에 도움이 될 수 있습니다.\n\n누구나 잠금 화면에서 이 정보를 읽을 수 있으며, 휴대전화를 잠금 해제하지 않고도 연락처 이름을 탭하여 전화를 걸 수 있습니다."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"긴급 상황 정보 추가"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"초기 대처자가 중요한 정보를 찾는 데 도움이 됩니다."</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 607d6b0..49ae841 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -31,7 +31,7 @@
     <string name="dob" msgid="2813161080307245706">"(<xliff:g id="DATE_OF_BIRTH">%1$s</xliff:g>)"</string>
     <string name="age" msgid="8327537794752630199">"Курагы: <xliff:g id="NUMERICAL_AGE">%1$d</xliff:g>"</string>
     <string name="remove_dob_icon_text" msgid="4413507180967999944">"Туулган күнүн алып салуу"</string>
-    <string name="blood_type" msgid="6947022772999974608">"Кан тобу"</string>
+    <string name="blood_type" msgid="6947022772999974608">"Канынын тобу"</string>
     <string name="unknown_blood_type" msgid="6337228278125085668">"Белгисиз"</string>
     <string name="oplus" msgid="7759756742377867011">"1-топ, +"</string>
     <string name="ominus" msgid="5227278501191741055">"1-топ, -"</string>
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Баарын тазалоо"</string>
     <string name="clear" msgid="3648880442502887163">"Тазалоо"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Бардык маалымат жана байланыштар тазалансынбы?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Медициналык маалыматты жана өзгөчө кырдаалда байланышка чыга турган адамдарды кошуу шашылыш учурда абдан жардам берет.\n\nБул маалымат телефон кулпуланып турса да, баарына көрүнөт."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Медициналык маалыматты жана өзгөчө кырдаалда байланышка чыга турган адамдарды кошуу шашылыш учурда абдан жардам берет.\n\nБул маалымат телефон кулпуланып турса да, баарына көрүнөт жана байланыштардын атын таптап, аларга чалууга болот."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Өзгөчө кырдаал маалыматын кошуу"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Маанилүү маалыматты тез табууга жардам бериңиз"</string>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index f13542e..def1f6b 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"ລຶບລ້າງທັງໝົດ"</string>
     <string name="clear" msgid="3648880442502887163">"ລຶບລ້າງ"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"ລຶບລ້າງຂໍ້ມູນ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ທັງໝົດອອກບໍ?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"ການເພີ່ມຂໍ້ມູນທາງການແພດ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ສຸກເສີນສາມາດຊ່ວຍຜູ້ຕອບກັບໃນກໍລະນີສຸກເສີນໄດ້.\n\nທຸກຄົນສາມາດອ່ານຂໍ້ມູນນີ້ຈາກໜ້າຈໍລັອກຂອງທ່ານໄດ້ໂດຍບໍ່ຕ້ອງປົດລັອກໂທລະສັບ."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"ການເພີ່ມຂໍ້ມູນທາງການແພດ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ສຸກເສີນສາມາດຊ່ວຍໃນກໍລະນີມີເຫດສຸກເສີນໄດ້.\n\nທຸກຄົນສາມາດເບິ່ງເຫັນຂໍ້ມູນນີ້ຈາກໜ້າຈໍລັອກຂອງທ່ານ ແລະ ໂທຫາລາຍຊື່ຜູ້ຕິດຕໍ່ຂອງທ່ານໂດຍການແຕະທີ່ຊື່ຂອງເຂົາເຈົ້າ, ໂດຍບໍ່ຕ້ອງປົດລັອກໂທລະສັບຂອງທ່ານໄດ້."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"ເພີ່ມຂໍ້ມູນສຸກເສີນ"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"ຊ່ວຍຜູ້ຕອບກັບທຳອິດຊອກຫາຂໍ້ມູນສຳຄັນໄດ້"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4aa61b4..a98fe80 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Išvalyti viską"</string>
     <string name="clear" msgid="3648880442502887163">"Išvalyti"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Išvalyti visą informaciją ir kontaktus?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Pridėję medicininę informaciją ir kritinės padėties kontaktą, padėsite žmonėms, kurie pirmieji sureaguos kritiniu atveju.\n\nVisi galės perskaityti šią informaciją užrakinimo ekrane neatrakinę telefono."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Pridėję medicininės informacijos ir kritinės padėties kontaktų, padėsite žmonėms, kurie sureaguos kritiniu atveju.\n\nVisi galės perskaityti šią informaciją ir paskambinti jūsų kontaktams įvesdami jų vardus užrakinimo ekrane neatrakinę telefono."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Pridėkite kritinės padėties informaciją"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Padėkite pirmiesiems sureagavusiems žmonėms rasti svarbią informaciją"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 4a192bf..a8fa6e3 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -88,7 +88,7 @@
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
     <string name="emergency_contacts_title" msgid="5462202017417821030">"Kontaktpersonas ārkārtas situācijām"</string>
-    <string name="add_emergency_contact" msgid="4063577069613981029">"Kontaktpersonas pievienošana"</string>
+    <string name="add_emergency_contact" msgid="4063577069613981029">"Pievienot kontaktpersonu"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"Nevarēja atrast kontaktpersonu atlasītāju."</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"Nevar parādīt kontaktpersonu."</string>
     <string name="remove_contact" msgid="6934983445723096759">"Vai noņemt kontaktpersonu <xliff:g id="CONTACT_NAME">%1$s</xliff:g> no ārkārtas situāciju kontaktpersonām?"</string>
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Notīrīt visu"</string>
     <string name="clear" msgid="3648880442502887163">"Notīrīt"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Vai notīrīt visu informāciju un kontaktpersonas?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Medicīniskās informācijas un ārkārtas situāciju kontaktpersonu pievienošana ārkārtas gadījumā var sniegt noderīgu informāciju glābējiem.\n\nIkviens var izlasīt šo informāciju jūsu bloķēšanas ekrānā, neatbloķējot jūsu tālruni."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Medicīniskās informācijas un ārkārtas situāciju kontaktpersonu pievienošana ārkārtas gadījumā var sniegt noderīgu informāciju glābējiem.\n\nIkviens var izlasīt šo informāciju jūsu bloķēšanas ekrānā un piezvanīt attiecīgajām kontaktpersonām, pieskaroties to vārdiem, taču neatbloķējot jūsu tālruni."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Ārkārtas informācijas pievienošana"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Palīdziet glābējiem atrast noderīgu informāciju"</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index b22d4d3..a9fff8b 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Исчисти ги сите"</string>
     <string name="clear" msgid="3648880442502887163">"Исчисти"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Да се исчистат сите информации и контакти?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Додавањето медицински информации и контакти за итни случаи може да им помогнат на првите лица што ќе реагираат при итен случај.\n\nСекој ќе може да ги прочита информацииве од заклучениот екран без да го отклучи телефонот."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Додавањето медицински информации и контакти за итни случаи може да им помогне на првите лица што ќе реагираат при итен случај.\n\nСекој ќе може да ги прочита информацииве од заклучениот екран и да ги повика контактите со допирање на нивните имиња, без да го отклучи телефонот."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Додајте информации за итни случаи"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Помогнете им на првите лица што ќе реагираат да најдат важни информации"</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 3adba55..4825751 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"എല്ലാം മായ്‌ക്കുക"</string>
     <string name="clear" msgid="3648880442502887163">"മായ്‌ക്കുക"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"എല്ലാ വിവരങ്ങളും കോൺടാക്റ്റുകളും മായ്ക്കണോ?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"മെഡിക്കൽ വിവരങ്ങളും അടിയന്തിര ഘട്ടത്തിൽ ബന്ധപ്പെടാനുള്ളവരുടെ വിവരങ്ങളും ചേർക്കുന്നത്, അടിയന്തിര ഘട്ടത്തിൽ ആദ്യം പ്രതികരിക്കുന്നവരെ സഹായിക്കും.\n\nനിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യാതെ തന്നെ നിങ്ങളുടെ ലോക്ക് സ്ക്രീനിൽ നിന്ന് ഈ വിവരങ്ങൾ ആർക്കും വായിക്കാൻ കഴിയും."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"മെഡിക്കൽ വിവരങ്ങളും അടിയന്തിര ഘട്ടത്തിൽ ബന്ധപ്പെടാനുള്ള വിവരങ്ങളും ചേർക്കുന്നത്, അടിയന്തിര ഘട്ടത്തിൽ ആദ്യം പ്രതികരിക്കുന്നവരെ സഹായിക്കും.\n\nനിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യാതെ ലോക്ക് സ്‌ക്രീനിൽ വിവരങ്ങൾ ആർക്കും വായിക്കാനാകുകയും ടാപ്പ് ചെയ്ത് കോൾ ചെയ്യാനും കഴിയുന്നു"</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"അടിയന്തിര ഘട്ടത്തിൽ ബന്ധപ്പെടാനുള്ളവരുടെ വിവരങ്ങൾ ചേർക്കുക"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"പ്രധാനപ്പെട്ട വിവരങ്ങൾ കണ്ടെത്തുന്നതിന് അടിയന്തിര ഘട്ടത്തിൽ ആദ്യം പ്രതികരിക്കുന്നവരെ സഹായിക്കുക"</string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index af7844a..f393b51 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Бүгдийг арилгах"</string>
     <string name="clear" msgid="3648880442502887163">"Устгах"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Бүх мэдээлэл, харилцагчдыг устгах уу?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Эрүүл мэндийн мэдээлэл болон яаралтай үед холбоо барих харилцагчийн мэдээлэл оруулснаар яаралтай тусламжийн үед анхлан туслагчдад хэрэг болно.\n\nЭнэ мэдээллийг хүн бүхэн таны түгжигдсэн дэлгэцээс утасны түгжээг тайлахгүйгээр харах боломжтой."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Эрүүл мэндийн мэдээлэл болон яаралтай үед холбоо барих харилцагчийн мэдээлэл оруулснаар яаралтай тусламжийн үед анхлан туслагчдад хэрэг болно.\n\nЭнэ мэдээллийг хүн бүхэн таны түгжигдсэн дэлгэцээс унших боломжтой бөгөөд утасны түгжээг тайлахгүйгээр харилцагчийн нэрийг товшин залгах боломжтой."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Яаралтай тусламжийн мэдээлэл нэмэх"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Анхлан туслагчдад чухал мэдээллийг олоход туслах"</string>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index a8364f3..4d8646e 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"सर्व साफ करा"</string>
     <string name="clear" msgid="3648880442502887163">"साफ करा"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"सर्व माहिती आणि संपर्क साफ करायचे?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"वैद्यकीय माहिती आणि आणीबाणी संपर्क जोडल्याने आणीबाणीच्या काळात प्रथम प्रतिसाद देणार्‍यांस मदत होऊ शकते.\n\nही माहिती कोणीही तुमचा फोन अनलॉक न करता तुमच्या लॉकस्क्रीनवरून वाचू शकते."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"वैद्यकीय माहिती आणि आपत्कालीन संपर्क जोडणे आपत्कालीन काळामध्ये प्रथम प्रतिसादकर्त्यांची मदत करू शकतात.\n\nकोणीही तुमच्या लॉकस्क्रीनवरून ही माहिती वाचू शकते आणि तुमचा फोन अनलॉक न करता तुमच्या संपर्कांना त्यांच्या नावावर टॅप करून डायल करू शकते."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"आणीबाणी माहिती जोडा"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"प्रथम प्रतिसाद देणार्‍यांना महत्त्वाची माहिती शोधण्यात मदत करा"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 4b83f81..759b3da 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Kosongkan semua"</string>
     <string name="clear" msgid="3648880442502887163">"Kosongkan"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Kosongkan semua maklumat dan kenalan?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Penambahan maklumat perubatan dan nombor untuk dihubungi dalam kes kecemasan dapat membantu pasukan bantuan pertama dalam kes kecemasan.\n\nSesiapa sahaja dapat membaca maklumat ini daripada skrin kunci anda tanpa membuka kunci telefon."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Penambahan maklumat perubatan dan butiran hubungan kecemasan dapat membantu pasukan bantuan dalam kes kecemasan.\n\nSesiapa sahaja dapat membaca maklumat ini daripada skrin kunci anda dan mendail orang hubungan anda dengan mengetik namanya tanpa membuka kunci telefon anda."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Tambahkan maklumat kecemasan"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Bantu pasukan bantuan pertama mencari maklumat penting"</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 458f584..58a2fd9 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -88,7 +88,7 @@
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
     <string name="emergency_contacts_title" msgid="5462202017417821030">"အရေးပေါ်အခြေအနေတွင် ဆက်သွယ်ရမည့်သူများ"</string>
-    <string name="add_emergency_contact" msgid="4063577069613981029">"အဆက်အသွယ် ထည့်ပါ"</string>
+    <string name="add_emergency_contact" msgid="4063577069613981029">"ထည့်ရန်"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"အဆက်အသွယ် ရွေးချယ်ခြင်းစနစ်ကို ရှာမတွေ့ပါ"</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"အဆက်အသွယ်များကို ပြသ၍မရပါ"</string>
     <string name="remove_contact" msgid="6934983445723096759">"<xliff:g id="CONTACT_NAME">%1$s</xliff:g> ကို အရေးပေါ်အခြေအနေတွင် ဆက်သွယ်ရမည့်သူများစာရင်းမှ ဖယ်ရှားမလား။"</string>
@@ -96,14 +96,14 @@
     <string name="fail_add_contact" msgid="6511490846952942291">"အဆက်အသွယ်အချက်အလက်များကို ကောင်းမွန်စွာ ဖတ်၍မရပါ"</string>
     <string name="remove" msgid="1243949503772376064">"ဖယ်ရှားပါ"</string>
     <string name="cancel" msgid="7401575239009060939">"မလုပ်တော့"</string>
-    <string name="ok" msgid="163967937451981024">"အိုကေ"</string>
+    <string name="ok" msgid="163967937451981024">"OK"</string>
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"ဖုန်းပိုင်ရှင်နှင့် ပတ်သက်သည့် အချက်အလက်များ မရှိပါ"</string>
     <string name="tap_pencil" msgid="2723698054265296934">"ဤအရာသည် သင့်ဖုန်းဖြစ်ပါက အရေးပေါ်ကိစ္စကြုံလာလျှင် ပြသမည့် အချက်အလက်များထည့်ရန် ခဲတံသင်္ကေတကို တို့ပါ"</string>
     <string name="clear_all" msgid="8899013032870561633">"အားလုံး ရှင်းပါ"</string>
     <string name="clear" msgid="3648880442502887163">"ရှင်းရန်"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"အချက်အလက်နှင့် အဆက်အသွယ်အားလုံးကို ရှင်းမလား။"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"ကျန်းမာရေးအချက်အလက်များနှင့် အရေးပေါ် အဆက်အသွယ်များကို ထည့်သွင်းခြင်းအားဖြင့် အရေးပေါ်အခြေအနေတစ်ခုတွင် ဦးဆုံးတုံ့ပြန်သူများက ၎င်းအချက်အလက်များကို တွေ့မြင်နိုင်ရန် ကူညီပေးပါသည်။\n\nသင့်ဖုန်းကို လော့ခ်ဖွင့်စရာမလိုဘဲ လော့ခ်ချထားချိန်မျက်နှာပြင်တွင် ဤအချက်အလက်များကို မည်သူမဆိုဖတ်နိုင်ပါသည်။"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"ကျန်းမာရေးအချက်အလက်များနှင့် အရေးပေါ် အဆက်အသွယ်များကို ထည့်သွင်းခြင်းအားဖြင့် အရေးပေါ်အခြေအနေတစ်ခုတွင် ဦးဆုံးတုံ့ပြန်သူများက ၎င်းအချက်အလက်များကို တွေ့မြင်နိုင်ရန် ကူညီပေးပါသည်။\n\nသင့်ဖုန်းကို လော့ခ်ဖွင့်စရာမလိုဘဲ သင့်အဆက်အသွယ်များကို လော့ခ်ချထားချိန်မျက်နှာပြင်တွင် ဤအချက်အလက်များကို မည်သူမဆိုဖတ်နိုင်ပြီး သင့်အဆက်အသွယ်များ၏ အမည်ကို တို့၍ ၎င်းတို့ကို ဖုန်းဆက်နိုင်ပါသည်။"</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"အရေးပေါ်အချက်အလက်များကို ထည့်သွင်းရန်"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"အရေးကြီးသော အချက်အလက်များကို ဦးဆုံးတုံ့ပြန်သူများက တွေ့မြင်နိုင်ရန် ကူညီပေးပါ"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 12ed671..dbdc612 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Fjern alt"</string>
     <string name="clear" msgid="3648880442502887163">"Fjern"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Vil du fjerne alle opplysningene og kontaktene?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Hvis du legger til medisinsk informasjon og nødkontakter, kan det hjelpe utrykningspersonell ved nødstilfeller.\n\nHvem som helst kan lese denne informasjonen fra låseskjermen uten å låse opp telefonen din."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Hvis du legger til medisinsk informasjon og nødkontakter, kan dette brukes ved førstehjelp i nødstilfeller.\n\nHvem som helst kan lese denne informasjonen fra låseskjermen og ringe kontaktene dine ved å trykke på kontaktnavnene – uten å låse opp telefonen din."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Legg til opplysninger for nødstilfeller"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Hjelp utrykningspersonell med å finne viktig informasjon"</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 7b0f1c8..0b6ed15 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"सबै हटाउनुहोस्"</string>
     <string name="clear" msgid="3648880442502887163">"खाली गर्नुहोस्"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"सबै जानकारी र सम्पर्कहरूलाई मेटाउने हो?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"चिकित्सकीय जानकारी थप्नुले आपतकालीन अवस्थामा सहयोग पुर्याउने पहिला व्यक्तिहरूलाई मद्दत गर्नसक्छ।\n\nजोसुकैले पनि तपाईंको फोन अनलक नगरिकनै यो जानकारी पढ्न सक्छन्।"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"चिकित्सकीय जानकारी तथा आपतकालीन सम्पर्क नम्बरहरू थप्नुले कुनै आपतकालीन अवस्थामा पहिलो प्रतिक्रिया दिने व्यक्तिहरूलाई मद्दत गर्नसक्छ।\n\nतपाईंको लक स्क्रिनबाट जोसुकैले पनि यो जानकारी पढ्न र तपाईंको फोन अनलक नगरिकनै तपाईंको सम्पर्क सूचीमा रहेका व्यक्तिहरूलाई उनीहरूको नाममा ट्याप गरेर कल गर्नसक्छ।"</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"आपतकालीन जानकारी थप्नुहोस्‌"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"आपतकालीन अवस्थामा सहयोग पुर्याउने पहिला व्यक्तिहरूलाई महत्त्वपूर्ण जानकारी प्राप्त गर्न मद्दत गर्नुहोस्‌"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 44483b5..f2bce55 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Alles wissen"</string>
     <string name="clear" msgid="3648880442502887163">"Wissen"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Alle informatie en contacten wissen?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Als je medische informatie en noodcontacten toevoegt, kan dit eerstehulpverleners helpen tijdens een noodgeval.\n\nIedereen kan deze informatie op je vergrendeldingsscherm lezen zonder je telefoon te ontgrendelen."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Als je medische informatie en noodcontacten toevoegt, kan dit eerstehulpverleners helpen tijdens een noodgeval.\n\nIedereen kan deze informatie op je vergrendelingsscherm lezen en je contacten bellen door op hun namen te tikken zonder je telefoon te ontgrendelen."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Noodinformatie toevoegen"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Help eerstehulpverleners belangrijke informatie te vinden"</string>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 4bb3f10..32efb30 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -19,7 +19,7 @@
     <string name="app_label" msgid="1090682794607161063">"ਸੰਕਟਕਾਲ ਜਾਣਕਾਰੀ"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"ਡਾਕਟਰੀ ਜਾਣਕਾਰੀ"</string>
     <string name="edit_medical_info" msgid="6733720353375319476">"ਜਾਣਕਾਰੀ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
-    <string name="edit_info" msgid="5973929805855224805">"ਐਮਰਜੈਂਸੀ ਜਾਣਕਾਰੀ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
+    <string name="edit_info" msgid="5973929805855224805">"ਸੰਕਟਕਾਲੀਨ ਜਾਣਕਾਰੀ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"ਜਾਣਕਾਰੀ"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"ਸੰਪਰਕ"</string>
     <string name="name" msgid="4286267457738861977">"ਨਾਮ"</string>
@@ -90,7 +90,7 @@
     <string name="emergency_contacts_title" msgid="5462202017417821030">"ਐਮਰਜੈਂਸੀ ਸੰਪਰਕ"</string>
     <string name="add_emergency_contact" msgid="4063577069613981029">"ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"ਕਿਸੇ ਸੰਪਰਕ ਚੋਣਕਾਰ ਨੂੰ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"</string>
-    <string name="fail_display_contact" msgid="4128854688897045879">"ਸੰਪਰਕ ਵਿਖਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"</string>
+    <string name="fail_display_contact" msgid="4128854688897045879">"ਸੰਪਰਕ ਪ੍ਰਦਰਸ਼ਿਤ ਨਹੀਂ ਜਾ ਸਕਦਾ"</string>
     <string name="remove_contact" msgid="6934983445723096759">"ਕੀ <xliff:g id="CONTACT_NAME">%1$s</xliff:g> ਤੋਂ ਐਮਰਜੈਂਸੀ ਸੰਪਰਕਾਂ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"</string>
     <string name="remove_contact_icon_text" msgid="4576641386490101363">"ਸੰਪਰਕ ਹਟਾਓ"</string>
     <string name="fail_add_contact" msgid="6511490846952942291">"ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਨੂੰ ਸਹੀ ਢੰਗ ਨਾਲ ਪੜ੍ਹਨ ਦੇ ਅਯੋਗ"</string>
@@ -99,11 +99,11 @@
     <string name="ok" msgid="163967937451981024">"ਠੀਕ"</string>
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"ਫ਼ੋਨ ਦੇ ਮਾਲਕ ਬਾਰੇ ਕੋਈ ਜਾਣਕਾਰੀ ਨਹੀਂ"</string>
-    <string name="tap_pencil" msgid="2723698054265296934">"ਜੇਕਰ ਇਹ ਤੁਹਾਡਾ ਫ਼ੋਨ ਹੈ, ਤਾਂ ਉਹ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਪੈਂਸਿਲ ਚਿੰਨ੍ਹ \'ਤੇ ਟੈਪ ਕਰੋ ਜੋ ਕਿ ਐਮਰਜੈਂਸੀ ਦੀ ਸਥਿਤੀ ਵਿੱਚ ਇੱਥੇ ਵਿਖਾਈ ਦੇਵੇਗੀ"</string>
+    <string name="tap_pencil" msgid="2723698054265296934">"ਜੇਕਰ ਇਹ ਤੁਹਾਡਾ ਫ਼ੋਨ ਹੈ, ਤਾਂ ਉਹ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਪੈਂਸਿਲ ਪ੍ਰਤੀਕ \'ਤੇ ਟੈਪ ਕਰੋ ਜੋ ਕਿ ਸੰਕਟਕਾਲੀਨ ਸਥਿਤੀ ਵਿੱਚ ਇੱਥੇ ਦਿਖਾਈ ਦੇਵੇਗੀ"</string>
     <string name="clear_all" msgid="8899013032870561633">"ਸਭ ਕਲੀਅਰ ਕਰੋ"</string>
     <string name="clear" msgid="3648880442502887163">"ਕਲੀਅਰ ਕਰੋ"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"ਕੀ ਸਾਰੀ ਜਾਣਕਾਰੀ ਅਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"ਡਾਕਟਰੀ ਜਾਣਕਾਰੀ ਅਤੇ ਸੰਕਟਕਾਲੀਨ ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰਨ ਨਾਲ ਕਿਸੇ ਸੰਕਟਕਾਲ ਵਿੱਚ ਸਭ ਤੋਂ ਪਹਿਲਾਂ ਪਹੁੰਚਣ ਵਾਲੇ ਮਦਦਗਾਰਾਂ ਨੂੰ ਮਦਦ ਮਿਲ ਸਕਦੀ ਹੈ।\n\nਕੋਈ ਵੀ ਵਿਅਕਤੀ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕੀਤੇ ਬਿਨਾਂ ਤੁਹਾਡੀ ਲੌਕ ਸਕ੍ਰੀਨ ਤੋਂ ਇਹ ਜਾਣਕਾਰੀ ਪੜ੍ਹ ਸਕਦਾ ਹੈ।"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Adding medical information and emergency contacts can help first responders in an emergency.\n\nAnyone can read this information from your lock screen, and dial your contacts by tapping their names, without unlocking your phone."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"ਸੰਕਟਕਾਲੀਨ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"ਮਹੱਤਵਪੂਰਨ ਜਾਣਕਾਰੀ ਲੱਭਣ ਵਿੱਚ ਸਭ ਤੋਂ ਪਹਿਲਾਂ ਪਹੁੰਚਣ ਵਾਲੇ ਮਦਦਗਾਰਾਂ ਦੀ ਮਦਦ ਕਰੋ"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8c14166..8f5e38e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Wyczyść wszystko"</string>
     <string name="clear" msgid="3648880442502887163">"Usuń"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Usunąć wszystkie informacje i kontakty?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Dodanie informacji medycznych i kontaktów alarmowych może pomóc ratownikom w sytuacji alarmowej.\n\nKażdy będzie mógł odczytać te informacje na ekranie blokady bez konieczności odblokowywania telefonu."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Dodanie informacji medycznych i kontaktów alarmowych może pomóc ratownikom w sytuacji alarmowej.\n\nKażdy będzie mógł odczytać te informacje na ekranie blokady oraz zadzwonić do Twoich kontaktów bez konieczności odblokowywania telefonu – wystarczy, że kliknie nazwę kontaktu."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Dodawanie informacji alarmowych"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Pomóż ratownikom znaleźć ważne informacje"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 335371e..247b1d3 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Limpar tudo"</string>
     <string name="clear" msgid="3648880442502887163">"Limpar"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Pretende limpar todas as informações e contactos?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Adicionar informações médicas e contactos de emergência pode ajudar os socorristas numa situação de emergência.\n\nQualquer pessoa pode ler estas informações no ecrã de bloqueio sem desbloquear o telemóvel."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Adicionar informações médicas e contactos de emergência pode ajudar os socorristas numa situação de emergência.\n\nQualquer pessoa pode ler estas informações no ecrã de bloqueio e marcar os números dos seus contactos ao tocar nos respetivos nomes sem desbloquear o telemóvel."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Adicionar informações de emergência"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Ajudar os socorristas a encontrar informações importantes"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 3133e84..62e6baa 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Limpar tudo"</string>
     <string name="clear" msgid="3648880442502887163">"Limpar"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Limpar todas as informações e contatos?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"A adição de informações médicas e contatos de emergência pode ajudar os socorristas em uma emergência.\n\nQualquer pessoa pode ler essas informações na tela de bloqueio sem destravar o smartphone."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Adicionar informações médicas e contatos de emergência pode ajudar os socorristas em uma emergência.\n\nQualquer pessoa pode ler essas informações na tela de bloqueio e ligar para seus contatos tocando no nome deles sem desbloquear o smartphone."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Adicionar informações de emergência"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Ajudar os socorristas a encontrar informações importantes"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a488a1a..82d06a7 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Ștergeți tot"</string>
     <string name="clear" msgid="3648880442502887163">"Ștergeți"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Ștergeți toate informațiile și persoanele de contact?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Adăugând informații medicale și persoane de contact pentru urgențe, îi puteți ajuta pe cei care acordă primul ajutor în caz de urgență.\n\n Oricine poate citi aceste informații de pe ecranul de blocare fără a vă debloca telefonul."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Adăugând informații medicale și persoane de contact pentru urgențe, îi puteți ajuta pe cei care acordă primul ajutor în caz de urgență.\n\nOricine poate să citească aceste informații de pe ecranul de blocare și să apeleze persoanele de contact atingându-le numele, fără să deblocheze telefonul."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Adăugați informații în caz de urgență"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Ajutați-i pe cei care acordă primul ajutor să găsească informații importante"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f02bd10..4eaf649 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -77,7 +77,7 @@
     <string name="medications" msgid="644428945685557183">"Медицинские препараты"</string>
     <string name="unknown_medications" msgid="2764171064510423734">"Неизвестно"</string>
     <string name="medications_hint" msgid="3221620025945593723">"Например, аспирин"</string>
-    <string name="medical_conditions" msgid="3555690011498283592">"Медицинская информация"</string>
+    <string name="medical_conditions" msgid="3555690011498283592">"Заболевания"</string>
     <string name="unknown_medical_conditions" msgid="8051364895172053770">"Неизвестно"</string>
     <string name="medical_conditions_hint" msgid="6959152183029062882">"Например, астма"</string>
     <string name="organ_donor" msgid="5953509460007124827">"Донор органов"</string>
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Очистить все"</string>
     <string name="clear" msgid="3648880442502887163">"Очистить"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Удалить все контакты и другие данные?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Мы рекомендуем указать медицинскую информацию о себе и контакты на случай чрезвычайной ситуации.\n\nЭти данные будут видны всем на заблокированном экране вашего устройства."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Мы рекомендуем указать медицинскую информацию о себе и контакты на случай чрезвычайной ситуации.\n\nЭти данные будут видны всем на заблокированном экране вашего устройства. Чтобы позвонить, достаточно будет нажать на имя контакта."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Добавьте данные для экстренных случаев"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Эта информация будет доступна всем на заблокированном экране"</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 3cae498..74a589d 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"සියල්ල හිස් කරන්න"</string>
     <string name="clear" msgid="3648880442502887163">"හිස් කරන්න"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"සියලු තොරතුරු හා සම්බන්ධතා හිස් කරන්නද?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"වෛද්‍යමය තොරතුරු සහ හදිසි අවස්ථා සම්බන්ධතා එක් කිරීම හදිසි අවස්ථාවකදී පළමු ප්‍රතිචාර දක්වන්නන්ට උදවු විය හැකිය.\n\nඕනෑම කෙනෙකුට ඔබේ දුරකථනය අගුලු හැරීමෙන් තොරව මෙම තොරතුරු කියවිය හැකිය."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"වෛද්‍යමය තොරතුරු සහ හදිසි අවස්ථා සම්බන්ධතා එක් කිරීම හදිසි අවස්ථාවකදී පළමු ප්‍රතිචාර දක්වන්නන්ට උදවු විය හැකිය.\n\nඕනෑම කෙනෙකුට ඔබේ දුරකථනය අගුලු හැරීමෙන් තොරව අගුලු තිරය මත මෙම තොරතුරු කියවීමට සහ ඔවුන්ගේ නම්වලට තට්ටු කිරීමෙන් ඔබේ සම්බන්ධතා ඩයල් කිරීමට හැකිය."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"හදිසි අවස්ථා තොරතුරු එක් කරන්න"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"පළමු ප්‍රතිචාර දක්වන්නන්ට වැදගත් තොරතුරු සොයා ගැනීමට උදවු වන්න"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index cec557f..b6d5c55 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Vymazať všetko"</string>
     <string name="clear" msgid="3648880442502887163">"Vymazať"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Vymazať všetky informácie a kontakty?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Pridaním zdravotníckych informácií a núdzových kontaktov pomôžete prvým zasahujúcim osobám v núdzovej situácii.\n\nTieto informácie si môže na uzamknutej obrazovke prečítať hocikto bez odomknutia vášho telefónu."</string>
-    <string name="settings_suggestion_title" msgid="2503369576806243476">"Pridajte núdzové informácie"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Pridaním zdravotníckych informácií a núdzových kontaktov pomôžete prvým zasahujúcim osobám v núdzovej situácii.\n\nTieto informácie si môže na uzamknutej obrazovke prečítať ktokoľvek a vytočiť kontakty klepnutím na ich mená bez odomknutia obrazovky."</string>
+    <string name="settings_suggestion_title" msgid="2503369576806243476">"Pridajte tiesňové informácie"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Pomôžte prvým zasahujúcim osobám zistiť dôležité informácie"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 3c4656c..78b940d 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Izbriši vse"</string>
     <string name="clear" msgid="3648880442502887163">"Izbriši"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Želite izbrisati vse informacije in stike?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Zdravstveni podatki in stiki za nujne primere, ki jih dodate v telefon, so lahko koristni za osebe, ki prve priskočijo na pomoč v nujnih primerih.\n\nTe podatke lahko vsakdo prebere na zaklenjenem zaslonu, ne da bi moral odkleniti telefon."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Zdravstveni podatki in stiki za nujne primere, ki jih dodate v telefon, so lahko koristni za osebe, ki prve priskočijo na pomoč v nujnih primerih.\n\nTe podatke lahko vsakdo prebere na zaklenjenem zaslonu in pokliče stike tako, da se dotakne njihovih imen, ne da bi pred tem moral odkleniti telefon."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Dodajanje podatkov za nujne primere"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Osebam, ki prve priskočijo na pomoč, pomagajte priti do pomembnih podatkov"</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 8b213e7..bab1034 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Pastroji të gjitha"</string>
     <string name="clear" msgid="3648880442502887163">"Pastro"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Të pastrohen të gjitha informacionet dhe kontaktet?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Shtimi i informacioneve mjekësore dhe kontakteve të urgjencës mund t\'i ndihmojë personat e parë që përgjigjen në rast urgjence.\n\nÇdo person mund t\'i lexojë këto informacione nga ekrani yt i kyçjes pa e shkyçur telefonin."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Shtimi i informacioneve mjekësore dhe kontakteve të urgjencës mund t\'i ndihmojë personat e parë që përgjigjen në rast urgjence.\n\nÇdo person mund t\'i lexojë këto informacione nga ekrani yt i kyçjes dhe t\'i telefonojë kontaktet e tua duke trokitur tek emrat, pa e shkyçur telefonin."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Shto informacionet e urgjencës"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Ndihmo personat e parë që përgjigjen që të gjejnë informacione të rëndësishme"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 332fe32..4f301ef 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Обриши све"</string>
     <string name="clear" msgid="3648880442502887163">"Обриши"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Желите ли да обришете све информације и контакте?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Ако додате медицинске податке и контакте за хитне случајеве, можете да помогнете екипама хитних служби у хитним случајевима.\n\nСвако може да прочита те податке са закључаног екрана без откључавања телефона."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Ако додате медицинске податке и контакте за хитне случајеве, можете да помогнете екипама хитних служби у хитним случајевима.\n\nСвако може да прочита те податке са закључаног екрана без откључавања телефона."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Додајте информације за хитне случајеве"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Помозите екипама хитних служби да пронађу важне информације"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 48840bb..e372bf4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -71,7 +71,7 @@
     <string name="ab_positive" msgid="1931300033534642005">"AB-positiv"</string>
     <string name="ab_negative" msgid="2064555613093591729">"AB-negativ"</string>
     <string name="h_h" msgid="2183333409760379720">"H H"</string>
-    <string name="allergies" msgid="2789200777539258165">"Allergi"</string>
+    <string name="allergies" msgid="2789200777539258165">"Allergier"</string>
     <string name="unknown_allergies" msgid="4383115953418061237">"Ingen uppgift"</string>
     <string name="allergies_hint" msgid="5488918780522184147">"Till exempel jordnötter"</string>
     <string name="medications" msgid="644428945685557183">"Läkemedel"</string>
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Rensa alla"</string>
     <string name="clear" msgid="3648880442502887163">"Rensa"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Vill du rensa alla uppgifter och kontakter?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Det kan vara till hjälp för utryckningspersonalen i en krissituation om du har lagt till medicinsk information och en kriskontakt.\n\nVem som helst kan läsa informationen på låsskärmen utan att låsa upp mobilen."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Om du lägger till medicinsk information och ICE-kontakter kan utryckningspersonalen använda dessa uppgifter i en nödsituation.\n\nVem som helst kan läsa informationen på låsskärmen och ringa kontakterna genom att trycka på namnen utan att låsa upp mobilen."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Lägga till krisinformation"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Hjälp utryckningspersonalen att hitta viktig information"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3fed4d7..317bcae 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -99,11 +99,11 @@
     <string name="ok" msgid="163967937451981024">"Sawa"</string>
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"Hatuna maelezo kuhusu mwenye simu hii"</string>
-    <string name="tap_pencil" msgid="2723698054265296934">"Ikiwa hii ni simu yako, gonga aikoni ya penseli ili uongeze maelezo ambayo yataonekana hapa wakati wa dharura."</string>
+    <string name="tap_pencil" msgid="2723698054265296934">"Ikiwa hii ni simu yako, gusa aikoni ya penseli ili uongeze maelezo ambayo yataonekana hapa wakati wa dharura."</string>
     <string name="clear_all" msgid="8899013032870561633">"Futa yote"</string>
     <string name="clear" msgid="3648880442502887163">"Futa"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Je, ungependa kufuta maelezo na anwani zote?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Kuongeza maelezo kuhusu matibabu na anwani za dharura kunaweza kuwasaidia wahudumu wa kwanza katika hali ya dharura.\n\nMtu yeyote anaweza kusoma maelezo haya kutoka kwenye skrini yako iliyofungwa bila kufungua simu yako."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Hatua ya kuongeza maelezo ya matibabu ya anwani za dharura inaweza kuwasaidia wahudumu wa hali za dharura.\n\nMtu yeyote anaweza kusoma maelezo haya kwenye skrini ya simu yako iliyofungwa na kuwapigia simu watu unaowasiliana nao kwa kugonga majina yao bila kufungua simu yako."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Ongeza maelezo ya dharura"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Wasaidie wahudumu wa kwanza wapate maelezo muhimu"</string>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index f52bd05..4a26483 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -83,7 +83,7 @@
     <string name="organ_donor" msgid="5953509460007124827">"உறுப்பு தானம் செய்பவர்"</string>
     <string name="unknown_organ_donor" msgid="2780515342875494225">"தெரியவில்லை"</string>
     <string name="yes" msgid="5829765567799916128">"ஆம்"</string>
-    <string name="no" msgid="1681689233660683509">"வேண்டாம்"</string>
+    <string name="no" msgid="1681689233660683509">"இல்லை"</string>
     <!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"அனைத்தையும் அழி"</string>
     <string name="clear" msgid="3648880442502887163">"அழி"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"எல்லா தகவலையும் தொடர்புகளையும் அழிக்கவா?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"மருத்துவத் தகவலையும் அவசரகாலத் தொடர்புகளையும் சேர்த்தால், அவசரகாலத்தில் முதலில் உதவுபவர்களுக்கு உதவலாம்.\n\nஉங்கள் மொபைலைத் திறக்காமலேயே, பூட்டுத் திரையிலிருந்து இந்தத் தகவலை எவரும் பார்க்க முடியும்."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"மருத்துவத் தகவலையும் அவசரகாலத் தொடர்புகளையும் சேர்ப்பதால், அவசரகாலத்தில் முதலில் உதவ முன்வருபவர்களுக்கு அந்தத் தகவல் உதவலாம்.\n\nஉங்கள் மொபைலைத் திறக்காமலேயே, பூட்டுத் திரையிலிருந்து இந்தத் தகவலை எவரும் பார்க்க முடியும். அத்துடன் உங்கள் தொடர்புகளின் பெயர்களைத் தட்டி, அவர்களை அழைக்க முடியும்."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"அவசரத் தகவலைச் சேர்க்கவும்"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"முதலில் உதவுபவர்கள் முக்கியமான தகவலைப் பெற உதவவும்"</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 021257f..8a8f986 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"అన్నీ తీసివేయి"</string>
     <string name="clear" msgid="3648880442502887163">"తీసివేయి"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"మొత్తం సమాచారం మరియు పరిచయాలను తీసివేయాలా?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"వైద్య సమాచారం మరియు అత్యవసర పరిచయాలను జోడిస్తే, అత్యవసర పరిస్థితిలో ముందుగా ప్రతిస్పందించే వారికి సహాయకరంగా ఉంటాయి.\n\nఎవరైనా సరే, మీ ఫోన్‌ని అన్‌లాక్ చేయకుండానే మీ లాక్ స్క్రీన్ నుండి ఈ సమాచారాన్ని చదవగలరు."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"వైద్య సమాచారం మరియు అత్యవసర పరిచయాలను జోడిస్తే, అత్యవసర పరిస్థితిలో ముందుగా ప్రతిస్పందించే వారికి సహాయకరంగా ఉంటాయి.\n\nఎవరైనా సరే, మీ ఫోన్‌ని అన్‌లాక్ చేయకుండానే మీ లాక్ స్క్రీన్ నుండి ఈ సమాచారాన్ని చదవగలరు మరియు వారి పేర్లు నొక్కడం ద్వారా మీ పరిచయాలకు డయల్ చేయగలరు."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"అత్యవసర సమాచారాన్ని జోడించండి"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"ముఖ్యమైన సమాచారాన్ని కనుగొనడంలో ముందుగా ప్రతిస్పందించే వారికి సహాయపడండి"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0ec5bbe..3d24e31 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"ล้างทั้งหมด"</string>
     <string name="clear" msgid="3648880442502887163">"ล้าง"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"ล้างข้อมูลและรายชื่อติดต่อทั้งหมดไหม"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"การเพิ่มข้อมูลทางการแพทย์และผู้ติดต่อกรณีฉุกเฉินจะเป็นประโยชน์ต่อผู้ปฏิบัติการแพทย์ฉุกเฉินเบื้องต้นในกรณีฉุกเฉิน\n\nผู้อื่นสามารถอ่านข้อมูลนี้จากหน้าจอล็อกโดยไม่ต้องปลดล็อกโทรศัพท์ของคุณ"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"การเพิ่มข้อมูลทางการแพทย์และผู้ติดต่อกรณีฉุกเฉินจะเป็นประโยชน์ต่อผู้ปฏิบัติการแพทย์ฉุกเฉินเบื้องต้นในกรณีฉุกเฉิน\n\nผู้อื่นสามารถอ่านข้อมูลนี้จากหน้าจอล็อกและโทรติดต่อรายชื่อด้วยการแตะที่ชื่ีอ โดยไม่ต้องปลดล็อกโทรศัพท์ของคุณ"</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"เพิ่มข้อมูลสำหรับกรณีฉุกเฉิน"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"ช่วยให้ผู้ปฏิบัติการแพทย์ฉุกเฉินเบื้องต้นทราบข้อมูลสำคัญ"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index defc7a0..b4e7818 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"I-clear lahat"</string>
     <string name="clear" msgid="3648880442502887163">"I-clear"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Iki-clear ba ang lahat ng impormasyon at contact?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Makakatulong sa mga unang tutugon sa isang emergency ang pagdaragdag ng medikal na impormasyon at mga pang-emergency na contact.\n\nMababasa ng sinuman ang impormasyong ito mula sa iyong lock screen nang hindi ina-unlock ang telepono mo."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Makakatulong ang pagdaragdag ng medikal na impormasyon at mga pang-emergency na contact sa mga unang reresponde sa isang emergency.\n\nMababasa ng sinuman ang impormasyong ito mula sa iyong lock screen, at mada-dial ang mga contact mo sa pamamagitan ng pag-tap sa kanilang mga pangalan, nang hindi ina-unlock ang iyong telepono."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Magdagdag ng impormasyong pang-emergency"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Tulungan ang mga unang tutugon na maghanap ng mahalagang impormasyon"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8bc9ccb..1a934b3 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Tümünü temizle"</string>
     <string name="clear" msgid="3648880442502887163">"Temizle"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Tüm bilgiler ve kişiler temizlensin mi?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Sağlıkla ilgili bilgileri ve acil durumda aranacak kişileri eklemek acil bir durumda ilk müdahaleyi yapan kişilere yardımcı olabilir.\n\nBu bilgileri herkes telefonunuzun kilidini açmadan kilit ekranınızdan okuyabilir."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Tıbbi bilgileri ve acil durumda aranacak kişileri eklemek, acil durumda ilk müdahaleyi yapanlara yardımcı olabilir.\n\nKilit ekranınızdaki bu bilgileri okuyan herhangi biri, ekrandaki adlara dokunarak telefonunuzun kilidini açmadan bu kişilere telefon edebilir."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Acil durum bilgisi ekleyin"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"İlk müdahalede bulunanların önemli bilgileri bulmasına yardımcı olun"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 39c3919..2eb559f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1090682794607161063">"Дані для екстр. вип."</string>
+    <string name="app_label" msgid="1090682794607161063">"Дані для екстр. випадків"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Медична інформація"</string>
     <string name="edit_medical_info" msgid="6733720353375319476">"Редагувати інформацію"</string>
     <string name="edit_info" msgid="5973929805855224805">"Редагувати дані про екстрену ситуацію"</string>
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Очистити все"</string>
     <string name="clear" msgid="3648880442502887163">"Очистити"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Очистити всю інформацію та контакти?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Додана медична інформація та контакти для екстрених випадків можуть допомогти в надзвичайних ситуаціях.\n\nБудь-хто може переглянути цю інформацію на заблокованому екрані, не розблоковуючи телефон."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Якщо ви додасте медичну інформацію та контакти для екстрених викликів, це допоможе людям, які першими відреагують на надзвичайну ситуацію.\n\nБудь-хто зможе переглянути цю інформацію на заблокованому екрані та торкнутись імені контакта, щоб зателефонувати йому, не розблоковуючи телефон."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Додайте дані для екстрених випадків"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Надайте важливу інформацію для отримання першої допомоги"</string>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 35d33bd..28a7a19 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"سبھی کو صاف کریں"</string>
     <string name="clear" msgid="3648880442502887163">"صاف کریں"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"تمام معلومات اور رابطے صاف کریں؟"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"طبی معلومات اور ہنگامی رابطے شامل کرنے سے ہنگامی حالت میں پہلے جواب دہندگان کو مدد مل سکتی ہے۔\n\nاپنے فون کو غیر مقفل کیے بغیر کوئی بھی شخص اپنے لاک اسکرین سے یہ معلومعات پڑھ سکتا ہے۔"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"طبی معلومات اور ایمرجینسی رابطے شامل کرنے سے ایمرجینسی حالت میں پہلے جواب دہندگان کو مدد مل سکتی ہے۔\n\nاپنے فون کو غیر مقفل کیے بغیر کوئی بھی شخص اپنے لاک اسکرین سے یہ معلومعات پڑھ سکتا ہے اور اپنے ناموں پر تھپتھپا کر آپ کے رابطے پر ڈائل کر سکتا ہے۔"</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"ہنگامی معلومات شامل کریں"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"اہم معلومات تلاش کرنے میں پہلے جواب دہندگان کی مدد کریں"</string>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 6be84d8..5537ec1 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -100,10 +100,10 @@
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"Telefon egasi haqida ma’lumot yo‘q"</string>
     <string name="tap_pencil" msgid="2723698054265296934">"Agar bu sizning telefoningiz bo‘lsa, bu yerda favqulodda holatlarda ko‘rsatiladigan ma’lumotlarni qo‘shish uchun qalam belgisini bosing"</string>
-    <string name="clear_all" msgid="8899013032870561633">"Hammasini o‘chirish"</string>
+    <string name="clear_all" msgid="8899013032870561633">"Hammasini tozalash"</string>
     <string name="clear" msgid="3648880442502887163">"O‘chirish"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Barcha kontaktlar va ma’lumotlar o‘chirib tashlansinmi?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Tibbiy axborot va favqulodda kontaktlar kiritish favqulodda holatlarda birinchi javob beruvchi uchun yordam beradi.\n\nIstalgan kishi bu ma’lumotlarni telefonni qulfdan chiqarmasdan ekran qulfidan o‘qiy oladi."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Tibbiy axborot va favqulodda kontaktlar kiritish favqulodda holatlarda birinchi javob beruvchi uchun yordam beradi.\n\nIstalgan kishi bu ma’lumotlarni telefonni qulfdan chiqarmasdan ekran qulfidan o‘qiy oladi hamda kontaktlaringizdagi ismlarning ustiga bosish orqali ularga qo‘ng‘iroq qila oladi."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Favqulodda axborot qo‘shish"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Birinchi javob beruvchi muhim ma’lumotlarni topishiga yordam bering"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a7842d3..a584b0c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -74,7 +74,7 @@
     <string name="allergies" msgid="2789200777539258165">"Dị ứng"</string>
     <string name="unknown_allergies" msgid="4383115953418061237">"Không xác định"</string>
     <string name="allergies_hint" msgid="5488918780522184147">"Ví dụ: đậu phộng"</string>
-    <string name="medications" msgid="644428945685557183">"Dược phẩm"</string>
+    <string name="medications" msgid="644428945685557183">"Thuốc"</string>
     <string name="unknown_medications" msgid="2764171064510423734">"Không xác định"</string>
     <string name="medications_hint" msgid="3221620025945593723">"Ví dụ: aspirin"</string>
     <string name="medical_conditions" msgid="3555690011498283592">"Ghi chú y tế"</string>
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Xóa tất cả"</string>
     <string name="clear" msgid="3648880442502887163">"Xóa"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Xóa tất cả thông tin và liên hệ?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Thêm thông tin y tế và liên hệ khẩn cấp có thể giúp ích cho những người ứng cứu đầu tiên trong trường hợp khẩn cấp.\n\nBất cứ ai cũng có thể đọc thông tin này từ màn hình khóa mà không cần mở khóa điện thoại của bạn."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Thêm thông tin y tế và liên hệ khẩn cấp có thể giúp ích cho những người ứng cứu đầu tiên trong trường hợp khẩn cấp.\n\nBất cứ ai cũng có thể đọc được thông tin này từ màn hình khóa và quay số gọi cho các liên hệ của bạn bằng cách nhấn vào tên của họ mà không cần mở khóa điện thoại của bạn."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Thêm thông tin khẩn cấp"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Giúp những người ứng cứu đầu tiên tìm thấy thông tin quan trọng"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 406cbd0..e60980b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"全部清除"</string>
     <string name="clear" msgid="3648880442502887163">"清除"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"要清除所有信息和联系人吗？"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"添加医疗信息和紧急情况联系人，有助于第一线救援人员在发生紧急事件时提供相关援助。\n\n任何人都能在您的手机未解锁的情况下在锁定屏幕上看到此类信息。"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"添加医疗信息和紧急情况联系人有助于第一线救援人员在发生紧急事件时提供相关援助。\n\n任何人都无需将您的手机解锁，即可在锁定屏幕上看到此类信息，并能通过点按相关联系人的姓名拨打对方的电话。"</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"添加紧急信息"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"协助第一线救援人员找到重要信息"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index fde7173..1f54ebf 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"全部清除"</string>
     <string name="clear" msgid="3648880442502887163">"清除"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"要清除所有資料和聯絡人嗎？"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"新増醫療資訊和緊急聯絡人可以協助先遣人員處理緊急情況。\n\n任何人都能在上鎖畫面中查看這些資料。"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"新増醫療資訊和緊急聯絡人可以協助先遣人員處理緊急情況。\n\n在您的手機未解鎖的情況下，任何人都能在上鎖畫面中查看這些資料，並透過輕按緊急聯絡人姓名來撥打對方的號碼。"</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"新增緊急資料"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"協助先遣人員尋找重要資料"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index eb93940..e5dc5bc 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"全部清除"</string>
     <string name="clear" msgid="3648880442502887163">"清除"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"要清除所有資訊和聯絡人嗎？"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"新增醫療資訊和緊急聯絡人，為緊急情況中的第一線處理人員提供協助。\n\n任何人都能在鎖定畫面上查看這項資訊，不必先將手機解鎖。"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"新增醫療資訊和緊急聯絡人，以便第一線救援人員在發生緊急事件時提供相關協助。\n\n任何人不必先將手機解鎖，都能在鎖定畫面上查看這項資訊，而且只要輕觸緊急聯絡人姓名，即可撥打對方號碼。"</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"新增緊急救援資訊"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"協助第一線處理人員找到重要資訊"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index d9e7a67..0b82f74 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -103,7 +103,7 @@
     <string name="clear_all" msgid="8899013032870561633">"Sula konke"</string>
     <string name="clear" msgid="3648880442502887163">"Sula"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Sula lonke ulwazi noxhumana nabo?"</string>
-    <string name="emergency_info_footer" msgid="4694516011247606250">"Ukungeza ulwazi lokwelashwa noxhumana nabo abaphuthumayo kungasiza abaphenduli bokuqala esimweni esiphuthumayo.\n\nNoma ubani angafunda lolu lwazi kusuka esikrinini sakho sokukhiya ngaphandle kokuvula ifoni yakho."</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Ukungeza ulwazi lwemithi noxhumana nabo abasheshayo kungasiza abaphenduli bokuqala esimweni esiphuthumayo.\n\nNoma ubani angafuna lolu lwazi kusuka kusikrini sakho sokukhiya, futhi adayele oxhumana nabo ngokuthepha amagama abo, ngaphandle kokuvula ifoni yakho."</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"Engeza ulwazi lesimo esiphuthumayo"</string>
     <string name="settings_suggestion_body" msgid="6623265155762787567">"Siza abaphenduli bukuqala ukuthola ulwazi olubalulekile"</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index cda3027..1e51f75 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -59,11 +59,9 @@
         <item name="android:layout">@layout/custom_preference_category_layout</item>
     </style>
 
-    <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
-        <!-- Parent path frameworks/support/v14/preference/res/values/themes.xml -->
-        <item name="android:scrollbars">vertical</item>
+    <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.SettingsBase">
+        <!-- Parent path frameworks/support/SettingsLib/res/values/themes.xml -->
         <item name="footerPreferenceStyle">@style/FooterPreference</item>
-        <item name="preferenceCategoryStyle">@style/PreferenceCategory</item>
     </style>
 
     <style name="FooterPreference" parent="PreferenceTheme">
@@ -71,8 +69,8 @@
         <item name="allowDividerAbove">true</item>
     </style>
 
-    <style name="PreferenceCategory" parent="@style/Preference.Category.Material">
-        <item name="allowDividerAbove">true</item>
-        <item name="android:layout">@layout/preference_category_material_settings</item>
+    <style name="NameAutoCompletePreference" parent="PreferenceTheme">
+        <item name="android:positiveButtonText">@android:string/ok</item>
+        <item name="android:negativeButtonText">@android:string/cancel</item>
     </style>
 </resources>
diff --git a/res/xml/edit_emergency_info.xml b/res/xml/edit_emergency_info.xml
index c7512a9..f95e6db 100644
--- a/res/xml/edit_emergency_info.xml
+++ b/res/xml/edit_emergency_info.xml
@@ -15,6 +15,7 @@
 -->
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
+        android:key="edit_emergency_info_settings"
         android:title="@string/app_label">
     <PreferenceCategory
             android:key="medical_info"
@@ -92,7 +93,7 @@
 
         <Preference
             android:key="edit_medical_info"
-            android:icon="@drawable/ic_mode_edit_googblue_24dp"
+            android:icon="@drawable/ic_mode_edit_24dp"
             android:title="@string/edit_medical_info">
             <intent android:action="android.emergency.EDIT_MEDICAL_INFO"/>
         </Preference>
@@ -108,5 +109,6 @@
 
     <com.android.settingslib.widget.FooterPreference
         android:title="@string/emergency_info_footer"
+        android:key="footer_preference"
         android:selectable="false"/>
 </PreferenceScreen>
diff --git a/res/xml/edit_medical_info.xml b/res/xml/edit_medical_info.xml
index 178cda6..5795e11 100644
--- a/res/xml/edit_medical_info.xml
+++ b/res/xml/edit_medical_info.xml
@@ -15,7 +15,8 @@
 -->
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:key="edit_medical_info_settings">
 
     <com.android.emergency.preferences.NameAutoCompletePreference
         android:icon="@drawable/ic_account_circle"
@@ -23,7 +24,8 @@
         android:key="name"
         android:singleLine="true"
         android:title="@string/name"
-        app:summary="@string/unknown_name" />
+        app:summary="@string/unknown_name"
+        style="@style/NameAutoCompletePreference" />
 
     <com.android.emergency.preferences.EmergencyEditTextPreference
         android:icon="@drawable/ic_address_black_24dp"
diff --git a/src/com/android/emergency/edit/EditMedicalInfoFragment.java b/src/com/android/emergency/edit/EditMedicalInfoFragment.java
index 6783972..1b0e3a3 100644
--- a/src/com/android/emergency/edit/EditMedicalInfoFragment.java
+++ b/src/com/android/emergency/edit/EditMedicalInfoFragment.java
@@ -29,6 +29,7 @@
 import com.android.emergency.util.PreferenceUtils;
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settingslib.CustomEditTextPreference;
 
 /**
  * Fragment that displays personal and medical information.
@@ -76,15 +77,20 @@
 
     @Override
     public void onDisplayPreferenceDialog(Preference preference) {
-        if (!(preference instanceof AutoCompleteEditTextPreference)) {
-            super.onDisplayPreferenceDialog(preference);
-            return;
+        DialogFragment fragment = null;
+        if (preference instanceof CustomEditTextPreference) {
+            fragment = CustomEditTextPreference.CustomPreferenceDialogFragment
+                    .newInstance(preference.getKey());
+        } else if (preference instanceof AutoCompleteEditTextPreference) {
+            fragment = AutoCompleteEditTextPreference.AutoCompleteEditTextPreferenceDialogFragment
+                    .newInstance(preference.getKey());
         }
-        DialogFragment fragment =
-                AutoCompleteEditTextPreference.AutoCompleteEditTextPreferenceDialogFragment
-                        .newInstance(preference.getKey());
-        fragment.setTargetFragment(this, 0);
-        fragment.show(getFragmentManager(), "dialog_preference");
+        if (fragment != null) {
+            fragment.setTargetFragment(this, 0);
+            fragment.show(getFragmentManager(), "dialog_preference");
+        } else {
+            super.onDisplayPreferenceDialog(preference);
+        }
     }
 
     /** Reloads all the preferences by reading the value from the shared preferences. */
diff --git a/src/com/android/emergency/preferences/AutoCompleteEditTextPreference.java b/src/com/android/emergency/preferences/AutoCompleteEditTextPreference.java
index 3796c94..ab3c6b4 100644
--- a/src/com/android/emergency/preferences/AutoCompleteEditTextPreference.java
+++ b/src/com/android/emergency/preferences/AutoCompleteEditTextPreference.java
@@ -56,7 +56,7 @@
     private boolean mTextSet;
 
     public AutoCompleteEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr,
-                                          int defStyleRes) {
+            int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
 
         mAutoCompleteTextView = new InstantAutoCompleteTextView(context, attrs);
@@ -91,7 +91,7 @@
     }
 
     public AutoCompleteEditTextPreference(Context context, AttributeSet attrs) {
-        this(context, attrs, android.R.attr.dialogPreferenceStyle);
+        this(context, attrs, R.attr.dialogPreferenceStyle);
     }
 
     public AutoCompleteEditTextPreference(Context context) {
@@ -142,6 +142,7 @@
 
         AutoCompleteTextView editText = mAutoCompleteTextView;
         editText.setText(getText());
+        editText.requestFocus();
 
         ViewParent oldParent = editText.getParent();
         if (oldParent != view) {
diff --git a/src/com/android/emergency/preferences/EmergencyEditTextPreference.java b/src/com/android/emergency/preferences/EmergencyEditTextPreference.java
index 1511055..7a6cfe5 100644
--- a/src/com/android/emergency/preferences/EmergencyEditTextPreference.java
+++ b/src/com/android/emergency/preferences/EmergencyEditTextPreference.java
@@ -22,6 +22,7 @@
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.TextView;
 
 import com.android.emergency.R;
@@ -80,6 +81,7 @@
     @Override
     protected void onBindDialogView(View view) {
         super.onBindDialogView(view);
-        getEditText().setSelection(getEditText().getText().length());
+        final EditText editText = view.findViewById(android.R.id.edit);
+        editText.setSelection(editText.getText().length());
     }
 }
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index efcd332..0000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# Include all makefiles in subdirectories
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/robolectric/Android.mk b/tests/robolectric/Android.mk
index 95dc47d..b8dd926 100644
--- a/tests/robolectric/Android.mk
+++ b/tests/robolectric/Android.mk
@@ -15,24 +15,23 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_JAVA_LIBRARIES := \
-    junit \
-    platform-robolectric-prebuilt \
-    sdk_vcurrent
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-v7-preference \
-    platform-system-robolectric \
+    platform-robolectric-android-all-stubs \
+    mockito-robolectric-prebuilt \
     truth-prebuilt \
     emergencyinfo-test-common
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_JAVA_LIBRARIES := \
+    junit \
+    platform-robolectric-3.6.1-prebuilt
 
 LOCAL_INSTRUMENTATION_FOR := EmergencyInfo
 LOCAL_MODULE := EmergencyInfoRoboTests
 
+LOCAL_MODULE_TAGS := optional
+
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 #############################################################
@@ -49,6 +48,4 @@
 
 LOCAL_TEST_PACKAGE := EmergencyInfo
 
-LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src
-
-include prebuilts/misc/common/robolectric/run_robotests.mk
+include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk
\ No newline at end of file
diff --git a/tests/robolectric/src/com/android/emergency/EmergencySearchIndexablesProviderTest.java b/tests/robolectric/src/com/android/emergency/EmergencySearchIndexablesProviderTest.java
index 51cf592..7989230 100644
--- a/tests/robolectric/src/com/android/emergency/EmergencySearchIndexablesProviderTest.java
+++ b/tests/robolectric/src/com/android/emergency/EmergencySearchIndexablesProviderTest.java
@@ -19,7 +19,6 @@
 
 import android.database.Cursor;
 import android.provider.SearchIndexablesContract;
-import android.test.suitebuilder.annotation.SmallTest;
 
 import com.android.emergency.R;
 import com.android.emergency.TestConfig;
@@ -34,7 +33,6 @@
 import org.robolectric.annotation.Config;
 
 /** Unit tests for {@link EmergencySearchIndexablesProvider}. */
-@SmallTest
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public final class EmergencySearchIndexablesProviderTest {
diff --git a/tests/robolectric/src/com/android/emergency/preferences/ContactPreferencesTest.java b/tests/robolectric/src/com/android/emergency/preferences/ContactPreferencesTest.java
index 7a039e4..a1f9a07 100644
--- a/tests/robolectric/src/com/android/emergency/preferences/ContactPreferencesTest.java
+++ b/tests/robolectric/src/com/android/emergency/preferences/ContactPreferencesTest.java
@@ -32,7 +32,6 @@
 import android.net.Uri;
 import android.os.Looper;
 import android.provider.ContactsContract;
-import android.test.suitebuilder.annotation.SmallTest;
 
 import com.android.emergency.ContactTestUtils;
 import com.android.emergency.EmergencyContactManager;
@@ -53,7 +52,6 @@
 import org.robolectric.annotation.Config;
 
 /** Unit tests for {@link ContactPreferences}. */
-@SmallTest
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ContactPreferencesTest {
diff --git a/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
index 6cc07c0..caddd12 100644
--- a/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
+++ b/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
@@ -32,7 +32,6 @@
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
-import android.test.suitebuilder.annotation.SmallTest;
 
 import com.android.emergency.ContactTestUtils;
 import com.android.emergency.EmergencyContactManager;
@@ -52,7 +51,6 @@
 import org.robolectric.annotation.Config;
 
 /** Unit tests for {@link EmergencyContactsPreference}. */
-@SmallTest
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class EmergencyContactsPreferenceTest {
diff --git a/tests/robolectric/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java
index 14e7a96..fbac306 100644
--- a/tests/robolectric/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java
+++ b/tests/robolectric/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java
@@ -16,8 +16,8 @@
 package com.android.emergency.preferences;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.nullable;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
@@ -26,7 +26,6 @@
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
-import android.test.suitebuilder.annotation.SmallTest;
 
 import com.android.emergency.PreferenceKeys;
 import com.android.emergency.TestConfig;
@@ -41,7 +40,6 @@
 import org.robolectric.annotation.Config;
 
 /** Unit tests for {@link EmergencyEditTextPreference}. */
-@SmallTest
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class EmergencyEditTextPreferenceTest {
@@ -77,7 +75,7 @@
         mPreference.setKey(PreferenceKeys.KEY_MEDICAL_CONDITIONS);
 
         String medicalConditions = "Asthma";
-        when(mSharedPreferences.getString(eq(mPreference.getKey()), anyString()))
+        when(mSharedPreferences.getString(eq(mPreference.getKey()), nullable(String.class)))
                 .thenReturn(medicalConditions);
 
         mPreference.reloadFromPreference();
diff --git a/tests/robolectric/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
index 124d569..df7eb1b 100644
--- a/tests/robolectric/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
+++ b/tests/robolectric/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
@@ -16,19 +16,16 @@
 package com.android.emergency.preferences;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.nullable;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
-import android.test.suitebuilder.annotation.SmallTest;
-
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
-import android.test.suitebuilder.annotation.SmallTest;
 import android.text.TextUtils;
 
 import com.android.emergency.PreferenceKeys;
@@ -47,7 +44,6 @@
 import org.robolectric.annotation.Config;
 
 /** Unit tests for {@link EmergencyListPreference}. */
-@SmallTest
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public final class EmergencyListPreferenceTest {
@@ -76,7 +72,8 @@
         CharSequence[] organDonorValues =
                 RuntimeEnvironment.application.getResources().getStringArray(
                         R.array.organ_donor_entries);
-        when(mSharedPreferences.getString(eq(PreferenceKeys.KEY_ORGAN_DONOR), anyString()))
+        when(mSharedPreferences.getString(
+                eq(PreferenceKeys.KEY_ORGAN_DONOR), nullable(String.class)))
                 .thenReturn((String) organDonorValues[0]);
 
         mPreference.setKey(PreferenceKeys.KEY_ORGAN_DONOR);
@@ -98,7 +95,8 @@
         mPreference.setKey(PreferenceKeys.KEY_ORGAN_DONOR);
         mPreference.setEntries(organDonorEntries);
         mPreference.setEntryValues(organDonorValues);
-        when(mSharedPreferences.getString(eq(PreferenceKeys.KEY_ORGAN_DONOR), anyString()))
+        when(mSharedPreferences.getString(
+                eq(PreferenceKeys.KEY_ORGAN_DONOR), nullable(String.class)))
                 .thenAnswer(new CyclingStringArrayAnswer(organDonorValues));
 
         for (int i = 0; i < mPreference.getEntryValues().length; i++) {
diff --git a/tests/robolectric/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java
index e5b85c5..c191325 100644
--- a/tests/robolectric/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java
+++ b/tests/robolectric/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java
@@ -16,9 +16,11 @@
 package com.android.emergency.preferences;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.nullable;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -26,7 +28,8 @@
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.text.Editable;
+import android.view.View;
 import android.widget.AutoCompleteTextView;
 
 import com.android.emergency.PreferenceKeys;
@@ -40,9 +43,9 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
 
 /** Unit tests for {@link NameAutoCompletePreference}. */
-@SmallTest
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class NameAutoCompletePreferenceTest {
@@ -81,7 +84,8 @@
         mPreference.setKey(PreferenceKeys.KEY_NAME);
 
         String name = "John";
-        when(mSharedPreferences.getString(eq(mPreference.getKey()), anyString())).thenReturn(name);
+        when(mSharedPreferences.getString(eq(mPreference.getKey()), nullable(String.class)))
+                .thenReturn(name);
 
         mPreference.reloadFromPreference();
         assertThat(mPreference.getText()).isEqualTo(name);
@@ -115,4 +119,17 @@
         when(mAutoCompleteSuggestionProvider.getNameSuggestion()).thenReturn(name);
         assertThat(mPreference.createAutocompleteSuggestions()).isEqualTo(new String[] {name});
     }
+
+    @Test
+    public void testBindDialog_shouldFocusOnEditText() {
+        final AutoCompleteTextView editText = mock(AutoCompleteTextView.class);
+        final Editable text = mock(Editable.class);
+        when(editText.getText()).thenReturn(text);
+        when(text.length()).thenReturn(0);
+        ReflectionHelpers.setField(mPreference, "mAutoCompleteTextView", editText);
+
+        mPreference.onBindDialogView(mock(View.class));
+
+        verify(editText).requestFocus();
+    }
 }
diff --git a/tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java b/tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java
index a467372..e47a1de 100644
--- a/tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java
+++ b/tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java
@@ -20,7 +20,6 @@
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -31,7 +30,6 @@
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
-import android.test.suitebuilder.annotation.SmallTest;
 
 import com.android.emergency.ContactTestUtils;
 import com.android.emergency.PreferenceKeys;
@@ -47,16 +45,12 @@
 import org.robolectric.annotation.Config;
 
 /** Unit tests for {@link PreferenceUtils}. */
-@SmallTest
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public final class PreferenceUtilsTest {
     private static final String PACKAGE_NAME = "com.android.emergency";
     private static final String NAME = "Jane";
     private static final String PHONE_NUMBER = "5150";
-    private static final ComponentName COMPONENT_NAME = new ComponentName(
-                PACKAGE_NAME,
-                PACKAGE_NAME + PreferenceUtils.SETTINGS_SUGGESTION_ACTIVITY_ALIAS);
 
     @Mock ContentResolver mContentResolver;
     @Mock Context mContext;
@@ -65,10 +59,16 @@
     @Mock SharedPreferences mSharedPreferences;
     @Mock SharedPreferences.Editor mSharedPreferencesEditor;
 
+    private ComponentName mComponentName;
+
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
+        mComponentName = new ComponentName(
+            PACKAGE_NAME,
+            PACKAGE_NAME + PreferenceUtils.SETTINGS_SUGGESTION_ACTIVITY_ALIAS);
+
         when(mContext.getContentResolver()).thenReturn(mContentResolver);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mContext.getPackageName()).thenReturn(PACKAGE_NAME);
@@ -118,7 +118,7 @@
         PreferenceUtils.enableSettingsSuggestion(mContext);
 
         verify(mPackageManager).setComponentEnabledSetting(
-                eq(COMPONENT_NAME),
+                eq(mComponentName),
                 eq(PackageManager.COMPONENT_ENABLED_STATE_ENABLED),
                 eq(PackageManager.DONT_KILL_APP));
     }
@@ -136,7 +136,7 @@
         PreferenceUtils.updateSettingsSuggestionState(mContext);
 
         verify(mPackageManager).setComponentEnabledSetting(
-                eq(COMPONENT_NAME),
+                eq(mComponentName),
                 eq(PackageManager.COMPONENT_ENABLED_STATE_DISABLED),
                 eq(PackageManager.DONT_KILL_APP));
     }
@@ -148,7 +148,7 @@
         PreferenceUtils.updateSettingsSuggestionState(mContext);
 
         verify(mPackageManager).setComponentEnabledSetting(
-                eq(COMPONENT_NAME),
+                eq(mComponentName),
                 eq(PackageManager.COMPONENT_ENABLED_STATE_ENABLED),
                 eq(PackageManager.DONT_KILL_APP));
     }
@@ -161,7 +161,7 @@
         PreferenceUtils.updateSettingsSuggestionState(mContext);
 
         verify(mPackageManager).setComponentEnabledSetting(
-                eq(COMPONENT_NAME),
+                eq(mComponentName),
                 eq(PackageManager.COMPONENT_ENABLED_STATE_DISABLED),
                 eq(PackageManager.DONT_KILL_APP));
     }
diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
index 16b5979..cdbba0a 100644
--- a/tests/unit/Android.mk
+++ b/tests/unit/Android.mk
@@ -23,7 +23,6 @@
     android-support-test \
     emergencyinfo-test-common \
     espresso-core \
-    legacy-android-test \
     truth-prebuilt \
     ub-uiautomator