[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
am: 516b2ff213 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib18c80d439c6a9aa09251722c65669fe7f6ea27b
diff --git a/Android.bp b/Android.bp
index 0c92347..ba7ce44 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,6 +15,7 @@
 android_app {
     name: "EmergencyInfo",
     platform_apis: true,
+    resource_dirs: [],
     optimize: {
         proguard_flags_files: ["proguard.flags"],
     },
@@ -22,17 +23,25 @@
     required: ["privapp_whitelist_com.android.emergency"],
     privileged: true,
     static_libs: [
+        "EmergencyInfo-lib"
+    ],
+    certificate: "platform",
+}
+
+android_library {
+    name: "EmergencyInfo-lib",
+    platform_apis: true,
+    resource_dirs: ["res"],
+    srcs: ["src/**/*.java"],
+    static_libs: [
         "androidx.legacy_legacy-preference-v14",
         "androidx.legacy_legacy-support-v13",
         "androidx.appcompat_appcompat",
         "androidx.preference_preference",
         "androidx.recyclerview_recyclerview",
         "androidx.legacy_legacy-support-v4",
-        "androidx.design_design",
+        "com.google.android.material_material",
         "androidx.transition_transition",
     ],
-    resource_dirs: ["res"],
-    srcs: ["src/**/*.java"],
-    certificate: "platform",
     defaults: ["SettingsLibDefaults"],
 }
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 626eb73..d9281f4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,6 +21,7 @@
     <uses-permission android:name="android.permission.CALL_PRIVILEGED" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.MANAGE_USERS" />
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
 
     <uses-sdk android:minSdkVersion="21"/>
 
@@ -100,6 +101,16 @@
             </intent-filter>
         </provider>
 
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="com.android.emergency.files"
+            android:grantUriPermissions="true"
+            android:exported="false">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
     </application>
 
 </manifest>
diff --git a/res/drawable/ic_info.xml b/res/drawable/ic_info.xml
deleted file mode 100644
index afe7e6b..0000000
--- a/res/drawable/ic_info.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-    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"
-        android:viewportHeight="24"
-        android:tint="?android:attr/colorAccent">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z"/>
-</vector>
diff --git a/res/drawable/ic_local_phone_gm2_24px.xml b/res/drawable/ic_local_phone_gm2_24px.xml
new file mode 100644
index 0000000..9ef4134
--- /dev/null
+++ b/res/drawable/ic_local_phone_gm2_24px.xml
@@ -0,0 +1,25 @@
+<!--
+  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"
+        android:viewportHeight="24">
+    <path
+        android:fillColor="#5F6368"
+        android:pathData="M16.01,14.48l-2.62,2.62c-2.75,-1.49 -5.01,-3.75 -6.5,-6.5l2.62,-2.62c0.24,-0.24 0.34,-0.58 0.27,-0.9L9.13,3.82c-0.09,-0.47 -0.5,-0.8 -0.98,-0.8L4,3.01c-0.56,0 -1.03,0.47 -1,1.03c0.17,2.91 1.04,5.63 2.43,8.01c1.57,2.69 3.81,4.93 6.5,6.5c2.38,1.39 5.1,2.26 8.01,2.43c0.56,0.03 1.03,-0.44 1.03,-1l0,-4.15c0,-0.48 -0.34,-0.89 -0.8,-0.98l-3.26,-0.65C16.58,14.14 16.24,14.24 16.01,14.48z"/>
+</vector>
\ No newline at end of file
diff --git a/res/layout/edit_user_info_dialog_content.xml b/res/layout/edit_user_info_dialog_content.xml
new file mode 100644
index 0000000..4d76e13
--- /dev/null
+++ b/res/layout/edit_user_info_dialog_content.xml
@@ -0,0 +1,49 @@
+<!--
+     Copyright (C) 2013 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.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:baselineAligned="false"
+    android:padding="16dip">
+
+    <ImageView
+        android:id="@+id/user_photo"
+        android:layout_width="56dip"
+        android:layout_height="56dip"
+        android:layout_gravity="bottom"
+        android:layout_marginEnd="6dp"
+        android:contentDescription="@string/user_image_photo_selector"
+        android:background="@*android:drawable/spinner_background_holo_dark"
+        android:scaleType="fitCenter"/>
+
+    <EditText
+        android:id="@+id/user_name"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_weight="1"
+        android:layout_marginStart="6dp"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textAlignment="viewStart"
+        android:labelFor="@id/user_photo"
+        android:inputType="text|textCapWords"
+        android:selectAllOnFocus="true"
+        android:hint="@string/user_nickname"/>
+
+</LinearLayout>
diff --git a/res/layout/preference_category_material_settings.xml b/res/layout/preference_category_material_settings.xml
index d815946..6ee1199 100644
--- a/res/layout/preference_category_material_settings.xml
+++ b/res/layout/preference_category_material_settings.xml
@@ -15,35 +15,20 @@
   limitations under the License.
   -->
 
-<!-- Based off frameworks/base/core/res/res/layout/preference_category_material.xml
-     except that this supports icon -->
+<!-- Based off frameworks/base/core/res/res/layout/preference_category_material.xml -->
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="8dp"
-    android:layout_marginBottom="8dp"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart" >
 
     <LinearLayout
-        android:id="@+id/icon_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="start|center_vertical"
-        android:orientation="horizontal">
-        <com.android.internal.widget.PreferenceImageView
-            android:id="@android:id/icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:tint="?android:attr/textColorPrimary"
-            android:maxWidth="18dp"
-            android:maxHeight="18dp"/>
-    </LinearLayout>
-
-    <LinearLayout
+        android:id="@+id/emergency_preference_category"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="56dp"
+        android:layout_marginBottom="8dp"
         android:orientation="vertical">
         <TextView
             android:id="@android:id/title"
@@ -52,7 +37,7 @@
             android:layout_height="wrap_content"
             android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
             android:textAppearance="@android:style/TextAppearance.Material.Body2"
-            android:textColor="?android:attr/colorAccent"
+            android:textColor="@color/emergency_contacts_text_color"
             android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"/>
         <TextView
             android:id="@android:id/summary"
@@ -63,5 +48,4 @@
             android:ellipsize="end"
             android:singleLine="true" />
     </LinearLayout>
-
 </FrameLayout>
diff --git a/res/layout/preference_user_delete_widget.xml b/res/layout/preference_user_action_widget.xml
similarity index 75%
rename from res/layout/preference_user_delete_widget.xml
rename to res/layout/preference_user_action_widget.xml
index 7a22721..122b87f 100644
--- a/res/layout/preference_user_delete_widget.xml
+++ b/res/layout/preference_user_action_widget.xml
@@ -13,19 +13,27 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:orientation="horizontal">
+    android:layout_height="match_parent">
     <ImageView
         android:id="@+id/delete_contact"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
         android:paddingStart="16dip"
         android:paddingEnd="16dip"
+        android:visibility="visible"
         android:src="@drawable/ic_clear_24dp"
         android:contentDescription="@string/remove_contact_icon_text"
         android:layout_gravity="center"
         android:background="?android:attr/selectableItemBackground" />
-</LinearLayout>
\ No newline at end of file
+
+    <ImageView
+        android:id="@+id/call_contact"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:src="@drawable/ic_local_phone_gm2_24px"
+        android:layout_gravity="center"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/restricted_popup_menu_item.xml b/res/layout/restricted_popup_menu_item.xml
index f644c12..0b66c6a 100644
--- a/res/layout/restricted_popup_menu_item.xml
+++ b/res/layout/restricted_popup_menu_item.xml
@@ -34,11 +34,11 @@
         android:layout_alignParentLeft="true" />
     <ImageView
         android:id="@+id/restricted_icon"
-        android:layout_width="@dimen/config_restricted_icon_size"
-        android:layout_height="@dimen/config_restricted_icon_size"
+        android:layout_width="@*android:dimen/config_restrictedIconSize"
+        android:layout_height="@*android:dimen/config_restrictedIconSize"
         android:scaleType="centerInside"
         android:tint="?android:attr/colorAccent"
-        android:src="@drawable/ic_info"
+        android:src="@*android:drawable/ic_info"
         android:layout_alignParentRight="true"
         android:visibility="gone" />
 </RelativeLayout>
diff --git a/res/layout/tabs.xml b/res/layout/tabs.xml
index e91324c..a12070b 100644
--- a/res/layout/tabs.xml
+++ b/res/layout/tabs.xml
@@ -18,7 +18,7 @@
     android:elevation="@dimen/tab_elevation"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         android:id="@+id/sliding_tabs"
         style="@style/AppTheme.TabLayout"
         android:layout_width="match_parent"
diff --git a/res/layout/view_activity_layout.xml b/res/layout/view_activity_layout.xml
index db32609..9e78c7b 100644
--- a/res/layout/view_activity_layout.xml
+++ b/res/layout/view_activity_layout.xml
@@ -25,23 +25,32 @@
         android:background="?attr/colorPrimary"
         android:elevation="@dimen/tab_elevation"
         android:orientation="vertical">
-        <TextView
-            android:id="@+id/personal_card_large"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxHeight="68dp"
-            android:minHeight="36dp"
-            android:maxLines="2"
-            android:textSize="26sp"
-            android:ellipsize="end"
-            android:layout_marginStart="72dp"
-            android:layout_marginEnd="16dp"
-            android:lineSpacingMultiplier="1.05026"
-            android:textColor="#FFFFFF"/>
-
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="18dp"></LinearLayout>
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <ImageView
+                android:id="@+id/personal_card_icon"
+                android:layout_width="56dp"
+                android:layout_height="56dp"
+                android:layout_gravity="center"
+                android:layout_marginVertical="20dp"
+                android:layout_marginStart="68dp"
+                android:layout_marginEnd="16dp"/>
+            <TextView
+                android:id="@+id/personal_card_large"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:maxLines="2"
+                android:textSize="22sp"
+                android:ellipsize="end"
+                android:layout_marginVertical="20dp"
+                android:layout_marginEnd="20dp"
+                android:lineHeight="28sp"
+                android:fontFamily="@*android:string/config_headlineFontFamily"
+                android:textColor="@color/emergency_owner_text_color"/>
+        </LinearLayout>
     </LinearLayout>
 
     <ViewFlipper
@@ -53,31 +62,33 @@
         <LinearLayout
             android:id="@+id/no_info"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginEnd="16dp"
-            android:layout_marginStart="16dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="72dp"
+            android:layout_marginBottom="48dp"
+            android:layout_marginEnd="104dp"
+            android:layout_marginStart="72dp"
             android:orientation="vertical">
 
             <TextView
                 android:id="@+id/no_info_text_view"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
+                android:layout_height="wrap_content"
+                android:gravity="start"
+                android:lineHeight="24sp"
                 android:text="@string/no_info_provided"
-                android:textColor="#61000000"
+                android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
+                android:textColor="?android:textColorPrimary"
                 android:textSize="16sp" />
 
             <TextView
                 android:id="@+id/tap"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@id/no_info_text_view"
-                android:layout_marginTop="20dp"
-                android:gravity="center"
-                android:lineSpacingMultiplier="1.21905"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="32dp"
+                android:gravity="start"
+                android:lineHeight="20sp"
                 android:text="@string/tap_pencil"
-                android:textColor="#61000000"
+                android:textColor="?android:textColorSecondary"
                 android:textSize="14sp" />
         </LinearLayout>
 
diff --git a/res/menu/view_info_menu.xml b/res/menu/view_info_menu.xml
index c902968..b7357ad 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"
+        android:icon="@*android:drawable/ic_mode_edit"
         android:title="@string/edit_info"
         android:showAsAction="always" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index fbed451..64af4ad 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Noodinligting"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Mediese inligting"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Wysig inligting"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Voeg inligting by"</string>
     <string name="edit_info" msgid="5973929805855224805">"Wysig noodinligting"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Inligting"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontakte"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Neem \'n foto"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Kies \'n prent"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Kies foto"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Bynaam"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f7b9b50..cffa8e4 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/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="add_medical_info" msgid="483921612415907139">"መረጃ ያክሉ"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"ፎቶ ያንሱ"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"ምስል ይምረጡ"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"ፎቶ ይምረጡ"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"ቅጽል ስም"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1b94385..a18ac44 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/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="add_medical_info" msgid="483921612415907139">"إضافة معلومات"</string>
     <string name="edit_info" msgid="5973929805855224805">"تعديل معلومات الطوارئ"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"المعلومات"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"جهات الاتصال"</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>
@@ -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,11 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"التقاط صورة"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"اختيار صورة"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"اختيار صورة"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"اللقب"</string>
 </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 0727400..e78eda7 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -106,8 +106,8 @@
     <string name="emergency_info_footer" msgid="8751758742506410146">"আপোনাৰ স্বাস্থ্য সম্পৰ্কীয় বিশেষ তথ্য আৰু জৰুৰীকালীন সম্পৰ্ক যোগ কৰিলে জৰুৰীকালীন পৰিস্থিতিত প্ৰথম সঁহাৰিদাতাজনৰ বাবে সহায়ক হয়।\n\nআপোনাৰ বন্ধ স্ক্ৰীণতেই যিকোনো লোকে এই তথ্য পঢ়িব পাৰে আৰু আপোনাৰ ফ\'নটো আনলক নকৰাকৈয়ে তেওঁলোকে জৰুৰীকালীন সম্পৰ্কসমূহৰ নাম টিপি তেওঁলোকক ফ\'ন কৰিব পাৰে।"</string>
     <string name="settings_suggestion_title" msgid="2503369576806243476">"জৰুৰীকালীন তথ্য যোগ কৰক"</string>
     <string name="settings_suggestion_body" msgid="5559349261345837716">"প্ৰথমে সঁহাৰি দিয়া লোকসকলক আপোনাৰ তথ্য চাবলৈ দিয়ক"</string>
-    <string name="user_image_take_photo" msgid="21997578349584645">"ফট’ তোলক"</string>
-    <string name="user_image_choose_photo" msgid="2739785560734553126">"গেলাৰীৰ পৰা ফট\' বাছনি কৰক"</string>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"এখন ফট’ তোলক"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"এখন প্ৰতিচ্ছবি বাছনি কৰক"</string>
     <string name="user_image_photo_selector" msgid="8941966433899876760">"ফট\' বাছনি কৰক"</string>
     <string name="user_nickname" msgid="7956055372443961161">"উপনাম"</string>
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 234c058..7081579 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Təcili məlumat"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Tibbi məlumat"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Məlumata düzəliş edin"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Məlumat əlavə edin"</string>
     <string name="edit_info" msgid="5973929805855224805">"Təcili məlumatı redaktə edin"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"İnfo"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontaktlar"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Foto çəkin"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Şəkil seçin"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Foto seçin"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Ləqəb"</string>
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index a7493f3..0ff577e 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Informacije za hitne slučajeve"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Medicinski podaci"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Izmeni podatke"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Dodajte informacije"</string>
     <string name="edit_info" msgid="5973929805855224805">"Izmenite informacije za hitne slučajeve"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informacije"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontakti"</string>
@@ -105,5 +105,9 @@
     <string name="clear_all_message" msgid="1548432000373861295">"Želite li da obrišete sve informacije i kontakte?"</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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Slikajte"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Odaberite sliku"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Izaberite sliku"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Nadimak"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 7936f32..6da8d24 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/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="add_medical_info" msgid="483921612415907139">"Дадайце інфармацыю"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Зрабіць фота"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Выбраць відарыс"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Выбраць фота"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Псеўданім"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 7c08868..50e9ce4 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/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="add_medical_info" msgid="483921612415907139">"Добавяне на информация"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Правене на снимка"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Избиране на изображение"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Изберете снимка"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Псевдоним"</string>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 31b464e..0a19fa6 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/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="add_medical_info" msgid="483921612415907139">"তথ্য যোগ করুন"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"ফটো তুলুন"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"একটি ছবি বেছে নিন"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"ফটো বেছে নিন"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"ডাকনাম"</string>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 2d782a3..d2575f5 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Informacije za hitne slučajeve"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Zdravstveni podaci"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Uređivanje informacija"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Dodavanje informacija"</string>
     <string name="edit_info" msgid="5973929805855224805">"Izmijeni informacije za hitne slučajeve"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informacije"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontakti"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Snimi fotografiju"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Odaberite sliku"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Odaberite fotografiju"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Nadimak"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 24f395e..b1ba3c3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Informació d\'emergència"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Informació mèdica"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Edita la informació"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Afegeix informació"</string>
     <string name="edit_info" msgid="5973929805855224805">"Edita la informació d\'emergència"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informació"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Contactes"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Fes una foto"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Tria una imatge"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Selecciona una foto"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Àlies"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3980509..e123418 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Nouzové informace"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Zdravotní údaje"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Upravit údaje"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Přidat informace"</string>
     <string name="edit_info" msgid="5973929805855224805">"Upravit nouzové informace"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informace"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontakty"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Vyfotit"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Zvolit obrázek"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Vybrat fotku"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Přezdívka"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f175b8b..f0d493a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -18,10 +18,10 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Info til nødsituationer"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Helbredsoplysninger"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Rediger oplysninger"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Tilføj oplysninger"</string>
     <string name="edit_info" msgid="5973929805855224805">"Rediger info til nødsituationer"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Info"</string>
-    <string name="tab_title_contacts" msgid="4298341166404791209">"Kontaktpersoner"</string>
+    <string name="tab_title_contacts" msgid="4298341166404791209">"Kontakter"</string>
     <string name="name" msgid="4286267457738861977">"Navn"</string>
     <string name="unknown_name" msgid="2834802479170495056">"Ukendt"</string>
     <string name="address" msgid="6449303483151189969">"Adresse"</string>
@@ -87,12 +87,12 @@
     <!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
-    <string name="emergency_contacts_title" msgid="5462202017417821030">"Kontaktpersoner ved nødsituationer"</string>
-    <string name="add_emergency_contact" msgid="4063577069613981029">"Tilføj kontaktperson"</string>
+    <string name="emergency_contacts_title" msgid="5462202017417821030">"Kontakter ved nødsituationer"</string>
+    <string name="add_emergency_contact" msgid="4063577069613981029">"Tilføj kontakt"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"Der kunne ikke findes en kontaktpersonvælger"</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"Kontaktpersonen kan ikke vises"</string>
-    <string name="remove_contact" msgid="6934983445723096759">"Vil du fjerne <xliff:g id="CONTACT_NAME">%1$s</xliff:g> fra kontaktpersoner ved nødsituationer?"</string>
-    <string name="remove_contact_icon_text" msgid="4576641386490101363">"Fjern kontaktperson"</string>
+    <string name="remove_contact" msgid="6934983445723096759">"Vil du fjerne <xliff:g id="CONTACT_NAME">%1$s</xliff:g> fra kontakter ved nødsituationer?"</string>
+    <string name="remove_contact_icon_text" msgid="4576641386490101363">"Fjern kontakt"</string>
     <string name="fail_add_contact" msgid="6511490846952942291">"Kontaktoplysningerne kunne ikke læses korrekt"</string>
     <string name="remove" msgid="1243949503772376064">"Fjern"</string>
     <string name="cancel" msgid="7401575239009060939">"Annuller"</string>
@@ -102,8 +102,12 @@
     <string name="tap_pencil" msgid="2723698054265296934">"Hvis dette er din telefon, skal du trykke på blyantikonet for at tilføje information, som vises her, hvis der opstår en nødsituation"</string>
     <string name="clear_all" msgid="8899013032870561633">"Ryd alt"</string>
     <string name="clear" msgid="3648880442502887163">"Ryd"</string>
-    <string name="clear_all_message" msgid="1548432000373861295">"Vil du rydde alle oplysninger og kontaktpersoner?"</string>
-    <string name="emergency_info_footer" msgid="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="clear_all_message" msgid="1548432000373861295">"Vil du rydde alle oplysninger og kontakter?"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"Hvis du tilføjer helbredsoplysninger og kontakter 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 kontakter 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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Tag et billede"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Vælg et billede"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Vælg billede"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Kaldenavn"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7259a2f..53585d1 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Notfallinformationen"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Medizinische Informationen"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Informationen bearbeiten"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Informationen hinzufügen"</string>
     <string name="edit_info" msgid="5973929805855224805">"Notfallinformationen bearbeiten"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Info"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontakte"</string>
@@ -96,7 +96,7 @@
     <string name="fail_add_contact" msgid="6511490846952942291">"Kontaktdaten können nicht richtig gelesen werden"</string>
     <string name="remove" msgid="1243949503772376064">"Entfernen"</string>
     <string name="cancel" msgid="7401575239009060939">"Abbrechen"</string>
-    <string name="ok" msgid="163967937451981024">"Ok"</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">"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 Stiftsymbol, um Informationen hinzuzufügen, die im Notfall eingeblendet werden"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Foto aufnehmen"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Bild auswählen"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Foto auswählen"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Alias"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 5c5dca6..aed4cde 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/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="add_medical_info" msgid="483921612415907139">"Προσθήκη πληροφοριών"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Λήψη φωτογραφίας"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Επιλέξτε μια εικόνα"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Επιλογή φωτογραφίας"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Ψευδώνυμο"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index fce6ab1..133b949 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -18,7 +18,7 @@
     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="add_medical_info" msgid="483921612415907139">"Add 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>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Take a photo"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Choose an image"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Select photo"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Nickname"</string>
 </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index fce6ab1..133b949 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -18,7 +18,7 @@
     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="add_medical_info" msgid="483921612415907139">"Add 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>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Take a photo"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Choose an image"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Select photo"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Nickname"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index fce6ab1..133b949 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -18,7 +18,7 @@
     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="add_medical_info" msgid="483921612415907139">"Add 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>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Take a photo"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Choose an image"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Select photo"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Nickname"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index fce6ab1..133b949 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -18,7 +18,7 @@
     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="add_medical_info" msgid="483921612415907139">"Add 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>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Take a photo"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Choose an image"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Select photo"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Nickname"</string>
 </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 40c6355..819bd41 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -16,32 +16,32 @@
 
 <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>
+    <string name="app_label" msgid="1090682794607161063">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎Emergency information‎‏‎‎‏‎"</string>
+    <string name="medical_info_title" msgid="3000192781136934887">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎Medical information‎‏‎‎‏‎"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎Add 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) -->
@@ -62,48 +62,52 @@
     <!-- 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>
+    <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>
+    <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="5559349261345837716">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎Let first responders see your information‎‏‎‎‏‎"</string>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‏‏‎‎Take a photo‎‏‎‎‏‎"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎Choose an image‎‏‎‎‏‎"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‎‎Select photo‎‏‎‎‏‎"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‏‎Nickname‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 33351c6..643f969 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Información de emergencia"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Información médica"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Editar información"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Agregar información"</string>
     <string name="edit_info" msgid="5973929805855224805">"Editar información de emergencia"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Información"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Contactos"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Toma una foto"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Elige una imagen"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Seleccionar foto"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Sobrenombre"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0e633fa..6930f41 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -18,21 +18,21 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Información de emergencia"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Información médica"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Editar información"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Añadir información"</string>
     <string name="edit_info" msgid="5973929805855224805">"Cambiar información de emergencia"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Información"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Contactos"</string>
     <string name="name" msgid="4286267457738861977">"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,11 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Hacer una foto"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Seleccionar una imagen"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Selecciona la foto"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Apodo"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 8c1006f..608a863 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Hädaabiteave"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Meditsiiniline teave"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Teabe muutmine"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Teabe lisamine"</string>
     <string name="edit_info" msgid="5973929805855224805">"Hädaabiteabe muutmine"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Teave"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontaktid"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Pildistamine"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Kujutise valimine"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Vali foto"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Hüüdnimi"</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index c4ca564..6331b99 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Larrialdietarako informazioa"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Osasun-informazioa"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Editatu informazioa"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Gehitu informazioa"</string>
     <string name="edit_info" msgid="5973929805855224805">"Editatu larrialdietarako informazioa"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informazioa"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontaktuak"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Atera argazki bat"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Aukeratu irudi bat"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Hautatu argazki bat"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Goitizena"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7b12900..8c8c63a 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/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="add_medical_info" msgid="483921612415907139">"افزودن اطلاعات"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"عکس گرفتن"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"انتخاب تصویر"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"انتخاب عکس"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"نام مستعار"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index dd6c274..1ed599c 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Hätätilannetiedot"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Lääketieteelliset tiedot"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Muokkaa tietoja"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Tietojen lisääminen"</string>
     <string name="edit_info" msgid="5973929805855224805">"Muokkaa hätätilannetietoja"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Tiedot"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Yhteystiedot"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Ota kuva"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Valitse kuva"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Valitse kuva"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Lempinimi"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index c08bbc9..c3daa94 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Données d\'urgence"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Données médicales"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Modifier les données"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Ajouter des renseignements"</string>
     <string name="edit_info" msgid="5973929805855224805">"Modifier les données d\'urgence"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Information"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Contacts"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Prendre une photo"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Sélectionner une image"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Sélectionner une photo"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Pseudonyme"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1eec189..1fb6bfd 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Informations d\'urgence"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Informations médicales"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Modifier les informations"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Ajouter des informations"</string>
     <string name="edit_info" msgid="5973929805855224805">"Modifier les informations d\'urgence"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informations"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Contacts"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Prendre une photo"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Choisir une image"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Sélectionner la photo"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Pseudo"</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index cd6f371..e0641ce 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -16,10 +16,10 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1090682794607161063">"Información de urxencia"</string>
+    <string name="app_label" msgid="1090682794607161063">"Información de emerxencia"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Información médica"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Editar información"</string>
-    <string name="edit_info" msgid="5973929805855224805">"Editar información de urxencia"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Engadir información"</string>
+    <string name="edit_info" msgid="5973929805855224805">"Editar información de emerxencia"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Información"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Contactos"</string>
     <string name="name" msgid="4286267457738861977">"Nome"</string>
@@ -87,11 +87,11 @@
     <!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
-    <string name="emergency_contacts_title" msgid="5462202017417821030">"Contactos de urxencia"</string>
+    <string name="emergency_contacts_title" msgid="5462202017417821030">"Contactos de emerxencia"</string>
     <string name="add_emergency_contact" msgid="4063577069613981029">"Engadir contacto"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"Non se puido encontrar un selector de contactos"</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"Non se pode mostrar o contacto"</string>
-    <string name="remove_contact" msgid="6934983445723096759">"Queres eliminar a <xliff:g id="CONTACT_NAME">%1$s</xliff:g> dos contactos de urxencia?"</string>
+    <string name="remove_contact" msgid="6934983445723096759">"Queres eliminar a <xliff:g id="CONTACT_NAME">%1$s</xliff:g> dos contactos de emerxencia?"</string>
     <string name="remove_contact_icon_text" msgid="4576641386490101363">"Eliminar contacto"</string>
     <string name="fail_add_contact" msgid="6511490846952942291">"Non se puido ler correctamente a información de contacto"</string>
     <string name="remove" msgid="1243949503772376064">"Eliminar"</string>
@@ -99,11 +99,15 @@
     <string name="ok" msgid="163967937451981024">"Aceptar"</string>
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"Non hai información sobre o propietario do teléfono"</string>
-    <string name="tap_pencil" msgid="2723698054265296934">"Se este é o teu teléfono, toca a icona do lapis para engadir a información que se mostrará aquí en caso de urxencia"</string>
+    <string name="tap_pencil" msgid="2723698054265296934">"Se este é o teu teléfono, toca a icona do lapis para engadir a información que se mostrará aquí en caso de emerxencia"</string>
     <string name="clear_all" msgid="8899013032870561633">"Borrar todo"</string>
     <string name="clear" msgid="3648880442502887163">"Borrar"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Queres borrar toda a información e os contactos?"</string>
-    <string name="emergency_info_footer" msgid="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="emergency_info_footer" msgid="8751758742506410146">"Engadir contactos de emerxencia e información médica pode resultar útil para os servizos de emerxencias en caso dunha emerxencia.\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 emerxencia"</string>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"Permite que o servizo de emerxencias vexa os teus datos"</string>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Tirar unha foto"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Escoller unha imaxe"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Seleccionar foto"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Alcume"</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index bf367d9..8e457db 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="add_medical_info" msgid="483921612415907139">"માહિતી ઉમેરો"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"ફોટો લો"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"છબી પસંદ કરો"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"ફોટો પસંદ કરો"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"ઉપનામ"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e9132c9..958e56d 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -17,8 +17,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"आपातकालीन जानकारी"</string>
-    <string name="medical_info_title" msgid="3000192781136934887">"चिकित्सा संबंधी जानकारी"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"जानकारी में बदलाव करें"</string>
+    <string name="medical_info_title" msgid="3000192781136934887">"इलाज से जुड़ी जानकारी"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"जानकारी जोड़ें"</string>
     <string name="edit_info" msgid="5973929805855224805">"आपातकालीन जानकारी में बदलाव करें"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"जानकारी"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"संपर्क"</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,11 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"फ़ोटो खींचें"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"इमेज चुनें"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"फ़ोटो चुनें"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"प्रचलित नाम"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 065e625..942b558 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -17,8 +17,8 @@
 <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="edit_medical_info" msgid="6733720353375319476">"Uredite informacije"</string>
+    <string name="medical_info_title" msgid="3000192781136934887">"Zdravstveni podaci"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Dodavanje podataka"</string>
     <string name="edit_info" msgid="5973929805855224805">"Uređivanje podataka za hitne slučajeve"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informacije"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontakti"</string>
@@ -103,7 +103,11 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Snimi fotografiju"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Odaberi sliku"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Odaberite fotografiju"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Nadimak"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 4aeac88..83929b3 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Segélyhívási információk"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Egészségügyi adatok"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Adatok szerkesztése"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Adatok megadása"</string>
     <string name="edit_info" msgid="5973929805855224805">"Segélyhívási információk szerkesztése"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Információ"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Névjegyek"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Fotó készítése"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Kép kiválasztása"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Fotó kiválasztása"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Becenév"</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 02e3508..81dd2fe 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/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="add_medical_info" msgid="483921612415907139">"Ավելացնել տվյալներ"</string>
     <string name="edit_info" msgid="5973929805855224805">"Փոփոխել անհետաձգելի բուժօգնության տվյալները"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Տեղեկություններ"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Կոնտակտներ"</string>
@@ -103,7 +103,11 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Լուսանկարել"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Ընտրել պատկեր"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Ընտրել լուսանկար"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Կեղծանուն"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e563b02..ac9199e 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Informasi darurat"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Informasi medis"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Edit informasi"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Tambahkan informasi"</string>
     <string name="edit_info" msgid="5973929805855224805">"Edit informasi darurat"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Info"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontak"</string>
@@ -99,11 +99,15 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Ambil foto"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Pilih gambar"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Pilih foto"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Nama"</string>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 85662ec..c25452d 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Neyðarupplýsingar"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Læknisfræðilegar upplýsingar"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Breyta upplýsingum"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Bæta við upplýsingum"</string>
     <string name="edit_info" msgid="5973929805855224805">"Breyta neyðarupplýsingum"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Upplýsingar"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Tengiliðir"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Taka mynd"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Velja mynd"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Velja mynd"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Gælunafn"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0f5d862..43a5807 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Informazioni per le emergenze"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Informazioni mediche"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Modifica informazioni"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Aggiungi informazioni"</string>
     <string name="edit_info" msgid="5973929805855224805">"Modifica informazioni per le emergenze"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Dati"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Contatti"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Scatta una foto"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Scegli un\'immagine"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Seleziona la foto"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Nickname"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 6a5c37a..08a36fb 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"מידע למקרה חירום"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"מידע רפואי"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"עריכת המידע"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"הוספת מידע"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"צילום תמונה"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"לבחירת תמונה"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"בחירת תמונה"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"כינוי"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index de8e482..a84898d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/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="add_medical_info" msgid="483921612415907139">"情報を追加する"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"写真を撮る"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"画像を選択"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"写真を選択"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"ニックネーム"</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 80002cd..664e699 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/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="add_medical_info" msgid="483921612415907139">"ინფორმაციის დამატება"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"ფოტოს გადაღება"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"სურათის არჩევა"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"ფოტოს არჩევა"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"მეტსახელი"</string>
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index a9c3fae..08c1d08 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/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="add_medical_info" msgid="483921612415907139">"Ақпарат енгізу"</string>
     <string name="edit_info" msgid="5973929805855224805">"Төтенше жағдайға арналған ақпаратты өзгерту"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Ақпарат"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Контактілер"</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,11 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Суретке түсіру"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Кескін таңдау"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Сурет таңдау"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Лақап ат"</string>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 410a4b6..068695e 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="add_medical_info" msgid="483921612415907139">"បញ្ចូល​ព័ត៌មាន"</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,10 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"ថតរូប"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"ជ្រើសរើស​រូបភាព"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"ជ្រើសរើស​​រូបថត"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"ឈ្មោះ​ហៅក្រៅ"</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index b488569..b5e48de 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/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="add_medical_info" msgid="483921612415907139">"ಮಾಹಿತಿಯನ್ನು ಸೇರಿಸಿ"</string>
     <string name="edit_info" msgid="5973929805855224805">"ತುರ್ತು ಮಾಹಿತಿಯನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"ಮಾಹಿತಿ"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"ಸಂಪರ್ಕಗಳು"</string>
@@ -103,7 +103,11 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"ಫೋಟೋವನ್ನು ಸೆರೆಹಿಡಿಯಿರಿ"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"ಚಿತ್ರವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"ಫೋಟೋ ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"ಅಡ್ಡ ಹೆಸರು"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 37d15b7..10ab2bd 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/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="add_medical_info" msgid="483921612415907139">"정보 추가"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"사진 찍기"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"이미지 선택"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"사진 선택"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"닉네임"</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 49ae841..ace78c4 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/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="add_medical_info" msgid="483921612415907139">"Маалымат кошуу"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Сүрөткө тартуу"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Сүрөт тандоо"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Сүрөт тандоо"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Ылакап аты"</string>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index def1f6b..f1a99f7 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/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="add_medical_info" msgid="483921612415907139">"ເພີ່ມຂໍ້ມູນ"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"ຖ່າຍຮູບ"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"ເລືອກຮູບ"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"ເລືອກຮູບ"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"ຊື່ຫຼິ້ນ"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index a98fe80..fd79779 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Kritinės padėties informacija"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Medicininė informacija"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Redaguoti informaciją"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Pridėti informacijos"</string>
     <string name="edit_info" msgid="5973929805855224805">"Redaguoti kritinės padėties informaciją"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informacija"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontaktai"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Fotografuoti"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Pasirinkti vaizdą"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Pasirinkti nuotrauką"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Slapyvardis"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index a8fa6e3..3f095df 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Ārkārtas informācija"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Medicīniskā informācija"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Rediģēt informāciju"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Pievienot informāciju"</string>
     <string name="edit_info" msgid="5973929805855224805">"Rediģēt ārkārtas informāciju"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informācija"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontaktpersonas"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Uzņemt fotoattēlu"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Izvēlēties attēlu"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Atlasīt fotoattēlu"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Segvārds"</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index a9fff8b..63b1258 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/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="add_medical_info" msgid="483921612415907139">"Додајте информации"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Фотографирај"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Избери слика"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Изберете ја фотографијата"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Прекар"</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 4825751..5e53ff6 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="add_medical_info" msgid="483921612415907139">"വിവരം ചേർക്കുക"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"ഒരു ഫോട്ടോ എടുക്കുക"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"ഒരു ചിത്രം തിരഞ്ഞെടുക്കുക"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"ഫോട്ടോ തിരഞ്ഞെടുക്കുക"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"വിളിപ്പേര്"</string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index f393b51..ace850c 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/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="add_medical_info" msgid="483921612415907139">"Мэдээлэл нэмэх"</string>
     <string name="edit_info" msgid="5973929805855224805">"Яаралтай тусламжийн мэдээллийг өөрчлөх"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Мэдээлэл"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Харилцагчийн хаяг"</string>
@@ -80,7 +80,7 @@
     <string name="medical_conditions" msgid="3555690011498283592">"Эрүүл мэндийн тэмдэглэл"</string>
     <string name="unknown_medical_conditions" msgid="8051364895172053770">"Тодорхойгүй"</string>
     <string name="medical_conditions_hint" msgid="6959152183029062882">"Жишээ нь: багтраа"</string>
-    <string name="organ_donor" msgid="5953509460007124827">"Эрхтэний донор"</string>
+    <string name="organ_donor" msgid="5953509460007124827">"Донор эрхтэн"</string>
     <string name="unknown_organ_donor" msgid="2780515342875494225">"Тодорхойгүй"</string>
     <string name="yes" msgid="5829765567799916128">"Тийм"</string>
     <string name="no" msgid="1681689233660683509">"Үгүй"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Зураг авах"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Зураг сонгох"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Зураг сонгох"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Хоч"</string>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 4d8646e..fe49513 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/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="add_medical_info" msgid="483921612415907139">"माहिती जोडा"</string>
     <string name="edit_info" msgid="5973929805855224805">"आणीबाणी माहिती संपादित करा"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"माहिती"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"संपर्क"</string>
@@ -99,11 +99,15 @@
     <string name="ok" msgid="163967937451981024">"ठीक आहे"</string>
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"फोनच्या मालकाविषयी कोणतीही माहिती नाही"</string>
-    <string name="tap_pencil" msgid="2723698054265296934">"हा आपला फोन असल्यास, आणीबाणी असताना येथे प्रदर्शित केली जाणारी माहिती जोडण्‍यासाठ‍ी पेन्सिल चिन्हावर टॅप करा"</string>
+    <string name="tap_pencil" msgid="2723698054265296934">"हा तुमचा फोन असल्यास, आणीबाणी असताना येथे प्रदर्शित केली जाणारी माहिती जोडण्‍यासाठ‍ी पेन्सिल चिन्हावर टॅप करा"</string>
     <string name="clear_all" msgid="8899013032870561633">"सर्व साफ करा"</string>
     <string name="clear" msgid="3648880442502887163">"साफ करा"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"सर्व माहिती आणि संपर्क साफ करायचे?"</string>
     <string name="emergency_info_footer" msgid="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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"फोटो काढा"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"इमेज निवडा"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"फोटो निवडा"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"टोपणनाव"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 759b3da..0738fdb 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Maklumat kecemasan"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Maklumat perubatan"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Edit maklumat"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Tambahkan maklumat"</string>
     <string name="edit_info" msgid="5973929805855224805">"Edit maklumat kecemasan"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Maklumat"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Hubungan"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Ambil foto"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Pilih imej"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Pilih foto"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Nama panggilan"</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 58a2fd9..8231ec4 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -17,8 +17,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"အရေးပေါ်အချက်အလက်"</string>
-    <string name="medical_info_title" msgid="3000192781136934887">"ဆေးဘက်ဆိုင်ရာအချက်အလက်များ"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"အချက်အလက်များကို တည်းဖြတ်ရန်"</string>
+    <string name="medical_info_title" msgid="3000192781136934887">"ဆေးကုသမှုဆိုင်ရာ အချက်အလက်များ"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"အချက်အလက်များ ထည့်သွင်းပါ"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"ဓာတ်ပုံရိုက်ရန်"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"ပုံရွေးရန်"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"ဓာတ်ပုံ ရွေးရန်"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"အမည်ပြောင်"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index dbdc612..86ac8f8 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="add_medical_info" msgid="483921612415907139">"Legg til 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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Ta et bilde"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Velg et bilde"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Velg et bilde"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Kallenavn"</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 0b6ed15..2b47a76 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/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="add_medical_info" msgid="483921612415907139">"जानकारी थप्नुहोस्"</string>
     <string name="edit_info" msgid="5973929805855224805">"आपतकालीन जानकारीलाई सम्पादन गर्नुहोस्"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"जानकारी"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"सम्पर्कहरू"</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">"ठिक छ"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"तस्बिर खिच्नुहोस्"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"कुनै तस्बिर छनौट गर्नुहोस्"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"तस्बिर चयन गर्नुहोस्‌"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"उपनाम"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f2bce55..c50818b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Informatie bij nood"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Medische informatie"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Informatie bewerken"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Informatie toevoegen"</string>
     <string name="edit_info" msgid="5973929805855224805">"Informatie bij nood bewerken"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informatie"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Contacten"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Een foto maken"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Een afbeelding kiezen"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Foto selecteren"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Bijnaam"</string>
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
new file mode 100644
index 0000000..8f901a7
--- /dev/null
+++ b/res/values-or/strings.xml
@@ -0,0 +1,113 @@
+<?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">"ଆପାତକାଳୀନ ସୂଚନା"</string>
+    <string name="medical_info_title" msgid="3000192781136934887">"ଡାକ୍ତରୀ ସୂଚନା"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"ସୂଚନା ଯୋଗ କରନ୍ତୁ"</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>
+    <string name="unknown_name" msgid="2834802479170495056">"ଅଜଣା"</string>
+    <string name="address" msgid="6449303483151189969">"ଠିକଣା"</string>
+    <string name="unknown_address" msgid="4212576729941786121">"ଅଜଣା"</string>
+    <string name="date_of_birth" msgid="777979232444227891">"ଜନ୍ମ ତାରିଖ:"</string>
+    <string name="unknown_date_of_birth" msgid="7416355536916066758">"ଅଜଣା"</string>
+    <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="unknown_blood_type" msgid="6337228278125085668">"ଅଜଣା"</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">"A2:B7"</string>
+    <string name="abminus" msgid="2510867828094325481">"A2:B7"</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 ପଜିଟିଭ୍"</string>
+    <string name="o_negative" msgid="5261178297066132923">"O ନେଗେଟିଭ୍"</string>
+    <string name="a_positive" msgid="160635169929713435">"A, ପଜିଟିଭ୍"</string>
+    <string name="a_negative" msgid="6680390511183224469">"A, ନେଗେଟିଭ୍"</string>
+    <string name="b_positive" msgid="8225619238000785345">"B ପଜିଟିଭ୍"</string>
+    <string name="b_negative" msgid="4110646487598488955">"B ନେଗେଟିଭ୍"</string>
+    <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="unknown_allergies" msgid="4383115953418061237">"ଅଜଣା"</string>
+    <string name="allergies_hint" msgid="5488918780522184147">"ଉଦାହରଣସ୍ଵରୂପ, ଚିନାବାଦାମ"</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="unknown_medical_conditions" msgid="8051364895172053770">"ଅଜଣା"</string>
+    <string name="medical_conditions_hint" msgid="6959152183029062882">"ଉଦାହରଣସ୍ଵରୂପ, ଆଜ୍‌ମା"</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="add_emergency_contact" msgid="4063577069613981029">"ଯୋଗାଯୋଗକୁ ଯୋଡ଼ନ୍ତୁ"</string>
+    <string name="fail_load_contact_picker" msgid="817205483833876726">"ଯୋଗାଯୋଗ ପିକର୍ ମିଳିଲାନାହିଁ"</string>
+    <string name="fail_display_contact" msgid="4128854688897045879">"ଯୋଗାଯୋଗକୁ ଦେଖାଇହେବନାହିଁ"</string>
+    <string name="remove_contact" msgid="6934983445723096759">"<xliff:g id="CONTACT_NAME">%1$s</xliff:g>କୁ ଆପାତାକାଳୀନ ଯୋଗାଯୋଗରୁ କାଢ଼ିଦିଅନ୍ତୁ?"</string>
+    <string name="remove_contact_icon_text" msgid="4576641386490101363">"ଯୋଗାଯୋଗକୁ କାଢ଼ିଦିଅନ୍ତୁ"</string>
+    <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="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
+    <string name="no_info_provided" msgid="716200382010821001">"ଫୋନ୍ ମାଲିକଙ୍କର କିଛି ସୂଚନା ନାହିଁ"</string>
+    <string name="tap_pencil" msgid="2723698054265296934">"ଯଦି ଏହା ଆପଣଙ୍କର ଫୋନ୍, ତେବେ ସୂଚନାକୁ ଯୋଡ଼ିବା ପାଇଁ ପେନସିଲ୍ ଆଇକନ୍ ଉପରେ ଟାପ୍ କରନ୍ତୁ, ଯାହା ଆପାତକାଳୀନ ସମୟରେ ଏଠାରେ ଦେଖାଦେବ"</string>
+    <string name="clear_all" msgid="8899013032870561633">"ସମସ୍ତ ଖାଲି କରନ୍ତୁ"</string>
+    <string name="clear" msgid="3648880442502887163">"ଖାଲି କରନ୍ତୁ"</string>
+    <string name="clear_all_message" msgid="1548432000373861295">"ସମସ୍ତ ସୂଚନା ଓ ଯୋଗାଯୋଗଗୁଡ଼ିକୁ ଖାଲି କରନ୍ତୁ?"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"ଡାକ୍ତରୀ ସୂଚନା ଓ ଆପାତକାଳୀନ ଯୋଗାଯୋଗକୁ ସଂଯୁକ୍ତ କରି ଏକ ଆପାତକାଳୀନ ସମୟରେ ପ୍ରଥମ ଉତ୍ତରଦାତା ସାହାଯ୍ୟ ପାଇପାରିବେ।\n\nଆପଣଙ୍କ ସ୍କ୍ରୀନ୍ ଲକ୍ ହୋଇଥିଲେ ମଧ୍ୟ ଯେକେହିହେଲେ ଏହି ସୂଚନାକୁ ପଢ଼ିପାରିବେ ଏବଂ ଫୋନକୁ ଅନଲକ୍ ନକରି ଆପଣଙ୍କ ଯୋଗାଯୋଗରେ ଥିବା ନାମଗୁଡ଼ିକ ଉପରେ ଟାପ୍‌କରି ଡାଏଲ୍ କରିପାରିବେ।"</string>
+    <string name="settings_suggestion_title" msgid="2503369576806243476">"ଆପାତକାଳୀନ ସୂଚନା ଯୋଡ଼ନ୍ତୁ"</string>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"ପ୍ରଥମ ଉତ୍ତରଦାତାଙ୍କୁ ଆପଣଙ୍କ ସୂଚନାକୁ ଦେଖିବାକୁ ଦିଅନ୍ତୁ"</string>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"ଗୋଟିଏ ଫଟୋ ଉଠାନ୍ତୁ"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"ଗୋଟିଏ ଛବି ବାଛନ୍ତୁ"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"ଫଟୋ ବାଛନ୍ତୁ"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"ଡାକନାମ"</string>
+</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 32efb30..9ad50cc 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -16,9 +16,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1090682794607161063">"ਸੰਕਟਕਾਲ ਜਾਣਕਾਰੀ"</string>
+    <string name="app_label" msgid="1090682794607161063">"ਸੰਕਟਕਾਲੀਨ ਜਾਣਕਾਰੀ"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"ਡਾਕਟਰੀ ਜਾਣਕਾਰੀ"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"ਜਾਣਕਾਰੀ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="edit_info" msgid="5973929805855224805">"ਸੰਕਟਕਾਲੀਨ ਜਾਣਕਾਰੀ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"ਜਾਣਕਾਰੀ"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"ਸੰਪਰਕ"</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,11 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"ਫ਼ੋਟੋ ਖਿੱਚੋ"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"ਚਿੱਤਰ ਚੁਣੋ"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"ਫ਼ੋਟੋ ਚੁਣੋ"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"ਉਪਨਾਮ"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8f5e38e..c138208 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Informacje alarmowe"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Informacje medyczne"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Edytuj informacje"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Dodaj informacje"</string>
     <string name="edit_info" msgid="5973929805855224805">"Edytuj informacje alarmowe"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informacje"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontakty"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Zrób zdjęcie"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Wybierz obraz"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Wybierz zdjęcie"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Pseudonim"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 247b1d3..6720195 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Informações de emergência"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Informações médicas"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Editar informações"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Adicionar informações"</string>
     <string name="edit_info" msgid="5973929805855224805">"Editar informações de emergência"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informações"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Contactos"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Tirar uma foto"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Escolher uma imagem"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Selecionar foto"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Pseudónimo"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 62e6baa..a29d7a3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Informações de emergência"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Informações médicas"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Editar informações"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Adicionar informações"</string>
     <string name="edit_info" msgid="5973929805855224805">"Edita as informações de emergência"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informações"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Contatos"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Tirar uma foto"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Escolher uma imagem"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Selecionar foto"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Apelido"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 82d06a7..7d32e7d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Informații în caz de urgență"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Informații medicale"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Editați informațiile"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Adăugați informații"</string>
     <string name="edit_info" msgid="5973929805855224805">"Editați informațiile afișate în caz de urgență"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informații"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Persoane"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Faceți o fotografie"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Alegeți o imagine"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Selectați fotografia"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Pseudonim"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4eaf649..e82c4a6 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/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="add_medical_info" msgid="483921612415907139">"Добавить информацию"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Сделать снимок"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Выбрать фото"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Выбрать фотографию"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Псевдоним"</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 74a589d..20dbd2e 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/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="add_medical_info" msgid="483921612415907139">"තොරතුරු එක් කරන්න"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"ඡායාරූපයක් ගන්න"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"රූපයක් තෝරන්න"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"ඡායාරූපය තෝරන්න"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"අපනාමය"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b6d5c55..ef2bd09 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Tiesňové informácie"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Zdravotné informácie"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Upraviť informácie"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Pridať informácie"</string>
     <string name="edit_info" msgid="5973929805855224805">"Upraviť tiesňové informácie"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informácie"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontakty"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Odfotiť"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Vybrať obrázok"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Vybrať fotku"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Prezývka"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 78b940d..6828001 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Informacije za nujne primere"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Zdravstveni podatki"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Urejanje podatkov"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Dodajanje podatkov"</string>
     <string name="edit_info" msgid="5973929805855224805">"Urejanje informacij za nujne primere"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informacije"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Stiki"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Fotografiranje"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Izbira slike"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Izberite fotografijo"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Vzdevek"</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index bab1034..d6a4e14 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Informacioni i urgjencës"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Informacionet mjekësore"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Redakto informacionet"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Shto informacion"</string>
     <string name="edit_info" msgid="5973929805855224805">"Redakto informacionin e urgjencës"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Informacione"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontaktet"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Bëj një fotografi"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Zgjidh një imazh"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Zgjidh një fotografi"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Pseudonimi"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4f301ef..0a721ad 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/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="add_medical_info" msgid="483921612415907139">"Додајте информације"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Сликајте"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Одаберите слику"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Изаберите слику"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Надимак"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e372bf4..6c6773b 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Krisinformation"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Medicinsk information"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Redigera information"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Lägg till information"</string>
     <string name="edit_info" msgid="5973929805855224805">"Redigera krisinformation"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Information"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontakter"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Ta ett foto"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Välj en bild"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Välj foto"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Smeknamn"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 317bcae..b6ae34e 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Maelezo ya dharura"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Maelezo ya matibabu"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Badilisha maelezo"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Ongeza maelezo"</string>
     <string name="edit_info" msgid="5973929805855224805">"Badilisha maelezo ya dharura"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Maelezo"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Anwani"</string>
@@ -103,7 +103,11 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Piga picha"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Chagua picha"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Chagua picha"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Jina la utani"</string>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 4a26483..da01e66 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/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="add_medical_info" msgid="483921612415907139">"தகவலைச் சேர்த்தல்"</string>
     <string name="edit_info" msgid="5973929805855224805">"அவசரத் தகவலைத் திருத்தும் ஐகான்"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"தகவல்"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"தொடர்புகள்"</string>
@@ -103,7 +103,11 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"படமெடு"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"படத்தைத் தேர்வுசெய்க"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"படத்தைத் தேர்ந்தெடுக்கும்"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"புனைப்பெயர்"</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 8a8f986..fea28cf 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/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="add_medical_info" msgid="483921612415907139">"సమాచారాన్ని జోడించండి"</string>
     <string name="edit_info" msgid="5973929805855224805">"అత్యవసర సమాచారాన్ని సవరిస్తుంది"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"సమాచారం"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"పరిచయాలు"</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>
@@ -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,11 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"ఫోటోను తీయి"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"చిత్రాన్ని ఎంచుకోండి"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"ఫోటోను ఎంచుకోండి"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"మారుపేరు"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 3d24e31..c2acee8 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/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="add_medical_info" msgid="483921612415907139">"เพิ่มข้อมูล"</string>
     <string name="edit_info" msgid="5973929805855224805">"แก้ไขข้อมูลสำหรับกรณีฉุกเฉิน"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"ข้อมูล"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"รายชื่อติดต่อ"</string>
@@ -103,7 +103,11 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"ถ่ายรูป"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"เลือกรูปภาพ"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"เลือกรูปภาพ"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"ชื่อเล่น"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index b4e7818..838f983 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Impormasyong pang-emergency"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Medikal na impormasyon"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"I-edit ang impormasyon"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Magdagdag ng impormasyon"</string>
     <string name="edit_info" msgid="5973929805855224805">"I-edit ang impormasyong pang-emergency"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Impormasyon"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Mga Contact"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Kumuha ng larawan"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Pumili ng larawan"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Pumili ng larawan"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Palayaw"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1a934b3..64dc880 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Acil durum bilgileri"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Tıbbi bilgiler"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Bilgileri düzenle"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Bilgi ekle"</string>
     <string name="edit_info" msgid="5973929805855224805">"Acil durum bilgilerini güncelle"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Bilgi"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kişiler"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Fotoğraf çek"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Resim seç"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Fotoğraf seçin"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Takma ad"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 2eb559f..58511d0 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/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="add_medical_info" msgid="483921612415907139">"Додайте інформацію"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Зробити фото"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Вибрати зображення"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Вибрати фото"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Псевдонім"</string>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 28a7a19..a16a8e0 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/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="add_medical_info" msgid="483921612415907139">"معلومات شامل کریں"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"ایک تصویر لیں"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"ایک تصویر منتخب کریں"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"تصویر منتخب کریں"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"عرفی نام"</string>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 5537ec1..3938d6c 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Favqulodda axborot"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Tibbiy ma’lumotlar"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Ma’lumotlarni tahrirlash"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Axborot kiritish"</string>
     <string name="edit_info" msgid="5973929805855224805">"Favqulodda vaziyatlar uchun axborotni tahrirlash"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Ma’lumot"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Kontaktlar"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Suratga olish"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Rasm tanlang"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Surat tanlang"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Nik"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a584b0c..ca0c762 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Thông tin khẩn cấp"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Thông tin y tế"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Chỉnh sửa thông tin"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Thêm thông tin"</string>
     <string name="edit_info" msgid="5973929805855224805">"Chỉnh sửa thông tin khẩn cấp"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Thông tin"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Liên hệ"</string>
@@ -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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Chụp ảnh"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Chọn hình ảnh"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Chọn ảnh"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Biệt hiệu"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e60980b..c8f3b2c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/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="add_medical_info" msgid="483921612415907139">"添加信息"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"拍照"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"选择图片"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"选择照片"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"昵称"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 1f54ebf..4381621 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/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="add_medical_info" msgid="483921612415907139">"新增資訊"</string>
     <string name="edit_info" msgid="5973929805855224805">"編輯緊急資料"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"資訊"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"聯絡人"</string>
@@ -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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"拍攝相片"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"選擇圖片"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"揀相"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"暱稱"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e5dc5bc..5748aba 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/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="add_medical_info" msgid="483921612415907139">"新增資訊"</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,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"拍照"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"選擇圖片"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"選取相片"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"暱稱"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 0b82f74..ae6567c 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="1090682794607161063">"Ulwazi lwesimo esiphuthumayo"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"Ulwazi lwezemithi"</string>
-    <string name="edit_medical_info" msgid="6733720353375319476">"Hlela ulwazi"</string>
+    <string name="add_medical_info" msgid="483921612415907139">"Engeza ulwazi"</string>
     <string name="edit_info" msgid="5973929805855224805">"Hlela ulwazi lwesimo esiphuthumayo"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"Ulwazi"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"Oxhumana nabo"</string>
@@ -105,5 +105,9 @@
     <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>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"Thatha isithombe"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"Khetha isithombe"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"Khetha isithombe"</string>
+    <string name="user_nickname" msgid="7956055372443961161">"Isiteketiso"</string>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 32177bc..9d0aa89 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,7 +16,10 @@
 <resources>
     <color name="emergency_primary_dark">#C62828</color>
     <color name="emergency_primary">#D93025</color>
+    <color name="emergency_contacts_text_color">#E53935</color>
     <color name="emergency_accent">#FFFF00</color>
+    <color name="emergency_owner_text_color">#FFFFFF</color>
+
     <color name="tab_text_color">#FFFFFF</color>
     <color name="white_with_alpha">#B2FFFFFF</color>
     <color name="hint_text_color">#36000000</color>
diff --git a/res/values/config.xml b/res/values/config.xml
index 54792d2..6a4cde6 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -18,4 +18,6 @@
       <!-- Fully-qualified class name for the implementation of the FeatureFactory to be instantiated. -->
     <string name="config_featureFactory" translatable="false">com.android.emergency.overlay.FeatureFactoryImpl</string>
 
+    <!-- Flag to enable search index feature in Settings. -->
+    <bool name="config_search_index_disabled">false</bool>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 5cf9561..e898fb3 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -16,14 +16,12 @@
 <resources>
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="circle_avatar_size">40dp</dimen>
+    <dimen name="circle_avatar_size">32dp</dimen>
     <dimen name="tab_elevation">4dp</dimen>
     <dimen name="action_bar_size">56dp</dimen>
     <dimen name="tab_height">48dp</dimen>
+    <dimen name="view_emergency_info_top_padding">8dp</dimen>
 
     <!-- Minimum width for the popup for updating a user's photo. -->
     <dimen name="update_user_photo_popup_min_width">300dip</dimen>
-
-    <!-- Size of icon shown beside a preference locked by admin -->
-    <dimen name="config_restricted_icon_size">16dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 65f1641..71e475e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -18,8 +18,8 @@
     <string name="app_label">Emergency information</string>
     <!-- The title of the medical information preferences category -->
     <string name="medical_info_title">Medical information</string>
-    <!-- The title of the action to edit the medical information preferences -->
-    <string name="edit_medical_info">Edit information</string>
+    <!-- The title of the action to add the medical information preferences -->
+    <string name="add_medical_info">Add information</string>
     <!-- The description of the pencil icon, for talkback. [CHAR_LIMIT=NONE] -->
     <string name="edit_info">Edit emergency information</string>
     <!-- The title of the emergency info tab. [CHAR_LIMIT=15] -->
@@ -218,8 +218,12 @@
     <!-- 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>
 
-    <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
-    <string name="user_image_take_photo">Take photo</string>
-    <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
-    <string name="user_image_choose_photo">Choose photo from Gallery</string>
+    <!-- An option in a photo selection dialog to take a new photo [CHAR LIMIT=50] -->
+    <string name="user_image_take_photo">Take a photo</string>
+    <!-- An option in a photo selection dialog to choose a pre-existing image [CHAR LIMIT=50] -->
+    <string name="user_image_choose_photo">Choose an image</string>
+    <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
+    <string name="user_image_photo_selector">Select photo</string>
+    <!-- Title for the preference to enter the nickname of the user to display in the user switcher [CHAR LIMIT=25]-->
+    <string name="user_nickname">Nickname</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1e51f75..d0fbe8a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -73,4 +73,8 @@
         <item name="android:positiveButtonText">@android:string/ok</item>
         <item name="android:negativeButtonText">@android:string/cancel</item>
     </style>
+
+    <style name="PreferenceCategory" parent="@style/Preference.Category.Material">
+        <item name="android:layout">@layout/preference_category_material_settings</item>
+    </style>
 </resources>
diff --git a/res/xml/edit_emergency_info.xml b/res/xml/edit_emergency_info.xml
index 5abab4b..2737b27 100644
--- a/res/xml/edit_emergency_info.xml
+++ b/res/xml/edit_emergency_info.xml
@@ -20,81 +20,73 @@
     <PreferenceCategory
             android:key="medical_info"
             android:title="@string/medical_info_title">
-        <com.android.emergency.preferences.NameAutoCompletePreference
-            android:enabled="false"
-            android:focusable="true"
+        <com.android.emergency.preferences.EmergencyNamePreference
             android:icon="@drawable/ic_account_circle_filled_24dp"
-            android:inputType="textCapWords|textPersonName"
             android:key="name"
-            android:selectable="false"
-            android:shouldDisableView="false"
-            android:singleLine="true"
-            android:title="@string/name" />
+            android:title="@string/name"
+            android:summary="@string/unknown_name" />
 
         <com.android.emergency.preferences.EmergencyEditTextPreference
-            android:enabled="false"
-            android:focusable="true"
             android:icon="@drawable/ic_home_24dp"
             android:key="address"
-            android:selectable="false"
-            android:shouldDisableView="false"
+            android:singleLine="false"
+            android:inputType="textCapWords|textPostalAddress|textMultiLine"
             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_24dp"
             android:entries="@array/blood_type_entries"
             android:entryValues="@array/blood_type_values"
             android:key="blood_type"
-            android:selectable="false"
-            android:shouldDisableView="false"
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
             android:title="@string/blood_type"
             app:entryContentDescriptions="@array/blood_type_content_description" />
 
         <com.android.emergency.preferences.EmergencyEditTextPreference
-            android:enabled="false"
-            android:focusable="true"
+            android:capitalize="sentences"
             android:icon="@drawable/ic_allergies_black_24dp"
+            android:hint="@string/allergies_hint"
+            android:textColorHint="@color/hint_text_color"
             android:key="allergies"
-            android:selectable="false"
-            android:shouldDisableView="false"
+            android:inputType="textMultiLine"
+            android:singleLine="false"
             android:title="@string/allergies" />
 
         <com.android.emergency.preferences.EmergencyEditTextPreference
-            android:enabled="false"
-            android:focusable="true"
+            android:capitalize="sentences"
             android:icon="@drawable/ic_medication_24dp"
+            android:hint="@string/medications_hint"
+            android:textColorHint="@color/hint_text_color"
             android:key="medications"
-            android:selectable="false"
-            android:shouldDisableView="false"
+            android:inputType="textMultiLine"
+            android:singleLine="false"
             android:title="@string/medications" />
 
         <com.android.emergency.preferences.EmergencyListPreference
-            android:enabled="false"
-            android:focusable="true"
             android:icon="@drawable/ic_favorite_border_24dp"
             android:entries="@array/organ_donor_entries"
             android:entryValues="@array/organ_donor_values"
             android:key="organ_donor"
-            android:selectable="false"
-            android:shouldDisableView="false"
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
             android:title="@string/organ_donor" />
 
         <com.android.emergency.preferences.EmergencyEditTextPreference
-            android:enabled="false"
-            android:focusable="true"
+            android:capitalize="sentences"
+            android:hint="@string/medical_conditions_hint"
+            android:textColorHint="@color/hint_text_color"
             android:icon="@drawable/ic_note_alt_24dp"
             android:key="medical_conditions"
-            android:selectable="false"
-            android:shouldDisableView="false"
+            android:inputType="textMultiLine"
+            android:singleLine="false"
             android:title="@string/medical_conditions" />
 
         <Preference
             android:key="edit_medical_info"
-            android:icon="@drawable/ic_mode_edit"
-            android:title="@string/edit_medical_info">
+            android:icon="@drawable/ic_add_24dp"
+            android:title="@string/add_medical_info">
             <intent android:action="android.emergency.EDIT_MEDICAL_INFO"/>
         </Preference>
     </PreferenceCategory>
diff --git a/res/xml/edit_medical_info.xml b/res/xml/edit_medical_info.xml
index 0087f8a..1e572c7 100644
--- a/res/xml/edit_medical_info.xml
+++ b/res/xml/edit_medical_info.xml
@@ -18,14 +18,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:key="edit_medical_info_settings">
 
-    <com.android.emergency.preferences.NameAutoCompletePreference
+    <com.android.emergency.preferences.EmergencyNamePreference
         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"
-        style="@style/NameAutoCompletePreference" />
+        app:summary="@string/unknown_name" />
 
     <com.android.emergency.preferences.EmergencyEditTextPreference
         android:icon="@drawable/ic_home_24dp"
diff --git a/res/xml/file_paths.xml b/res/xml/file_paths.xml
new file mode 100644
index 0000000..d0738ee
--- /dev/null
+++ b/res/xml/file_paths.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Offer access to files under Context.getCacheDir() -->
+    <cache-path name="my_cache" />
+</paths>
diff --git a/res/xml/view_emergency_contacts.xml b/res/xml/view_emergency_contacts.xml
index 9d170f3..2175e51 100644
--- a/res/xml/view_emergency_contacts.xml
+++ b/res/xml/view_emergency_contacts.xml
@@ -16,5 +16,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <com.android.emergency.preferences.ViewEmergencyContactsPreference
         android:key="emergency_contacts"
-        android:title="@string/emergency_contacts_title" />
+        android:title="@string/emergency_contacts_title"
+        style="@style/PreferenceCategory" />
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/view_emergency_info.xml b/res/xml/view_emergency_info.xml
index ebbf9c6..4755dad 100644
--- a/res/xml/view_emergency_info.xml
+++ b/res/xml/view_emergency_info.xml
@@ -15,7 +15,6 @@
 <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"
diff --git a/src/com/android/emergency/EmergencySearchIndexablesProvider.java b/src/com/android/emergency/EmergencySearchIndexablesProvider.java
index 28ce01b..ea2db43 100644
--- a/src/com/android/emergency/EmergencySearchIndexablesProvider.java
+++ b/src/com/android/emergency/EmergencySearchIndexablesProvider.java
@@ -50,6 +50,10 @@
 
     @Override
     public Cursor queryXmlResources(String[] projection) {
+        if (getContext().getResources().getBoolean(R.bool.config_search_index_disabled)) {
+            return null;
+        }
+
         MatrixCursor cursor = new MatrixCursor(INDEXABLES_XML_RES_COLUMNS);
         for (int i = 0, length = INDEXABLE_RES.length; i < length; i++) {
             cursor.newRow()
@@ -66,13 +70,11 @@
 
     @Override
     public Cursor queryRawData(String[] projection) {
-        MatrixCursor cursor = new MatrixCursor(INDEXABLES_RAW_COLUMNS);
-        return cursor;
+        return null;
     }
 
     @Override
     public Cursor queryNonIndexableKeys(String[] projection) {
-        MatrixCursor cursor = new MatrixCursor(NON_INDEXABLES_KEYS_COLUMNS);
-        return cursor;
+        return null;
     }
 }
diff --git a/src/com/android/emergency/PreferenceKeys.java b/src/com/android/emergency/PreferenceKeys.java
index 89db2a6..bdfd47d 100644
--- a/src/com/android/emergency/PreferenceKeys.java
+++ b/src/com/android/emergency/PreferenceKeys.java
@@ -32,7 +32,7 @@
     /** Key for the add emergency contact preference */
     public static final String KEY_ADD_EMERGENCY_CONTACT = "add_emergency_contact";
 
-    /** Key to store and read the name of the user. */
+    /** Key for emergency name preference */
     public static final String KEY_NAME = "name";
 
     /** Key to store and read the address of the user. */
@@ -58,7 +58,7 @@
      *
      * <p>Note: Do not change the order of these keys, since the order is used to collect TRON stats
      */
-    public static final String[] KEYS_EDIT_EMERGENCY_INFO = {KEY_NAME, KEY_ADDRESS,
+    public static final String[] KEYS_EDIT_EMERGENCY_INFO = {KEY_ADDRESS,
             KEY_BLOOD_TYPE, KEY_ALLERGIES, KEY_MEDICATIONS,
             KEY_MEDICAL_CONDITIONS, KEY_ORGAN_DONOR};
 
diff --git a/src/com/android/emergency/edit/EditInfoActivity.java b/src/com/android/emergency/edit/EditInfoActivity.java
index 8f19692..7a6a01b 100644
--- a/src/com/android/emergency/edit/EditInfoActivity.java
+++ b/src/com/android/emergency/edit/EditInfoActivity.java
@@ -92,16 +92,15 @@
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                // The user asked to navigate up, which, in this case, can easily be accomplished
-                // by finishing the activity.
-                finish();
-                return true;
-
-            case R.id.action_clear_all:
-                showClearAllDialog();
-                return true;
+        int itemId = item.getItemId();
+        if (itemId == android.R.id.home) {
+            // The user asked to navigate up, which, in this case, can easily be accomplished
+            // by finishing the activity.
+            finish();
+            return true;
+        } else if (itemId == R.id.action_clear_all) {
+            showClearAllDialog();
+            return true;
         }
         return super.onOptionsItemSelected(item);
     }
diff --git a/src/com/android/emergency/edit/EditInfoFragment.java b/src/com/android/emergency/edit/EditInfoFragment.java
index 2a1c911..53cae38 100644
--- a/src/com/android/emergency/edit/EditInfoFragment.java
+++ b/src/com/android/emergency/edit/EditInfoFragment.java
@@ -16,16 +16,17 @@
 package com.android.emergency.edit;
 
 import android.app.Activity;
+import android.app.DialogFragment;
 import android.content.ActivityNotFoundException;
+import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.ContactsContract;
+import androidx.preference.Preference.OnPreferenceChangeListener;
 import androidx.preference.PreferenceFragment;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -33,7 +34,11 @@
 import com.android.emergency.R;
 import com.android.emergency.ReloadablePreferenceInterface;
 import com.android.emergency.preferences.EmergencyContactsPreference;
+import com.android.emergency.preferences.EmergencyNamePreference;
+import com.android.emergency.util.PreferenceUtils;
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.settingslib.CustomDialogPreference;
+import com.android.settingslib.CustomEditTextPreference;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -45,12 +50,16 @@
     /** Result code for contact picker */
     private static final int CONTACT_PICKER_RESULT = 1001;
 
+    private static final String DIALOG_PREFERENCE_TAG = "dialog_preference";
+
     private final Map<String, Preference> mMedicalInfoPreferences =
             new HashMap<String, Preference>();
 
     /** The category that holds the emergency contacts. */
     private EmergencyContactsPreference mEmergencyContactsPreferenceCategory;
 
+    private EmergencyNamePreference mEmergencyNamePreference;
+
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.edit_emergency_info, rootKey);
@@ -59,11 +68,16 @@
             Preference preference = findPreference(preferenceKey);
             mMedicalInfoPreferences.put(preferenceKey, preference);
 
+            preference.setOnPreferenceChangeListener(new PreferenceChangeListener(getActivity()));
+
             if (((ReloadablePreferenceInterface) preference).isNotSet()) {
                 getMedicalInfoParent().removePreference(preference);
             }
         }
 
