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/AndroidManifest.xml b/AndroidManifest.xml
index 6d2675b..a589a20 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -35,7 +35,7 @@
             android:theme="@style/AppThemeEmergency"
             android:taskAffinity="com.android.settings"
             android:showOnLockScreen="true"
-            android:icon="@mipmap/ic_launcher_settings"
+            android:icon="@drawable/ic_launcher_settings"
             android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.telephony.action.EMERGENCY_ASSISTANCE" />
@@ -45,7 +45,7 @@
 
         <activity
             android:name=".edit.EditInfoActivity"
-            android:icon="@mipmap/ic_launcher_settings"
+            android:icon="@drawable/ic_launcher_settings"
             android:theme="@style/AppTheme"
             android:taskAffinity="com.android.settings"
             android:launchMode="singleTask">
@@ -76,7 +76,7 @@
 
         <activity
             android:name=".edit.EditMedicalInfoActivity"
-            android:icon="@mipmap/ic_launcher_settings"
+            android:icon="@drawable/ic_launcher_settings"
             android:label="@string/medical_info_title"
             android:parentActivityName="com.android.emergency.edit.EditInfoActivity"
             android:theme="@style/AppTheme"
diff --git a/res/drawable/ic_account_circle.xml b/res/drawable/ic_account_circle.xml
deleted file mode 100644
index a924cd1..0000000
--- a/res/drawable/ic_account_circle.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    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:fillColor="#FFFFFFFF"/>
-</vector>
diff --git a/res/drawable/ic_account_circle_filled_24dp.xml b/res/drawable/ic_account_circle_filled_24dp.xml
new file mode 100644
index 0000000..0b5a993
--- /dev/null
+++ b/res/drawable/ic_account_circle_filled_24dp.xml
@@ -0,0 +1,29 @@
+<!--
+  Copyright (C) 2018 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 xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33C4.62,15.49 4,13.82 4,12c0,-4.41 3.59,-8 8,-8c4.41,0 8,3.59 8,8C20,13.82 19.38,15.49 18.36,16.83z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13c1.94,0 3.5,-1.56 3.5,-3.5S13.94,6 12,6z"/>
+</vector>
diff --git a/res/drawable/ic_add_24dp.xml b/res/drawable/ic_add_24dp.xml
index 2c92dae..12d5107 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="?android:attr/colorControlNormal">
     <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
deleted file mode 100644
index f5d0209..0000000
--- a/res/drawable/ic_address_black_24dp.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="#61000000">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
-</vector>
diff --git a/res/drawable/ic_allergies_black_24dp.xml b/res/drawable/ic_allergies_black_24dp.xml
index 140dfc3..120ac75 100644
--- a/res/drawable/ic_allergies_black_24dp.xml
+++ b/res/drawable/ic_allergies_black_24dp.xml
@@ -18,8 +18,8 @@
     android:height="24dp"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0"
-    android:tint="#61000000">
+    android:tint="?android:attr/colorControlNormal">
     <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_24dp.xml b/res/drawable/ic_bloodtype_24dp.xml
new file mode 100644
index 0000000..051fc26
--- /dev/null
+++ b/res/drawable/ic_bloodtype_24dp.xml
@@ -0,0 +1,35 @@
+<!--
+  Copyright (C) 2018 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 xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,5.52l4.25,4.24c1.11,1.11 1.75,2.66 1.75,4.23c0,1.59 -0.64,3.14 -1.75,4.26C15.11,19.37 13.6,20 12,20s-3.11,-0.63 -4.25,-1.76C6.64,17.12 6,15.57 6,13.98c0,-1.57 0.64,-3.11 1.75,-4.22L12,5.52M12,2.69L6.34,8.34C4.78,9.9 4,11.98 4,13.98s0.78,4.11 2.34,5.67C7.9,21.21 9.95,22 12,22s4.1,-0.79 5.66,-2.35c1.56,-1.56 2.34,-3.67 2.34,-5.67s-0.78,-4.08 -2.34,-5.64L12,2.69L12,2.69z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M11,9h2v6h-2z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M9,13l0,-2l6,0l-0,2z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M9,18l0,-2l6,0l-0,2z"/>
+</vector>
diff --git a/res/drawable/ic_bloodtype_black_24dp.xml b/res/drawable/ic_bloodtype_black_24dp.xml
deleted file mode 100644
index dc21cff..0000000
--- a/res/drawable/ic_bloodtype_black_24dp.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    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"/>
-</vector>
diff --git a/res/drawable/ic_clear_24dp.xml b/res/drawable/ic_clear_24dp.xml
index f1fb6ca..1495365 100644
--- a/res/drawable/ic_clear_24dp.xml
+++ b/res/drawable/ic_clear_24dp.xml
@@ -18,7 +18,7 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="#61000000">
+        android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
diff --git a/res/drawable/ic_favorite_border_24dp.xml b/res/drawable/ic_favorite_border_24dp.xml
new file mode 100644
index 0000000..593949d
--- /dev/null
+++ b/res/drawable/ic_favorite_border_24dp.xml
@@ -0,0 +1,26 @@
+<!--
+  Copyright (C) 2018 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 xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3C4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5C22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1l-0.1,-0.1C7.14,14.24 4,11.39 4,8.5C4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5C20,11.39 16.86,14.24 12.1,18.55z"/>
+</vector>
diff --git a/res/drawable/ic_heart_black_24dp.xml b/res/drawable/ic_heart_black_24dp.xml
deleted file mode 100644
index b675eb8..0000000
--- a/res/drawable/ic_heart_black_24dp.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    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:fillColor="#FFFFFFFF"/>
-</vector>
diff --git a/res/drawable/ic_home_24dp.xml b/res/drawable/ic_home_24dp.xml
new file mode 100644
index 0000000..3bbd859
--- /dev/null
+++ b/res/drawable/ic_home_24dp.xml
@@ -0,0 +1,26 @@
+<!--
+  Copyright (C) 2018 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 xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,3L4,9v12h16V9L12,3zM18,19h-3v-6H9v6H6v-9l6,-4.5l6,4.5V19z"/>
+</vector>
diff --git a/res/drawable/ic_launcher_settings.xml b/res/drawable/ic_launcher_settings.xml
new file mode 100644
index 0000000..cd6d497
--- /dev/null
+++ b/res/drawable/ic_launcher_settings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2018 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.
+  -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@*android:color/accent_device_default_light"/>
+    <foreground android:drawable="@mipmap/ic_launcher_settings"/>
+</adaptive-icon>
diff --git a/res/drawable/ic_medication_24dp.xml b/res/drawable/ic_medication_24dp.xml
index cf399e8..17f413e 100644
--- a/res/drawable/ic_medication_24dp.xml
+++ b/res/drawable/ic_medication_24dp.xml
@@ -1,28 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!--
+  Copyright (C) 2018 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
+  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
+       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.
--->
+  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 xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="#61000000">
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
     <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:fillColor="#FFFFFF"
+        android:pathData="M10.5,15H8v-3h2.5V9.5h3V12H16v3h-2.5v2.5h-3V15zM19,8v11c0,1.1 -0.9,2 -2,2H7c-1.1,0 -2,-0.9 -2,-2V8c0,-1.1 0.9,-2 2,-2h10C18.1,6 19,6.9 19,8zM17,8H7v11h10V8zM18,3H6v2h12V3z"/>
 </vector>
diff --git a/res/drawable/ic_mode_edit_24dp.xml b/res/drawable/ic_mode_edit_24dp.xml
deleted file mode 100644
index e54e8e9..0000000
--- a/res/drawable/ic_mode_edit_24dp.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.
--->
-<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="#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"/>
-</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_note_alt_24dp.xml b/res/drawable/ic_note_alt_24dp.xml
new file mode 100644
index 0000000..98e9eb5
--- /dev/null
+++ b/res/drawable/ic_note_alt_24dp.xml
@@ -0,0 +1,35 @@
+<!--
+  Copyright (C) 2018 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 xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7,15h7v2h-7z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7,11h10v2h-10z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7,7h10v2h-10z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M19,3L19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2H5h0C4.86,3 4.73,3.01 4.6,3.04C4.21,3.12 3.86,3.32 3.59,3.59c-0.18,0.18 -0.33,0.4 -0.43,0.64C3.06,4.46 3,4.72 3,5v14c0,0.27 0.06,0.54 0.16,0.78c0.1,0.24 0.25,0.45 0.43,0.64c0.27,0.27 0.62,0.47 1.01,0.55C4.73,20.99 4.86,21 5,21h0h14h0c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM12,2.75c0.41,0 0.75,0.34 0.75,0.75c0,0.41 -0.34,0.75 -0.75,0.75c-0.41,0 -0.75,-0.34 -0.75,-0.75C11.25,3.09 11.59,2.75 12,2.75zM19,19H5V5h14V19z"/>
+</vector>
diff --git a/res/drawable/ic_notes_black_24dp.xml b/res/drawable/ic_notes_black_24dp.xml
deleted file mode 100644
index a3c0829..0000000
--- a/res/drawable/ic_notes_black_24dp.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="true"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    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:fillColor="#FFFFFFFF"/>
-</vector>
diff --git a/res/drawable/view_contact_divider.xml b/res/drawable/view_contact_divider.xml
index 238eaac..c93d413 100644
--- a/res/drawable/view_contact_divider.xml
+++ b/res/drawable/view_contact_divider.xml
@@ -13,10 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:insetLeft="72dp">
-    <shape xmlns:android="http://schemas.android.com/apk/res/android"
-        android:tint="?android:attr/colorForeground">
+    <shape android:tint="?android:attr/colorForeground">
         <solid android:color="#1f000000" />
         <size
             android:height="1dp"
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/layout/preference_category_material_settings.xml b/res/layout/preference_category_material_settings.xml
index 81ee58d..d815946 100644
--- a/res/layout/preference_category_material_settings.xml
+++ b/res/layout/preference_category_material_settings.xml
@@ -50,6 +50,7 @@
             android:layout_marginTop="16dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
             android:textAppearance="@android:style/TextAppearance.Material.Body2"
             android:textColor="?android:attr/colorAccent"
             android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"/>
diff --git a/res/menu/view_info_menu.xml b/res/menu/view_info_menu.xml
index 006cdae..c902968 100644
--- a/res/menu/view_info_menu.xml
+++ b/res/menu/view_info_menu.xml
@@ -16,7 +16,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_edit"
-        android:icon="@drawable/ic_mode_edit_24dp"
+        android:icon="@drawable/ic_mode_edit"
         android:title="@string/edit_info"
         android:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/res/mipmap-hdpi/ic_launcher_settings.png b/res/mipmap-hdpi/ic_launcher_settings.png