+        mEmergencyNamePreference = (EmergencyNamePreference) findPreference(
+                PreferenceKeys.KEY_NAME);
+
         // Fill in emergency contacts.
         mEmergencyContactsPreferenceCategory = (EmergencyContactsPreference)
                 findPreference(PreferenceKeys.KEY_EMERGENCY_CONTACTS);
@@ -96,6 +110,7 @@
     public void onResume() {
         super.onResume();
         reloadFromPreference();
+        mEmergencyNamePreference.reloadFromUserManager();
     }
 
     /** Reloads the contacts by reading the value from the shared preferences. */
@@ -115,6 +130,24 @@
     }
 
     @Override
+    public void onDisplayPreferenceDialog(Preference preference) {
+        DialogFragment fragment = null;
+        if (preference instanceof CustomEditTextPreference) {
+            fragment = CustomEditTextPreference.CustomPreferenceDialogFragment
+                    .newInstance(preference.getKey());
+        } else if (preference instanceof CustomDialogPreference) {
+            fragment = EmergencyNamePreference.EmergencyNamePreferenceDialogFragment
+                    .newInstance(preference.getKey());
+        }
+        if (fragment != null) {
+            fragment.setTargetFragment(this, 0);
+            fragment.show(getFragmentManager(), DIALOG_PREFERENCE_TAG);
+        } else {
+            super.onDisplayPreferenceDialog(preference);
+        }
+    }
+
+    @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == CONTACT_PICKER_RESULT && resultCode == Activity.RESULT_OK) {
             Uri phoneUri = data.getData();
@@ -131,4 +164,26 @@
     public Preference getMedicalInfoPreference(String key) {
         return mMedicalInfoPreferences.get(key);
     }
+
+    @VisibleForTesting
+    static class PreferenceChangeListener implements OnPreferenceChangeListener {
+        private final Context mContext;
+
+        public PreferenceChangeListener(Context context) {
+            mContext = context;
+        }
+
+        @Override
+        public boolean onPreferenceChange(Preference preferenceItem, Object value) {
+            // Enable or disable settings suggestion, as appropriate.
+            PreferenceUtils.updateSettingsSuggestionState(mContext);
+            // If the preference implements OnPreferenceChangeListener, notify it of the
+            // change as well.
+            if (Preference.OnPreferenceChangeListener.class.isInstance(preferenceItem)) {
+                return ((Preference.OnPreferenceChangeListener) preferenceItem)
+                    .onPreferenceChange(preferenceItem, value);
+            }
+            return true;
+        }
+    }
 }