index 252e6b4..ddce98e 100644
--- a/res/mipmap-hdpi/ic_launcher_settings.png
+++ b/res/mipmap-hdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_settings.png b/res/mipmap-mdpi/ic_launcher_settings.png
index d2ecee9..86f3be8 100644
--- a/res/mipmap-mdpi/ic_launcher_settings.png
+++ b/res/mipmap-mdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_settings.png b/res/mipmap-xhdpi/ic_launcher_settings.png
index fa8c813..360aa69 100644
--- a/res/mipmap-xhdpi/ic_launcher_settings.png
+++ b/res/mipmap-xhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_settings.png b/res/mipmap-xxhdpi/ic_launcher_settings.png
index 3fa69e9..7cb67a9 100644
--- a/res/mipmap-xxhdpi/ic_launcher_settings.png
+++ b/res/mipmap-xxhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_settings.png b/res/mipmap-xxxhdpi/ic_launcher_settings.png
index 72946b7..3fec9c4 100644
--- a/res/mipmap-xxxhdpi/ic_launcher_settings.png
+++ b/res/mipmap-xxxhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index fbed451..1e6de37 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Vee alle inligting en kontakte uit?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Laat diegene wat eerste reageer jou inligting sien"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f7b9b50..89f7dfe 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"ሁሉንም መረጃ እና እውቂያዎች ይጸዱ?"</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="5559349261345837716">"የመጀመሪያ ደረጃ ምላሽ ሰጪዎች መረጃዎን ይመልከቱ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1b94385..8bfa2e5 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -71,7 +71,7 @@
     <string name="ab_positive" msgid="1931300033534642005">"‏A B موجب"</string>
     <string name="ab_negative" msgid="2064555613093591729">"‏A B سالب"</string>
     <string name="h_h" msgid="2183333409760379720">"H H"</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>
@@ -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>
@@ -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="8751758742506410146">"يمكن لإضافة المعلومات الطبية وجهات الاتصال أن تساعد فرق الاستجابة الفورية في حالات الطوارئ.\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="5559349261345837716">"السماح لفِرق الإغاثة الفورية بالاطلاع على معلوماتك"</string>
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 234c058..4eb74c6 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Bütün məlumat və kontaktlar silinsin?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Əvvəlcə respondetlərin məlumatı görməsinə icazə verin"</string>
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 0df504d..5977301 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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Dozvolite ekipama hitnih službi da vide informacije"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 2e85a60..353e221 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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Пакіньце даныя для атрымання першай дапамогі"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 7c08868..ea56766 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Да се изчистят ли всички данни и контакти?"</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="5559349261345837716">"Направете данните си видими за органите за бързо реагиране"</string>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 31b464e..7090b95 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"সমস্ত তথ্য ও পরিচিতি সাফ করবেন?"</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="5559349261345837716">"যারা প্রথম এগিয়ে আসবেন তাদেরকে আপনার মেসেজ দেখতে দিন"</string>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 208cbec..69d20dd 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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Omogući da oni koji prvi reagiraju vide informaciju"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 24f395e..ecc59a7 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Vols esborrar tota la informació i tots els contactes?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Mostra la teva informació als serveis d\'emergència"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3980509..3d54b13 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Vymazat všechny údaje a kontakty?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Sdílejte své údaje s lidmi v nouzi"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f175b8b..f313768 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Vil du rydde alle oplysninger og kontaktpersoner?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Lad førstehjælpsydere se dine oplysninger"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e4a59df..aaf0256 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -82,7 +82,7 @@
     <string name="medical_conditions_hint" msgid="6959152183029062882">"Beispiel: Asthma"</string>
     <string name="organ_donor" msgid="5953509460007124827">"Organspender"</string>
     <string name="unknown_organ_donor" msgid="2780515342875494225">"Unbekannt"</string>
-    <string name="yes" msgid="5829765567799916128">"Ja"</string>
+    <string name="yes" msgid="5829765567799916128">"\"Ja\""</string>
     <string name="no" msgid="1681689233660683509">"Nein"</string>
     <!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
@@ -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="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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Deine Informationen für Ersthelfer"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 5c5dca6..54324f2 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Να διαγραφούν όλες οι πληροφορίες και οι επαφές;"</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="5559349261345837716">"Να βλέπουν τα στοιχεία σας όσοι απαντούν πρώτοι"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index fce6ab1..ad0f804 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -105,5 +105,5 @@
     <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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Let first responders see your 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 fce6ab1..ad0f804 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -105,5 +105,5 @@
     <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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Let first responders see your information"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index fce6ab1..ad0f804 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -105,5 +105,5 @@
     <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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Let first responders see your 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 33351c6..b81d8c1 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"¿Quieres borrar toda la información y los contactos?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Permite que primeros auxilios vea tu información"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0e633fa..1c7364c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -23,16 +23,16 @@
     <string name="tab_title_info" msgid="1402033103294855812">"Información"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Contactos"</string>
     <string name="name" msgid="4286267457738861977">"Nombre"</string>
-    <string name="unknown_name" msgid="2834802479170495056">"Desconocido"</string>
+    <string name="unknown_name" msgid="2834802479170495056">"Sin definir"</string>
     <string name="address" msgid="6449303483151189969">"Dirección"</string>
-    <string name="unknown_address" msgid="4212576729941786121">"Desconocida"</string>
+    <string name="unknown_address" msgid="4212576729941786121">"Sin definir"</string>
     <string name="date_of_birth" msgid="777979232444227891">"Fecha de nacimiento"</string>
-    <string name="unknown_date_of_birth" msgid="7416355536916066758">"Desconocida"</string>
+    <string name="unknown_date_of_birth" msgid="7416355536916066758">"Sin definir"</string>
     <string name="dob" msgid="2813161080307245706">"(<xliff:g id="DATE_OF_BIRTH">%1$s</xliff:g>)"</string>
     <string name="age" msgid="8327537794752630199">"Edad: <xliff:g id="NUMERICAL_AGE">%1$d</xliff:g>"</string>
     <string name="remove_dob_icon_text" msgid="4413507180967999944">"Quitar fecha de nacimiento"</string>
     <string name="blood_type" msgid="6947022772999974608">"Grupo sanguíneo"</string>