diff --git a/src/com/android/emergency/edit/EditMedicalInfoFragment.java b/src/com/android/emergency/edit/EditMedicalInfoFragment.java
index d132c69..b8567a5 100644
--- a/src/com/android/emergency/edit/EditMedicalInfoFragment.java
+++ b/src/com/android/emergency/edit/EditMedicalInfoFragment.java
@@ -18,23 +18,31 @@
 import android.app.DialogFragment;
 import android.app.Fragment;
 import android.os.Bundle;
-import androidx.preference.PreferenceFragment;
+
 import androidx.preference.Preference;
-import android.text.TextUtils;
+import androidx.preference.PreferenceFragment;
 
 import com.android.emergency.PreferenceKeys;
 import com.android.emergency.R;
 import com.android.emergency.ReloadablePreferenceInterface;
-import com.android.emergency.preferences.AutoCompleteEditTextPreference;
+import com.android.emergency.preferences.EmergencyNamePreference;
 import com.android.emergency.util.PreferenceUtils;
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settingslib.CustomDialogPreference;
 import com.android.settingslib.CustomEditTextPreference;
 
+import android.text.TextUtils;
+
 /**
  * Fragment that displays personal and medical information.
  */
 public class EditMedicalInfoFragment extends PreferenceFragment {
+
+    private EmergencyNamePreference mEmergencyNamePreference;
+
+    private static final String DIALOG_PREFERENCE_TAG = "dialog_preference";
+
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.edit_medical_info, rootKey);
@@ -67,12 +75,16 @@
                 }
             });
         }