-    <string name="unknown_blood_type" msgid="6337228278125085668">"Desconocido"</string>
+    <string name="unknown_blood_type" msgid="6337228278125085668">"Sin definir"</string>
     <string name="oplus" msgid="7759756742377867011">"O+"</string>
     <string name="ominus" msgid="5227278501191741055">"O-"</string>
     <string name="aplus" msgid="4982472245421753463">"A+"</string>
@@ -72,16 +72,16 @@
     <string name="ab_negative" msgid="2064555613093591729">"AB negativo"</string>
     <string name="h_h" msgid="2183333409760379720">"Hh"</string>
     <string name="allergies" msgid="2789200777539258165">"Alergias"</string>
-    <string name="unknown_allergies" msgid="4383115953418061237">"Desconocidas"</string>
+    <string name="unknown_allergies" msgid="4383115953418061237">"Sin definir"</string>
     <string name="allergies_hint" msgid="5488918780522184147">"Por ejemplo, nueces"</string>
     <string name="medications" msgid="644428945685557183">"Medicación"</string>
-    <string name="unknown_medications" msgid="2764171064510423734">"Desconocida"</string>
+    <string name="unknown_medications" msgid="2764171064510423734">"Sin definir"</string>
     <string name="medications_hint" msgid="3221620025945593723">"Por ejemplo, aspirina"</string>
     <string name="medical_conditions" msgid="3555690011498283592">"Notas médicas"</string>
-    <string name="unknown_medical_conditions" msgid="8051364895172053770">"Desconocidas"</string>
+    <string name="unknown_medical_conditions" msgid="8051364895172053770">"Sin definir"</string>
     <string name="medical_conditions_hint" msgid="6959152183029062882">"Por ejemplo, asma"</string>
     <string name="organ_donor" msgid="5953509460007124827">"Donante de órganos"</string>
-    <string name="unknown_organ_donor" msgid="2780515342875494225">"Desconocido"</string>
+    <string name="unknown_organ_donor" msgid="2780515342875494225">"Sin definir"</string>
     <string name="yes" msgid="5829765567799916128">"Sí"</string>
     <string name="no" msgid="1681689233660683509">"No"</string>
     <!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
@@ -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="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="emergency_info_footer" msgid="8751758742506410146">"Añadir información médica y contactos de emergencia puede ayudar a los servicios de emergencia en caso de 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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Permitir que primeros en responder vean tu información"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 8c1006f..1c1bf36 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Kas kustutada kogu teave ja kõik kontaktid?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Lubage abipakkujatel teie teavet näha"</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index c4ca564..01abc24 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Informazioa eta kontaktu guztiak garbitu nahi dituzu?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Utzi erantzuten duten lehenengoei zure datuak ikusten"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7b12900..02fe8ff 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"همه اطلاعات و مخاطبین پاک شوند؟"</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="5559349261345837716">"بگذارید اولین پاسخ‌دهندگان، اطلاعات شما را ببینند"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index dd6c274..520bd8c 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Tyhjennetäänkö kaikki tiedot ja yhteystiedot?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Anna ensivastehenkilöstön nähdä tietosi"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index c08bbc9..f7e3a23 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Effacer toutes les données et tous les contacts?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Laissez premiers intervenants voir vos données d\'urgence"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1eec189..4a9a96a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Effacer toutes les informations et tous les contacts ?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Autoriser les premiers secours à voir vos informations"</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index cd6f371..11eb201 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Queres borrar toda a información e os contactos?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Permite que o servizo de urxencias vexa os teus datos"</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index bf367d9..0ac2ced 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/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>
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"તમામ માહિતી અને સંપર્કો સાફ કરીએ?"</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="5559349261345837716">"પ્રથમ પ્રતિસાદ આપનારાઓને તમારી માહિતી જોવા દો"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e9132c9..05d7061 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/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">"आपातकालीन जानकारी"</string>
-    <string name="medical_info_title" msgid="3000192781136934887">"चिकित्सा संबंधी जानकारी"</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>
@@ -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">"O+"</string>
     <string name="ominus" msgid="5227278501191741055">"O-"</string>
@@ -74,20 +74,20 @@
     <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>
+    <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>
+    <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>
     <!-- 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">"आपातकालीन संपर्क"</string>
+    <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>
@@ -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="8751758742506410146">"चिकित्सा (मेडिकल) से जुड़ी जानकारी और आपातकालीन संपर्क जोड़ने से आपातकालीन परिस्थिति में पहली प्रतिक्रिया देने वाले लोगों को मदद मिल सकती है.\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="5559349261345837716">"सबसे पहले प्रतिक्रिया देने वाले आपकी जानकारी देख पाएं"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 065e625..07ef634 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/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">"Podaci za hitne slučajeve"</string>
-    <string name="medical_info_title" msgid="3000192781136934887">"Medicinske informacije"</string>
+    <string name="medical_info_title" msgid="3000192781136934887">"Zdravstveni podaci"</string>
     <string name="edit_medical_info" msgid="6733720353375319476">"Uredite informacije"</string>
     <string name="edit_info" msgid="5973929805855224805">"Uređivanje podataka za hitne slučajeve"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informacije"</string>
@@ -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="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="emergency_info_footer" msgid="8751758742506410146">"Dodavanje podataka 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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Neka hitne službe vide vaše podatke"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 4aeac88..b99ccdc 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Törli az összes információt és névjegyet?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Adatok megjelenítése az elsősegélynyújtók számára"</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 02e3508..3c04403 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/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="8751758742506410146">"Արտակարգ իրավիճակներում ձեր բժշկական տվյալներն ու կոնտակտները կարող են օգտակար լինել առաջին օգնություն ցուցաբերողներին և փրկարարներին:\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="5559349261345837716">"Ձեր տվյալները կցուցադրվեն կողպված էկրանին"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e563b02..93955f8 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -99,11 +99,11 @@
     <string name="ok" msgid="163967937451981024">"Oke"</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">"Tidak ada informasi tentang pemilik ponsel"</string>