+
+        mEmergencyNamePreference = (EmergencyNamePreference) findPreference(
+                PreferenceKeys.KEY_NAME);
     }
 
     @Override
     public void onResume() {
         super.onResume();
         reloadFromPreference();
+        mEmergencyNamePreference.reloadFromUserManager();
     }
 
     @Override
@@ -81,13 +93,13 @@
         if (preference instanceof CustomEditTextPreference) {
             fragment = CustomEditTextPreference.CustomPreferenceDialogFragment
                     .newInstance(preference.getKey());
-        } else if (preference instanceof AutoCompleteEditTextPreference) {
-            fragment = AutoCompleteEditTextPreference.AutoCompleteEditTextPreferenceDialogFragment
+        } else if (preference instanceof CustomDialogPreference) {
+            fragment = EmergencyNamePreference.EmergencyNamePreferenceDialogFragment
                     .newInstance(preference.getKey());
         }
         if (fragment != null) {
             fragment.setTargetFragment(this, 0);
-            fragment.show(getFragmentManager(), "dialog_preference");
+            fragment.show(getFragmentManager(), DIALOG_PREFERENCE_TAG);
         } else {
             super.onDisplayPreferenceDialog(preference);
         }
diff --git a/src/com/android/emergency/preferences/AutoCompleteEditTextPreference.java b/src/com/android/emergency/preferences/AutoCompleteEditTextPreference.java
deleted file mode 100644
index a94576b..0000000
--- a/src/com/android/emergency/preferences/AutoCompleteEditTextPreference.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * 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.
- */
-package com.android.emergency.preferences;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.SharedPreferences;
-import android.content.res.TypedArray;
-import android.graphics.Rect;
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-import androidx.preference.PreferenceDialogFragment;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.inputmethod.EditorInfo;
-import android.widget.AutoCompleteTextView;
-import android.widget.TextView;
-
-import com.android.emergency.R;
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.settingslib.CustomDialogPreference;
-
-/**
- * Almost a copy of EditTextPreference that shows a {@link AutoCompleteTextView} instead of the
- * basic EditText. It always show the suggested options.
- * TODO: an EditTextPreference always shows the soft input keyboard, whereas this class does not,
- * and it should, to mimic EditTextPreference better.
- */
-public class AutoCompleteEditTextPreference extends CustomDialogPreference {
-    /**
-     * The edit text shown in the dialog.
-     */
-    private AutoCompleteTextView mAutoCompleteTextView;
-
-    private String mText;
-    private boolean mTextSet;
-
-    public AutoCompleteEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr,
-            int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-
-        mAutoCompleteTextView = new InstantAutoCompleteTextView(context, attrs);
-
-        // Give it an ID so it can be saved/restored
-        mAutoCompleteTextView.setId(R.id.edit);
-
-        /*
-         * The preference framework and view framework both have an 'enabled'
-         * attribute. Most likely, the 'enabled' specified in this XML is for
-         * the preference framework, but it was also given to the view framework.
-         * We reset the enabled state.
-         */
-        mAutoCompleteTextView.setEnabled(true);
-
-        mAutoCompleteTextView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE) {
-                    onClick(getDialog(), DialogInterface.BUTTON_POSITIVE);
-                    getDialog().dismiss();
-                    return true;
-                }
-                return false;
-            }
-        });
-        setDialogLayoutResource(R.layout.preference_dialog_autocomplete_edittext);
-    }
-
-    public AutoCompleteEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        this(context, attrs, defStyleAttr, 0);
-    }
-
-    public AutoCompleteEditTextPreference(Context context, AttributeSet attrs) {
-        this(context, attrs, R.attr.dialogPreferenceStyle);
-    }
-
-    public AutoCompleteEditTextPreference(Context context) {
-        this(context, null);
-    }
-
-    public AutoCompleteTextView getAutoCompleteTextView() {
-        return mAutoCompleteTextView;
-    }
-
-    /**
-     * Saves the text to the {@link SharedPreferences}.
-     *
-     * @param text The text to save
-     */
-    public void setText(String text) {
-        // Always persist/notify the first time.
-        final boolean changed = !TextUtils.equals(mText, text);
-        if (changed || !mTextSet) {
-            mText = text;
-            mTextSet = true;
-            persistString(text);
-            if (changed) {
-                notifyDependencyChange(shouldDisableDependents());
-                notifyChanged();
-            }
-        }
-    }
-
-    @VisibleForTesting
-    @Override
-    public void onClick() {
-        super.onClick();
-    }
-
-    /**
-     * Gets the text from the {@link SharedPreferences}.
-     *
-     * @return The current preference value.
-     */
-    public String getText() {
-        return mText;
-    }
-
-    @Override
-    protected void onBindDialogView(View view) {
-        super.onBindDialogView(view);
-
-        AutoCompleteTextView editText = mAutoCompleteTextView;
-        editText.setText(getText());
-        editText.requestFocus();
-
-        ViewParent oldParent = editText.getParent();
-        if (oldParent != view) {
-            if (oldParent != null) {
-                ((ViewGroup) oldParent).removeView(editText);
-            }
-            onAddEditTextToDialogView(view, editText);
-        }
-        editText.setSelection(editText.getText().length());
-    }
-
-    /**
-     * Adds the AutoCompleteTextView widget of this preference to the dialog's view.
-     *
-     * @param dialogView The dialog view.
-     */
-    protected void onAddEditTextToDialogView(View dialogView, AutoCompleteTextView editText) {
-        ViewGroup container = (ViewGroup) dialogView
-                .findViewById(R.id.autocomplete_edittext_container);
-        if (container != null) {
-            container.addView(editText, ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT);
-        }
-    }
-
-    @Override
-    protected void onDialogClosed(boolean positiveResult) {
-        super.onDialogClosed(positiveResult);
-
-        if (positiveResult) {
-            String value = mAutoCompleteTextView.getText().toString();
-            if (callChangeListener(value)) {
-                setText(value);
-            }
-        }
-    }
-
-    @Override
-    protected Object onGetDefaultValue(TypedArray a, int index) {
-        return a.getString(index);
-    }
-
-    @Override
-    protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
-        setText(restoreValue ? getPersistedString(mText) : (String) defaultValue);
-    }
-
-    @Override
-    public boolean shouldDisableDependents() {
-        return TextUtils.isEmpty(mText) || super.shouldDisableDependents();
-    }
-
-    @Override
-    protected Parcelable onSaveInstanceState() {
-        final Parcelable superState = super.onSaveInstanceState();
-        if (isPersistent()) {
-            // No need to save instance state since it's persistent
-            return superState;
-        }
-
-        final SavedState myState = new SavedState(superState);
-        myState.text = getText();
-        return myState;
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Parcelable state) {
-        if (state == null || !state.getClass().equals(SavedState.class)) {
-            // Didn't save state for us in onSaveInstanceState
-            super.onRestoreInstanceState(state);
-            return;
-        }
-
-        SavedState myState = (SavedState) state;
-        super.onRestoreInstanceState(myState.getSuperState());
-        setText(myState.text);
-    }
-
-    private static class SavedState extends BaseSavedState {
-        String text;
-
-        public SavedState(Parcel source) {
-            super(source);
-            text = source.readString();
-        }
-
-        @Override
-        public void writeToParcel(Parcel dest, int flags) {
-            super.writeToParcel(dest, flags);
-            dest.writeString(text);
-        }
-
-        public SavedState(Parcelable superState) {
-            super(superState);
-        }
-
-        public static final Parcelable.Creator<SavedState> CREATOR =
-                new Parcelable.Creator<SavedState>() {
-                    public SavedState createFromParcel(Parcel in) {
-                        return new SavedState(in);
-                    }
-
-                    public SavedState[] newArray(int size) {
-                        return new SavedState[size];
-                    }
-                };
-    }
-
-    /** {@link AutoCompleteTextView} that always shows the suggestions. */
-    private class InstantAutoCompleteTextView extends AutoCompleteTextView {
-        public InstantAutoCompleteTextView(Context context, AttributeSet attrs) {
-            super(context, attrs);
-        }
-
-        @Override
-        public boolean enoughToFilter() {
-            return true;
-        }
-
-        @Override
-        protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
-            super.onFocusChanged(focused, direction, previouslyFocusedRect);
-
-            showDropDownIfFocused();
-        }
-
-        @Override
-        protected void onAttachedToWindow() {
-            super.onAttachedToWindow();
-            showDropDownIfFocused();
-        }
-
-        private void showDropDownIfFocused() {
-            if (isFocused() && getWindowVisibility() == View.VISIBLE) {
-                showDropDown();
-            }
-        }
-    }
-
-    public static class AutoCompleteEditTextPreferenceDialogFragment
-            extends CustomDialogPreference.CustomPreferenceDialogFragment {
-        public static CustomDialogPreference.CustomPreferenceDialogFragment
-                newInstance(String key) {
-            return CustomDialogPreference.CustomPreferenceDialogFragment.newInstance(key);
-        }
-    }
-}
diff --git a/src/com/android/emergency/preferences/ContactPreference.java b/src/com/android/emergency/preferences/ContactPreference.java
index 459d1b8..447723c 100644
--- a/src/com/android/emergency/preferences/ContactPreference.java
+++ b/src/com/android/emergency/preferences/ContactPreference.java
@@ -38,6 +38,7 @@
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.Toast;
 
 import com.android.emergency.CircleFramedDrawable;
@@ -115,7 +116,7 @@
 
         setPhoneUri(phoneUri);
 
-        setWidgetLayoutResource(R.layout.preference_user_delete_widget);
+        setWidgetLayoutResource(R.layout.preference_user_action_widget);
         setPersistent(false);
     }
 
@@ -189,16 +190,16 @@
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
         View deleteContactIcon = holder.findViewById(R.id.delete_contact);
+        View callContactIcon = holder.findViewById(R.id.call_contact);
         if (mRemoveContactPreferenceListener == null) {
+            // Default icon is delete, change icon to phone when ContactPreference binding
+            // ViewEmergencyContactsFragment.
             deleteContactIcon.setVisibility(View.GONE);
+            callContactIcon.setVisibility(View.VISIBLE);
         } else {
-            deleteContactIcon.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    showRemoveContactDialog(null);
-                }
+            deleteContactIcon.setOnClickListener((View view) -> {
+                showRemoveContactDialog(null);
             });
-
         }
     }
 
diff --git a/src/com/android/emergency/preferences/EditUserPhotoController.java b/src/com/android/emergency/preferences/EditUserPhotoController.java
index 14481b4..6064ed8 100644
--- a/src/com/android/emergency/preferences/EditUserPhotoController.java
+++ b/src/com/android/emergency/preferences/EditUserPhotoController.java
@@ -52,7 +52,7 @@
 
 import com.android.emergency.CircleFramedDrawable;
 import com.android.emergency.R;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
 
 import libcore.io.Streams;
 