-    <string name="tap_pencil" msgid="2723698054265296934">"Jika ini ponsel Anda, ketuk ikon pensil untuk menambahkan informasi yang akan ditampilkan di sini jika terjadi keadaan darurat"</string>
+    <string name="tap_pencil" msgid="2723698054265296934">"Jika ini ponsel Anda, tap ikon pensil untuk menambahkan informasi yang akan ditampilkan di sini jika terjadi keadaan darurat"</string>
     <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="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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Biarkan petugas pertolongan pertama melihat informasi"</string>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 85662ec..c61772a 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Viltu hreinsa allar upplýsingar og tengiliði?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Leyfa neyðarviðbragðsaðilum að sjá upplýsingarnar þínar"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0f5d862..7f08849 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Cancellare tutte le informazioni e i contatti?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Mostra ai soccorritori le tue informazioni"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 6a5c37a..4ba718f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"האם לנקות את כל המידע ואנשי הקשר?"</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="5559349261345837716">"מומלץ לאפשר לצוותי עזרה ראשונה לראות את המידע שלך"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index de8e482..fe4f064 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"すべての情報と連絡先を消去しますか？"</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="5559349261345837716">"緊急時の初期対応に役立つ情報が表示されます"</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 80002cd..aa3c4e7 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"გსურთ ინფორმაციისა და კონტაქტების მთლიანად გასუფთავება?"</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="5559349261345837716">"გადაუდებელი რეაგირების გუნდისთვის ინფორმაციის ჩვენება"</string>
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index a9c3fae..8c96976 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -87,7 +87,7 @@
     <!-- 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">"Төтенше контактілер"</string>
+    <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>
@@ -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="8751758742506410146">"Медициналық ақпарат пен төтенше жағдайда хабарласу мәліметтері төтенше жағдайда алдымен қызметкерлерге көмектеседі.\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="5559349261345837716">"Алдымен жауап берушілерге ақпаратты көруге мүмкіндік беріңіз"</string>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 410a4b6..787f8e5 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/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">"ព័ត៌មានបន្ទាន់"</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>
+    <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>
@@ -104,6 +104,6 @@
     <string name="clear" msgid="3648880442502887163">"លុប"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"លុបព័ត៌មាន និងទំនាក់ទំនងទាំងអស់ឬ?"</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_title" msgid="2503369576806243476">"បញ្ចូលព័ត៌មានសង្គ្រោះបន្ទាន់"</string>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"អនុញ្ញាត​ឱ្យអ្នកសង្គ្រោះ​បឋម​មើលឃើញ​ព័ត៌មាន​របស់អ្នក"</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index b488569..44578c9 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="8751758742506410146">"ವೈದ್ಯಕೀಯ ಮಾಹಿತಿಯನ್ನು ಸೇರಿಸುವುದು ಮತ್ತು ತುರ್ತು ಸಂಪರ್ಕಗಳು ತುರ್ತುಸ್ಥಿತಿಯಲ್ಲಿ ಮೊದಲ ಪ್ರಯೋಜನಕಾರಿಯಾಗಿರುತ್ತದೆ\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="5559349261345837716">"ಮೊದಲು ಪ್ರತಿಕ್ರಿಯಿಸುವವರಿಗೆ ನಿಮ್ಮ ಮಾಹಿತಿ ನೋಡಲು ಅನುಮತಿಸಿ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 37d15b7..724f6a5 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"모든 정보 및 연락처를 삭제하시겠습니까?"</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="5559349261345837716">"긴급 구조 대원이 내 정보를 볼 수 있도록 입력합니다."</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 49ae841..6ccf68a 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Бардык маалымат жана байланыштар тазалансынбы?"</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="5559349261345837716">"Маанилүү маалыматты тез табууга жардам бериңиз"</string>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index def1f6b..48ad6f9 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"ລຶບລ້າງຂໍ້ມູນ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ທັງໝົດອອກບໍ?"</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="5559349261345837716">"ໃຫ້ຜູ້ຕອບສະໜອງທຳອິດເຫັນຂໍ້ມູນຂອງທ່ານ"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index a98fe80..0b6a1b3 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Išvalyti visą informaciją ir kontaktus?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Leiskite pirmiesiems sureag. žm. matyti jūsų inform."</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index a8fa6e3..056f335 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Vai notīrīt visu informāciju un kontaktpersonas?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Ļaujiet glābējiem skatīt jūsu informāciju"</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index a9fff8b..40091b3 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Да се исчистат сите информации и контакти?"</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="5559349261345837716">"Дозволете првите спасувачи да ги видат информациите"</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 4825751..565e654 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -18,8 +18,8 @@
     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="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>
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"എല്ലാ വിവരങ്ങളും കോൺടാക്റ്റുകളും മായ്ക്കണോ?"</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="5559349261345837716">"ആദ്യം പ്രതികരിക്കുന്നവരെ നിങ്ങളുടെ വിവരങ്ങൾ കാണാൻ അനുവദിക്കുക"</string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index f393b51..b5a0332 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -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>
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Бүх мэдээлэл, харилцагчдыг устгах уу?"</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="5559349261345837716">"Эхний хариу илгээгчид таны мэдэгдлийг харахыг зөвшөөрөх"</string>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 4d8646e..5c91d5f 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"सर्व माहिती आणि संपर्क साफ करायचे?"</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="5559349261345837716">"अगोदर प्रतिसाद देणार्‍यांना तुमची माहिती पाहू द्या"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 759b3da..62ca0eb 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Kosongkan semua maklumat dan kenalan?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Benarkan pasukan kecemasan melihat maklumat anda"</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index db54891..076ca54 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/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">"အရေးပေါ်အချက်အလက်"</string>
-    <string name="medical_info_title" msgid="3000192781136934887">"ဆေးဘက်ဆိုင်ရာအချက်အလက်များ"</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>
@@ -96,7 +96,7 @@
     <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>
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"အချက်အလက်နှင့် အဆက်အသွယ်အားလုံးကို ရှင်းမလား။"</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="5559349261345837716">"ပထမဆုံးတုံ့ပြန်သူက သင့်အချက်အလက်များကို မြင်အောင်လုပ်ပါ"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index dbdc612..f51342a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Informasjon for nødstilfeller"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Medisinsk informasjon"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Rediger informasjon"</string>
+    <string name="edit_medical_info" msgid="6733720353375319476">"Endre informasjon"</string>
     <string name="edit_info" msgid="5973929805855224805">"Endre informasjonen for nødstilfeller"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informasjon"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontakter"</string>
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Vil du fjerne alle opplysningene og kontaktene?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Vis informasjonen din til utrykningspersonell"</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 0b6ed15..f15d62f 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -96,7 +96,7 @@
     <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>
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"सबै जानकारी र सम्पर्कहरूलाई मेटाउने हो?"</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="5559349261345837716">"तपाईंको जानकारी आपतकालीन अवस्थामा सहयोग पुर्‍याउने पहिला मान्छेहरूलाई हेर्न दिनुहोस्‌"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f2bce55..d3e4b95 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Alle informatie en contacten wissen?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Laat hulpdiensten je gegevens bekijken"</string>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 32efb30..0401687 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/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>
@@ -87,7 +87,7 @@
     <!-- 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">"ਐਮਰਜੈਂਸੀ ਸੰਪਰਕ"</string>
+    <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>
@@ -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="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="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="5559349261345837716">"ਪਹਿਲੇ ਮਦਦਗਾਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਜਾਣਕਾਰੀ ਦੇਖਣ ਦਿਓ"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8f5e38e..56fcb0f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Usunąć wszystkie informacje i kontakty?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Ratownicy będą mogli zobaczyć informacje o Tobie"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 247b1d3..6365ec2 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Pretende limpar todas as informações e contactos?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Permita que os socorristas vejam as suas informações."</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 62e6baa..c6ba211 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Limpar todas as informações e contatos?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Permita que os socorristas vejam suas informações"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 82d06a7..e2d2ff1 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Ștergeți toate informațiile și persoanele de contact?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Lăsați echipa de prim ajutor să vă vadă informațiile"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4eaf649..013c6ab 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Удалить все контакты и другие данные?"</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="5559349261345837716">"Эти данные будут доступны на заблокированном экране"</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 74a589d..1e691f7 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"සියලු තොරතුරු හා සම්බන්ධතා හිස් කරන්නද?"</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="5559349261345837716">"පළමුවෙන් ප්‍රතිචාර දක්වන්නන්ට ඔබේ තොරතුරු බැලීමට ඉඩ දෙමු"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b6d5c55..b37687d 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Vymazať všetky informácie a kontakty?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Umožnite prvým zasahujúcim zobraziť si vaše informácie"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 78b940d..3174d12 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Želite izbrisati vse informacije in stike?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Omogočite prikaz svojih podatkov reševalcem"</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index bab1034..4217c54 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Të pastrohen të gjitha informacionet dhe kontaktet?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Lejo shërbimet e emergjencës të shohin informacionin tënd"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4f301ef..eb6d67d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Желите ли да обришете све информације и контакте?"</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="5559349261345837716">"Дозволите екипама хитних служби да виде информације"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e372bf4..c2743d8 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Vill du rensa alla uppgifter och kontakter?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Tillåt att räddningspersonal ser dina uppgifter"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 317bcae..e19d209 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -103,7 +103,7 @@
     <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="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="emergency_info_footer" msgid="8751758742506410146">"Hatua ya kuongeza maelezo ya matibabu na anwani za dharura inaweza kuwasaidia watakaofika kwanza katika hali za dharura.\n\nMtu yeyote anaweza kusoma maelezo haya kwenye skrini ya simu yako iliyofungwa na kuwapigia simu watu unaowasiliana nao kwa kugusa 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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Ruhusu wanaohudumia dharura waone maelezo yako"</string>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 4a26483..d432941 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/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="8751758742506410146">"மருத்துவத் தகவலையும் அவசரகாலத் தொடர்புகளையும் சேர்ப்பதால், அவசரகாலத்தில் முதலில் உதவ முன்வருபவர்களுக்கு அந்தத் தகவல் உதவலாம்.\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="5559349261345837716">"முதலில் உதவுபவர்கள், உங்கள் தகவலைப் பார்க்கும்படி செய்க"</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 8a8f986..af404d4 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/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">"O+"</string>
     <string name="ominus" msgid="5227278501191741055">"O-"</string>