@@ -396,7 +396,7 @@
         private final Context mContext;
         private final String mTitle;
         private final Runnable mAction;
-        private final RestrictedLockUtils.EnforcedAdmin mAdmin;
+        private final RestrictedLockUtilsInternal.EnforcedAdmin mAdmin;
         // Restriction may be set by system or something else via UserManager.setUserRestriction().
         private final boolean mIsRestrictedByBase;
 
@@ -415,9 +415,9 @@
             mAction = action;
 
             final int myUserId = UserHandle.myUserId();
-            mAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(context,
+            mAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
                     restriction, myUserId);
-            mIsRestrictedByBase = RestrictedLockUtils.hasBaseUserRestriction(mContext,
+            mIsRestrictedByBase = RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
                     restriction, myUserId);
         }
 
@@ -432,7 +432,7 @@
             }
 
             if (isRestrictedByAdmin()) {
-                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext, mAdmin);
+                RestrictedLockUtilsInternal.sendShowAdminSupportDetailsIntent(mContext, mAdmin);
                 return;
             }
 
diff --git a/src/com/android/emergency/preferences/EmergencyListPreference.java b/src/com/android/emergency/preferences/EmergencyListPreference.java
index b20a66e..5815c9f 100644
--- a/src/com/android/emergency/preferences/EmergencyListPreference.java
+++ b/src/com/android/emergency/preferences/EmergencyListPreference.java
@@ -91,7 +91,7 @@
         SpannableString str = new SpannableString(displayText);
         str.setSpan(new TtsSpan.TextBuilder((String) accessibleText).build(), 0,
                 displayText.length(),
-                Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         return str;
     }
 }
diff --git a/src/com/android/emergency/preferences/EmergencyNamePreference.java b/src/com/android/emergency/preferences/EmergencyNamePreference.java
new file mode 100644
index 0000000..b6a754f
--- /dev/null
+++ b/src/com/android/emergency/preferences/EmergencyNamePreference.java
@@ -0,0 +1,278 @@
+/*
+ * 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.
+ */
+package com.android.emergency.preferences;
+
+import android.app.AlertDialog;
+import android.app.Fragment;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.DialogPreference;
+import com.android.emergency.CircleFramedDrawable;
+import com.android.emergency.R;
+import com.android.internal.util.UserIcons;
+import com.android.settingslib.CustomDialogPreference;
+
+import java.io.File;
+
+/**
+ * Custom {@link DialogPreference} that allows us to editing the user name and photo.
+ */
+public class EmergencyNamePreference extends CustomDialogPreference {
+
+    private static final String KEY_AWAITING_RESULT = "awaiting_result";
+    private static final String KEY_SAVED_PHOTO = "pending_photo";
+
+    private UserManager mUserManager = getContext().getSystemService(UserManager.class);
+    private EditUserPhotoController mEditUserPhotoController;
+    private Fragment mFragment;
+    private Bitmap mSavedPhoto;
+    private EditText mUserNameView;
+    private ImageView mUserPhotoView;
+    private boolean mWaitingForActivityResult = false;
+
+    public EmergencyNamePreference(Context context, AttributeSet attrs,
+            int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        setSummary(mUserManager.getUserName());
+        setIcon(getCircularUserIcon());
+        setDialogLayoutResource(R.layout.edit_user_info_dialog_content);
+    }
+
+    public EmergencyNamePreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        this(context, attrs, defStyleAttr, 0);
+    }
+
+    public EmergencyNamePreference(Context context, AttributeSet attrs) {
+        this(context, attrs, R.attr.dialogPreferenceStyle);
+    }
+
+    public EmergencyNamePreference(Context context) {
+        this(context, null);
+    }
+
+    /**
+     * Setup fragment for Dialog and EditUserPhotoController.
+     */
+    public void setFragment(Fragment fragment) {
+        mFragment = fragment;
+    }
+
+    /**
+     * Reload user name and photo form UserManager.
+     */
+    public void reloadFromUserManager() {
+        setSummary(mUserManager.getUserName());
+        setIcon(getCircularUserIcon());
+    }
+
+    /**
+     * Restore user photo when EditUserPhotoController had pending photo.
+     */
+    public void onRestoreInstanceState(Bundle icicle) {
+        String pendingPhoto = icicle.getString(KEY_SAVED_PHOTO);
+        if (pendingPhoto != null) {
+            mSavedPhoto = EditUserPhotoController.loadNewUserPhotoBitmap(new File(pendingPhoto));
+        }
+        mWaitingForActivityResult = icicle.getBoolean(KEY_AWAITING_RESULT, false);
+    }
+
+    /**
+     * Save a temp user photo when layout need to recreating but Dialog is showing.
+     */
+    public void onSaveInstanceState(Bundle outState) {
+        if (getDialog() != null && getDialog().isShowing()
+                && mEditUserPhotoController != null) {
+            // Bitmap cannot be stored into bundle because it may exceed parcel limit
+            // Store it in a temporary file instead
+            File file = mEditUserPhotoController.saveNewUserPhotoBitmap();
+            if (file != null) {
+                outState.putString(KEY_SAVED_PHOTO, file.getPath());
+            }
+        }
+        if (mWaitingForActivityResult) {
+            outState.putBoolean(KEY_AWAITING_RESULT, mWaitingForActivityResult);
+        }
+    }
+
+    /**
+     * Set mWaitingForActivityResult to true when EmergencyNamePreferenceDialogFragment
+     * startActivityForResult, means we are waiting the activity result.
+     */
+    public void startingActivityForResult() {
+        mWaitingForActivityResult = true;
+    }
+
+    /**
+     * Reset mWaitingForActivityResult and send the result code to EditUserPhotoController when
+     * EmergencyNamePreferenceDialogFragment onActivityResult.
+     */
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        mWaitingForActivityResult = false;
+
+        if (getDialog() != null) {
+            mEditUserPhotoController.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
+    @Override
+    protected void onBindDialogView(View view) {
+        super.onBindDialogView(view);
+
+        mUserNameView = view.findViewById(R.id.user_name);
+        mUserNameView.setText(mUserManager.getUserName());
+        mUserPhotoView = view.findViewById(R.id.user_photo);
+        Drawable drawable;
+        if (mSavedPhoto != null) {
+            drawable = CircleFramedDrawable.getInstance(getContext(), mSavedPhoto);
+        } else {
+            drawable = getCircularUserIcon();
+        }
+        mUserPhotoView.setImageDrawable(drawable);
+
+        mEditUserPhotoController = createEditUserPhotoController(mUserPhotoView,
+                getCircularUserIcon());
+    }
+
+    @Override
+    protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
+            DialogInterface.OnClickListener listener) {
+        super.onPrepareDialogBuilder(builder, listener);
+        builder.setTitle(R.string.name)
+                .setCancelable(true)
+                .setPositiveButton(android.R.string.ok, listener)
+                .setNegativeButton(android.R.string.cancel, listener)
+                .create();
+    }
+
+    @Override
+    protected void onDialogClosed(boolean positiveResult) {
+        super.onDialogClosed(positiveResult);
+        if (positiveResult) {
+            // Update the name if changed.
+            CharSequence userName = mUserNameView.getText();
+            if (!TextUtils.isEmpty(userName)) {
+                if (mUserManager.getUserName() == null
+                        || !userName.toString().equals(mUserManager.getUserName())) {
+                    mUserManager.setUserName(UserHandle.myUserId(), userName.toString());
+                    setSummary(userName);
+                }
+            }
+            // Update the photo if changed.
+            Drawable drawable = mEditUserPhotoController.getNewUserPhotoDrawable();
+            Bitmap bitmap = mEditUserPhotoController.getNewUserPhotoBitmap();
+            if (drawable != null && bitmap != null
+                    && !drawable.equals(getCircularUserIcon())) {
+                new AsyncTask<Void, Void, Void>() {
+                    @Override
+                    protected Void doInBackground(Void... params) {
+                        mUserManager.setUserIcon(UserHandle.myUserId(),
+                                mEditUserPhotoController.getNewUserPhotoBitmap());
+                        return null;
+                    }
+                }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
+                setIcon(drawable);
+            }
+            if (mFragment != null) {
+                mFragment.getActivity().removeDialog(1);
+            }
+        }
+        clear();
+    }
+
+    private void clear() {
+        mEditUserPhotoController.removeNewUserPhotoBitmapFile();
+        mSavedPhoto = null;
+    }
+
+    private Drawable getCircularUserIcon() {
+        Bitmap bitmapUserIcon = mUserManager.getUserIcon(UserHandle.myUserId());
+
+        if (bitmapUserIcon == null) {
+            // get default user icon.
+            final Drawable defaultUserIcon = UserIcons.getDefaultUserIcon(
+                    getContext().getResources(), UserHandle.myUserId(), false);
+            bitmapUserIcon = UserIcons.convertToBitmap(defaultUserIcon);
+        }
+        Drawable drawableUserIcon = new CircleFramedDrawable(bitmapUserIcon,
+                (int) getContext().getResources().getDimension(R.dimen.circle_avatar_size));
+
+        return drawableUserIcon;
+    }
+
+    @VisibleForTesting
+    EditUserPhotoController createEditUserPhotoController(ImageView userPhotoView,
+                Drawable drawable) {
+        return new EditUserPhotoController(mFragment, userPhotoView,
+                mSavedPhoto, drawable, mWaitingForActivityResult);
+    }
+
+    public static class EmergencyNamePreferenceDialogFragment extends
+            CustomPreferenceDialogFragment {
+
+        public static CustomDialogPreference.CustomPreferenceDialogFragment newInstance(
+                String key) {
+            final CustomDialogPreference.CustomPreferenceDialogFragment
+                    fragment = new EmergencyNamePreferenceDialogFragment();
+            final Bundle b = new Bundle(1 /* capacity */);
+            b.putString(ARG_KEY, key);
+            fragment.setArguments(b);
+            return fragment;
+        }
+
+        private EmergencyNamePreference getEmergencyNamePreference() {
+            return (EmergencyNamePreference) getPreference();
+        }
+
+        @Override
+        public void onCreate(Bundle icicle) {
+            super.onCreate(icicle);
+            getEmergencyNamePreference().setFragment(this);
+            if (icicle != null) {
+                getEmergencyNamePreference().onRestoreInstanceState(icicle);
+            }
+        }
+
+        @Override
+        public void onSaveInstanceState(Bundle outState) {
+            super.onSaveInstanceState(outState);
+            getEmergencyNamePreference().onSaveInstanceState(outState);
+        }
+
+        @Override
+        public void onActivityResult(int requestCode, int resultCode, Intent data) {
+            getEmergencyNamePreference().onActivityResult(requestCode, resultCode, data);
+        }
+
+        @Override
+        public void startActivityForResult(Intent intent, int requestCode) {
+            getEmergencyNamePreference().startingActivityForResult();
+            super.startActivityForResult(intent, requestCode);
+        }
+    }
+}
diff --git a/src/com/android/emergency/preferences/NameAutoCompletePreference.java b/src/com/android/emergency/preferences/NameAutoCompletePreference.java
deleted file mode 100644
index 93c1e7e..0000000
--- a/src/com/android/emergency/preferences/NameAutoCompletePreference.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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.
- */
-package com.android.emergency.preferences;
-
-import android.content.Context;
-import android.os.UserManager;
-import androidx.annotation.Nullable;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.widget.ArrayAdapter;
-
-import com.android.emergency.ReloadablePreferenceInterface;
-import com.android.internal.annotations.VisibleForTesting;
-
-/**
- * {@link AutoCompleteEditTextPreference} that prepopulates the edit text view with the name of the
- * user provided in settings.
- */
-public class NameAutoCompletePreference extends AutoCompleteEditTextPreference implements
-        ReloadablePreferenceInterface {
-    private static final String[] EMPTY_STRING_ARRAY = new String[] {};
-
-    private final SuggestionProvider mSuggestionProvider;
-
-    public NameAutoCompletePreference(Context context, AttributeSet attrs) {
-        this(context, attrs, new SuggestionProvider() {
-            private final UserManager mUserManager =
-                    (UserManager) context.getSystemService(Context.USER_SERVICE);
-
-            @Override
-            public boolean hasNameToSuggest() {
-                return mUserManager.isUserNameSet();
-            }
-
-            @Override
-            public String getNameSuggestion() {
-                if (!hasNameToSuggest()) {
-                    return null;
-                }
-                return mUserManager.getUserName();
-            }
-        });
-    }
-
-    @VisibleForTesting
-    public NameAutoCompletePreference(Context context, AttributeSet attrs,
-            SuggestionProvider suggestionProvider) {
-        super(context, attrs);
-        mSuggestionProvider = suggestionProvider;
-        getAutoCompleteTextView().setAdapter(createAdapter());
-    }
-
-    @VisibleForTesting
-    public String[] createAutocompleteSuggestions() {
-        if (!mSuggestionProvider.hasNameToSuggest()) {
-            return EMPTY_STRING_ARRAY;
-        }
-        return new String[] {mSuggestionProvider.getNameSuggestion()};
-    }
-
-    private ArrayAdapter createAdapter() {
-        UserManager userManager =
-                (UserManager) getContext().getSystemService(Context.USER_SERVICE);
-        String[] autocompleteSuggestions = createAutocompleteSuggestions();
-        return new ArrayAdapter<String>(getContext(),
-                android.R.layout.simple_dropdown_item_1line, autocompleteSuggestions);
-    }
-
-
-    @Override
-    public void reloadFromPreference() {
-        setText(getPersistedString(""));
-    }
-
-    @Override
-    public boolean isNotSet() {
-        return TextUtils.isEmpty(getText());
-    }
-
-    @Override
-    public CharSequence getSummary() {
-        String text = getText();
-        return TextUtils.isEmpty(text) ? super.getSummary() : text;
-    }
-
-    /**
-     * Interface for suggesting a name.
-     */
-    public interface SuggestionProvider {
-        /** @return whether this class has a name to suggest. */
-        boolean hasNameToSuggest();
-
-        /**
-         * Gets a suggested name.
-         * @return a suggest name, or {@code null} if there is no name to suggest.
-         */
-        @Nullable
-        String getNameSuggestion();
-    }
-}
diff --git a/src/com/android/emergency/preferences/ViewEmergencyContactsPreference.java b/src/com/android/emergency/preferences/ViewEmergencyContactsPreference.java
index 48a4e6e..a6e2bd4 100644
--- a/src/com/android/emergency/preferences/ViewEmergencyContactsPreference.java
+++ b/src/com/android/emergency/preferences/ViewEmergencyContactsPreference.java
@@ -17,7 +17,13 @@
 
 import android.content.Context;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
 import android.util.AttributeSet;
+import android.view.View;
+
+import com.android.emergency.R;
+import com.android.emergency.util.PreferenceUtils;
 
 /**
  * Sets a listener to be called the contacts when tapping on the preference.
@@ -28,6 +34,16 @@
     }
 
     @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+        // Hide preference title if has at least one medical info preference is set.
+        if (PreferenceUtils.hasAtLeastOnePreferenceSet(getContext())) {
+            View preferenceCategoryTitle = holder.findViewById(R.id.emergency_preference_category);
+            preferenceCategoryTitle.setVisibility(View.GONE);
+        }
+    }
+
+    @Override
     protected void onBindContactView(final ContactPreference contactPreference) {
         contactPreference
                 .setOnPreferenceClickListener(
diff --git a/src/com/android/emergency/view/ViewEmergencyContactsFragment.java b/src/com/android/emergency/view/ViewEmergencyContactsFragment.java
index 88b9bd5..689edef 100644
--- a/src/com/android/emergency/view/ViewEmergencyContactsFragment.java
+++ b/src/com/android/emergency/view/ViewEmergencyContactsFragment.java
@@ -15,11 +15,11 @@
  */
 package com.android.emergency.view;
 
-import android.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import androidx.preference.PreferenceFragment;
+import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 import android.widget.ListView;
 
@@ -30,7 +30,7 @@
 /**
  * Fragment that displays emergency contacts.
  */
-public class ViewEmergencyContactsFragment extends PreferenceFragment {
+public class ViewEmergencyContactsFragment extends PreferenceFragmentCompat {
     /** The category that holds the emergency contacts. */
     private EmergencyContactsPreference mEmergencyContactsPreference;
 
diff --git a/src/com/android/emergency/view/ViewEmergencyInfoFragment.java b/src/com/android/emergency/view/ViewEmergencyInfoFragment.java
index 87f73e3..3f2bdd6 100644
--- a/src/com/android/emergency/view/ViewEmergencyInfoFragment.java
+++ b/src/com/android/emergency/view/ViewEmergencyInfoFragment.java
@@ -15,9 +15,13 @@
  */
 package com.android.emergency.view;
 
-import android.app.Fragment;
+import android.view.View;
 import android.os.Bundle;
-import androidx.preference.PreferenceFragment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceManager;
 
@@ -31,7 +35,7 @@
 /**
  * Fragment that displays personal and medical information.
  */
-public class ViewEmergencyInfoFragment extends PreferenceFragment {
+public class ViewEmergencyInfoFragment extends PreferenceFragmentCompat {
     /** A list with all the preferences. */
     private final List<Preference> mPreferences = new ArrayList<Preference>();
 
@@ -49,6 +53,16 @@
         }
     }
 
+  @Override
+  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+      super.onViewCreated(view, savedInstanceState);
+
+      // Set a top padding for the EmergencyInfo View.
+      int topPadding = (int) getResources().getDimension(R.dimen.view_emergency_info_top_padding);
+      view.setPadding(view.getPaddingLeft(), view.getPaddingTop() + topPadding,
+          view.getPaddingRight(), view.getPaddingBottom());
+  }
+
     @Override
     public void onResume() {
         super.onResume();
diff --git a/src/com/android/emergency/view/ViewInfoActivity.java b/src/com/android/emergency/view/ViewInfoActivity.java
index 87b46ff..30bcae3 100644
--- a/src/com/android/emergency/view/ViewInfoActivity.java
+++ b/src/com/android/emergency/view/ViewInfoActivity.java
@@ -15,17 +15,22 @@
  */
 package com.android.emergency.view;
 
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentManager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import androidx.annotation.LayoutRes;
-import android.support.design.widget.TabLayout;
-import android.support.design.widget.TabLayout.TabLayoutOnPageChangeListener;
-import android.support.design.widget.TabLayout.ViewPagerOnTabSelectedListener;
-import androidx.legacy.app.FragmentStatePagerAdapter;
+import android.os.UserHandle;
+import android.os.UserManager;
+import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayout.TabLayoutOnPageChangeListener;
+import com.google.android.material.tabs.TabLayout.ViewPagerOnTabSelectedListener;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import androidx.preference.PreferenceManager;
 import android.text.TextUtils;
@@ -34,26 +39,28 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.WindowManager;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toolbar;
 import android.widget.ViewFlipper;
 
-import com.android.emergency.PreferenceKeys;
+import com.android.emergency.CircleFramedDrawable;
 import com.android.emergency.R;
 import com.android.emergency.edit.EditInfoActivity;
 import com.android.emergency.util.PreferenceUtils;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.util.UserIcons;
 
 import java.util.ArrayList;
 
 /**
  * Activity for viewing emergency information.
  */
-public class ViewInfoActivity extends Activity {
+public class ViewInfoActivity extends FragmentActivity {
+    private ImageView mPersonalCardLargeIcon;
     private TextView mPersonalCardLargeItem;
     private SharedPreferences mSharedPreferences;
     private LinearLayout mPersonalCard;
@@ -78,6 +85,7 @@
         setContentView(R.layout.view_activity_layout);
         mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         mPersonalCard = (LinearLayout) findViewById(R.id.name_and_dob_linear_layout);
+        mPersonalCardLargeIcon = (ImageView) findViewById(R.id.personal_card_icon);
         mPersonalCardLargeItem = (TextView) findViewById(R.id.personal_card_large);
         mViewFlipper = (ViewFlipper) findViewById(R.id.view_flipper);
 
@@ -87,20 +95,35 @@
     @Override
     public void onResume() {
         super.onResume();
-        loadName();
+        loadUserInfo();
         // Update the tabs: new info might have been added/deleted from the edit screen that
         // could lead to adding/removing a fragment
         setupTabs();
         maybeHideTabs();
     }
 
-    private void loadName() {
-        String name = mSharedPreferences.getString(PreferenceKeys.KEY_NAME, "");
-        if (TextUtils.isEmpty(name)) {
+    private void loadUserInfo() {
+        UserManager userManager = getSystemService(UserManager.class);
+        if (TextUtils.isEmpty(userManager.getUserName())) {
             mPersonalCard.setVisibility(View.GONE);
         } else {
             mPersonalCard.setVisibility(View.VISIBLE);
-            mPersonalCardLargeItem.setText(name);
+            mPersonalCardLargeItem.setText(userManager.getUserName());
+
+            Bitmap bitmapUserIcon = userManager.getUserIcon(UserHandle.myUserId());
+
+            if (bitmapUserIcon == null) {
+                // Get default user icon.
+                Drawable defaultUserIcon = UserIcons.getDefaultUserIcon(
+                        getApplicationContext().getResources(), UserHandle.myUserId(),
+                        false /* light icon */);
+                bitmapUserIcon = UserIcons.convertToBitmap(defaultUserIcon);
+            }
+
+            Drawable drawableUserIcon = new CircleFramedDrawable(bitmapUserIcon,
+                    (int) getResources().getDimension(R.dimen.action_bar_size));
+
+            mPersonalCardLargeIcon.setImageDrawable(drawableUserIcon);
         }
     }
 
@@ -131,16 +154,15 @@
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                onBackPressed();
-                return true;
-
-            case R.id.action_edit:
-                Intent intent = new Intent(this, EditInfoActivity.class);
-                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                startActivity(intent);
-                return true;
+        int itemId = item.getItemId();
+        if (itemId == android.R.id.home) {
+            onBackPressed();
+            return true;
+        } else if (itemId == R.id.action_edit) {
+            Intent intent = new Intent(this, EditInfoActivity.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            startActivity(intent);
+            return true;
         }
         return super.onOptionsItemSelected(item);
     }
@@ -183,7 +205,7 @@
         if (mTabsAdapter == null) {
             // The viewpager that will host the section contents.
             ViewPager viewPager = (ViewPager) findViewById(R.id.view_pager);
-            mTabsAdapter = new ViewPagerAdapter(getFragmentManager());
+            mTabsAdapter = new ViewPagerAdapter(getSupportFragmentManager());
             viewPager.setAdapter(mTabsAdapter);
             mTabLayout.setTabsFromPagerAdapter(mTabsAdapter);
 
diff --git a/tests/robolectric/config/robolectric.properties b/tests/robolectric/config/robolectric.properties
index c727238..7865720 100644
--- a/tests/robolectric/config/robolectric.properties
+++ b/tests/robolectric/config/robolectric.properties
@@ -1,2 +1,2 @@
 manifest=packages/apps/EmergencyInfo/AndroidManifest.xml
-sdk=NEWEST_SDK
\ No newline at end of file
+sdk=23
\ No newline at end of file
diff --git a/tests/robolectric/src/com/android/emergency/edit/EditInfoFragmentTest.java b/tests/robolectric/src/com/android/emergency/edit/EditInfoFragmentTest.java
new file mode 100644
index 0000000..d0f1a78
--- /dev/null
+++ b/tests/robolectric/src/com/android/emergency/edit/EditInfoFragmentTest.java
@@ -0,0 +1,82 @@
+package com.android.emergency.edit;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import com.android.emergency.edit.EditInfoFragment.PreferenceChangeListener;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class EditInfoFragmentTest {
+
+    @Mock
+    private PackageManager mPackageManager;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mPackageManager).when(mContext).getPackageManager();
+    }
+
+    @Test
+    public void testOnPreferenceChange_without_listener() {
+        final PreferenceChangeListener listener = new PreferenceChangeListener(mContext);
+        final PreferenceWithoutListener preference = spy(new PreferenceWithoutListener(mContext));
+        final Object value = new Object();
+
+        assertThat(listener.onPreferenceChange(preference, value)).isTrue();
+        verify(mPackageManager).setComponentEnabledSetting(any(ComponentName.class), anyInt(),
+            eq(PackageManager.DONT_KILL_APP));
+    }
+
+    @Test
+    public void testOnPreferenceChange_with_listener() {
+        final PreferenceChangeListener listener = new PreferenceChangeListener(mContext);
+        final PreferenceWithListener preference = spy(new PreferenceWithListener(mContext));
+        final Object value = new Object();
+        final boolean resultValue = false;
+        doReturn(resultValue).when(preference).onPreferenceChange(preference, value);
+
+        assertThat(listener.onPreferenceChange(preference, value)).isEqualTo(resultValue);
+        verify(mPackageManager).setComponentEnabledSetting(any(ComponentName.class), anyInt(),
+            eq(PackageManager.DONT_KILL_APP));
+        verify(preference).onPreferenceChange(preference, value);
+    }
+
+    public class PreferenceWithoutListener extends Preference {
+
+        public PreferenceWithoutListener(Context context) {
+            super(context);
+        }
+    }
+
+    public class PreferenceWithListener extends Preference implements OnPreferenceChangeListener {
+
+        public PreferenceWithListener(Context context) {
+            super(context);
+        }
+
+        @Override
+        public boolean onPreferenceChange(Preference preference, Object o) {
+            return false;
+        }
+    }
+}
diff --git a/tests/robolectric/src/com/android/emergency/preferences/ContactPreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/ContactPreferenceTest.java
new file mode 100644
index 0000000..e53d9a2
--- /dev/null
+++ b/tests/robolectric/src/com/android/emergency/preferences/ContactPreferenceTest.java
@@ -0,0 +1,91 @@
+/*
+ * 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.
+ */
+package com.android.emergency.preferences;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.app.Application;
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.net.Uri;
+import com.android.emergency.ContactTestUtils;
+import com.android.emergency.EmergencyContactManager;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+
+/** Unit tests for {@link ContactPreference}. */
+@RunWith(RobolectricTestRunner.class)
+public class ContactPreferenceTest {
+
+    private static final String NAME = "Jake";
+    private static final String PHONE_NUMBER = "123456";
+
+    @Mock private ContactPreference.ContactFactory mContactFactory;
+    @Mock private EmergencyContactManager.Contact mContact;
+    private ContactPreference mPreference;
+    private Uri mPhoneUri;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        final ContentResolver contentResolver = RuntimeEnvironment.application.getContentResolver();
+        mPhoneUri = ContactTestUtils.createContact(contentResolver, NAME, PHONE_NUMBER);
+
+        when(mContactFactory.getContact(any(), any())).thenReturn(mContact);
+        when(mContact.getName()).thenReturn(NAME);
+        when(mContact.getPhoneUri()).thenReturn(mPhoneUri);
+        when(mContact.getPhoneNumber()).thenReturn(PHONE_NUMBER);
+        when(mContact.getContactLookupUri()).thenReturn(mPhoneUri);
+
+        final Activity activity = Robolectric.setupActivity(Activity.class);
+        mPreference = new ContactPreference(activity, mPhoneUri, mContactFactory);
+    }
+
+    @Test
+    public void testContactPreference() {
+        assertThat(mPreference.getPhoneUri()).isEqualTo(mPhoneUri);
+        assertThat(mPreference.getContact().getName()).isEqualTo(NAME);
+        assertThat(mPreference.getContact().getPhoneNumber()).isEqualTo(PHONE_NUMBER);
+
+        assertThat(mPreference.getRemoveContactDialog()).isNull();
+        mPreference.setRemoveContactPreferenceListener(
+            preference -> {
+                // Do nothing
+            });
+        assertThat(mPreference.getRemoveContactDialog()).isNotNull();
+    }
+
+    @Test
+    public void testDisplayContact() {
+        mPreference.displayContact();
+
+        final Intent expected = new Intent(Intent.ACTION_VIEW).setData(mPhoneUri);
+        final Application application = RuntimeEnvironment.application;
+        final Intent actual = Shadows.shadowOf(application).getNextStartedActivity();
+        assertThat(actual.filterEquals(expected)).isTrue();
+    }
+}
diff --git a/tests/robolectric/src/com/android/emergency/preferences/ContactPreferencesTest.java b/tests/robolectric/src/com/android/emergency/preferences/ContactPreferencesTest.java
deleted file mode 100644
index 7d3c7d7..0000000
--- a/tests/robolectric/src/com/android/emergency/preferences/ContactPreferencesTest.java
+++ /dev/null
@@ -1,132 +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.
- */
-package com.android.emergency.preferences;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.os.Looper;
-import android.provider.ContactsContract;
-
-import com.android.emergency.ContactTestUtils;
-import com.android.emergency.EmergencyContactManager;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-
-/** Unit tests for {@link ContactPreferences}. */
-@RunWith(RobolectricTestRunner.class)
-public class ContactPreferencesTest {
-    private static final String NAME = "Jake";
-    private static final String PHONE_NUMBER = "123456";
-    @Mock private PackageManager mPackageManager;
-    @Mock private ContactPreference.ContactFactory mContactFactory;
-    @Mock private EmergencyContactManager.Contact mContact;
-    private ContextWrapper mContext;
-    private ContactPreference mPreference;
-    private Uri mPhoneUri;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mPackageManager).when(mContext).getPackageManager();
-
-        mPhoneUri = ContactTestUtils.createContact(
-                mContext.getContentResolver(), NAME, PHONE_NUMBER);
-
-        when(mContactFactory.getContact(any(), any())).thenReturn(mContact);
-        when(mContact.getName()).thenReturn(NAME);
-        when(mContact.getPhoneUri()).thenReturn(mPhoneUri);
-        when(mContact.getPhoneNumber()).thenReturn(PHONE_NUMBER);
-        when(mContact.getContactLookupUri()).thenReturn(mPhoneUri);
-
-        mPreference = new ContactPreference(mContext, mPhoneUri, mContactFactory);
-    }
-
-    @Test
-    public void testContactPreference() {
-        assertThat(mPreference.getPhoneUri()).isEqualTo(mPhoneUri);
-        assertThat(mPreference.getContact().getName()).isEqualTo(NAME);
-        assertThat(mPreference.getContact().getPhoneNumber()).isEqualTo(PHONE_NUMBER);
-
-        assertThat(mPreference.getRemoveContactDialog()).isNull();
-        mPreference.setRemoveContactPreferenceListener(
-                new ContactPreference.RemoveContactPreferenceListener() {
-                    @Override
-                    public void onRemoveContactPreference(ContactPreference preference) {
-                        // Do nothing
-                    }
-                });
-        assertThat(mPreference.getRemoveContactDialog()).isNotNull();
-    }
-
-    @Test
-    public void testDisplayContact() throws Throwable {
-        mPreference.displayContact();
-
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setData(mPhoneUri);
-        assertThat(Shadows.shadowOf(mContext).getNextStartedActivity().filterEquals(intent))
-                .isTrue();
-    }
-
-    @Test
-    public void testCallContact() throws Throwable {
-        final String name = "a name";
-        final String packageName = "a package name";
-
-        List<ResolveInfo> resolveInfos = new ArrayList<>();
-        ResolveInfo resolveInfo = new ResolveInfo();
-        resolveInfo.activityInfo = new ActivityInfo();
-        resolveInfo.activityInfo.name = name;
-        resolveInfo.activityInfo.packageName = packageName;
-        resolveInfos.add(resolveInfo);
-        when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
-                .thenReturn(resolveInfos);
-
-        mPreference.callContact();
-
-        Intent intent = new Intent(Intent.ACTION_CALL);
-        intent.setData(Uri.parse("tel:" + PHONE_NUMBER));
-        intent.setComponent(new ComponentName(packageName, name));
-        assertThat(Shadows.shadowOf(mContext).getNextStartedActivity().filterEquals(intent))
-                .isTrue();
-    }
-}
diff --git a/tests/robolectric/src/com/android/emergency/preferences/EmergencyNamePreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/EmergencyNamePreferenceTest.java
new file mode 100644
index 0000000..416b06f
--- /dev/null
+++ b/tests/robolectric/src/com/android/emergency/preferences/EmergencyNamePreferenceTest.java
@@ -0,0 +1,173 @@
+/*
+ * 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.
+ */
+package com.android.emergency.preferences;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.same;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.os.UserManager;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import com.android.emergency.R;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class EmergencyNamePreferenceTest {
+
+    private final Bitmap mBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private Dialog mDialog;
+    private Context mContext;
+    private EditText mNameView;
+    private ImageView mIconView;
+    private TestEmergencyNamePreference mTestEmergencyNamePreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
+        when(mUserManager.getUserIcon(0)).thenReturn(mBitmap);
+
+        mTestEmergencyNamePreference = spy(new TestEmergencyNamePreference(mContext));
+    }
+
+    @Test
+    public void emergencyNamePreference_setDefaultProperties_defaultPropertiesIsSet() {
+        assertThat(mTestEmergencyNamePreference.isEnabled()).isTrue();
+        assertThat(mTestEmergencyNamePreference.isSelectable()).isTrue();
+    }
+
+
+    @Test
+    public void loadDataFromUserManager_setUserNameAndPhoto_preferenceSummaryAndIconIsSet() {
+        assertThat(mTestEmergencyNamePreference.getSummary()).isNull();
+        assertThat(mTestEmergencyNamePreference.getIcon()).isNull();
+
+        when(mUserManager.getUserName()).thenReturn("Wesley");
+        mTestEmergencyNamePreference.reloadFromUserManager();
+
+        assertThat(mTestEmergencyNamePreference.getSummary()).isEqualTo(mUserManager.getUserName());
+        assertThat(mTestEmergencyNamePreference.getIcon()).isNotNull();
+    }
+
+    @Test
+    public void onBindDialogView_setUserName_textViewTitleIsSet() {
+        View view = createLayout();
+        when(mUserManager.getUserName()).thenReturn("Wesley");
+
+        mTestEmergencyNamePreference.onBindDialogView(view);
+
+        TextView textView = view.findViewById(R.id.user_name);
+        assertThat(textView.getText().toString()).isEqualTo(mUserManager.getUserName());
+    }
+
+    @Test
+    public void onBindDialogView_setUserPhoto_imageViewDrawableIsSet() {
+        View view = createLayout();
+
+        mTestEmergencyNamePreference.onBindDialogView(view);
+
+        ImageView imageView = view.findViewById(R.id.user_photo);
+        assertThat(imageView.getDrawable()).isNotNull();
+    }
+
+    @Test
+    public void onBindDialogView_setEditUserPhotoController_editUserPhotoControllerIsSet() {
+        View view = createLayout();
+
+        EditUserPhotoController photoController = mTestEmergencyNamePreference.getPhotoController();
+        assertThat(photoController).isNull();
+
+        mTestEmergencyNamePreference.onBindDialogView(view);
+
+        photoController = mTestEmergencyNamePreference.getPhotoController();
+        assertThat(photoController).isNotNull();
+    }
+
+    @Test
+    public void onActivityResult_whenWaitingForActivityResult_onActivityResultIsCalled() {
+        View view = createLayout();
+
+        mTestEmergencyNamePreference.onBindDialogView(view);
+        doReturn(mDialog).when(mTestEmergencyNamePreference).getDialog();
+        mTestEmergencyNamePreference.startingActivityForResult();
+        Intent resultData = new Intent();
+        mTestEmergencyNamePreference.onActivityResult(0, 0, resultData);
+        EditUserPhotoController photoController = mTestEmergencyNamePreference.getPhotoController();
+        verify(photoController).onActivityResult(eq(0), eq(0), same(resultData));
+    }
+
+    private ViewGroup createLayout() {
+        ViewGroup root = new LinearLayout(mContext);
+
+        mNameView = new EditText(mContext);
+        mNameView.setId(R.id.user_name);
+        root.addView(mNameView);
+
+        mIconView = new ImageView(mContext);
+        mIconView.setId(R.id.user_photo);
+        root.addView(mIconView);
+
+        return root;
+    }
+
+    public class TestEmergencyNamePreference extends EmergencyNamePreference {
+
+        private EditUserPhotoController mPhotoController;
+
+        public TestEmergencyNamePreference(Context context) {
+            super(context, null);
+            setSummary(mUserManager.getUserName());
+            setIcon(null);
+        }
+
+        public EditUserPhotoController getPhotoController() {
+            return mPhotoController;
+        }
+
+        @Override
+        protected EditUserPhotoController createEditUserPhotoController(ImageView userPhotoView,
+            Drawable drawable) {
+            mPhotoController = mock(EditUserPhotoController.class, Answers.RETURNS_DEEP_STUBS);
+            return mPhotoController;
+        }
+    }
+}
diff --git a/tests/robolectric/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java
deleted file mode 100644
index 29769cf..0000000
--- a/tests/robolectric/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java
+++ /dev/null
@@ -1,132 +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.
- */
-package com.android.emergency.preferences;
-
-import static com.google.common.truth.Truth.assertThat;
-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;
-import android.content.SharedPreferences;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-import android.text.Editable;
-import android.view.View;
-import android.widget.AutoCompleteTextView;
-
-import com.android.emergency.PreferenceKeys;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.util.ReflectionHelpers;
-
-/** Unit tests for {@link NameAutoCompletePreference}. */
-@RunWith(RobolectricTestRunner.class)
-public class NameAutoCompletePreferenceTest {
-    @Mock private PreferenceManager mPreferenceManager;
-    @Mock private SharedPreferences mSharedPreferences;
-    @Mock private NameAutoCompletePreference.SuggestionProvider mAutoCompleteSuggestionProvider;
-    private NameAutoCompletePreference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        when(mPreferenceManager.getSharedPreferences()).thenReturn(mSharedPreferences);
-
-        Context context = RuntimeEnvironment.application;
-
-        mPreference =
-            spy(new NameAutoCompletePreference(context, null, mAutoCompleteSuggestionProvider));
-
-        PreferenceGroup prefRoot = spy(new PreferenceScreen(context, null));
-        when(prefRoot.getPreferenceManager()).thenReturn(mPreferenceManager);
-        prefRoot.addPreference(mPreference);
-    }
-
-    @Test
-    public void testProperties() {
-        assertThat(mPreference).isNotNull();
-        assertThat(mPreference.isEnabled()).isTrue();
-        assertThat(mPreference.isPersistent()).isTrue();
-        assertThat(mPreference.isSelectable()).isTrue();
-        assertThat(mPreference.isNotSet()).isTrue();
-    }
-
-    @Test
-    public void testReloadFromPreference() throws Throwable {
-        mPreference.setKey(PreferenceKeys.KEY_NAME);
-
-        String name = "John";
-        when(mSharedPreferences.getString(eq(mPreference.getKey()), nullable(String.class)))
-                .thenReturn(name);
-
-        mPreference.reloadFromPreference();
-        assertThat(mPreference.getText()).isEqualTo(name);
-        assertThat(mPreference.isNotSet()).isFalse();
-    }
-
-    @Test
-    public void testSetText() throws Throwable {
-        final String name = "John";
-        mPreference.setText(name);
-        assertThat(mPreference.getText()).isEqualTo(name);
-        assertThat(mPreference.getSummary()).isEqualTo(name);
-    }
-
-    @Test
-    public void testGetAutoCompleteTextView() {
-        AutoCompleteTextView autoCompleteTextView = mPreference.getAutoCompleteTextView();
-        assertThat(autoCompleteTextView).isNotNull();
-    }
-
-    @Test
-    public void testCreateAutocompleteSuggestions_noNameToSuggest() {
-        when(mAutoCompleteSuggestionProvider.hasNameToSuggest()).thenReturn(false);
-        assertThat(mPreference.createAutocompleteSuggestions()).isEqualTo(new String[] {});
-    }
-
-    @Test
-    public void testCreateAutocompleteSuggestions_nameToSuggest() {
-        final String name = "Jane";
-        when(mAutoCompleteSuggestionProvider.hasNameToSuggest()).thenReturn(true);
-        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/unit/Android.bp b/tests/unit/Android.bp
index 6a5b0bc..d43b6ac 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -16,9 +16,9 @@
     name: "EmergencyInfoUnitTests",
     libs: ["android.test.runner"],
     static_libs: [
-        "android-support-test",
+        "androidx.test.rules",
         "emergencyinfo-test-common",
-        "espresso-core",
+        "androidx.test.espresso.core",
         "truth-prebuilt",
         "ub-uiautomator",
     ],
diff --git a/tests/unit/AndroidManifest.xml b/tests/unit/AndroidManifest.xml
index bb60b7a..2dd4add 100644
--- a/tests/unit/AndroidManifest.xml
+++ b/tests/unit/AndroidManifest.xml
@@ -24,7 +24,7 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
         android:targetPackage="com.android.emergency"
         android:label="Emergency Info Test Cases">
     </instrumentation>
diff --git a/tests/unit/src/com/android/emergency/edit/EditInfoActivityTest.java b/tests/unit/src/com/android/emergency/edit/EditInfoActivityTest.java
index d266cc3..ad196b8 100644
--- a/tests/unit/src/com/android/emergency/edit/EditInfoActivityTest.java
+++ b/tests/unit/src/com/android/emergency/edit/EditInfoActivityTest.java
@@ -15,10 +15,11 @@
  */
 package com.android.emergency.edit;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
@@ -31,11 +32,12 @@
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.provider.ContactsContract;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceManager;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.android.emergency.ContactTestUtils;
 import com.android.emergency.PreferenceKeys;
@@ -43,12 +45,8 @@
 import com.android.emergency.preferences.EmergencyContactsPreference;
 import com.android.emergency.preferences.EmergencyEditTextPreference;
 import com.android.emergency.preferences.EmergencyListPreference;
-import com.android.emergency.preferences.NameAutoCompletePreference;
 import com.android.emergency.util.PreferenceUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -82,7 +80,8 @@
         // Because the initial state of each preference is empty, the edit activity removes the
         // preference. As a result, we expect them all to be null.
         for (String key : PreferenceKeys.KEYS_EDIT_EMERGENCY_INFO) {
-            assertWithMessage(key).that(medicalInfoParent.findPreference(key)).isNull();
+            assertWithMessage(key).that((Preference) medicalInfoParent.findPreference(key))
+                    .isNull();
         }
         EmergencyContactsPreference emergencyContactsPreference =
                 (EmergencyContactsPreference) fragment.findPreference(
@@ -102,8 +101,6 @@
     @Test
     public void testClearAllPreferences() {
         PreferenceManager.getDefaultSharedPreferences(mTargetContext).edit().putString(
-                PreferenceKeys.KEY_NAME, "John").commit();
-        PreferenceManager.getDefaultSharedPreferences(mTargetContext).edit().putString(
                 PreferenceKeys.KEY_ADDRESS, "Home").commit();
         PreferenceManager.getDefaultSharedPreferences(mTargetContext).edit().putString(
                 PreferenceKeys.KEY_BLOOD_TYPE, "A+").commit();
@@ -134,9 +131,6 @@
         EditInfoActivity activity = startEditInfoActivity();
         EditInfoFragment fragment = (EditInfoFragment) activity.getFragment();
 
-        final NameAutoCompletePreference namePreference =
-                (NameAutoCompletePreference) fragment.getMedicalInfoPreference(
-                        PreferenceKeys.KEY_NAME);
         final EmergencyEditTextPreference addressPreference =
                 (EmergencyEditTextPreference) fragment.getMedicalInfoPreference(
                         PreferenceKeys.KEY_ADDRESS);
@@ -159,7 +153,6 @@
                 (EmergencyContactsPreference) fragment.findPreference(
                         PreferenceKeys.KEY_EMERGENCY_CONTACTS);
 
-        String unknownName = activity.getResources().getString(R.string.unknown_name);
         String unknownAddress = activity.getResources().getString(R.string.unknown_address);
         String unknownBloodType = activity.getResources().getString(R.string.unknown_blood_type);
         String unknownAllergies = activity.getResources().getString(R.string.unknown_allergies);
@@ -168,7 +161,6 @@
                 activity.getResources().getString(R.string.unknown_medical_conditions);
         String unknownOrganDonor = activity.getResources().getString(R.string.unknown_organ_donor);
 
-        assertThat(namePreference.getSummary()).isNotEqualTo(unknownName);
         assertThat(addressPreference.getSummary()).isNotEqualTo(unknownAddress);
         assertThat(bloodTypePreference.getSummary()).isNotEqualTo(unknownBloodType);
         assertThat(allergiesPreference.getSummary()).isNotEqualTo(unknownAllergies);
@@ -199,7 +191,6 @@
 
         // After the clear all the preferences dialog is confirmed, the preferences values are
         // reloaded, and the existing object references are updated in-place.
-        assertThat(namePreference.getSummary()).isNull();
         assertThat(addressPreference.getSummary()).isNull();
         assertThat(bloodTypePreference.getSummary().toString()).isEqualTo(unknownBloodType);
         assertThat(allergiesPreference.getSummary()).isNull();
@@ -212,7 +203,8 @@
         // The preference values are not displayed, being empty.
         PreferenceGroup medicalInfoParent = fragment.getMedicalInfoParent();
         for (String key : PreferenceKeys.KEYS_EDIT_EMERGENCY_INFO) {
-            assertWithMessage(key).that(medicalInfoParent.findPreference(key)).isNull();
+            assertWithMessage(key).that((Preference) medicalInfoParent.findPreference(key))
+                    .isNull();
         }
 
         // Now that the settings have been cleared, the settings suggestion should reappear.
diff --git a/tests/unit/src/com/android/emergency/edit/EditMedicalInfoActivityTest.java b/tests/unit/src/com/android/emergency/edit/EditMedicalInfoActivityTest.java
index c6ce238..0a85410 100644
--- a/tests/unit/src/com/android/emergency/edit/EditMedicalInfoActivityTest.java
+++ b/tests/unit/src/com/android/emergency/edit/EditMedicalInfoActivityTest.java
@@ -15,19 +15,19 @@
  */
 package com.android.emergency.edit;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static com.google.common.truth.Truth.assertThat;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
 import android.app.Instrumentation;
 import android.content.Context;
 import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
 import android.support.test.uiautomator.UiDevice;
 import android.view.Surface;
 
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
 import com.android.emergency.R;
 
 import org.junit.After;
diff --git a/tests/unit/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java b/tests/unit/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
index ea464ae..c498ca0 100644
--- a/tests/unit/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
+++ b/tests/unit/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
@@ -15,11 +15,12 @@
  */
 package com.android.emergency.preferences;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.isEnabled;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import android.app.Instrumentation;
@@ -27,13 +28,14 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Looper;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.runner.AndroidJUnit4;
-import androidx.preference.PreferenceManager;
 import android.view.View;
 
+import androidx.preference.PreferenceManager;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.runner.AndroidJUnit4;
+
 import com.android.emergency.ContactTestUtils;
 import com.android.emergency.PreferenceKeys;
 import com.android.emergency.R;
diff --git a/tests/unit/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java b/tests/unit/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
index e733672..9758f3e 100644
--- a/tests/unit/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
+++ b/tests/unit/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
@@ -20,12 +20,13 @@
 import android.app.Instrumentation;
 import android.content.Context;
 import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-import androidx.preference.PreferenceManager;
 import android.text.SpannableString;
 import android.text.style.TtsSpan;
 
+import androidx.preference.PreferenceManager;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
 import com.android.emergency.PreferenceKeys;
 import com.android.emergency.R;
 import com.android.emergency.edit.EditInfoActivity;
diff --git a/tests/unit/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java b/tests/unit/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java
deleted file mode 100644
index c4422be..0000000
--- a/tests/unit/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java
+++ /dev/null
@@ -1,82 +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.
- */
-package com.android.emergency.preferences;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static com.google.common.truth.Truth.assertThat;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.any;
-import static org.hamcrest.Matchers.not;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Looper;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-import android.view.View;
-
-import com.android.emergency.PreferenceKeys;
-import com.android.emergency.R;
-import com.android.emergency.edit.EditMedicalInfoActivity;
-import com.android.emergency.edit.EditMedicalInfoFragment;
-
-import org.hamcrest.Matcher;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/** Unit tests for {@link NameAutoCompletePreference}. */
-@RunWith(AndroidJUnit4.class)
-public final class NameAutoCompletePreferenceTest {
-    private NameAutoCompletePreference mNameAutoCompletePreference;
-
-    @BeforeClass
-    public static void oneTimeSetup() {
-        if (Looper.myLooper() == null) {
-            Looper.prepare();
-        }
-    }
-
-    @Before
-    public void setUp() {
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-
-        final Intent editActivityIntent = new Intent(
-                instrumentation.getTargetContext(), EditMedicalInfoActivity.class);
-        EditMedicalInfoActivity activity =
-                (EditMedicalInfoActivity) instrumentation.startActivitySync(editActivityIntent);
-        EditMedicalInfoFragment fragment = activity.getFragment();
-
-        mNameAutoCompletePreference =
-                (NameAutoCompletePreference) fragment.findPreference(PreferenceKeys.KEY_NAME);
-    }
-
-    @Test
-    public void testDialogShow() {
-        onView(withText(R.string.name)).perform(click());
-
-        onView(withText(android.R.string.ok))
-                .check(matches(isDisplayed()));
-        onView(withText(android.R.string.cancel))
-                .check(matches(isDisplayed()));
-    }
-}
diff --git a/tests/unit/src/com/android/emergency/view/ViewInfoActivityTest.java b/tests/unit/src/com/android/emergency/view/ViewInfoActivityTest.java
index 5f8ae78..fbf8dff 100644
--- a/tests/unit/src/com/android/emergency/view/ViewInfoActivityTest.java
+++ b/tests/unit/src/com/android/emergency/view/ViewInfoActivityTest.java
@@ -17,13 +17,9 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import android.app.Fragment;
 import android.app.Instrumentation;
 import android.content.Context;
 import android.content.Intent;
-import androidx.preference.PreferenceManager;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
 import android.support.test.uiautomator.UiDevice;
 import android.util.Pair;
 import android.view.Surface;
@@ -31,18 +27,23 @@
 import android.widget.TextView;
 import android.widget.ViewFlipper;
 
+import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceManager;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
 import com.android.emergency.ContactTestUtils;
 import com.android.emergency.PreferenceKeys;
 import com.android.emergency.R;
 import com.android.emergency.edit.EditInfoActivity;
 
-import java.util.ArrayList;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.ArrayList;
+
 /** Unit tests for {@link ViewInfoActivity}. */
 @RunWith(AndroidJUnit4.class)
 public class ViewInfoActivityTest {