@@ -71,7 +71,7 @@
     <string name="ab_positive" msgid="1931300033534642005">"A B పాజిటివ్"</string>
     <string name="ab_negative" msgid="2064555613093591729">"A B నెగిటివ్"</string>
     <string name="h_h" msgid="2183333409760379720">"H H"</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="8751758742506410146">"వైద్య సమాచారం మరియు అత్యవసర పరిచయాలను జోడిస్తే, అత్యవసర పరిస్థితిలో ముందుగా ప్రతిస్పందించే వారికి సహాయకరంగా ఉంటాయి.\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="5559349261345837716">"మీ సమాచారాన్ని మొదటగా ప్రతిస్పందించే వారిని చూడనివ్వండి"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 3d24e31..2889961 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="8751758742506410146">"การเพิ่มข้อมูลทางการแพทย์และผู้ติดต่อกรณีฉุกเฉินจะเป็นประโยชน์ต่อผู้ปฏิบัติการแพทย์ฉุกเฉินเบื้องต้นในกรณีฉุกเฉิน\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="5559349261345837716">"ให้ผู้ช่วยเหลือเบื้องต้นเห็นข้อมูลของคุณ"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index b4e7818..b2fe2e4 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Iki-clear ba ang lahat ng impormasyon at contact?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Hayaang makita ng unang reresponde ang impormasyon mo"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1a934b3..27d98b5 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Tüm bilgiler ve kişiler temizlensin mi?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"İlk yanıt verenlerin bilgilerinizi görmesine izin verin"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 2eb559f..1fb73bc 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Очистити всю інформацію та контакти?"</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="5559349261345837716">"Надайте інформацію для отримання першої допомоги"</string>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 28a7a19..9e70fb8 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"تمام معلومات اور رابطے صاف کریں؟"</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="5559349261345837716">"اولین جواب دہندگان کو اپنی معلومات دیکھنے کی سہولت دیں"</string>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 5537ec1..522107e 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Barcha kontaktlar va ma’lumotlar o‘chirib tashlansinmi?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Birinchi yordam uchun ma’lumotlaringizni taqdim eting"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a584b0c..14614f3 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -80,7 +80,7 @@
     <string name="medical_conditions" msgid="3555690011498283592">"Ghi chú y tế"</string>
     <string name="unknown_medical_conditions" msgid="8051364895172053770">"Không xác định"</string>
     <string name="medical_conditions_hint" msgid="6959152183029062882">"Ví dụ: bệnh hen"</string>
-    <string name="organ_donor" msgid="5953509460007124827">"Người hiến tạng"</string>
+    <string name="organ_donor" msgid="5953509460007124827">"Hiến tạng"</string>
     <string name="unknown_organ_donor" msgid="2780515342875494225">"Không xác định"</string>
     <string name="yes" msgid="5829765567799916128">"Có"</string>
     <string name="no" msgid="1681689233660683509">"Không"</string>
@@ -105,5 +105,5 @@
     <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="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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Cho phép những người phản hồi đầu tiên xem thông tin"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e60980b..922e020 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"要清除所有信息和联系人吗？"</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="5559349261345837716">"让一线急救人员查看您的信息"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 1f54ebf..28b4189 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -74,7 +74,7 @@
     <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>
+    <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>
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"要清除所有資料和聯絡人嗎？"</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="5559349261345837716">"讓先遣人員查看您的資料"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e5dc5bc..9021328 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"要清除所有資訊和聯絡人嗎？"</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="5559349261345837716">"讓第一位回覆者查看你的資訊"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 0b82f74..d1d30b4 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -105,5 +105,5 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Sula lonke ulwazi noxhumana nabo?"</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>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Vumela abaphenduli bokuqala babone ulwazi lwakho"</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 705a96d..9d3ff75 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -213,9 +213,9 @@
     <string name="clear_all_message">Clear all information and contacts?</string>
     <!-- Information footer describing the use of emergency information. [CHAR LIMIT=NONE] -->
     <string name="emergency_info_footer">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>
-    <!-- Title for a suggestion to a user to set up their emergency information [CHAR_LIMIT=60] -->
+    <!-- Title for a suggestion to a user to set up their emergency information [CHAR_LIMIT=46] -->
     <string name="settings_suggestion_title">Add emergency information</string>
-    <!-- Explanatory text for a suggestion to a user to set up their emergency information [CHAR_LIMIT=NONE] -->
-    <string name="settings_suggestion_body">Help first responders find important information</string>
+    <!-- Explanatory text for a suggestion to a user to set up their emergency information [CHAR_LIMIT=55] -->
+    <string name="settings_suggestion_body">Let first responders see your information</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..5abab4b 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"
@@ -22,7 +23,7 @@
         <com.android.emergency.preferences.NameAutoCompletePreference
             android:enabled="false"
             android:focusable="true"
-            android:icon="@drawable/ic_account_circle"
+            android:icon="@drawable/ic_account_circle_filled_24dp"
             android:inputType="textCapWords|textPersonName"
             android:key="name"
             android:selectable="false"
@@ -33,7 +34,7 @@
         <com.android.emergency.preferences.EmergencyEditTextPreference
             android:enabled="false"
             android:focusable="true"
-            android:icon="@drawable/ic_address_black_24dp"
+            android:icon="@drawable/ic_home_24dp"
             android:key="address"
             android:selectable="false"
             android:shouldDisableView="false"
@@ -43,7 +44,7 @@
             xmlns:app="http://schemas.android.com/apk/res/com.android.emergency"
             android:enabled="false"
             android:focusable="true"
-            android:icon="@drawable/ic_bloodtype_black_24dp"
+            android:icon="@drawable/ic_bloodtype_24dp"
             android:entries="@array/blood_type_entries"
             android:entryValues="@array/blood_type_values"
             android:key="blood_type"
@@ -73,7 +74,7 @@
         <com.android.emergency.preferences.EmergencyListPreference
             android:enabled="false"
             android:focusable="true"
-            android:icon="@drawable/ic_heart_black_24dp"
+            android:icon="@drawable/ic_favorite_border_24dp"
             android:entries="@array/organ_donor_entries"
             android:entryValues="@array/organ_donor_values"
             android:key="organ_donor"
@@ -84,7 +85,7 @@
         <com.android.emergency.preferences.EmergencyEditTextPreference
             android:enabled="false"
             android:focusable="true"
-            android:icon="@drawable/ic_notes_black_24dp"
+            android:icon="@drawable/ic_note_alt_24dp"
             android:key="medical_conditions"
             android:selectable="false"
             android:shouldDisableView="false"
@@ -92,7 +93,7 @@
 
         <Preference
             android:key="edit_medical_info"
-            android:icon="@drawable/ic_mode_edit_googblue_24dp"
+            android:icon="@drawable/ic_mode_edit"
             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..0087f8a 100644
--- a/res/xml/edit_medical_info.xml
+++ b/res/xml/edit_medical_info.xml
@@ -15,18 +15,20 @@
 -->
 <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"
+        android:icon="@drawable/ic_account_circle_filled_24dp"
         android:inputType="textCapWords|textPersonName"
         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"
+        android:icon="@drawable/ic_home_24dp"
         android:inputType="textCapWords|textPostalAddress|textMultiLine"
         android:key="address"
         android:singleLine="false"
@@ -38,7 +40,7 @@
         android:defaultValue=""
         android:entries="@array/blood_type_entries"
         android:entryValues="@array/blood_type_values"
-        android:icon="@drawable/ic_bloodtype_black_24dp"
+        android:icon="@drawable/ic_bloodtype_24dp"
         android:key="blood_type"
         android:negativeButtonText="@null"
         android:positiveButtonText="@null"
@@ -71,7 +73,7 @@
     <com.android.emergency.preferences.EmergencyListPreference
         android:entries="@array/organ_donor_entries"
         android:entryValues="@array/organ_donor_values"
-        android:icon="@drawable/ic_heart_black_24dp"
+        android:icon="@drawable/ic_favorite_border_24dp"
         android:key="organ_donor"
         android:defaultValue=""
         android:negativeButtonText="@null"
@@ -83,7 +85,7 @@
         android:capitalize="sentences"
         android:hint="@string/medical_conditions_hint"
         android:textColorHint="@color/hint_text_color"
-        android:icon="@drawable/ic_notes_black_24dp"
+        android:icon="@drawable/ic_note_alt_24dp"
         android:inputType="textMultiLine"
         android:key="medical_conditions"
         android:singleLine="false"
diff --git a/res/xml/view_emergency_info.xml b/res/xml/view_emergency_info.xml
index 87a8fc1..ebbf9c6 100644
--- a/res/xml/view_emergency_info.xml
+++ b/res/xml/view_emergency_info.xml
@@ -12,11 +12,14 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res/com.android.emergency">
+
     <com.android.emergency.preferences.EmergencyEditTextPreference
         android:enabled="false"
         android:focusable="true"
-        android:icon="@drawable/ic_address_black_24dp"
+        android:icon="@drawable/ic_home_24dp"
         android:key="address"
         android:selectable="false"
         android:shouldDisableView="false"
@@ -24,10 +27,9 @@
         android:title="@string/address" />
 
     <com.android.emergency.preferences.EmergencyListPreference
-        xmlns:app="http://schemas.android.com/apk/res/com.android.emergency"
         android:enabled="false"
         android:focusable="true"
-        android:icon="@drawable/ic_bloodtype_black_24dp"
+        android:icon="@drawable/ic_bloodtype_24dp"
         android:entries="@array/blood_type_entries"
         android:entryValues="@array/blood_type_values"
         android:key="blood_type"
@@ -60,7 +62,7 @@
     <com.android.emergency.preferences.EmergencyListPreference
         android:enabled="false"
         android:focusable="true"
-        android:icon="@drawable/ic_heart_black_24dp"
+        android:icon="@drawable/ic_favorite_border_24dp"
         android:entries="@array/organ_donor_entries"
         android:entryValues="@array/organ_donor_values"
         android:key="organ_donor"
@@ -72,7 +74,7 @@
     <com.android.emergency.preferences.EmergencyEditTextPreference
         android:enabled="false"
         android:focusable="true"
-        android:icon="@drawable/ic_notes_black_24dp"
+        android:icon="@drawable/ic_note_alt_24dp"
         android:key="medical_conditions"
         android:selectable="false"
         android:shouldDisableView="false"
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/ContactPreference.java b/src/com/android/emergency/preferences/ContactPreference.java
index ff5e3cc..feb8d2d 100644
--- a/src/com/android/emergency/preferences/ContactPreference.java
+++ b/src/com/android/emergency/preferences/ContactPreference.java
@@ -150,7 +150,7 @@
             icon = new CircleFramedDrawable(mContact.getPhoto(),
                     (int) getContext().getResources().getDimension(R.dimen.circle_avatar_size));
         } else {
-            icon = getContext().getResources().getDrawable(R.drawable.ic_account_circle);
+            icon = getContext().getDrawable(R.drawable.ic_account_circle_filled_24dp);
         }
         setIcon(icon);
     }
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 c450a42..b8dd926 100644
--- a/tests/robolectric/Android.mk
+++ b/tests/robolectric/Android.mk
@@ -15,23 +15,23 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_JAVA_LIBRARIES := \
-    junit \
-    platform-robolectric-prebuilt
+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)
 
 #############################################################
@@ -48,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/preferences/EmergencyEditTextPreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java
index c7fd3bc..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;
 
@@ -75,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 4712a2a..df7eb1b 100644
--- a/tests/robolectric/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
+++ b/tests/robolectric/src/com/android/emergency/preferences/EmergencyListPreferenceTest.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;
 
@@ -72,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);
@@ -94,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 0549154..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,6 +28,8 @@
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
+import android.text.Editable;
+import android.view.View;
 import android.widget.AutoCompleteTextView;
 
 import com.android.emergency.PreferenceKeys;
@@ -39,6 +43,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
 
 /** Unit tests for {@link NameAutoCompletePreference}. */
 @RunWith(RobolectricTestRunner.class)
@@ -79,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);
@@ -113,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 eaa5a13..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;
 
@@ -52,9 +51,6 @@
     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;
@@ -63,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);
@@ -116,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));
     }
@@ -134,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));
     }
@@ -146,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));
     }
@@ -159,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