diff --git a/strings/src/main/res/values-af/strings.xml b/strings/src/main/res/values-af/strings.xml
index c57c91a698d..ca22cb6634d 100644
--- a/strings/src/main/res/values-af/strings.xml
+++ b/strings/src/main/res/values-af/strings.xml
@@ -180,6 +180,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">Jammer, Posisie-verskaffers is afgeskakel!</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -199,7 +210,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -251,7 +261,7 @@
   <string name="delete_file">Verwyder Geselekteerde</string>
   <string name="delete_no">Moenie Verwyder Nie</string>
   <string name="delete_yes">Verwyder Vorms</string>
-    <string name="file_deleted_ok">%s vorm(s) suksesvol verwyder!</string>
+  <string name="file_deleted_ok">%s vorm(s) suksesvol verwyder!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -385,6 +395,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -429,4 +444,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-am/strings.xml b/strings/src/main/res/values-am/strings.xml
index 0859c26d4bd..765ad6c8a98 100644
--- a/strings/src/main/res/values-am/strings.xml
+++ b/strings/src/main/res/values-am/strings.xml
@@ -190,6 +190,17 @@
   <string name="streets">መንገዶች</string>
   <string name="terrain">መልከአ ምድር</string>
   <string name="satellite">ሳተላይት</string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">ይቅርታ፣ የአካባቢ አቅራቢዎች አይሰሩም፡፡</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -214,7 +225,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -265,7 +275,7 @@
   <string name="delete_file">የተመረጠውን ሰርዝ</string>
   <string name="delete_no">አትሰርዝ</string>
   <string name="delete_yes">ቅጾችን ሰርዝ</string>
-    <string name="file_deleted_ok">1 %s ቅጽ (ዎች) በተሳካ ሁኔታ ተሰርዘዋል!</string>
+  <string name="file_deleted_ok">1 %s ቅጽ (ዎች) በተሳካ ሁኔታ ተሰርዘዋል!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -431,6 +441,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -475,4 +490,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">አስወግድ</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-ar/strings.xml b/strings/src/main/res/values-ar/strings.xml
index f37d533b923..520a76779b1 100644
--- a/strings/src/main/res/values-ar/strings.xml
+++ b/strings/src/main/res/values-ar/strings.xml
@@ -380,8 +380,18 @@
   <string name="google_play_services_error_occured">غير قادر على الوصول إلى خرائط الجوجل. هل خدمات Google Play مثبتة؟</string>
   <string name="carto_map_style_positron">بوزيترون</string>
   <string name="carto_map_style_dark_matter">المادة المظلمة</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">الطبقة المرجعية</string>
-  <string name="layer_data_file">ملف بيانات الطبقة</string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">سجل نقطة</string>
   <string name="location_accuracy">الدقة: %1$s متر </string>
   <string name="location_provider">مزود خدمة تحديد الموقع: %s</string>
@@ -476,7 +486,6 @@
   <string name="view_data">عرض الإستمارات المحفوظة</string>
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -541,7 +550,7 @@
   <string name="delete_file">إحذف الخيارات المحددة</string>
   <string name="delete_no">لا تحذف</string>
   <string name="delete_yes">حذف الاستمارات</string>
-    <string name="form_delete_message">جاري حذف الاستمارات المحددة</string>
+  <string name="form_delete_message">جاري حذف الاستمارات المحددة</string>
   <string name="file_deleted_ok">%s تم حذف الاستمارة /ت!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -807,6 +816,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -851,4 +865,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">تجاهل</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-bg/strings.xml b/strings/src/main/res/values-bg/strings.xml
index f16429e2e0c..86671647647 100644
--- a/strings/src/main/res/values-bg/strings.xml
+++ b/strings/src/main/res/values-bg/strings.xml
@@ -118,6 +118,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
   <!--Displayed in the form filling menu when a form has background location disabled-->
@@ -136,7 +147,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -251,6 +261,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -295,4 +310,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-bn/strings.xml b/strings/src/main/res/values-bn/strings.xml
index d49f3189d15..9d3ec5b3ca5 100644
--- a/strings/src/main/res/values-bn/strings.xml
+++ b/strings/src/main/res/values-bn/strings.xml
@@ -151,6 +151,17 @@
   <string name="terrain">ভূখণ্ড</string>
   <string name="hybrid">হাইব্রিড</string>
   <string name="satellite">উপগ্রহ</string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">দুঃখিত, অবস্থান প্রদানকারী সেবা বন্ধ আছে!</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -173,7 +184,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -223,7 +233,7 @@
   <string name="delete_file">ফাইল ডিলিট</string>
   <string name="delete_no">মুছবেন না</string>
   <string name="delete_yes">ফরম মুছে দিন </string>
-    <string name="file_deleted_ok">%s ফরম/(ফরমগুলি) সফলভাবে মুছে গেছে!</string>
+  <string name="file_deleted_ok">%s ফরম/(ফরমগুলি) সফলভাবে মুছে গেছে!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -347,6 +357,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -391,4 +406,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-ca/strings.xml b/strings/src/main/res/values-ca/strings.xml
index 2808436768a..3d16e48a0e5 100644
--- a/strings/src/main/res/values-ca/strings.xml
+++ b/strings/src/main/res/values-ca/strings.xml
@@ -205,6 +205,17 @@
   <string name="hybrid">Híbrid</string>
   <string name="satellite">Satel·lit</string>
   <string name="google_play_services_error_occured">No pot accedir a Google Maps. Teniu el servei instal·lat ?</string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">Atenció, la Locatització està desactivada!</string>
   <string name="gps_result">Latitud: %1$s\nLongitud: %2$s\nAltitud: %3$sm\nPrecisió: %4$sm</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
@@ -236,7 +247,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -289,7 +299,7 @@
   <string name="delete_file">Eliminar seleccionats</string>
   <string name="delete_no">No eliminar</string>
   <string name="delete_yes">Esborrar formularis</string>
-    <string name="file_deleted_ok">%s formularis(s) eliminats correctament!</string>
+  <string name="file_deleted_ok">%s formularis(s) eliminats correctament!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -453,6 +463,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -497,4 +512,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Descarta</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-cs/strings.xml b/strings/src/main/res/values-cs/strings.xml
index 98fb87de151..9df2d8ad86f 100644
--- a/strings/src/main/res/values-cs/strings.xml
+++ b/strings/src/main/res/values-cs/strings.xml
@@ -385,8 +385,18 @@
   <string name="google_play_services_error_occured">Nelze přistupovat k Mapám Google. Je služba Google Play nainstalována?</string>
   <string name="carto_map_style_positron">Positron</string>
   <string name="carto_map_style_dark_matter">Temná hmota</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">Referenční vrstva</string>
-  <string name="layer_data_file">Soubor datové vrstvy</string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">Zaznamenat bod</string>
   <string name="location_accuracy">Přesnost: %1$s m</string>
   <string name="location_provider">Poskytovatel polohy: %s</string>
@@ -485,8 +495,6 @@
   <string name="location_tracking_notification_channel_name">Sledování polohy</string>
   <!--Title for notification that lets user know their location is currently being tracked-->
   <string name="location_tracking_notification_title">Sledování polohy…</string>
-  <!--Text of button user can press to get help when setting up Reference Layers-->
-  <string name="get_help_with_reference_layers">Získejte nápovědu k referenčním vrstvám</string>
   <!--Description for button that zooms to the user's current location on a map-->
   <string name="show_my_location">Zobrazit mou polohu</string>
   <!--Description for button that zooms a map so that it shows all items-->
@@ -567,7 +575,7 @@
   <string name="delete_file">Smazat označené</string>
   <string name="delete_no">Nemazat</string>
   <string name="delete_yes">Smazat dotazníky</string>
-    <string name="form_delete_message">Smazání vybraných formulářů</string>
+  <string name="form_delete_message">Smazání vybraných formulářů</string>
   <string name="file_deleted_ok">%s dotazníků úspěšně smazáno!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -901,6 +909,11 @@
   <string name="open_settings">Otevřít nastavení</string>
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
   <string name="entities_title">Subjekty</string>
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -984,4 +997,22 @@
   <string name="empty_list_of_forms_to_delete_title">Žádné formuláře k odstranění.</string>
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Vyřadit</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-da/strings.xml b/strings/src/main/res/values-da/strings.xml
index aab582b09db..5372b09ce4c 100644
--- a/strings/src/main/res/values-da/strings.xml
+++ b/strings/src/main/res/values-da/strings.xml
@@ -222,7 +222,18 @@
   <string name="outdoors" tools:ignore="UnusedResources">Udendørs</string>
   <string name="topographic">Topografisk</string>
   <string name="carto_map_style_positron">Positron</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">Referencelag</string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="location_accuracy">Præcision: 1%1$s m</string>
   <string name="location_provider">Lokalitetsudbyder: 1%s</string>
   <string name="provider_disabled_error">Geolokation er slået fra</string>
@@ -287,7 +298,6 @@
   <string name="view_data">Inpicér gemt formular</string>
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -341,7 +351,7 @@
   <string name="delete_file">Slet valgte</string>
   <string name="delete_no">Undlad at slette</string>
   <string name="delete_yes">Fjern formularer</string>
-    <string name="file_deleted_ok">1%s formular slettet </string>
+  <string name="file_deleted_ok">1%s formular slettet </string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -516,6 +526,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -560,4 +575,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Kassér</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-de/strings.xml b/strings/src/main/res/values-de/strings.xml
index 0fd4010010c..96a78d88c1b 100644
--- a/strings/src/main/res/values-de/strings.xml
+++ b/strings/src/main/res/values-de/strings.xml
@@ -391,8 +391,18 @@
   <string name="google_play_services_error_occured">Zugriff auf Google Maps nicht möglich. Sind die Google Play Services installiert?</string>
   <string name="carto_map_style_positron">Positron</string>
   <string name="carto_map_style_dark_matter">Dunkle Materie</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">Referenzebene</string>
-  <string name="layer_data_file">Ebenendaten-Datei</string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">Punkt erfassen</string>
   <string name="location_accuracy">Genauigkeit: %1$s m</string>
   <string name="location_provider">Standortdienst: %s</string>
@@ -487,8 +497,6 @@
   <string name="location_tracking_notification_channel_name">Standortverlauf</string>
   <!--Title for notification that lets user know their location is currently being tracked-->
   <string name="location_tracking_notification_title">Standort wird aufgezeichnet… </string>
-  <!--Text of button user can press to get help when setting up Reference Layers-->
-  <string name="get_help_with_reference_layers">Hilfe zu Referenzebenen</string>
   <!--Description for button that zooms to the user's current location on a map-->
   <string name="show_my_location">Meinen Standort anzeigen</string>
   <!--Description for button that zooms a map so that it shows all items-->
@@ -569,7 +577,7 @@
   <string name="delete_file">Auswahl löschen</string>
   <string name="delete_no">Nicht löschen</string>
   <string name="delete_yes">Formulare löschen</string>
-    <string name="form_delete_message">Ausgewählte Formulare löschen</string>
+  <string name="form_delete_message">Ausgewählte Formulare löschen</string>
   <string name="file_deleted_ok">%s Formular(e) erfolgreich gelöscht!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -903,6 +911,12 @@
   <string name="open_settings">Einstellungen öffnen</string>
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
   <string name="entities_title">Objekte</string>
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <string name="clear_entities">Alle löschen</string>
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -1021,4 +1035,25 @@
   <string name="empty_list_of_blank_forms_to_delete_subtitle">Wenn sie Leerformulare heruntergeladen haben, erscheinen sie hier.</string>
   <!--Subtext displayed when the list of filled forms to delete is empty-->
   <string name="empty_list_of_saved_forms_to_delete_subtitle">Wenn Sie gespeicherte Formulare haben, erscheinen sie hier.</string>
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <string name="savepoint_recovery_dialog_title">Ihre Arbeit Wiederherstellen?</string>
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <string name="savepoint_recovery_dialog_message">Collect wurde am \'EEE, MMM dd, yyyy \'um\' HH:mm\' unerwartet beendet und hat ihre Arbeit gespeichert.\n\nWollen Sie die gespeicherte Arbeit wiederherstellen oder verwerfen?</string>
+  <!--Text for the button that accepts the recovery of the work-->
+  <string name="recover">Wiederherstellen</string>
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Verwerfen</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-es/strings.xml b/strings/src/main/res/values-es/strings.xml
index d596be86ec8..ade205894a1 100644
--- a/strings/src/main/res/values-es/strings.xml
+++ b/strings/src/main/res/values-es/strings.xml
@@ -117,7 +117,6 @@
   <string name="save_enter_data_description">Esta al final de \"%s\".</string>
   <string name="form_edits_warning_title">Los formularios finalizados no pueden ser editados.</string>
   <string name="form_edits_warning_title_auto_send_enabled">Los formularios enviados no pueden ser editados.</string>
-  <string name="form_edits_warning_message">Si necesita hacer cambios, \"Guardar como borrador\" hasta que esté listo para enviar.</string>
   <string name="form_edits_warning_learn_more">Aprende más</string>
   <string name="save_as_draft">Guardar como borrador</string>
   <string name="finalize">Finalizar</string>
@@ -388,8 +387,18 @@
   <string name="google_play_services_error_occured">No se puede acceder a Google Maps. ¿Están los servicios de Google Play instalados?</string>
   <string name="carto_map_style_positron">Positrón</string>
   <string name="carto_map_style_dark_matter">Materia oscura</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">Capa de referencia</string>
-  <string name="layer_data_file">Archivo de datos de capa</string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">Registrando un punto</string>
   <string name="location_accuracy">Precisión: %1$s m</string>
   <string name="location_provider">Proveedor de Ubicación: %s</string>
@@ -485,8 +494,6 @@
   <string name="location_tracking_notification_channel_name">Seguimiento de ubicación</string>
   <!--Title for notification that lets user know their location is currently being tracked-->
   <string name="location_tracking_notification_title">Monitoreando ubicación…</string>
-  <!--Text of button user can press to get help when setting up Reference Layers-->
-  <string name="get_help_with_reference_layers">Obtenga ayuda con las capas de referencia</string>
   <!--Description for button that zooms to the user's current location on a map-->
   <string name="show_my_location">Mostrar mi ubicación</string>
   <!--Description for button that zooms a map so that it shows all items-->
@@ -567,7 +574,7 @@
   <string name="delete_file">Borrar los Seleccionados</string>
   <string name="delete_no">No Borrar</string>
   <string name="delete_yes">Borrar los Formularios</string>
-    <string name="form_delete_message">Eliminando formularios seleccionados</string>
+  <string name="form_delete_message">Eliminando formularios seleccionados</string>
   <string name="file_deleted_ok">¡%s formulario(s) se borraron correctamente!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -902,6 +909,11 @@
   <string name="open_settings">Abrir Configuración</string>
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
   <string name="entities_title">Entidades</string>
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -978,4 +990,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Descartar</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-et/strings.xml b/strings/src/main/res/values-et/strings.xml
index fc58c99b98b..8d8e889b805 100644
--- a/strings/src/main/res/values-et/strings.xml
+++ b/strings/src/main/res/values-et/strings.xml
@@ -210,6 +210,17 @@
   <string name="hybrid">Hübriid</string>
   <string name="satellite">Satelliit</string>
   <string name="google_play_services_error_occured">Puudub ligipääs Google Maps-ile. Veenduge, et Google Play teenused on paigaldatud.</string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">Kahjuks on asukoha küsimine maha keeratud!</string>
   <string name="gps_result">Laiuskraad: %1$s\nPikkuskraad: %2$s\nKõrgus: %3$sm\nTäpsusaste: %4$sm</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
@@ -245,7 +256,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -298,7 +308,7 @@
   <string name="delete_file">Kustuta valitu</string>
   <string name="delete_no">Ei kustuta</string>
   <string name="delete_yes">Kustuta vormid</string>
-    <string name="file_deleted_ok">%s vorm(id) edukalt kustutatud!</string>
+  <string name="file_deleted_ok">%s vorm(id) edukalt kustutatud!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -457,6 +467,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -501,4 +516,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Loobu</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-fa-rAF/strings.xml b/strings/src/main/res/values-fa-rAF/strings.xml
index a2cbff8383a..ce2b2f013d6 100644
--- a/strings/src/main/res/values-fa-rAF/strings.xml
+++ b/strings/src/main/res/values-fa-rAF/strings.xml
@@ -357,8 +357,18 @@
   <string name="google_play_services_error_occured">دسترسی به نقشه های گوگل امکان پذیر نیست. آیا خدمات Google Play نصب شده است؟</string>
   <string name="carto_map_style_positron">پوزیترون</string>
   <string name="carto_map_style_dark_matter">ماده تاریک</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer"> مرجع به لایه</string>
-  <string name="layer_data_file">لایه data فایل </string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">یک نقطه را ثبت کنید</string>
   <string name="location_accuracy">دقت: %1$s متر</string>
   <string name="location_provider">ارائه دهنده مکان: %s</string>
@@ -447,8 +457,6 @@
   <string name="location_tracking_notification_channel_name">ردیابی موقعیت مکانی</string>
   <!--Title for notification that lets user know their location is currently being tracked-->
   <string name="location_tracking_notification_title">ردیابی مکان…</string>
-  <!--Text of button user can press to get help when setting up Reference Layers-->
-  <string name="get_help_with_reference_layers">از لایه های مرجع کمک بگیرید</string>
   <!--Description for button that zooms to the user's current location on a map-->
   <string name="show_my_location">نمایش لوکیشن من</string>
   <!--Description for button that zooms a map so that it shows all items-->
@@ -529,7 +537,7 @@
   <string name="delete_file">حذف مورد انتخاب شده</string>
   <string name="delete_no">حذف نکنید</string>
   <string name="delete_yes">حذف فورم ها</string>
-    <string name="form_delete_message">حذف کردن فورم های انتخاب شده</string>
+  <string name="form_delete_message">حذف کردن فورم های انتخاب شده</string>
   <string name="file_deleted_ok">%sفورم(ها) موفقانه حذف گردید!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -861,6 +869,11 @@
   <string name="open_settings">تنظیمات را باز کنید</string>
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
   <string name="entities_title">موجودیت ها</string>
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -970,4 +983,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">دور انداختن</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-fa/strings.xml b/strings/src/main/res/values-fa/strings.xml
index a2cbff8383a..ce2b2f013d6 100644
--- a/strings/src/main/res/values-fa/strings.xml
+++ b/strings/src/main/res/values-fa/strings.xml
@@ -357,8 +357,18 @@
   <string name="google_play_services_error_occured">دسترسی به نقشه های گوگل امکان پذیر نیست. آیا خدمات Google Play نصب شده است؟</string>
   <string name="carto_map_style_positron">پوزیترون</string>
   <string name="carto_map_style_dark_matter">ماده تاریک</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer"> مرجع به لایه</string>
-  <string name="layer_data_file">لایه data فایل </string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">یک نقطه را ثبت کنید</string>
   <string name="location_accuracy">دقت: %1$s متر</string>
   <string name="location_provider">ارائه دهنده مکان: %s</string>
@@ -447,8 +457,6 @@
   <string name="location_tracking_notification_channel_name">ردیابی موقعیت مکانی</string>
   <!--Title for notification that lets user know their location is currently being tracked-->
   <string name="location_tracking_notification_title">ردیابی مکان…</string>
-  <!--Text of button user can press to get help when setting up Reference Layers-->
-  <string name="get_help_with_reference_layers">از لایه های مرجع کمک بگیرید</string>
   <!--Description for button that zooms to the user's current location on a map-->
   <string name="show_my_location">نمایش لوکیشن من</string>
   <!--Description for button that zooms a map so that it shows all items-->
@@ -529,7 +537,7 @@
   <string name="delete_file">حذف مورد انتخاب شده</string>
   <string name="delete_no">حذف نکنید</string>
   <string name="delete_yes">حذف فورم ها</string>
-    <string name="form_delete_message">حذف کردن فورم های انتخاب شده</string>
+  <string name="form_delete_message">حذف کردن فورم های انتخاب شده</string>
   <string name="file_deleted_ok">%sفورم(ها) موفقانه حذف گردید!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -861,6 +869,11 @@
   <string name="open_settings">تنظیمات را باز کنید</string>
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
   <string name="entities_title">موجودیت ها</string>
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -970,4 +983,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">دور انداختن</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-fi/strings.xml b/strings/src/main/res/values-fi/strings.xml
index fff026742b6..4d91b42dc8c 100644
--- a/strings/src/main/res/values-fi/strings.xml
+++ b/strings/src/main/res/values-fi/strings.xml
@@ -16,22 +16,22 @@
   <string name="version_number">Versio: %s</string>
   <string name="id_number">ID: %s</string>
   <!--Please format date appropriately for your language: http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html-->
-  <string name="added_on_date_at_time">\'Lisätty\' EEE, dd MMM yyyy \'kello\' HH:mm</string>
+  <string name="added_on_date_at_time">\'Lisätty\' EEE dd.MMM.yyyy \'kello\' HH:mm</string>
   <!--Please format date appropriately for your language: http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html-->
   <string name="updated_on_date_at_time">\'Päivitetty\' EEE dd.MM.yyyy \'kello\' HH:mm</string>
   <!--Please format date appropriately for your language: http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html-->
-  <string name="saved_on_date_at_time">\'Tallennettu\' EEE, dd MMM yyyy \'kello\' HH:mm</string>
+  <string name="saved_on_date_at_time">\'Tallennettu\' EEE dd.MM.yyyy \'kello\' HH:mm</string>
   <!--Please format date appropriately for your language: http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html-->
-  <string name="finalized_on_date_at_time">\'Viimeistelty\' EEE, dd MMM yyyy \'kello\' HH:mm</string>
+  <string name="finalized_on_date_at_time">\'Viimeistelty\' EEE dd.MM.yyyy \'kello\' HH:mm</string>
   <!--Please format date appropriately for your language: http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html-->
-  <string name="sent_on_date_at_time">\'Lähetetty\' EEE, dd MMM yyyy \'kello\' HH:mm</string>
+  <string name="sent_on_date_at_time">\'Lähetetty\' EEE dd.MM.yyyy \'kello\' HH:mm</string>
   <!--Please format date appropriately for your language: http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html-->
-  <string name="sending_failed_on_date_at_time">\'Lähettäminen epäonnistunut\' EEE, dd MMM yyyy \'kello\' HH:mm</string>
+  <string name="sending_failed_on_date_at_time">\'Lähettäminen epäonnistunut\' EEE dd.MM.yyyy \'kello\' HH:mm</string>
   <!--Please format date appropriately for your language: http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html-->
-  <string name="deleted_on_date_at_time">\'Poistettu\' EEE, dd MMM yyyy \'kello\' HH:mm</string>
+  <string name="deleted_on_date_at_time">\'Poistettu\' EEE dd.MM.yyyy \'kello\' HH:mm</string>
   <string name="submission_deleted">Lähetys poistettu</string>
   <!--Please format date appropriately for your language: http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html-->
-  <string name="modified_on_date_at_time">\'Muokattu\' EEE, dd MMM yyyy \'kello\' HH:mm</string>
+  <string name="modified_on_date_at_time">\'Muokattu\' EEE dd.MM.yyyy \'kello\' HH:mm</string>
   <string name="encrypted_form">Salattu lomake</string>
   <string name="deleted_form">Poistettu lomake</string>
   <string name="sort_the_list">Lajittele lista</string>
@@ -134,10 +134,10 @@
   <string name="keep_editing">Jatka muokkausta</string>
   <string name="quit_form_title">Tallennetaanko lomake?</string>
   <string name="save_explanation">Voit tallentaa tämän lomakkeen ja löytää sen milloin tahansa luonnostesi joukosta.</string>
-  <string name="save_explanation_with_last_saved">\'Tämä lomake tallennettiin viimeksi\' EEE, MMM dd, yyyy \'kello\' HH:mm\'. Tallenna luonnos säilyttääksesi muutokset.\'</string>
+  <string name="save_explanation_with_last_saved">\'Tämä lomake tallennettiin viimeksi\' EEE dd.MM.yyyy \'kello\' HH:mm\'. Tallenna luonnos säilyttääksesi muutokset.\'</string>
   <string name="quit_form_continue_title">Jatketaanko muokkausta?</string>
   <string name="discard_form_warning">Jos hylkäät lomakkeen, tulet menettämään kaikki tähän mennessä tekemäsi muutokset.</string>
-  <string name="discard_changes_warning">\'Tämä lomake tallennettiin viimeksi\' EEE, MMM dd, yyyy \'kello\' HH:mm\'. Jos hylkäät muutokset, tulet menettämään kaikki tähän mennessä tekemäsi muutokset.\'</string>
+  <string name="discard_changes_warning">\'Tämä lomake tallennettiin viimeksi\' EEE dd.MM.yyyy \'kello\' HH:mm\'. Jos hylkäät muutokset, tulet menettämään kaikki tähän mennessä tekemäsi muutokset.\'</string>
   <string name="saving_form">Tallentamassa lomaketta</string>
   <string name="survey_saving_validating_message">Tarkistetaan vastauksia…</string>
   <string name="survey_saving_collecting_message">Kerätää dataa…</string>
@@ -391,8 +391,29 @@
   <string name="google_play_services_error_occured">Google Maps -palveluun ei saada yhteyttä. Onko Google Play Services asennettu?</string>
   <string name="carto_map_style_positron">Positroni</string>
   <string name="carto_map_style_dark_matter">Pimeä aine</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">Viitekerros</string>
-  <string name="layer_data_file">Kerrosdatatiedosto</string>
+  <!--Label for the reference layer setting-->
+  <string name="layer_data_file">Kerros</string>
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <string name="reference_layer_dialog_title">Valitse viitekerros</string>
+  <!--Description of how to add reference layers to the project-->
+  <string name="reference_layer_dialog_description" tools:ignore="UnusedResources">Valitse viitekerros jota käytetään kaikissa tämän projektin kartoissa. Voit lisätä vaihtoehtoja listaan valitsemalla MBTile-tiedoston laitteeltasi.</string>
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <string name="get_help_with_reference_layers">Opi lisää MBTile-tiedostojen lisäämisestä.</string>
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <string name="add_layer" tools:ignore="UnusedResources">Lisää kerros</string>
+  <!--Text for button that lets the user delete a reference layer-->
+  <string name="delete_layer" tools:ignore="UnusedResources">Poista kerros</string>
+  <!--Text for title above list of layers-->
+  <string name="layers_list_title" tools:ignore="UnusedResources">Kerrokset</string>
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <string name="select_layer_access_title" tools:ignore="UnusedResources">Valitse kerroksen käyttöoikeudet</string>
+  <string name="select_layer_access_subtitle" tools:ignore="UnusedResources">Haluatko kerroksen olevan käytettävissä kaikissa projekteissa vai ainoastaan tässä projektissa?</string>
+  <!--Text for option where layer should be available to all projects-->
+  <string name="all_projects_option" tools:ignore="UnusedResources">Kaikissa projekteissa</string>
+  <!--Text for option where layer should be available to the current project only-->
+  <string name="current_project_option" tools:ignore="UnusedResources">Vain tässä projektissa</string>
   <string name="record_geopoint">Tallenna piste</string>
   <string name="location_accuracy">Tarkkuus: %1$s m</string>
   <string name="location_provider">Sijaintilähde: %s</string>
@@ -487,8 +508,6 @@
   <string name="location_tracking_notification_channel_name">Sijainnin seuranta</string>
   <!--Title for notification that lets user know their location is currently being tracked-->
   <string name="location_tracking_notification_title">Sijaintia seurataan…</string>
-  <!--Text of button user can press to get help when setting up Reference Layers-->
-  <string name="get_help_with_reference_layers">Viitekerrosten ohje</string>
   <!--Description for button that zooms to the user's current location on a map-->
   <string name="show_my_location">Näytä sijaintini</string>
   <!--Description for button that zooms a map so that it shows all items-->
@@ -569,7 +588,7 @@
   <string name="delete_file">Poista valittu</string>
   <string name="delete_no">Älä poista</string>
   <string name="delete_yes">Poista lomakkeita</string>
-    <string name="form_delete_message">Valittuja lomakkeita poistetaan</string>
+  <string name="form_delete_message">Valittuja lomakkeita poistetaan</string>
   <string name="file_deleted_ok">%s lomakkeen poistaminen onnistui!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -903,6 +922,16 @@
   <string name="open_settings">Avaa asetukset</string>
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
   <string name="entities_title">Entiteettejä</string>
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <string name="include_local_entities_setting">Aktivoi paikalliset entiteetit</string>
+  <string name="local_entity_features_summary">Seurantalomakkeilla tulee olemaan johdonmukaiset entiteettilistat ja tulevat sisällyttämään paikallisesti luodut tai päivitetyt entiteetit.</string>
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <string name="entity_browser_button">Tarkastele entiteettilistoja</string>
+  <!--Text for button that deletes all entities for the project-->
+  <string name="clear_entities">Poista kaikki</string>
+  <!--Text for button that adds a new entity list-->
+  <string name="add_entity_list">Lisää entiteettilista</string>
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -1021,4 +1050,35 @@
   <string name="empty_list_of_blank_forms_to_delete_subtitle">Kun olet ladannut tyhjiä lomakkeita ne tulevat ilmestymään tänne</string>
   <!--Subtext displayed when the list of filled forms to delete is empty-->
   <string name="empty_list_of_saved_forms_to_delete_subtitle">Kun olet tallentanut lomakkeita ne tulevat ilmestymään tänne</string>
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <string name="savepoint_recovery_dialog_title">Haluatko palauttaa työsi?</string>
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <string name="savepoint_recovery_dialog_message">\'Collect sulkeutui odottamattomasti\' EEE dd.MM.yyyy \'kello\' HH:mm\' ja tallensi työsi.\n\nHaluatko palauttaa työsi?\'</string>
+  <!--Text for the button that accepts the recovery of the work-->
+  <string name="recover">Palauta</string>
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Hylkää</string>
+  <!--Text for the button that initiates getting user location-->
+  <string name="get_point">Hae piste</string>
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <string name="view_or_change_point">Tarkastele tai muuta pistettä</string>
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <string name="view_point">Tarkastele pistettä</string>
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <string name="change_point">Muuta pistettä</string>
+  <!--Text for the button that displays a map for getting a new line-->
+  <string name="get_line">Hae viiva</string>
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <string name="view_or_change_line">Tarkastele tai muuta viivaa</string>
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <string name="view_line">Tarkastele viivaa</string>
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <string name="get_polygon">Hae monikulmio</string>
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <string name="view_or_change_polygon">Tarkastele tai muuta monikulmiota</string>
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
+  <string name="view_polygon">Tarkastele monikulmiota</string>
 </resources>
diff --git a/strings/src/main/res/values-fr/strings.xml b/strings/src/main/res/values-fr/strings.xml
index 23f4be12156..4870148cfaa 100644
--- a/strings/src/main/res/values-fr/strings.xml
+++ b/strings/src/main/res/values-fr/strings.xml
@@ -391,8 +391,29 @@
   <string name="google_play_services_error_occured">Impossible d’accéder à Google Maps. Google Play Services est-il installé ?</string>
   <string name="carto_map_style_positron">Positron</string>
   <string name="carto_map_style_dark_matter">Matière Sombre</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">Couche de référence</string>
-  <string name="layer_data_file">Dossier de calques</string>
+  <!--Label for the reference layer setting-->
+  <string name="layer_data_file">Couche</string>
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <string name="reference_layer_dialog_title">Sélectionnez la couche de référence</string>
+  <!--Description of how to add reference layers to the project-->
+  <string name="reference_layer_dialog_description" tools:ignore="UnusedResources">Sélectionnez la couche de référence à utiliser pour toutes les cartes de ce projet.  Vous pouvez ajouter des options à la liste en sélectionnant un fichier MBTile sur votre appareil.</string>
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <string name="get_help_with_reference_layers">En apprendre plus à propos de l\'ajout de MBTiles.</string>
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <string name="add_layer" tools:ignore="UnusedResources">Ajouter une couche</string>
+  <!--Text for button that lets the user delete a reference layer-->
+  <string name="delete_layer" tools:ignore="UnusedResources">Supprimer une couche</string>
+  <!--Text for title above list of layers-->
+  <string name="layers_list_title" tools:ignore="UnusedResources">Couches</string>
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <string name="select_layer_access_title" tools:ignore="UnusedResources">Sélectionner l\'accès à la couche</string>
+  <string name="select_layer_access_subtitle" tools:ignore="UnusedResources">Voulez vous que la couche soit disponible dans tous les projets ou seulement dans le projet courant ?</string>
+  <!--Text for option where layer should be available to all projects-->
+  <string name="all_projects_option" tools:ignore="UnusedResources">Tous les projets</string>
+  <!--Text for option where layer should be available to the current project only-->
+  <string name="current_project_option" tools:ignore="UnusedResources">Projet courant seulement</string>
   <string name="record_geopoint">Enregistrer un point</string>
   <string name="location_accuracy">Précision: %1$s m</string>
   <string name="location_provider">Fournisseur de la localisation: 1%s</string>
@@ -490,8 +511,6 @@
   <string name="location_tracking_notification_channel_name">Suivi de la localisation</string>
   <!--Title for notification that lets user know their location is currently being tracked-->
   <string name="location_tracking_notification_title">Enregistrement de la localisation…</string>
-  <!--Text of button user can press to get help when setting up Reference Layers-->
-  <string name="get_help_with_reference_layers">Obtenir de l\'aide au sujet des couches de référence</string>
   <!--Description for button that zooms to the user's current location on a map-->
   <string name="show_my_location">Montrer ma position</string>
   <!--Description for button that zooms a map so that it shows all items-->
@@ -572,7 +591,7 @@
   <string name="delete_file">Supprimer la sélection</string>
   <string name="delete_no">Ne pas supprimer</string>
   <string name="delete_yes">Supprimer ces formulaires</string>
-    <string name="form_delete_message">Supprimer les formulaires sélectionnés</string>
+  <string name="form_delete_message">Supprimer les formulaires sélectionnés</string>
   <string name="file_deleted_ok">%s formulaire(s) supprimé(s) avec succès.</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -906,6 +925,17 @@
   <string name="open_settings">Ouvrir les paramètres</string>
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
   <string name="entities_title">Entités</string>
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <string name="include_local_entities_setting">Activer les entités locales</string>
+  <string name="local_entity_features_summary">Les formulaires de suivi auront accès aux listes d\'entités partagées incluant les entités créées ou mises à jour localement.</string>
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <string name="entity_browser_button">Voir liste d\'entités</string>
+  <!--Text for button that deletes all entities for the project-->
+  <string name="clear_entities">Tout supprimer</string>
+  <!--Text for button that adds a new entity list-->
+  <string name="add_entity_list">Ajouter liste d\'entités</string>
+  <!--Label for entity that has been created offline and is not on the server yet-->
+  <string name="offline">Hors ligne</string>
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -962,8 +992,8 @@
     <item quantity="other">Dernier formulaire envoyé : %d jours auparavant</item>
   </plurals>
   <plurals name="forms_ready_to_send">
-    <item quantity="one">%dformulaire prêt à être envoyé</item>
-    <item quantity="many">%dformulaires prêts à être envoyés</item>
+    <item quantity="one">%d formulaire prêt à être envoyé</item>
+    <item quantity="many">%d formulaires prêts à être envoyés</item>
     <item quantity="other">%d formulaires prêts à être envoyés</item>
   </plurals>
   <string name="edit_finalized_form_warning" tools:ignore="UnusedResources">Dans les versions futures, les formulaires finalisés ne seront plus modifiables. Enregistrez les formulaires comme ébauches pour les modifier plus tard.\n\nVous pouvez vérifier la présence d\'erreurs dans une ébauche de formulaire en tapant les trois points (⋮) puis Vérifier les erreurs</string>
@@ -1032,4 +1062,35 @@
   <string name="empty_list_of_blank_forms_to_delete_subtitle">Quand vous aurez téléchargé des formulaires vierges, ils apparaîtront ici</string>
   <!--Subtext displayed when the list of filled forms to delete is empty-->
   <string name="empty_list_of_saved_forms_to_delete_subtitle">Quand vous aurez enregistré des formulaires, ils apparaîtront ici</string>
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <string name="savepoint_recovery_dialog_title">Récupérer votre travail ?</string>
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <string name="savepoint_recovery_dialog_message">\'Collect s\'est arrété de manière inattendue le \'EEE dd MMM yyyy à HH:mm\' et a sauvegardé votre travail.\n\nVoulez vous le récupérer ou l\'ignorer ?\'</string>
+  <!--Text for the button that accepts the recovery of the work-->
+  <string name="recover">Récupérer ?</string>
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Abandoner changements</string>
+  <!--Text for the button that initiates getting user location-->
+  <string name="get_point">Créer le point</string>
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <string name="view_or_change_point">Voir ou modifier le point</string>
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <string name="view_point">Voir le point</string>
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <string name="change_point">Modifier le point</string>
+  <!--Text for the button that displays a map for getting a new line-->
+  <string name="get_line">Créer la ligne</string>
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <string name="view_or_change_line">Voir ou modifier la ligne</string>
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <string name="view_line">Voir la ligne</string>
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <string name="get_polygon">Créer le polygone</string>
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <string name="view_or_change_polygon">Voir ou modifier le polygone</string>
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
+  <string name="view_polygon">Voir le polygone</string>
 </resources>
diff --git a/strings/src/main/res/values-hi/strings.xml b/strings/src/main/res/values-hi/strings.xml
index 5664213b0a1..493baa1f2c6 100644
--- a/strings/src/main/res/values-hi/strings.xml
+++ b/strings/src/main/res/values-hi/strings.xml
@@ -226,6 +226,17 @@
   <string name="hybrid">हाइब्रिड </string>
   <string name="satellite">उपग्रह</string>
   <string name="google_play_services_error_occured">गूगल मानचित्र तक पहुंचने में असमर्थ क्या गूगल प्ले सर्विस इनस्टॉल है?</string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">क्षमा करें, लोकेशन प्रदाता सक्षम नही हैं!</string>
   <string name="gps_result">अक्षांश: %1$s \n देशांतर: %2$s \n ऊंचाई: %3$sm \n शुद्धता: %4$sm</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
@@ -261,7 +272,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -315,7 +325,7 @@
   <string name="delete_file">चयन मिटाएं</string>
   <string name="delete_no">न मिटाएं</string>
   <string name="delete_yes">फॉर्म मिटाएं</string>
-    <string name="file_deleted_ok">%s फॉर्म(s) सफलतापूर्वक मिटाये!</string>
+  <string name="file_deleted_ok">%s फॉर्म(s) सफलतापूर्वक मिटाये!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -521,6 +531,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -565,4 +580,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">छोड़ दें </string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-ht/strings.xml b/strings/src/main/res/values-ht/strings.xml
index 192e06c0a86..62ed3fb8fec 100644
--- a/strings/src/main/res/values-ht/strings.xml
+++ b/strings/src/main/res/values-ht/strings.xml
@@ -204,6 +204,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <string name="go_to_settings">Ale nan paramèt</string>
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -223,7 +234,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -350,6 +360,11 @@
     ##############################################-->
   <string name="open_settings">Ouvri paramèt yo</string>
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -395,4 +410,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-in/strings.xml b/strings/src/main/res/values-in/strings.xml
index 8c3056e526d..0b8627c888d 100644
--- a/strings/src/main/res/values-in/strings.xml
+++ b/strings/src/main/res/values-in/strings.xml
@@ -384,8 +384,18 @@
   <string name="google_play_services_error_occured">Tidak dapat mengakses Google Maps. Apakah Google Play Services telah terinstal?</string>
   <string name="carto_map_style_positron">Positron</string>
   <string name="carto_map_style_dark_matter">Dark Matter</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">Lapisan referensi</string>
-  <string name="layer_data_file">Berkas data lapisan</string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">Rekam titik</string>
   <string name="location_accuracy">Tingkat akurasi adalah %1$s meter</string>
   <string name="location_provider">Lokasi penyedia jasa: %s</string>
@@ -475,8 +485,6 @@
   <string name="location_tracking_notification_channel_name">Melacak lokasi</string>
   <!--Title for notification that lets user know their location is currently being tracked-->
   <string name="location_tracking_notification_title">Lokasi pelacakan</string>
-  <!--Text of button user can press to get help when setting up Reference Layers-->
-  <string name="get_help_with_reference_layers">Minta bantuan untuk Lapisan Referensi</string>
   <!--Description for button that zooms to the user's current location on a map-->
   <string name="show_my_location">Tunjukkan lokasi saya</string>
   <!--Description for button that zooms a map so that it shows all items-->
@@ -557,7 +565,7 @@
   <string name="delete_file">Hapus Terpilih</string>
   <string name="delete_no">Batal Hapus</string>
   <string name="delete_yes">Hapus Formulir</string>
-    <string name="form_delete_message">Menghapus form terpilih</string>
+  <string name="form_delete_message">Menghapus form terpilih</string>
   <string name="file_deleted_ok">%s formulir telah berhasil dihapus.</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -891,6 +899,11 @@
   <string name="open_settings">Buka Pengaturan</string>
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
   <string name="entities_title">Entitas</string>
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -952,4 +965,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Buang</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-it/strings.xml b/strings/src/main/res/values-it/strings.xml
index 2ee3c174fcf..9e30c5fd8e6 100644
--- a/strings/src/main/res/values-it/strings.xml
+++ b/strings/src/main/res/values-it/strings.xml
@@ -388,8 +388,18 @@
   <string name="google_play_services_error_occured">Impossibile accedere a Google Maps. Il Servizio di Google Play è installato?</string>
   <string name="carto_map_style_positron">Posizione</string>
   <string name="carto_map_style_dark_matter">Scuro è importante</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">Livello di riferimento</string>
-  <string name="layer_data_file">File di dati del livello</string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">Memorizza un punto</string>
   <string name="location_accuracy">Precisione: %1$s m</string>
   <string name="location_provider">Fornitore di posizione: %s</string>
@@ -485,8 +495,6 @@
   <string name="location_tracking_notification_channel_name">Tracciamento della posizione</string>
   <!--Title for notification that lets user know their location is currently being tracked-->
   <string name="location_tracking_notification_title">Monitoraggio della posizione…</string>
-  <!--Text of button user can press to get help when setting up Reference Layers-->
-  <string name="get_help_with_reference_layers">Ottieni aiuto con i livelli di riferimento</string>
   <!--Description for button that zooms to the user's current location on a map-->
   <string name="show_my_location">Mostra la mia posizione</string>
   <!--Description for button that zooms a map so that it shows all items-->
@@ -567,7 +575,7 @@
   <string name="delete_file">Elimina Selezionato</string>
   <string name="delete_no">Non Eliminare</string>
   <string name="delete_yes">Elimina moduli</string>
-    <string name="form_delete_message">Elimina i moduli selezionati</string>
+  <string name="form_delete_message">Elimina i moduli selezionati</string>
   <string name="file_deleted_ok">%s modulo(i) cancellato(i) con successo!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -901,6 +909,11 @@
   <string name="open_settings">Apri impostazioni</string>
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
   <string name="entities_title">Entità</string>
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -1019,4 +1032,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Annulla</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-ja/strings.xml b/strings/src/main/res/values-ja/strings.xml
index c9f6229f1f6..3f33a30eee5 100644
--- a/strings/src/main/res/values-ja/strings.xml
+++ b/strings/src/main/res/values-ja/strings.xml
@@ -350,8 +350,18 @@
   <string name="google_play_services_error_occured">Google マップにアクセスできません。 Google Play サービスはインストールされていますか?</string>
   <string name="carto_map_style_positron">位置</string>
   <string name="carto_map_style_dark_matter">ダークマター</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">参照レイヤー</string>
-  <string name="layer_data_file">レイヤーデータファイル</string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">位置を記録</string>
   <string name="location_accuracy">精度: %1$s m</string>
   <string name="location_provider">ロケーションプロバイダー: %s</string>
@@ -425,7 +435,6 @@
   <string name="view_data">保存済のフォームを表示</string>
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -490,7 +499,7 @@
   <string name="delete_file">選択を削除</string>
   <string name="delete_no">削除しない</string>
   <string name="delete_yes">フォームを削除</string>
-    <string name="form_delete_message">選択したフォームを削除中</string>
+  <string name="form_delete_message">選択したフォームを削除中</string>
   <string name="file_deleted_ok">%s フォームを削除しました!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -755,6 +764,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -799,4 +813,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">破棄</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-ka/strings.xml b/strings/src/main/res/values-ka/strings.xml
index 0be1f53ce86..27b84218098 100644
--- a/strings/src/main/res/values-ka/strings.xml
+++ b/strings/src/main/res/values-ka/strings.xml
@@ -210,6 +210,17 @@
     tile caches, and are not shown in the UI.-->
   <string name="basemap_source">წყარო</string>
   <string name="streets">ქუჩები</string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">უკაცრავად, მდებარეობის მიმღები არ არის გააქტიურებული!</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -233,7 +244,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -286,7 +296,7 @@
   <string name="delete_file">არჩეულის წაშლა</string>
   <string name="delete_no">არ წაშალოთ</string>
   <string name="delete_yes">ფორმის წაშლა</string>
-    <string name="file_deleted_ok">%s ფორმა წარმატებით წაიშალა</string>
+  <string name="file_deleted_ok">%s ფორმა წარმატებით წაიშალა</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -430,6 +440,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -479,4 +494,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-km/strings.xml b/strings/src/main/res/values-km/strings.xml
index fcd6330fa6e..3181254c07c 100644
--- a/strings/src/main/res/values-km/strings.xml
+++ b/strings/src/main/res/values-km/strings.xml
@@ -330,6 +330,17 @@
   <string name="light" tools:ignore="UnusedResources">ភ្លឺ</string>
   <string name="dark" tools:ignore="UnusedResources">ងងឹត</string>
   <string name="google_play_services_error_occured">មិនអាចចូលដំណើរការផែនទី Google ។ តើសេវា Google Play បានដំឡើងហើយឬនៅ?</string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">សុំទោស, សេវាចាប់យកទីតាំងត្រូវបានបិទ</string>
   <string name="gps_result">រយៈទទឹង: %1$s\nរយៈបណ្ដោយ: %2$s\nរយៈកំពស់: %3$sm\nភាពត្រឹមត្រូវ: %4$sm</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
@@ -376,7 +387,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -433,7 +443,7 @@
   <string name="delete_file">លុប​អ្វី​ដែល​បាន​ជ្រើស</string>
   <string name="delete_no">កុំ​លុប</string>
   <string name="delete_yes">លុប​សំណុំបែបបទ</string>
-    <string name="form_delete_message">កំពុងលុបទម្រង់ដែលបានជ្រើសរើសរួច</string>
+  <string name="form_delete_message">កំពុងលុបទម្រង់ដែលបានជ្រើសរើសរួច</string>
   <string name="file_deleted_ok">%s សំណុំបែបបទបានលុបដោយជោគជ័យ ! </string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -680,6 +690,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -724,4 +739,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">បោះបង់</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-ln/strings.xml b/strings/src/main/res/values-ln/strings.xml
index 7a4e1c30770..a0a51214083 100644
--- a/strings/src/main/res/values-ln/strings.xml
+++ b/strings/src/main/res/values-ln/strings.xml
@@ -94,6 +94,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
   <!--Displayed in the form filling menu when a form has background location disabled-->
@@ -112,7 +123,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -237,6 +247,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -281,4 +296,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-lo-rLA/strings.xml b/strings/src/main/res/values-lo-rLA/strings.xml
index cc9f466fe29..510ae759983 100644
--- a/strings/src/main/res/values-lo-rLA/strings.xml
+++ b/strings/src/main/res/values-lo-rLA/strings.xml
@@ -177,6 +177,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">ຄຳສັ່ງບັນທຶກຈຸດທີ່ຕັ້ງ GPS ຖືກປິດໃຫ້ໃຊ້ງານ</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -196,7 +207,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -249,7 +259,7 @@
   <string name="delete_file">ລຶບສະເພາະແບບຟອມທີ່ໄດ້ເລືອກ</string>
   <string name="delete_no">ບໍ່ຕ້ອງການລຶບ</string>
   <string name="delete_yes">ລຶບແບບຟອມ</string>
-    <string name="file_deleted_ok">ລຶບແບບຟອມ%s ສຳເລັດແລ້ວ!</string>
+  <string name="file_deleted_ok">ລຶບແບບຟອມ%s ສຳເລັດແລ້ວ!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -383,6 +393,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -427,4 +442,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-lt/strings.xml b/strings/src/main/res/values-lt/strings.xml
index b77c52665a2..06b014a4330 100644
--- a/strings/src/main/res/values-lt/strings.xml
+++ b/strings/src/main/res/values-lt/strings.xml
@@ -145,6 +145,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">Deja, padėties valdikliai yra išjungti!</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -164,7 +175,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -215,7 +225,7 @@
   <string name="delete_file">Ištrinti pažymėtas</string>
   <string name="delete_no">Neištrinti</string>
   <string name="delete_yes">Ištrinti formas</string>
-    <string name="file_deleted_ok">%s forma(-os) sėkmingai ištrintos!</string>
+  <string name="file_deleted_ok">%s forma(-os) sėkmingai ištrintos!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -339,6 +349,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -383,4 +398,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-mg/strings.xml b/strings/src/main/res/values-mg/strings.xml
index 289ddf61fa0..c872a23ed6b 100644
--- a/strings/src/main/res/values-mg/strings.xml
+++ b/strings/src/main/res/values-mg/strings.xml
@@ -88,6 +88,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
   <!--Displayed in the form filling menu when a form has background location disabled-->
@@ -106,7 +117,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -222,6 +232,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -266,4 +281,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-ml/strings.xml b/strings/src/main/res/values-ml/strings.xml
index 9de86da7464..bc55e9b9781 100644
--- a/strings/src/main/res/values-ml/strings.xml
+++ b/strings/src/main/res/values-ml/strings.xml
@@ -156,6 +156,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
   <!--Displayed in the form filling menu when a form has background location disabled-->
@@ -174,7 +185,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -303,6 +313,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -347,4 +362,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-mr/strings.xml b/strings/src/main/res/values-mr/strings.xml
index b42c891be1d..a1f11b3f6c6 100644
--- a/strings/src/main/res/values-mr/strings.xml
+++ b/strings/src/main/res/values-mr/strings.xml
@@ -220,6 +220,17 @@
   <string name="hybrid">संकरित</string>
   <string name="satellite">उपग्रह</string>
   <string name="google_play_services_error_occured">गूगल नकाशे मध्ये प्रवेश करण्यात अक्षम. गूगल प्ले सेवा स्थापित केली आहे का?</string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">क्षमस्व, स्थान प्रदाता अक्षम केले आहेत!</string>
   <string name="gps_result">अक्षांश: %1$s\nरेखांश: %2$s\nअल्टिट्यूड: %3$sm\nअॅक्चुसीसी: %4$sm</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
@@ -255,7 +266,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -309,7 +319,7 @@
   <string name="delete_file">निवडलेले हटवा ?</string>
   <string name="delete_no">हटवू नका</string>
   <string name="delete_yes">फॉर्म हटवा</string>
-    <string name="file_deleted_ok">%s फॉर्म(स) यशस्वीरित्या हटविले!</string>
+  <string name="file_deleted_ok">%s फॉर्म(स) यशस्वीरित्या हटविले!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -510,6 +520,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -554,4 +569,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">टाकून द्या</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-ms/strings.xml b/strings/src/main/res/values-ms/strings.xml
index 38b4e84464a..5b88e229c66 100644
--- a/strings/src/main/res/values-ms/strings.xml
+++ b/strings/src/main/res/values-ms/strings.xml
@@ -91,6 +91,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
   <!--Displayed in the form filling menu when a form has background location disabled-->
@@ -109,7 +120,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -232,6 +242,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -276,4 +291,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-my/strings.xml b/strings/src/main/res/values-my/strings.xml
index 4a679720acf..b24e0d67717 100644
--- a/strings/src/main/res/values-my/strings.xml
+++ b/strings/src/main/res/values-my/strings.xml
@@ -167,6 +167,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">တည္ေနရာဖမ္းယူမွု ခ်ိဳ႔ယြင္းေနပါသည္</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -186,7 +197,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -237,7 +247,7 @@
   <string name="delete_file">ေရြးခ်ယ္ထားသည္မ်ားကို ဖ်က္ရန္</string>
   <string name="delete_no">မဖ်က္ရန္</string>
   <string name="delete_yes">ပုံစံကို ဖယ်ရှားရန်</string>
-    <string name="file_deleted_ok">%s ပံုစံမ်ားဖ်က္ၿပီးျဖစ္ပါသည္</string>
+  <string name="file_deleted_ok">%s ပံုစံမ်ားဖ်က္ၿပီးျဖစ္ပါသည္</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -362,6 +372,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -406,4 +421,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-ne-rNP/strings.xml b/strings/src/main/res/values-ne-rNP/strings.xml
index 5a376e5dfe0..e171ae777e2 100644
--- a/strings/src/main/res/values-ne-rNP/strings.xml
+++ b/strings/src/main/res/values-ne-rNP/strings.xml
@@ -212,6 +212,17 @@
   <string name="hybrid">हाइव्रिड</string>
   <string name="satellite">उपग्रह</string>
   <string name="google_play_services_error_occured">गुगल  म्याप्स् मा जान सकिएन । के गुगल प्ले सर्भिसेस इन्स्टल गरिएको छ ?</string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">माफ गर्नुहोस्, स्थान प्रदायकहरु निष्क्रिय गरिएका छन् !</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -240,7 +251,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -294,7 +304,7 @@
   <string name="delete_file">छानिएका डिलिट गर्नुहोस</string>
   <string name="delete_no">डिलिट नगर्नुहोस</string>
   <string name="delete_yes">फारमहरू डिलिट गर्नुहोस्</string>
-    <string name="file_deleted_ok">%s फारम (हरु) डिलिट भयो !</string>
+  <string name="file_deleted_ok">%s फारम (हरु) डिलिट भयो !</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -479,6 +489,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -523,4 +538,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">त्याग्नुहोस्</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-nl/strings.xml b/strings/src/main/res/values-nl/strings.xml
index 9a4c23d8a87..feeb55579dd 100644
--- a/strings/src/main/res/values-nl/strings.xml
+++ b/strings/src/main/res/values-nl/strings.xml
@@ -275,6 +275,17 @@
   <string name="dark" tools:ignore="UnusedResources">Donker</string>
   <string name="outdoors" tools:ignore="UnusedResources">Buiten</string>
   <string name="topographic">Topografisch</string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">Sorry, GPS is uitgeschakeld!</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <string name="go_to_settings">Ga naar instellingen</string>
@@ -298,7 +309,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <string name="show_my_location">Toon mijn locatie</string>
   <!--Description for button that zooms a map so that it shows all items-->
@@ -355,7 +365,7 @@
   <string name="delete_file">Verwijder selectie</string>
   <string name="delete_no">Niet verwijderen</string>
   <string name="delete_yes">Verwijderen</string>
-    <string name="form_delete_message">Verwijderen van geselecteerde formulieren</string>
+  <string name="form_delete_message">Verwijderen van geselecteerde formulieren</string>
   <string name="file_deleted_ok">%s formulier(en) verwijderd!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -555,6 +565,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -599,4 +614,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-no/strings.xml b/strings/src/main/res/values-no/strings.xml
index 18c8ef81080..9a0878e9e1d 100644
--- a/strings/src/main/res/values-no/strings.xml
+++ b/strings/src/main/res/values-no/strings.xml
@@ -180,6 +180,17 @@
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
   <string name="google_play_services_error_occured">Ikke mulig å åpne Google Maps. Er Google Play Services installert?</string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">Beklager, stedstjenesten er deaktivert!</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -199,7 +210,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -252,7 +262,7 @@
   <string name="delete_file">Slett utvalgte</string>
   <string name="delete_no">Ikke slett</string>
   <string name="delete_yes">Slett skjemaer</string>
-    <string name="file_deleted_ok">%s skjema(er) er slettet!</string>
+  <string name="file_deleted_ok">%s skjema(er) er slettet!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -388,6 +398,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -432,4 +447,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-pl/strings.xml b/strings/src/main/res/values-pl/strings.xml
index 7964bee7df6..e2f0c257ca0 100644
--- a/strings/src/main/res/values-pl/strings.xml
+++ b/strings/src/main/res/values-pl/strings.xml
@@ -330,8 +330,18 @@
   <string name="google_play_services_error_occured">Nie można uzyskać dostępu do Google Maps. Czy Google Play Services są zainstalowane?</string>
   <string name="carto_map_style_positron">Pozyton</string>
   <string name="carto_map_style_dark_matter">Ciemna Materia</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">Warstwa referencyjna</string>
-  <string name="layer_data_file">Plik danych warstwy</string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">Zapisz punkt</string>
   <string name="provider_disabled_error">Przykro mi, dostawcy usługi Lokalizacji są niedostępni.</string>
   <string name="gps_result">Szerokość: %1$s\nDługość: %2$s\nWzniesienie: %3$sm\nDokładność: %4$sm</string>
@@ -407,7 +417,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -463,7 +472,7 @@
   <string name="delete_file">Skasuj Wybrane</string>
   <string name="delete_no">Nie Kasuj</string>
   <string name="delete_yes">Skasuj Formularze</string>
-    <string name="form_delete_message">Kasowanie wybranych formularzy</string>
+  <string name="form_delete_message">Kasowanie wybranych formularzy</string>
   <string name="file_deleted_ok">%s formularz/y zostało skasowanych!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -711,6 +720,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -755,4 +769,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Usuń</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-ps/strings.xml b/strings/src/main/res/values-ps/strings.xml
index 3660fbc2003..31f6cea8f16 100644
--- a/strings/src/main/res/values-ps/strings.xml
+++ b/strings/src/main/res/values-ps/strings.xml
@@ -135,6 +135,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">اوبخښه ، د موقعیت وړاندي کوونکي غیر فعاله دی!</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -154,7 +165,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -320,6 +330,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -364,4 +379,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-pt/strings.xml b/strings/src/main/res/values-pt/strings.xml
index fbf2730fbbc..aa214326086 100644
--- a/strings/src/main/res/values-pt/strings.xml
+++ b/strings/src/main/res/values-pt/strings.xml
@@ -175,6 +175,7 @@
   <string name="no_app">Aplicativo faltando. Por favor, inserir manualmente a informação</string>
   <string name="null_intent_value">A aplicação externa não enviou as informações esperadas.</string>
   <!--Text on button that is part of print questions. Tapping the button prints the value of the question.-->
+  <string name="print">Imprimir</string>
   <string name="launch_printer">Impressão Inicializada</string>
   <string name="no_printer">A impressora solicitada não está instalada. Por favor, instale a impressora</string>
   <string name="open_url">Abrir URL</string>
@@ -225,7 +226,9 @@
   <!--Description text for button that that resumes recording sound-->
   <string name="resume_recording">Continuar</string>
   <!--Displayed in the form filling menu when a form has background audio recording enabled-->
+  <string name="record_audio_on">Gravação de áudio: ligado</string>
   <!--Displayed in the form filling menu when a form has background audio recording disabled-->
+  <string name="record_audio_off">Gravação de áudio: desligado</string>
   <string name="background_audio_permission_explanation">Esse formulário grava áudio em segundo plano. Você precisa dar permissão de acesso ao microfone para o ODK Collect. Se não permitir isso, você não poderá abrir esse formulário.</string>
   <!--Text asking the user to confirm whether they want to stop recording or not (which deletes the recording file)-->
   <string name="stop_recording_confirmation">Esse formulário solicita gravação de áudio em segundo plano. Desabilitar isso irá interromper a gravação e descartar o áudio já gravado. Você tem certeza que deseja continuar?</string>
@@ -388,8 +391,28 @@
   <string name="google_play_services_error_occured">Não foi capaz de acessar o Google Maps. O serviço do Google Play está instalado?</string>
   <string name="carto_map_style_positron">Positron</string>
   <string name="carto_map_style_dark_matter">Matéria escura</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">Camada de referência</string>
-  <string name="layer_data_file">Arquivo de dados da camada</string>
+  <!--Label for the reference layer setting-->
+  <string name="layer_data_file">Camada</string>
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <string name="reference_layer_dialog_title">Selecionar camada de referência</string>
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <string name="get_help_with_reference_layers">Saber mais sobre adicionar MBTiles.</string>
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <string name="add_layer" tools:ignore="UnusedResources">Adicionar camada</string>
+  <!--Text for button that lets the user delete a reference layer-->
+  <string name="delete_layer" tools:ignore="UnusedResources">Apagar camada</string>
+  <!--Text for title above list of layers-->
+  <string name="layers_list_title" tools:ignore="UnusedResources">Camadas</string>
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <string name="select_layer_access_title" tools:ignore="UnusedResources">Selecionar acesso à camada</string>
+  <string name="select_layer_access_subtitle" tools:ignore="UnusedResources">Você deseja que a camada esteja disponível em todos os projetos ou somente no projeto atual?</string>
+  <!--Text for option where layer should be available to all projects-->
+  <string name="all_projects_option" tools:ignore="UnusedResources">Todos os projetos</string>
+  <!--Text for option where layer should be available to the current project only-->
+  <string name="current_project_option" tools:ignore="UnusedResources">Apenas o projeto atual</string>
   <string name="record_geopoint">Registre um ponto</string>
   <string name="location_accuracy">Precisão: %1$s m</string>
   <string name="location_provider">Provedor de localização: %s</string>
@@ -400,7 +423,9 @@
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <string name="go_to_settings">Ir para as configurações</string>
   <!--Displayed in the form filling menu when a form has background location enabled-->
+  <string name="track_location_on">Rastrear localização: ligado</string>
   <!--Displayed in the form filling menu when a form has background location disabled-->
+  <string name="track_location_off">Rastrear localização: desligado</string>
   <string name="background_location_disabled">Este formulário necessita rastrear sua localização, mas a localização está desabilitada no seu celular. Por favor, habilite no menu %1$s acima.</string>
   <string name="background_location_enabled">Este formulário rastreia a sua localização. Você pode desabilitar o rastreamento de localização no menu %1$s acima.</string>
   <!--Text of an option available when filling out a form. Tapping this option checks the form for constraint or required violations and navigates the user back to the first field with an error.-->
@@ -485,8 +510,6 @@
   <string name="location_tracking_notification_channel_name">Registro de localização</string>
   <!--Title for notification that lets user know their location is currently being tracked-->
   <string name="location_tracking_notification_title">Obtendo localização…</string>
-  <!--Text of button user can press to get help when setting up Reference Layers-->
-  <string name="get_help_with_reference_layers">Obter ajuda com Camadas de Referência</string>
   <!--Description for button that zooms to the user's current location on a map-->
   <string name="show_my_location">Mostrar minha localização</string>
   <!--Description for button that zooms a map so that it shows all items-->
@@ -567,7 +590,7 @@
   <string name="delete_file">Apagar Selecionados</string>
   <string name="delete_no">Não Apagar</string>
   <string name="delete_yes">Apagar Formulários</string>
-    <string name="form_delete_message">Apagando formulários selecionados</string>
+  <string name="form_delete_message">Apagando formulários selecionados</string>
   <string name="file_deleted_ok">%s formulário(s) apagados com sucesso!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -901,6 +924,15 @@
   <string name="open_settings">Abrir configurações</string>
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
   <string name="entities_title">Entidades</string>
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <string name="include_local_entities_setting">Habilitar entidades locais</string>
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <string name="entity_browser_button">Ver listas de entidades</string>
+  <!--Text for button that deletes all entities for the project-->
+  <string name="clear_entities">Limpar tudo</string>
+  <!--Text for button that adds a new entity list-->
+  <string name="add_entity_list">Adicionar lista de entidades</string>
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -1002,7 +1034,9 @@
   <!--Message displayed when the list of questions is empty-->
   <string name="empty_list_of_questions">Não há nada para exibir</string>
   <!--Message displayed when the list of blank forms is empty-->
+  <string name="empty_list_of_blank_forms_title">Não há formulários em branco</string>
   <!--Subtext displayed when the list of blank forms is empty-->
+  <string name="empty_list_of_blank_forms_subtitle">Baixe o formulário para começar</string>
   <!--Message displayed when the list of drafts is empty-->
   <string name="empty_list_of_drafts_title">Não há nada em rascunhos</string>
   <!--Subtext displayed when the list of drafts is empty-->
@@ -1016,7 +1050,42 @@
   <!--Subtext of message displayed when the list of sent forms is empty-->
   <string name="empty_list_of_sent_forms_subtitle">Quando você enviar formulários finalizados eles aparecerão aqui</string>
   <!--Message displayed when the list of forms to download is empty-->
+  <string name="empty_list_of_forms_to_download_title">Não há formulários para baixar</string>
+  <string name="empty_list_of_forms_to_download_subtitle">Baixe o formulário para começar</string>
   <!--Message displayed when the list of forms to delete is empty-->
+  <string name="empty_list_of_forms_to_delete_title">Não há formulários para apagar</string>
   <!--Subtext displayed when the list of blank forms to delete is empty-->
+  <string name="empty_list_of_blank_forms_to_delete_subtitle">Quando você tiver baixado formulários em branco, eles aparecerão aqui</string>
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <string name="empty_list_of_saved_forms_to_delete_subtitle">Quando você tiver formulários salvos, eles aparecerão aqui</string>
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <string name="savepoint_recovery_dialog_title">Recuperar o seu trabalho?</string>
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <string name="recover">Recuperar</string>
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Descartar</string>
+  <!--Text for the button that initiates getting user location-->
+  <string name="get_point">Obter ponto</string>
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <string name="view_or_change_point">Ver ou modificar o ponto</string>
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <string name="view_point">Visualizar ponto</string>
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <string name="change_point">Alterar ponto</string>
+  <!--Text for the button that displays a map for getting a new line-->
+  <string name="get_line">Obter linha</string>
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <string name="view_or_change_line">Ver ou modificar linha</string>
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <string name="view_line">Visualizar linha</string>
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <string name="get_polygon">Obter polígono</string>
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <string name="view_or_change_polygon">Ver ou modificar polígono</string>
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
+  <string name="view_polygon">Visualizar polígono</string>
 </resources>
diff --git a/strings/src/main/res/values-ro/strings.xml b/strings/src/main/res/values-ro/strings.xml
index 4cc3cee4c49..456e6028ad2 100644
--- a/strings/src/main/res/values-ro/strings.xml
+++ b/strings/src/main/res/values-ro/strings.xml
@@ -189,6 +189,17 @@
   <string name="hybrid">Hibrid</string>
   <string name="satellite">Satelit</string>
   <string name="google_play_services_error_occured">Nu am putut accesa Google Maps. Aveți instalat Google Play Services?</string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">Ne pare rău, localizarea este dezactivată!</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -216,7 +227,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -269,7 +279,7 @@
   <string name="delete_file">Ștergeți cele selectate</string>
   <string name="delete_no">Nu ștergeți</string>
   <string name="delete_yes">Ștergeți formulare</string>
-    <string name="file_deleted_ok">%s formular(e) șters(e) cu succes!</string>
+  <string name="file_deleted_ok">%s formular(e) șters(e) cu succes!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -413,6 +423,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -457,4 +472,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-ru/strings.xml b/strings/src/main/res/values-ru/strings.xml
index 265c4113b1d..de5e650790d 100644
--- a/strings/src/main/res/values-ru/strings.xml
+++ b/strings/src/main/res/values-ru/strings.xml
@@ -369,8 +369,18 @@
   <string name="outdoors" tools:ignore="UnusedResources">Снаружи</string>
   <string name="topographic">Топографический</string>
   <string name="google_play_services_error_occured">Не удалось получить доступ к Google картам. Установлен ли Google Play Services?</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">Базовый слой</string>
-  <string name="layer_data_file">Файл данных слоя</string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">Зафиксировать точку</string>
   <string name="location_accuracy">Точность: %1$s м</string>
   <string name="location_provider">Провайдер геолокации: %s</string>
@@ -451,8 +461,6 @@
   <string name="location_tracking_notification_channel_name">Отслеживание местоположения</string>
   <!--Title for notification that lets user know their location is currently being tracked-->
   <string name="location_tracking_notification_title">Отслеживание местоположения…</string>
-  <!--Text of button user can press to get help when setting up Reference Layers-->
-  <string name="get_help_with_reference_layers">Получить помощь по слоям</string>
   <!--Description for button that zooms to the user's current location on a map-->
   <string name="show_my_location">Показать мое местоположение</string>
   <!--Description for button that zooms a map so that it shows all items-->
@@ -533,7 +541,7 @@
   <string name="delete_file">Удалить выбранные</string>
   <string name="delete_no">Не удалять</string>
   <string name="delete_yes">Удалить бланки</string>
-    <string name="form_delete_message">Удаляю выбранные опросники</string>
+  <string name="form_delete_message">Удаляю выбранные опросники</string>
   <string name="file_deleted_ok">Бланк опросника успешно удалён: %s шт.</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -852,6 +860,11 @@
     ##############################################-->
   <string name="open_settings">Открыть настройки</string>
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -908,4 +921,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Отменить</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-rw/strings.xml b/strings/src/main/res/values-rw/strings.xml
index 7041d19b6ad..eb837dfa80d 100644
--- a/strings/src/main/res/values-rw/strings.xml
+++ b/strings/src/main/res/values-rw/strings.xml
@@ -353,8 +353,18 @@ N\'ukomea guhura n\'iki kibazo, wakigeza kuwa gusabye gukusanya  amakuru.</strin
   <string name="google_play_services_error_occured">Ntibishoka ko ukoresha ikarita iranga ahantu.Reba ko waba ufite google play muri telefone yawe</string>
   <string name="carto_map_style_positron">Utunyangingo.</string>
   <string name="carto_map_style_dark_matter">Ibibazo bidasobanutse cg byijimye.</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">Indangakitegererezo.</string>
-  <string name="layer_data_file">Ububiko bw\'amakuru shingiro.</string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">Irabika amakuru</string>
   <string name="location_accuracy">Birizewe: %1$s m</string>
   <string name="location_provider">Igitanga aho uri ubu: %s</string>
@@ -431,7 +441,6 @@ N\'ukomea guhura n\'iki kibazo, wakigeza kuwa gusabye gukusanya  amakuru.</strin
   <string name="view_data">Reba Form Wabitse </string>
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -496,7 +505,7 @@ N\'ukomea guhura n\'iki kibazo, wakigeza kuwa gusabye gukusanya  amakuru.</strin
   <string name="delete_file">Siba icyo utoranije</string>
   <string name="delete_no">Ntubisibe</string>
   <string name="delete_yes">Siba ifishi</string>
-    <string name="form_delete_message">Ifishi wahisemo ziri gusibwa</string>
+  <string name="form_delete_message">Ifishi wahisemo ziri gusibwa</string>
   <string name="file_deleted_ok">Ifishi %s zamaze gusibwa</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -790,6 +799,11 @@ Birashoboka ko ari zimwe zashyizwemo mubihe bitandukanye cgw ziturutse ahatanduk
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -834,4 +848,22 @@ Birashoboka ko ari zimwe zashyizwemo mubihe bitandukanye cgw ziturutse ahatanduk
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Kuraho cg Jugunya.</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-si/strings.xml b/strings/src/main/res/values-si/strings.xml
index 5ae4c846e33..132f135de71 100644
--- a/strings/src/main/res/values-si/strings.xml
+++ b/strings/src/main/res/values-si/strings.xml
@@ -87,6 +87,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
   <!--Displayed in the form filling menu when a form has background location disabled-->
@@ -117,7 +128,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -235,6 +245,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -279,4 +294,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-sl/strings.xml b/strings/src/main/res/values-sl/strings.xml
index 6370648a7ec..887e13cf676 100644
--- a/strings/src/main/res/values-sl/strings.xml
+++ b/strings/src/main/res/values-sl/strings.xml
@@ -1,40 +1,65 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools" xmlns:oat="http://schema.getodk.org/odkAndroidTools">
   <!--Text for the topmost button on the main screen. It should be short and action-oriented.-->
+  <string name="enter_data">Izpolni prazen obrazec</string>
   <!--Text for an action button on the main screen.-->
+  <string name="review_data">Osnutki</string>
   <!--Text for an action button on the main screen.-->
+  <string name="send_data">Pripravljeni za oddajo</string>
   <!--Text for an action button on the main screen.-->
+  <string name="view_sent_forms">Oddani</string>
   <!--Text for an action button on the main screen.-->
+  <string name="get_forms">Prenesi obrazec</string>
   <!--Text for an action button on the main screen.-->
+  <string name="manage_files">Izbriši obrazec</string>
+  <string name="saved_forms">Shranjeni obrazci</string>
+  <string name="version_number">Verzija: %s</string>
+  <string name="id_number">ID: %s</string>
   <!--Please format date appropriately for your language: http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html-->
-  <string name="added_on_date_at_time">\'Dodan na\' EEE,MMM dd, yyyy \'ob\' HH:mm</string>
+  <string name="added_on_date_at_time">\'Dodan\' EEE,MMM dd, yyyy \'ob\' HH:mm</string>
   <!--Please format date appropriately for your language: http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html-->
+  <string name="updated_on_date_at_time">\'Posodobljen\' EEE, MMM dd, yyyy \'at\' HH:mm</string>
   <!--Please format date appropriately for your language: http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html-->
-  <string name="saved_on_date_at_time">\'Shranjen na\' EEE,MMM dd, yyyy \'ob\' HH:mm</string>
+  <string name="saved_on_date_at_time">\'Shranjen \' EEE,MMM dd, yyyy \'ob\' HH:mm</string>
   <!--Please format date appropriately for your language: http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html-->
-  <string name="finalized_on_date_at_time">\'Zaključen na\' EEE,MMM dd, yyyy \'ob\' HH:mm</string>
+  <string name="finalized_on_date_at_time">\'Zaključen\' EEE,MMM dd, yyyy \'ob\' HH:mm</string>
   <!--Please format date appropriately for your language: http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html-->
-  <string name="sent_on_date_at_time">\'Poslan na\' EEE,MMM dd, yyyy \'ob\' HH:mm</string>
+  <string name="sent_on_date_at_time">\'Poslan \' EEE,MMM dd, yyyy \'ob\' HH:mm</string>
   <!--Please format date appropriately for your language: http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html-->
-  <string name="sending_failed_on_date_at_time">\'Pošiljanje ni uspelo na\' EEE,MMM dd, yyyy \'ob\' HH:mm</string>
+  <string name="sending_failed_on_date_at_time">\'Pošiljanje ni uspelo \' EEE,MMM dd, yyyy \'ob\' HH:mm</string>
   <!--Please format date appropriately for your language: http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html-->
-  <string name="deleted_on_date_at_time">\'Brsian na\' EEE,MMM dd, yyyy \'ob\' HH:mm</string>
+  <string name="deleted_on_date_at_time">\'Odstranjen na\' EEE,MMM dd, yyyy \'ob\' HH:mm</string>
+  <string name="submission_deleted">Poslan obrazec izbrisan</string>
   <!--Please format date appropriately for your language: http://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html-->
-  <string name="modified_on_date_at_time">\'Spremenjeno\' EEE, MMM dd,  yyyy \'ob\' HH:mm</string>
+  <string name="modified_on_date_at_time">\'Spremenjen\' EEE, MMM dd,  yyyy \'ob\' HH:mm</string>
   <string name="encrypted_form">Šifriran obrazec</string>
+  <string name="deleted_form">Izbrisan obrazec</string>
+  <string name="sort_the_list">Sortiraj seznam</string>
+  <string name="sort_by">Sortiraj po</string>
+  <string name="sort_by_name_asc">Ime, A-Z</string>
+  <string name="sort_by_name_desc">Ime, Z-A</string>
   <string name="sort_by_date_desc">Datum, najprej najnovejši</string>
   <string name="sort_by_date_asc">Datum, najprej najstarejši</string>
   <!--A sort option for blank forms. When this option is selected, the form for which a filled instance was last filled will go first.-->
+  <string name="sort_by_last_saved">Po datumu shranjevanja</string>
+  <string name="filter_the_list">Filtiraj seznam</string>
   <!--Displayed in search boxes for form lists or question types that involve search-->
+  <string name="search">Poišči</string>
+  <string name="not_granted_permission">Željena aktivnost nima potrebnih dovoljenj za dostop.</string>
+  <string name="storage_runtime_permission_denied_title">Dovoljenja za shranjevanje</string>
   <string name="storage_runtime_permission_denied_desc">Brez teh dovoljenj, Collect ne more dostopati do vaših obrazcev ali shraniti odgovorov. Aplikacijo znova odprite, ko ste jih pripravljeni odobriti.</string>
+  <string name="location_runtime_permissions_denied_title">Dovoljenja za dostop do lokacije</string>
   <!--Starting in Android 12, Android makes it possible to give precise or approximate location permissions to an application. ODK Collect only captures location if the precise location permission is granted.-->
-  <string name="camera_runtime_permission_denied_title">Dovljenje za fotoaparat</string>
+  <string name="location_runtime_permissions_denied_desc">Brez dovoljenja za <b> lokacijo</b> Collect ne more zabeležiti vaše lokacije. Prosimo, poskusite znova, ko boste pripravljeni, da ga odobrite.</string>
+  <string name="camera_runtime_permission_denied_title">Dovoljenje za fotoaparat</string>
   <string name="camera_runtime_permission_denied_desc">Brez tega dovoljenja Collect ne more dostopati do fotoaparata. Prosimo, poskusite znova, ko ste pripravljeni odobriti.</string>
+  <string name="record_audio_runtime_permission_denied_title">Dovoljenje za snemanje zvoka</string>
   <string name="record_audio_runtime_permission_denied_desc">Brez tega dovoljenja Collect ne more dostopati do mikrofona. Prosimo, poskusite znova, ko ste pripravljeni odobriti.</string>
   <!--##############################################
     # FILL BLANK FORM
     ##############################################-->
   <!--Accessibility description of the form map button (e.g. used by screen readers). This button is shown next to every form definition in Fill Blank Form. When tapped, a map of all filled forms for that form definition is shown.-->
+  <string name="open_form_map">Odpri zemljevid z obrazci</string>
   <string name="instance_scan_count">%1$d obrazcev dodanih.</string>
   <string name="finished_disk_scan">Končano skeniranje. Vsi obrazci so naloženi.</string>
   <string name="xform_parse_error">Xform napaka obravnave za %1$s: %2$s manjka ali je napačen.</string>
@@ -43,6 +68,8 @@
   <string name="survey_loading_reading_data_message">Berem podatke obrazcev…</string>
   <string name="survey_loading_reading_csv_message">Berem CSV datoteke…</string>
   <string name="parse_error">Napaka, ne morem opredeliti obrazca.</string>
+  <string name="loading_form_failed">Pri nalaganju obrazca je prišlo do napake. Prosimo, poizkusite ponovno.</string>
+  <string name="parent_form_not_present">Osnutek ni na voljo za urejanje, saj ni prisotnega osnovnega praznega obrazca ali pa je bil izbrisan.\n\nForm ID: %1$s</string>
   <string name="cannot_edit_completed_form">Obrazca ni moč popravljati ko je bil zaključen. Lahko pa ga šifrirate.</string>
   <!--Displayed when loading a form if that form was previously filled but closed because of a crash or system failure-->
   <string name="savepoint_used">Neshranjene spremembe vrnjene na shranjeno točko.</string>
@@ -51,6 +78,7 @@
   <!--Text for button displayed in the form filling menu to see the form's table of contents-->
   <string name="view_hierarchy">Pojdi na vprašanje</string>
   <!--Text for button displayed in the form filling menu to save the form-->
+  <string name="save_all_answers">Shrani kot osnutek</string>
   <!--Text of button from the form's table of contents to jump to the beginning of the form-->
   <string name="jump_to_beginning">Pojdi na začetek</string>
   <!--Text of button from the form's table of contents to jump to the end of the form-->
@@ -58,8 +86,15 @@
   <!--Text of button from the form's table of contents to navigate out of a group or a repeat-->
   <string name="jump_to_previous">Pojdi gor</string>
   <!--Displayed below group names in a form's table of contents-->
+  <string name="group_label">Skupina</string>
   <!--Displayed below repeat names in a form's table of contents-->
+  <string name="repeatable_group_label">Ponavljajoča skupina</string>
+  <string name="exit">Izhod</string>
   <!--This sentence is used in the dialog for adding repeats and will be completed by a singular noun usually. Examples would be ‘Add “observation”?’ or ‘Add “Reading”?’. If the phrase doesn’t make sense in your language you can add a word like “new”, being careful of gender/plural.-->
+  <string name="add_repeat_question">Dodaj \"%s\"?</string>
+  <string name="add_repeat">Dodaj</string>
+  <string name="dont_add_repeat">Ne dodaj</string>
+  <string name="add_another_menu">Dodaj ponovno</string>
   <!--Title of overlay menu displayed when long pressing on a question in a form-->
   <string name="edit_prompt">Uredi</string>
   <string name="clearanswer_confirm">Odstranim odgovor za \"%s\"?</string>
@@ -73,54 +108,101 @@
   <string name="delete_repeat_confirm">Odstranim skupino %s in vse njene podskupine?</string>
   <string name="delete_repeat_no">Prekini</string>
   <string name="invalid_answer_error">Ta odgovor je napačen!</string>
-  <string name="required_answer_error">Ta odgovor je obvezen</string>
+  <string name="required_answer_error">Ta odgovor je obvezen!</string>
+  <string name="success_form_validation">Brez najdenih napak v obrazcu!</string>
   <string name="invalid_space_in_answer_singular">Opozorilo: vrednost %s vsebuje presledke</string>
   <string name="invalid_space_in_answer_plural">Opozorila: vrednosti %s vsebujejo presledke</string>
-  <string name="survey_internal_error">Interna napaka. Korak k vprašanju ni uspel.</string>
-  <string name="save_enter_data_description">Si pri koncu %s</string>
+  <string name="too_complex_form">Obrazec je preveč kompleksen za vašo napravo. Poskusite poenostaviti vprašanja ali vprašati za pomoč na forumu.</string>
+  <string name="survey_internal_error">Interna napaka: prehod ni uspel.</string>
+  <string name="save_enter_data_description">Ste pri koncu %s.</string>
+  <string name="form_edits_warning_title">Zaključeni obrazci niso na voljo za urejanje.</string>
+  <string name="form_edits_warning_title_auto_send_enabled">Poslani obrazi niso na voljo za urejanje.</string>
+  <string name="form_edits_warning_message">Če želite spreminjati shranjene odgovore, shranite kot osnutek dokler niste pripravljeni za oddajo.</string>
+  <string name="form_edits_warning_learn_more">Preberi več</string>
+  <string name="save_as_draft">Shrani kot osnutek</string>
+  <string name="finalize">Zaključi</string>
+  <string name="send">Pošlji</string>
   <string name="data_saved_error">Shranjevanje obrazca ni uspelo!</string>
   <string name="data_saved_ok">Obrazec uspešno shranjen!</string>
-  <string name="save_point_error">Napaka pri shranjevanju  obnovitvene točke %s</string>
+  <string name="save_point_error">Napaka pri shranjevanju obnovitvene točke %s</string>
   <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
   <string name="quit_application">Izhod %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
+  <string name="do_not_save">Zavrzi obrazec</string>
+  <string name="discard_changes">Zavrzi spremembe</string>
   <string name="keep_changes">Shrani spremembe</string>
+  <string name="keep_editing">Urejaj še naprej</string>
+  <string name="quit_form_title">Shrani obrazec?</string>
+  <string name="save_explanation">Obrazec lahko shranite kot osnutek in ga nato urejate iz osnutkov.</string>
+  <string name="save_explanation_with_last_saved">\'Obrazec zadnjič shranjen \' EEE, MMM dd, yyyy \'at\' HH:mm\'. Shranite kot osnutek, če želite shraniti spremembe.\'</string>
+  <string name="quit_form_continue_title">Nadaljuj z urejanjem?</string>
+  <string name="discard_form_warning">Če boste zavrgli obrazec, boste izgubili vse vnešene podatke do zdaj.</string>
+  <string name="discard_changes_warning">\'Obrazec zadnjič shranjen\' EEE, MMM dd, yyyy \'at\' HH:mm\'. Če boste zavrgli spremembe, jih boste izgubili.\'</string>
   <string name="saving_form">Shrani obrazec</string>
   <string name="survey_saving_validating_message">Vrednotim odgovore…</string>
   <string name="survey_saving_collecting_message">Zbiram podatke…</string>
   <string name="survey_saving_saving_message">Shranjujem na SD kartico…</string>
   <string name="survey_saving_finalizing_message">Zaključujem na SD kartico…</string>
   <string name="survey_saving_encrypting_message">Šifriram podatke…</string>
+  <string name="not_exactly_one_record_for_this_instance">Ni samo enega zapisa za to instanco!</string>
+  <string name="not_exactly_one_blank_form_for_this_form_id">Ni samo enega praznega obrazca s tem jr_form_id.</string>
+  <string name="no_form_id_specified">ID obrazca ni bil specificiran???</string>
   <string name="phone_does_not_support_rsa">Telefon ne podpira RSA šifriranja.</string>
+  <string name="invalid_rsa_public_key">Neveljaven RSA javni ključ.</string>
+  <string name="encryption_error_message">Obrazec %s ni bil shranjen kot dokončan.</string>
   <!--Displayed when form filling is attempted to be launched by intent but the intent URI is incorrect-->
+  <string name="bad_uri">Nedelujoč URI: %s</string>
   <!--Displayed when form filling is attempted to be launched by intent but the intent URI mime type is unknown-->
+  <string name="unrecognized_uri">Neprepoznan URI: %s</string>
   <!--Text displayed when audio recording fails to start-->
+  <string name="start_recording_failed">Začetek snemanja zvoka neuspešen.</string>
   <!--Text displayed when user tries to start recording while the mic is already in use-->
+  <string name="mic_in_use">Mikrofon že v uporabi.</string>
   <!--Error message displayed when copying media from a temporary directory fails-->
+  <string name="answer_file_copy_failed_message">Medijske datoteke ni mogoče priložiti obrazcu, vendar je na voljo na %1$s.</string>
   <!--Text displayed in the audio bar when background audio recording is explicitly disabled from the options menu. Should be as short as possible. The inserted string is ⋮ which indicates the options menu.-->
+  <string name="recording_disabled">Snemanje zvoka onemogočeno. Omogoči v %s</string>
   <!--Error displayed when opened filled form has been deleted on disk-->
+  <string name="instance_deleted_message">Izpolnjen obrazec je bil izbrisan!</string>
   <!--Error displayed when something bad happens during updating widgets in a field-list group-->
+  <string name="update_widgets_error">Napaka pri posodabljanju vrednosti. To je običajno posledica napačne uporabe izračunov v oblikovanju obrazca.\n\nČe se ta težava še naprej pojavlja, jo sporočite osebi, ki vas je prosila, da zbirate podatke.</string>
   <!--##############################################
     # FORM FEATURES
     ##############################################-->
   <!--Name of button displayed when a screen contains multiple questions populated by an external app: https://docs.getodk.org/launch-apps-from-collect/#launching-external-apps-to-populate-multiple-fields-->
   <string name="launch_app">Zaženi</string>
-  <string name="activity_not_found">Ne najdem aktivnosti za obravnavo %s</string>
+  <string name="activity_not_found">Ne najdem aktivnosti za obravnavo: %s</string>
   <string name="no_app">Zahtevane aplikacije ne najdem ali ni na voljo. Ročno vnesi vrednost.</string>
+  <string name="null_intent_value">Zunanja aplikacija ni zagotovila pričakovanih informacij.</string>
   <!--Text on button that is part of print questions. Tapping the button prints the value of the question.-->
+  <string name="print">Tisk</string>
   <string name="launch_printer">Zaženi tiskanje</string>
   <string name="no_printer">Želen tiskalnik ni nameščen. Namesti tiskalnik.</string>
   <string name="open_url">Odpri URL</string>
   <string name="capture_osm">Zaženi OpenMapKit</string>
   <string name="recapture_osm">Ponovi OSM označevanje</string>
+  <string name="edited_osm_file">Urejena OSM XML datoteka:</string>
+  <string name="invalid_osm_data">Nekaj je šlo narobe. Nismo prejeli veljavnih OSM podatkov.</string>
+  <string name="alert">Opozorilo</string>
   <string name="install_openmapkit">Prosim, namestite OpenMapKit!</string>
   <string name="get_barcode">Pridobi črtno kodo</string>
   <string name="replace_barcode">Zamenjaj črtno kodo</string>
+  <string name="barcode_scanner_prompt">Postavite črtno kodo znotraj pravokotnika.</string>
+  <string name="open_file">Odpri datoteko</string>
+  <string name="rank_items">Razvrsti </string>
+  <string name="number_picker_title">Izbirnik številk</string>
+  <string name="invalid_range_widget">Ta widget ima neveljavne parametre!</string>
+  <string name="svg_file_does_not_exist">SVG datoteka ne obstaja!</string>
   <string name="capture_image">Fotografiraj</string>
   <string name="choose_image">Izberi sliko</string>
+  <string name="selected_invalid_image">Izbrana datoteka ni veljavna slika.</string>
   <string name="take_picture_instruction">Klikni na ekran za fotografiranje</string>
-  <string name="error_front_camera_unavailable">Prednja kamera ni na voljo v tej napravi.</string>
+  <string name="error_front_camera_unavailable">Prednja kamera ni na voljo v tej napravi</string>
+  <string name="camera_error">Prišlo je do napake pri fotografiranju.</string>
+  <string name="camera_failed_to_initialize">Kamera ni na voljo!</string>
   <string name="annotate_image">Označi na sliki</string>
+  <string name="gif_not_supported">Gif datoteke niso podprte</string>
+  <string name="invalid_file_type">Aplikacija je vrnila neveljavno vrsto datoteke</string>
   <!--Dialog heading for saving annotated image-->
   <string name="save_and_close">Shrani in zapri</string>
   <string name="signature_capture">Zajem podpisa</string>
@@ -134,41 +216,61 @@
   <string name="play_video">Predvajaj video</string>
   <string name="choose_file">Izberi datoteko</string>
   <!--Text for button that deletes a file that is the answer to a question-->
+  <string name="delete_answer_file">Izbriši</string>
   <!--Text for button that starts recording sound-->
   <string name="capture_audio">Posnemi zvok</string>
   <!--Text for button that lets the user choose a sound file on their device-->
   <string name="choose_sound">Izberi zvočno datoteko</string>
   <!--Description text for button that that pauses recording sound-->
+  <string name="pause_recording">Premor</string>
   <!--Description text for button that that resumes recording sound-->
+  <string name="resume_recording">Nadaljuj</string>
   <!--Displayed in the form filling menu when a form has background audio recording enabled-->
+  <string name="record_audio_on">Snemanje zvoka: vklopljeno</string>
   <!--Displayed in the form filling menu when a form has background audio recording disabled-->
+  <string name="record_audio_off">Snemanje zvoka: izklopljeno</string>
+  <string name="background_audio_permission_explanation">Ta obrazec snema zvok v ozadju. Za uporabo morate dovoliti uporabo mikrofona. Če tega ne storite, ne boste mogli odpreti tega obrazca.</string>
   <!--Text asking the user to confirm whether they want to stop recording or not (which deletes the recording file)-->
+  <string name="stop_recording_confirmation">Ta obrazec želi snemati zvok v ozadju. Onemogočanje le-tega bo ustavilo snemanje zvoka in zavrglo obstoječi posnetek. Ali želite nadaljevati?</string>
   <!--Button text for the dialog confirming whether the user wants to disable background recording-->
+  <string name="disable_recording">Onemogoči snemanje.</string>
   <!--Text warning that user after they're reenabled background audio recording that it won't start again until they re-open the form-->
+  <string name="background_audio_recording_enabled_explanation">Snemanje zvoka se ne bo začelo takoj. Obrazec morate ponovno odpreti, da pričnete s snemanjem.</string>
   <!--Title for dialog asking the user if they want to delete a file-->
+  <string name="delete_answer_file_question">Izbriši datoteko?</string>
   <!--Dialog text warning the user they won't be able to recover a file once deleted-->
+  <string name="answer_file_delete_warning">Ne boste mogli obnoviti te datoteke, ko jo izbrišete. Ste prepričani, da želite nadaljevati?</string>
   <!--Text for button that stops audio recording-->
+  <string name="stop_recording">Ustavi</string>
   <!--Text to let the user know a recording is in progress-->
+  <string name="recording">Snemanje..</string>
   <!--Title of Android Notification Channel for audio recording notifications-->
+  <string name="recording_channel">Zvočni posnetek</string>
   <!--Text for button that plays audio clip-->
+  <string name="play_audio">Predvajaj posnetek</string>
   <!--Text to let the user know a file is being saved-->
+  <string name="saving_file">Shranjevanje datoteke</string>
   <!--Text in dialog that instructs the user to stop recording audio before leaving the form-->
+  <string name="recording_warning">Preden nadaljujte morate ustaviti snemanje zvoka.</string>
   <string name="error_attaching_binary_file">Napaka pri dodajanju medijske vsebine: %s</string>
   <!--Displayed in form questions for which the user needs to select a value-->
+  <string name="select_value">Izberi vrednost</string>
   <string name="select_answer">Izberi odgovor</string>
   <!--Displayed in form questions for which the user needs to select a value-->
+  <string name="edit_value">Uredi vrednost</string>
   <!--Displayed in form questions for which the user needs to select a value-->
+  <string name="no_value_selected">Ni izbrana nobena vrednost.</string>
   <string name="selected">Izbrano:</string>
   <string name="trigger">OK. Nadaljuj</string>
-  <string name="ext_file_no_data_error">Datoteka ne vsebuje podatkov</string>
+  <string name="ext_file_no_data_error">Datoteka ne vsebuje podatkov!</string>
   <string name="ext_conflicting_columns_error">Stolpci %s se ujemajo!</string>
-  <string name="ext_sortBy_numeric_error">Razvrsti stolpec po vrednostih naj bi vseboval le številčne vrednosti. Težava je pri vrednost  \' %s\'.</string>
-  <string name="ext_search_wrong_arguments_error">Sintaktična napaka v search() funkciji. Funkcija potrebuje 1,4 od 6 argumentov.</string>
+  <string name="ext_sortBy_numeric_error">Stolpec za razvrstitev naj bi vseboval le številčne vrednosti. Težava je pri vrednosti  \' %s\'.</string>
+  <string name="ext_search_wrong_arguments_error">Sintaktična napaka v search() funkciji. Funkcija potrebuje 1,4 ali 6 argumentov.</string>
   <string name="ext_search_wrong_function_error">Sintaktična napaka v search() funkciji: neprepoznana funkcija \'%s\'.</string>
   <string name="ext_search_bad_function_error">Sintaktična napaka v search() funkciji. \'%s\' ne morem ovrednotiti kot funkcijo.</string>
   <string name="ext_search_return_error">Iskalnik je vrnil objekt tipa \'%s\'.</string>
-  <string name="ext_import_generic_error">Ne morem uvoziti podatkov iz %1$s. Razlog %2$s</string>
-  <string name="ext_import_progress_message">Nalagam podatke iz \'%1$s\'. Počakaj prosim %2$s.</string>
+  <string name="ext_import_generic_error">Ne morem uvoziti podatkov iz %1$s. Razlog: %2$s</string>
+  <string name="ext_import_progress_message">Nalagam podatke iz \'%1$s\', prosimo počakajte… %2$s.</string>
   <string name="ext_import_cancelled_message">Branje podatkov prekinjeno!</string>
   <string name="ext_import_finalizing_message">Zaključujem prednaložene podatke …</string>
   <string name="ext_import_completed_message">Branje podatkov končano!</string>
@@ -176,40 +278,161 @@
   <string name="ext_import_csv_missing_error">Zunanji podatki za %1$s niso bili uvoženi. Morda si pozabil vključiti %2$s csv datoteko v obrazec?</string>
   <string name="ext_search_generic_error">Sintaktična napaka v search() funkciji: %s</string>
   <string name="ext_assign_value_error">Ne morem pripisati vrednosti k \'%s\'.</string>
-  <string name="get_bearing">Zabeleži smer</string>
-  <string name="replace_bearing">Zamenjaj smer</string>
-  <string name="getting_bearing">Nalagam smer</string>
-  <string name="accept_bearing">Zabeleži smer</string>
+  <string name="parser_exception">XPathParser Izjema: \"%s\"</string>
+  <string name="get_bearing">Zabeleži azimut</string>
+  <string name="replace_bearing">Zamenjaj azimut</string>
+  <string name="getting_bearing">Nalagam azimut</string>
+  <string name="accept_bearing">Zabeleži azimut</string>
+  <string name="bearing">Azimut: %.3f</string>
+  <string name="direction">Smer: %s</string>
+  <string name="bearing_lack_of_sensors">Napaka: azimuta ni mogoče zabeležiti, ker naprava nima pospeškomera, senzorja magnetnega polja ali obojega.</string>
+  <string name="select_date">Izberite datum</string>
+  <string name="select_time">Izberite čas</string>
+  <string name="no_date_selected">Ni izbran noben datum</string>
+  <string name="no_time_selected">Ni izbranega časa</string>
+  <string name="ethiopian_month_1">Meskerem</string>
+  <string name="ethiopian_month_2">Tikimt</string>
+  <string name="ethiopian_month_3">Hidar</string>
+  <string name="ethiopian_month_4">Tahsas</string>
+  <string name="ethiopian_month_5">Tir</string>
+  <string name="ethiopian_month_6">Yekatit</string>
+  <string name="ethiopian_month_7">Megabit</string>
+  <string name="ethiopian_month_8">Miazia</string>
+  <string name="ethiopian_month_9">Ginbot</string>
+  <string name="ethiopian_month_10">Senie</string>
+  <string name="ethiopian_month_11">Hamlie</string>
+  <string name="ethiopian_month_12">Nehasie</string>
+  <string name="ethiopian_month_13">Pagumien</string>
+  <string name="coptic_month_1">Thout</string>
+  <string name="coptic_month_2">Paopi</string>
+  <string name="coptic_month_3">Hathor</string>
+  <string name="coptic_month_4">Koiak</string>
+  <string name="coptic_month_5">Tobi</string>
+  <string name="coptic_month_6">Meshir</string>
+  <string name="coptic_month_7">Paremhat</string>
+  <string name="coptic_month_8">Parmouti</string>
+  <string name="coptic_month_9">Pashons</string>
+  <string name="coptic_month_10">Paoni</string>
+  <string name="coptic_month_11">Epip</string>
+  <string name="coptic_month_12">Mesori</string>
+  <string name="coptic_month_13">Pi Kogi Enavot</string>
+  <string name="islamic_month_1">Muharram</string>
+  <string name="islamic_month_2">Safar</string>
+  <string name="islamic_month_3">Rabi\' al-awwal</string>
+  <string name="islamic_month_4">Rabi\' al-thani</string>
+  <string name="islamic_month_5">Jumada al-awwal</string>
+  <string name="islamic_month_6">Jumada al-thani</string>
+  <string name="islamic_month_7">Rajab</string>
+  <string name="islamic_month_8">Sha\'ban</string>
+  <string name="islamic_month_9">Ramadan</string>
+  <string name="islamic_month_10">Shawwal</string>
+  <string name="islamic_month_11">Dhu al-Qidah</string>
+  <string name="islamic_month_12">Dhu al-Hijjah</string>
+  <string name="persian_month_1">Farvardin</string>
+  <string name="persian_month_2">Ordibehesht</string>
+  <string name="persian_month_3">Khordad</string>
+  <string name="persian_month_4">Tir</string>
+  <string name="persian_month_5">Mordad</string>
+  <string name="persian_month_6">Shahrivar</string>
+  <string name="persian_month_7">Mehr</string>
+  <string name="persian_month_8">Aban</string>
+  <string name="persian_month_9">Azar</string>
+  <string name="persian_month_10">Dey</string>
+  <string name="persian_month_11">Bahman</string>
+  <string name="persian_month_12">Esfand</string>
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
+  <string name="custom_date">%1$s (%2$s)</string>
   <!--Displayed when a form media file such as an image for a question label or an audio file for a choice is invalid-->
-  <string name="file_invalid">Datoteka %s je napačna.</string>
+  <string name="file_invalid">Datoteka %s je neveljavna.</string>
   <!--Displayed when a form media file such as an image for a question label or an audio file for a choice is missing-->
   <string name="file_missing">Ne najdem datoteke %s.</string>
   <!--Heading for a dialog which prompts the user to identify themselves when making changes to data. See https://docs.getodk.org/form-audit-log/#enumerator-identification.-->
+  <string name="enter_identity">Vnesite identiteto</string>
   <!--Label for prompt for the user to identify themselves when making changes to data. See https://docs.getodk.org/form-audit-log/#enumerator-identification.-->
+  <string name="identity">Identiteta</string>
   <!--Explanation for prompt for the user to identify themselves when making changes to data. See https://docs.getodk.org/form-audit-log/#enumerator-identification.-->
+  <string name="enter_identity_description">Ta obrazec zahteva, da se identificirate.</string>
   <!--Action to close a full screen dialog-->
+  <string name="close">Zapri</string>
   <!--Heading for a dialog which prompts the user to describe why a change was made to data. See https://docs.getodk.org/form-audit-log/#change-tracking.-->
+  <string name="reason_for_changes">Razlog za spremembe</string>
   <!--Label for prompt for the user to describe why a change was made to data. See https://docs.getodk.org/form-audit-log/#change-tracking.-->
+  <string name="reason">Razlog</string>
   <!--Explanation for prompt for the user to describe why a change was made to data. See https://docs.getodk.org/form-audit-log/#change-tracking.-->
+  <string name="reason_for_changes_description">Morate pojasniti razlog za spremembe tega obrazca.</string>
   <!--Action to save the contents of a full screen dialog-->
+  <string name="save">Shrani</string>
   <!--Button text to select a place from a list presented on a map-->
+  <string name="select_place">Izberite lokacijo</string>
+  <string name="choices">Možnosti</string>
   <!--##############################################
     # GEO
     ##############################################-->
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <string name="openmap_usgs_topo">USGS National Map Topo</string>
+  <string name="openmap_usgs_sat">USGS National Map Hybrid</string>
+  <string name="openmap_usgs_img">USGS National Map Imagery</string>
+  <string name="openmap_cartodb_positron">CartoDB Positron</string>
+  <string name="openmap_cartodb_darkmatter">CartoDB Dark Matter</string>
+  <string name="basemap">Basemap</string>
+  <string name="basemap_source">Vir</string>
+  <string name="basemap_source_unavailable">Oprostite, %s temeljne karte niso na voljo na tem napravi. Prosimo, izberite drugo temeljno karto v Nastavitve &gt; Zemljevidi.</string>
+  <string name="map_style_label">%s slog zemljevida</string>
+  <string name="streets">Ulice</string>
+  <string name="terrain">Teren</string>
+  <string name="hybrid">Hibrid</string>
   <string name="satellite">Satelit</string>
+  <string name="light" tools:ignore="UnusedResources">Svetlost</string>
+  <string name="dark" tools:ignore="UnusedResources">Temnost</string>
+  <string name="outdoors" tools:ignore="UnusedResources">Na prostem</string>
+  <string name="topographic">Topografsko</string>
+  <string name="google_play_services_error_occured">Ne morem dostopati do Google Maps. Je nameščen Google Play Services?</string>
+  <string name="carto_map_style_positron">Positron</string>
+  <string name="carto_map_style_dark_matter">Dark Matter</string>
+  <!--Title for the reference layer section of settings-->
+  <string name="reference_layer">Referenčni sloj</string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
+  <string name="record_geopoint">Posnemi točko</string>
+  <string name="location_accuracy">Natančnost je %1$s m</string>
+  <string name="location_provider">Ponudnik lokacije: %s</string>
   <string name="provider_disabled_error">Ponudniki lociranja so onemogočeni!</string>
+  <string name="gps_result">Zemljepisna širina: %1$s\nZemljepisna dolžina: %2$s\nNadmorska višina: %3$sm\nNatančnost: %4$sm</string>
+  <string name="google_play_services_not_available">Ta obrazec želi uporabiti vašo lokacijo, vendar storitve Google Play niso na voljo.</string>
+  <string name="location_providers_disabled_dialog_message">Ta obrazec želi uporabiti vašo lokacijo, vendar so ponudniki lokacije onemogočeni. Prosimo, omogočite jih v nastavitvah Androida.</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
+  <string name="go_to_settings">Pojdite v nastavitve</string>
   <!--Displayed in the form filling menu when a form has background location enabled-->
+  <string name="track_location_on">Sledenje lokaciji: vklopljeno</string>
   <!--Displayed in the form filling menu when a form has background location disabled-->
+  <string name="track_location_off">Sledenje lokaciji: izklopljeno</string>
+  <string name="background_location_disabled">Ta obrazec želi slediti vaši lokaciji, vendar je sledenje onemogočeno. Prosimo, omogočite ga v meniju %1$s zgoraj.</string>
+  <string name="background_location_enabled">Ta obrazec sledi vaši lokaciji. Sledenje lahko onemogočite v meniju %1$s zgoraj.</string>
   <!--Text of an option available when filling out a form. Tapping this option checks the form for constraint or required violations and navigates the user back to the first field with an error.-->
+  <string name="validate">Preveri napake</string>
   <!--%1$s is the time taken so far in hh:mm:ss-->
+  <string name="time_elapsed">Pretečen čas: %1$s</string>
   <!--%1$s is the accuracy required for a point to be automatically saved-->
+  <string name="point_will_be_saved">Točka bo shranjena pri %1$s</string>
   <!--%1$s is the number of satellites being used to get location-->
+  <string name="satellites">Sateliti: %1$s</string>
+  <string name="waiting_for_location">Pridobivam lokacijo. Prosim, počakajte.</string>
+  <string name="poor_accuracy">Slaba natančnost. Prosim, počakajte.</string>
+  <string name="unacceptable_accuracy">Nesprejemljiva natančnost. Prosim, počakajte.</string>
+  <string name="improving_accuracy">Izboljšujem natančnost. Počakajte, prosim.</string>
+  <string name="accuracy_status_title">Pridobivam lokacijo</string>
   <!--The accuracy of a location fix in meters-->
+  <string name="accuracy_m">%1$sm</string>
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in W 18°48'8"-->
   <string name="west">Z %1$s%2$s%3$s</string>
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
@@ -218,23 +441,76 @@
   <string name="south">J %1$s%2$s%3$s</string>
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
   <string name="north">S %1$s%2$s%3$s</string>
+  <string name="geoshape_title">GeoShape</string>
+  <string name="input_method">Vhodna metoda</string>
   <string name="start">Začni</string>
   <string name="enable_gps">Omogoči GPS</string>
+  <string name="geotrace_title">GeoTrace</string>
+  <string name="gps_enable_message">GPS v napravi je onemogočen. Želite omogočiti?</string>
   <string name="geo_clear_warning">Funkcija je že narejena. Želite izbrisati funkcijo?</string>
   <string name="geo_exit_warning">Želite zavreči spremembe in se vrniti v ODK?</string>
+  <string name="polygon_validator">Potrebne so vsaj 3 točke za ustvarjenje poligona</string>
+  <string name="polyline_validator">Potrebne so vsaj 2 točki za polilinijo</string>
   <string name="clear">Počisti</string>
+  <string name="placement_mode">Določitev z dotikom</string>
+  <string name="manual_mode">Ročno beleženje lokacije</string>
+  <string name="automatic_mode">Samodejno beleženje lokacije</string>
+  <string name="recording_interval">Interval beleženja:</string>
   <!--Used to display choices for location recording interval in geotrace and geoshape questions-->
+  <plurals name="number_of_seconds">
+    <item quantity="one">%d sekunda</item>
+    <item quantity="two">%d sekundi</item>
+    <item quantity="few">%d sekund</item>
+    <item quantity="other">%d sekund</item>
+  </plurals>
   <!--Used to display choices for location recording interval in geotrace and geoshape questions-->
+  <plurals name="number_of_minutes">
+    <item quantity="one">%d minuta</item>
+    <item quantity="two">%d minuti</item>
+    <item quantity="few">%d minut</item>
+    <item quantity="other">%d minut</item>
+  </plurals>
+  <string name="accuracy_requirement">Zahtevana natančnost:</string>
+  <string name="none">Brez</string>
   <!--Used to display choices for accuracy requirements in geotrace and geoshape questions-->
+  <plurals name="number_of_meters">
+    <item quantity="one">%d meter</item>
+    <item quantity="two">%d metra</item>
+    <item quantity="few">%d metrov</item>
+    <item quantity="other">%d metrov</item>
+  </plurals>
+  <string name="location_status_searching">Pridobivanje lokacije, prosimo počakajte …</string>
+  <string name="location_status_accuracy">Natančnost lokacije: %.2f m</string>
+  <string name="location_status_acceptable">Natančnost lokacije: %.2f m (sprejemljivo)</string>
+  <string name="location_status_unacceptable">Natančnost lokacije: %.2f m (nesprejemljivo)</string>
+  <string name="collection_status_paused">Vnesene točke: %d</string>
+  <string name="collection_status_placement">Vnesene točke: %d (tapnite za postavitev točk)</string>
+  <string name="collection_status_manual">Vnesene točke: %d (ročno beleženje)</string>
+  <string name="collection_status_auto_seconds">Vnesene točke: %1$d (snemanje vsakih %2$d sekund)</string>
+  <string name="collection_status_auto_minutes">Vnesene točke: %1$d (snemanje vsakih %2$d min)</string>
+  <string name="collection_status_auto_seconds_accuracy">Vnesene točke: %1$d (snemanje vsakih %2$d sekund, natančnost %3$d m)</string>
+  <string name="collection_status_auto_minutes_accuracy">Vnesene točke: %1$d (snemanje vsakih %2$d min, natančnost %3$d m)</string>
+  <string name="geopoint_instruction">Dolgi pritisk za postavitev oznake ali tapnite gumb za dodajanje oznake.</string>
+  <string name="geopoint_no_draggable_instruction">Pritisni gumb za označevanje.</string>
   <string name="discard">Zavrzi</string>
+  <string name="select_item_count">%s: %d (%d prikazano na zemljevidu)</string>
+  <string name="select_item">Izberi</string>
+  <string name="new_item">Nov element</string>
   <!--Name of an action button-->
+  <string name="edit_data">Uredi osnutek</string>
+  <string name="view_data">Ogled shranjenega obrazca</string>
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
+  <string name="location_tracking_notification_channel_name">Sledenje lokaciji</string>
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <string name="location_tracking_notification_title">Beležim lokacijo…</string>
   <!--Description for button that zooms to the user's current location on a map-->
+  <string name="show_my_location">Pokaži mojo lokacijo</string>
   <!--Description for button that zooms a map so that it shows all items-->
+  <string name="zoom_to_fit_all">Prikaži vse</string>
   <!--Description for button that pauses automatic location recording-->
+  <string name="pause_location_recording">Premor</string>
   <!--Description for button that removes the last recorded point-->
+  <string name="remove_last_point">Odstrani zadnjo točko</string>
   <!--##############################################
     # SEND FINALIZED FORM
     ##############################################-->
@@ -252,6 +528,10 @@
   <string name="show_sent_and_unsent_forms">Pokaži poslane in neposlane obrazce</string>
   <string name="show_unsent_forms">Pokaži neposlane obrazce</string>
   <string name="send_in_progress">Pošiljanja se izvaja v ozadju, prosim poskusite znova cez malo časa</string>
+  <string name="forms_upload_succeeded">Obrazci so bili uspešno poslani.</string>
+  <string name="forms_upload_failed">Obrazci niso bili poslani.</string>
+  <string name="all_uploads_succeeded">Vsi prenosi so uspeli!</string>
+  <string name="some_uploads_failed">%1$s od %2$s pošiljanj ni uspelo!</string>
   <!--##############################################
     # GET BLANK FORM
     ##############################################-->
@@ -261,18 +541,37 @@
   <string name="fetching_file">Pridobivam %1$s.\n\nObrazec %2$s od %3$sobrazcev.</string>
   <string name="form_download_progress">%1$s. Pridobivam medijske datoteke: %2$s od %3$s</string>
   <string name="version">Verzija:</string>
+  <string name="form_updates_available">Na voljo so posodobitve obrazca</string>
+  <string name="newer_version_of_a_form_info">To je novejša verzija že prenešenega obrazca</string>
+  <string name="form_update_error">Posodobitev obrazca ni uspela.</string>
+  <string name="form_update_succeeded">Obrazec je bil uspešno posodobljen.</string>
+  <string name="load_remote_form_error">Seznam obrazcev ni bilo mogoče prenesti.</string>
+  <string name="forms_download_succeeded">Obrazci so bili uspešno preneseni.</string>
+  <string name="forms_download_failed">Obrazci niso bili preneseni.</string>
+  <string name="all_downloads_succeeded">Vsi prenosi so uspeli!</string>
+  <string name="some_downloads_failed">%1$s od %2$s prenosov ni uspelo!</string>
   <!--Part of form download dialog. Clicking it displays additional information about a form that failed-->
+  <string name="form_details">ID: %1$s Različica: %2$s</string>
   <!--##############################################
     # GET BLANK FORM - ERROR MESSAGES
     ##############################################-->
+  <string name="report_to_project_lead">Če se vam težave večkrat ponavljajo, jih sporočite osebi, ki vas je prosila, da zbirate podatke.</string>
   <!--Displayed in error dialog for form downloads. Followed by instructions to talk to person who asked to collect data-->
+  <string name="unreachable_error">Collect ne more doseči strežnika na %s. Ste pravilno vnesli URL?</string>
   <!--Displayed in error dialog for form downloads. Followed by instructions to talk to person who asked to collect data-->
+  <string name="security_error">Collect se ne more varno povezati s strežnikom na %s. Ste pravilno vnesli URL?</string>
   <!--Displayed in error dialog for form downloads. Followed by instructions to talk to person who asked to collect data-->
+  <string name="server_error">Strežnik %1$s je vrnil kodo stanja %2$s.</string>
   <!--Displayed in error dialog for form downloads. Followed by instructions to talk to person who asked to collect data-->
+  <string name="invalid_response">Strežnik %s je posredoval neveljaven odgovor.</string>
   <!--Displayed in error dialog for form downloads. Followed by instructions to talk to person who asked to collect data-->
+  <string name="form_with_no_hash_error">Strežnik ni zagotovil hasha za ta obrazec.</string>
   <!--Displayed in error dialog for form downloads. Followed by instructions to talk to person who asked to collect data-->
+  <string name="form_parsing_error">Ta obrazec ne more biti sprocesiran.</string>
   <!--Displayed in error dialog for form downloads. Followed by instructions to talk to person who asked to collect data-->
+  <string name="form_save_disk_error">Pri prenosu tega obrazca je prišlo do napake na napravi.</string>
   <!--Displayed in error dialog for form downloads. Followed by instructions to talk to person who asked to collect data-->
+  <string name="form_with_invalid_submission_error">Ta obrazec ima neveljaven URL za oddajo.</string>
   <!--##############################################
     # DELETE SAVED FORM
     ##############################################-->
@@ -284,35 +583,57 @@
   <string name="delete_file">Izbriši izbrano</string>
   <string name="delete_no">Ne briši</string>
   <string name="delete_yes">Izbriši obrazce</string>
-    <string name="form_delete_message">Izbriši izbrane obrazce</string>
+  <string name="form_delete_message">Izbriši izbrane obrazce</string>
   <string name="file_deleted_ok">%s obrazcev uspešno zbrisanih!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
+  <string name="project_settings">Nastavitve projekta</string>
   <!--Title of a settings section-->
+  <string name="server_settings_title">Strežnik</string>
   <!--Subtext of a settings section-->
+  <string name="server_settings_subtext">URL, uporabniško ime, geslo</string>
   <!--Title of a settings section-->
+  <string name="project_display_title">Prikaz projektov</string>
   <!--Subtext of a settings section-->
+  <string name="project_display_subtext">Ime, ikone, barve</string>
   <!--Title of a settings section-->
   <string name="client">Uporabniški vmesnik</string>
   <!--Subtext of a settings section-->
+  <string name="user_interface_settings_subtext">Jezik aplikacije, tema, velikost pisave</string>
   <!--Title of a settings section-->
+  <string name="maps">Zemljevidi</string>
   <!--Subtext of a settings section-->
+  <string name="maps_settings_subtext">Temeljne karte, stili, plasti</string>
   <!--Title of a settings section-->
+  <string name="form_management_preferences">Upravljanje obrazcev</string>
   <!--Subtext of a settings section-->
+  <string name="form_management_settings_subtext">Samodejno posodabljanje, pošiljanje in brisanje</string>
   <!--Title of a settings section-->
+  <string name="user_and_device_identity_title">Identiteta uporabnika in naprave</string>
   <!--Subtext of a settings section-->
+  <string name="user_and_device_identity_settings_subtext">Uporabniško ime, telefonska številka, ID naprave</string>
   <!--Title of a settings section only available in beta or development builds.-->
+  <string name="experimental">Eksperimentalno</string>
+  <string name="protected_settings">Zaščiteno</string>
   <!--Title of a settings section-->
+  <string name="unlock_protected_settings_section_title">Odkleni zaščitene nastavitve</string>
   <!--Subtext of a settings section-->
+  <string name="unlock_protected_settings_section_subtext">Spremenite geslo, nastavite nadzor dostopa</string>
+  <string name="set_admin_password">Nastavi skrbniško geslo</string>
   <!--Title of a settings section-->
+  <string name="project_management_section_title">Upravljanje projektov</string>
   <!--Subtext of a settings section-->
+  <string name="project_management_section_subtext">Ponovno nastavi, ponastavi, izbriši</string>
   <!--Title of a settings section-->
+  <string name="access_control_section_title">Nadzor dostopa</string>
   <!--Subtext of a settings section-->
+  <string name="access_control_section_subtext">Omejitve uporabniškega vmesnika</string>
   <string name="server_preferences">Nastavitve strežnika</string>
   <!--Label for server type setting-->
   <string name="server_url">URL</string>
   <!--Title of dialog for configuring server URL-->
+  <string name="change_server_url">Strežnik URL</string>
   <string name="url_error">Napaka, neveljaven URL!</string>
   <string name="username">Uporabniško ime</string>
   <string name="change_username">ODK uporabniško ime</string>
@@ -323,7 +644,9 @@
   <string name="app_theme">Tema</string>
   <string name="theme_light">Svetla tema</string>
   <string name="theme_dark">Temna tema</string>
+  <string name="theme_system">Uporabi temo naprave</string>
   <string name="language">Jezik</string>
+  <string name="use_device_language">Uporabi jezik naprave</string>
   <string name="font_size">Velikost črk</string>
   <string name="change_font_size">Velikost črk</string>
   <string name="font_size_extra_large">Extra veliko</string>
@@ -338,12 +661,19 @@
   <!--Text for navigation button showed at the bottom of a form that's being filled. Try to use a short word common for navigation.-->
   <string name="form_forward">Naprej</string>
   <!--Text for navigation button showed at the bottom of a form that's being filled. Try to use a short word common for navigation.-->
+  <string name="form_backward">Nazaj</string>
   <!--Heading for the settings category about updating blank forms-->
+  <string name="form_update_category">Posodobitev obrazcev</string>
   <!--Name of the setting that defines how blank forms are updated from the server.-->
+  <string name="form_update_mode_title">Posodobitve praznih obrazcev</string>
   <!--One of the possible settings values for "Blank form update mode". Manual update mode means forms have to be explicitly downloaded from Get Blank Forms.-->
+  <string name="manual">Ročno</string>
   <!--One of the possible settings values for "Blank form update mode". "Previously downloaded" update mode means forms that have been manually downloaded will be kept up to date.-->
+  <string name="previously_downloaded_only">Samo obstoječi obrazci</string>
   <!--One of the possible settings values for "Blank form update mode". "Exactly match server" update mode means that new forms or form updates on the server will be downloaded and forms that the server doesn't know about will be removed.-->
+  <string name="match_exactly">Strogo usklajevanje obrazcev s stanjem na strežniku</string>
   <!--Name of the setting that defines how often blank forms are updated from the server.-->
+  <string name="form_update_frequency_title">Frekvenca samodejnih posodobitev</string>
   <!--Frequency for requesting blank form updates from the server-->
   <string name="every_fifteen_minutes">Vsakih petnajst minut</string>
   <!--Frequency for requesting blank form updates from the server-->
@@ -356,25 +686,59 @@
   <string name="automatic_download">Samodejni prenos</string>
   <string name="automatic_download_summary">Samodejno prenesi posodobljene različice obrazcev</string>
   <string name="hide_old_form_versions_setting_title">Skrij stare različice obrazca</string>
+  <string name="hide_old_form_versions_setting_summary">Prikazana bo samo najnovejša različica v seznamu praznih obrazcev.</string>
   <string name="form_submission_category">Predložitev obrazca</string>
   <string name="autosend_selector_title">Samodejno pošlji</string>
   <string name="autosend">Samodejno pošlji</string>
+  <string name="off">Izključeno</string>
   <string name="wifi_autosend">Samo WiFi</string>
   <string name="cellular_autosend">Samo mobilno omrežje</string>
   <string name="wifi_cellular_autosend">WiFi ali mobilno omrežje</string>
+  <string name="delete_after_send">Izbriši po pošiljanju</string>
+  <string name="delete_after_send_summary">Izbriše zaključene obrazce in medijske datoteke iz naprave po pošiljanju na strežnik.</string>
+  <string name="form_filling_category">Izpolnjevanje obrazca</string>
+  <string name="constraint_behavior_title">Omejitve procesiranja</string>
   <string name="constraint_behavior">Način obravnave omejitev</string>
   <string name="constraint_behavior_on_swipe">Ovrednoti ob potegu naprej</string>
   <string name="constraint_behavior_on_finalize">Zadrži vrednotenje do zaključka</string>
+  <string name="high_resolution_title">Visoko-resolucijski video</string>
   <string name="high_resolution_summary">Omogoči video zapis visoke resolucije</string>
+  <string name="image_size_title">Velikost slike</string>
+  <string name="image_size_dialog_title">Največje število pikslov na daljši stranici slike</string>
+  <string name="image_size_large">Velika (3072px)</string>
+  <string name="image_size_medium">Srednja (2048px)</string>
+  <string name="image_size_small">Majhna (1024px)</string>
+  <string name="image_size_very_small">Zelo majhna (640px)</string>
+  <string name="image_size_original">Izvirna velikost iz kamere (privzeto)</string>
   <!--Name of setting for enabling guidance hints while filling forms. Guidance hints are meant for training or other specialized contexts.-->
+  <string name="guidance_hint_title">Pokaži navodila za vprašanja</string>
+  <string name="guidance_no">Ne</string>
+  <string name="guidance_yes">Da - vedno prikazano</string>
   <!--Guidance hints can be displayed behind an icon that must be tapped to reveal the hint.-->
+  <string name="guidance_yes_collapsed">Da - skrito</string>
   <!--Title for setting to let the user switch between using Collect or another app (on the device) for recording audio-->
+  <string name="external_app_recording">Uporabite zunanjo aplikacijo za snemanje zvoka</string>
+  <string name="form_import_category">Uvoz obrazcev</string>
+  <string name="instance_sync">Zaključi obrazec ob uvozu</string>
+  <string name="instance_sync_summary">Vpliva na obrazce, dodane neposredno v mapo.</string>
+  <string name="analytics_preferences">Podatki o uporabi</string>
   <string name="analytics">Zberi anonimne podatke o uporabi</string>
+  <string name="analytics_summary">Anonimni podatki o uporabi pomagajo ODK ekipi določiti prednost popravkov in funkcij.</string>
+  <string name="form_metadata_title">Metapodatki obrazca</string>
+  <string name="form_metadata">Metapodatki obrazca</string>
   <string name="form_metadata_summary">Vrednosti bodo dodane obrazcem, ki imajo uporabnisko ime, email ali telefonsko stevilko …</string>
+  <string name="user_defined">Določeno s strani uporabnika</string>
   <string name="phone_number">Telefonska številka</string>
+  <string name="email">E-poštni naslov</string>
+  <string name="invalid_email_address">Neveljaven e-poštni naslov!</string>
+  <string name="device_defined">Določeno z napravo</string>
+  <string name="device_id">ID naprave</string>
   <!--Displayed when a device property such as the phone number is not available-->
+  <string name="preference_not_available">Ni na voljo</string>
   <!--Label for an item displayed in the project settings menu to unlock settings-->
+  <string name="unlock_settings">Odkleni nastavitve</string>
   <!--Label for an item displayed in the project settings menu to indicate that settings are unlocked-->
+  <string name="settings_unlocked">Nastavitve odklenjene</string>
   <!--##############################################
      # PROTECTED SETTINGS
      ##############################################-->
@@ -387,28 +751,85 @@
   <string name="change_admin_password">Spremeni Admin geslo</string>
   <string name="show_password">Pokaži geslo</string>
   <string name="found_in_main">Ne izberi da ne prikaže v Glavnem meniju</string>
+  <string name="found_in_settings">Ne odkljukaj, da ne prikažeš pri Splošnih nastavitvah</string>
+  <string name="form_entry">Ne odkljukaj, da ne prikažeš pri izpopolnjevanju obrazca</string>
+  <string name="form_end">Ne odkljukaj, da ne prikažeš pri zaključevanju obrazca</string>
   <string name="reset_project_settings_title">Resetiraj</string>
+  <string name="reset_project_settings_subtext">Izberite med nastavitvami, obrazci, podatki.</string>
+  <string name="delete_project">Izbriši</string>
+  <string name="select_all">Izberi vse</string>
   <string name="clear_all">Počisti vse.</string>
+  <string name="reset_settings">Vse nastavitve (notranje in določene s strani uporabnika)</string>
   <string name="reset_saved_forms">Shranjeni obrazci</string>
+  <string name="reset_blank_forms">Prazni obrazci (mapa obrazcev, baza podatkov, baza vprašanj)</string>
+  <string name="reset_layers">Sloji zemljevida (mapa slojev)</string>
+  <string name="reset_cache">Predpomnilnik obrazcev (mapa .predpomnilnika)</string>
+  <string name="reset_settings_dialog_title">Izberite, kaj želite ponastaviti.</string>
   <string name="reset_settings_button_reset">Resetiraj</string>
+  <string name="reset_in_progress">Ponastavljanje …</string>
+  <string name="reset_app_state_result">Ponastavi rezultate</string>
   <string name="reset_app_state_warning">Vsi izbrani podatki bodo trajno izbrisani. Razveljavitev ni mogoča.</string>
+  <string name="reset_settings_result">Vse nastavitve :: %s</string>
   <string name="reset_saved_forms_result">Shranjeni obrazci :: %s</string>
   <string name="reset_blank_forms_result">Prazni obrazci :: %s</string>
+  <string name="reset_layers_result">Sloji zemljevida :: %s</string>
+  <string name="reset_cache_result">Predpomnilnik obrazcev :: %s</string>
+  <string name="main_menu_settings">Glavni meni nastavitev</string>
+  <string name="main_menu_settings_summary">Pokaži ali skrij gumbe</string>
+  <string name="user_settings">Uporabniške nastavitve</string>
+  <string name="user_setting_summary">Pokaži ali skrij nastavitve</string>
   <string name="form_entry_setting">Nastavitve za vnos obrazca</string>
+  <string name="form_entry_settings_summary">Pokaži ali skrij dejanja</string>
   <!--Name of a setting that determines whether users can navigate backwards in a form-->
+  <string name="moving_backwards_title">Gibanje nazaj</string>
+  <string name="moving_backwards_disabled_title">Gibanje nazaj onemogočeno</string>
+  <string name="moving_backwards_disabled_message">Želite preprečiti uporabnikom, da bi zaobšli to nastavitev?\n\nSpremembe so: \n\u2022\u2022 Onemogoči urejanje osnutka \n\u2022 Onemogoči shranjevanje kot osnutek \n\u2022 Onemogoči prehod na poziv \n\u2022 Ovrednosti vprašanja ob premiku naprej</string>
+  <string name="yes">Da</string>
+  <string name="no">Ne</string>
+  <string name="moving_backwards_enabled_title">Gibanje nazaj omogočeno</string>
+  <string name="moving_backwards_enabled_message">Morda želite pregledati naslednje nastavitve:\n\n\u2022 Uredi osnutek\n\u2022 Shrani kot osnutek\n\u2022 Pojdi na poziv\n\u2022 Vrednotenje vprašanj</string>
   <!--Protected setting. When enabled, users are allowed to save forms while filling them. When disabled, users are only allowed to save forms when they reach their end-->
+  <string name="save_mid">Shrani kot osnutek</string>
+  <string name="save_mid_summary">Shrani ikona v zgornji vrstici in gumb \"Shrani kot osnutek\" ob izhodu iz obrazca</string>
   <!--##############################################
      # ABOUT
      ##############################################-->
+  <string name="about_preferences">O nas</string>
+  <string name="tell_your_friends">Delite ODK Collect.</string>
   <string name="tell_your_friends_msg">Ali vaši kolegi še vedno zbirajo podatke na papirju? Delite ODK Collect z njimi.</string>
+  <string name="leave_a_review">Oceni aplikacijo v Play Store.</string>
+  <string name="leave_a_review_msg">Vaša (upajmo pozitivna) ocena poveča vidnost aplikacije v Play Store.</string>
+  <string name="odk_website">Obiščite spletno stran ODK.</string>
+  <string name="odk_website_summary">ODK se uporablja za zbiranje podatkov za družbeno dobro v zahtevnih okoljih.</string>
+  <string name="odk_forum">Pridružite se ODK forumu</string>
+  <string name="odk_forum_summary">Pridružite se forumu, da dobite podporo, izrazite podporo novim funkcijam in sodelujete pri programiranju ali prevodih!</string>
+  <string name="all_open_source_licenses">Odprtokodne knjižnice/licence</string>
   <string name="all_open_source_licenses_msg">Stojimo na ramenih velikanov!</string>
   <!--##############################################
      # SETTINGS IMPORT
      ##############################################-->
+  <string name="reconfigure_with_qr_code_settings_title">Ponovno konfigurirajte s QR kodo</string>
+  <string name="reconfigure_with_qr_code_settings_subtext">Zamenjajte vse obstoječe nastavitve.</string>
+  <string name="qr_code">QR koda konfiguracija</string>
+  <string name="scan_qr_code_fragment_title">Skeniraj</string>
+  <string name="view_qr_code_fragment_title">QR koda</string>
+  <string name="import_qrcode_sd">Uvozi QR kodo</string>
   <string name="successfully_imported_settings">Nastavitve uspešno uvožene</string>
+  <string name="encoding_max_limit" tools:ignore="UnusedResources">Doseženo največje število znakov: QR koda ne more biti ustvarjena za vse nastavitve</string>
+  <string name="share">Deli</string>
   <string name="turn_on_flashlight">Vklopi svetilko</string>
   <string name="turn_off_flashlight">Izklopi svetilko</string>
+  <string name="qrcode_with_both_passwords">Vsebuje občutljive informacije: <b>admin</b> in <b>gesla za strežnik</b></string>
+  <string name="qrcode_without_passwords">QR koda ne vsebuje gesel za <b>admin</b> ali <b>server</b>. Tapnite za konfiguracijo.</string>
+  <string name="qrcode_with_admin_password">Vsebuje občutljive informacije: <b>admin</b> geslo</string>
+  <string name="qrcode_with_server_password">Vsebuje občutljive informacije: <b>server</b> geslo</string>
   <string name="server_password">Geslo strežnika</string>
+  <string name="include_password_dialog">Gesla vključena v kodo</string>
+  <string name="generate">Generiraj</string>
+  <string name="invalid_qrcode">QR koda ne vsebuje veljavnih nastavitev</string>
+  <string name="qr_code_not_found">QR koda ni bila najdena na izbrani sliki.</string>
+  <string name="corrupt_imported_preferences_error">Trenutne nastavitve so poškodovane. Iz nastavitev upravljanja projekta ponastavite nastavitve ali uvozite delujoče.</string>
+  <string name="settings_with_gd_protocol">Google Drive/Sheets projekti niso več na voljo</string>
   <!--##############################################
      # MISC
      ##############################################-->
@@ -420,6 +841,7 @@
   <string name="do_not_change">Prekini</string>
   <string name="do_not_exit">Prekini</string>
   <string name="canceling">Prekinjam</string>
+  <string name="notification_channel_name">Splošna obvestila</string>
   <string name="success">Uspešno</string>
   <string name="error_occured">Nastala je napaka</string>
   <string name="please_wait">Malo počakaj, prosim.</string>
@@ -428,76 +850,228 @@
   <string name="fs_create_media_folder_error">Ne morem ustvariti medijsko mapo \'%s\'.</string>
   <string name="fs_file_copy_error">Ne morem kopirat \'%1$s\' preko \'%2$s\'. Razlog: %3$s.</string>
   <string name="survey_multiple_forms_error">Naložili ste dva različna obrazca z istim ID obrazca in verzijo. Izbrišite enega od obeh.</string>
+  <string name="select_odk_shortcut">Izberite bližnjico za dostop do ODK</string>
+  <string name="background_audio_help">Ta obrazec snema zvok preko mikrofona vaše naprave.\n\nZa zagotovitev, da je mikrofon dovolj blizu zvoku, ki ga želite posneti, lahko uporabite kazalnik glasnosti.\n\nZa ustavitev snemanja zapustite ta obrazec.\n\nZa več informacij se obrnite na osebo, ki vas je prosila za zbiranje podatkov.</string>
+  <string name="loading">Nalaganje …</string>
   <!--##############################################
      # Projects
      ##############################################-->
+  <string name="projects">Projekti</string>
+  <string name="settings">Nastavitve</string>
+  <string name="add_project">Dodaj projekt</string>
+  <string name="add">Dodaj</string>
   <!--Title of the dialog shown when attempting to create a project with connection settings that match an existing project-->
+  <string name="duplicate_project">Podvoji projekt</string>
   <!--Detail text of the dialog shown when attempting to create a project with connection settings that match an existing project-->
+  <string name="duplicate_project_details">Projekt s temi nastavitvami povezave že obstaja? Ali želite preklopiti na obstoječi projekt ali dodati novega?</string>
   <!--Button text for adding a duplicate project-->
+  <string name="add_duplicate_project">Dodaj podvojen projekt</string>
   <!--Buton text for switching to an existing project-->
+  <string name="switch_to_existing">Preklopi na obstoječi projekt</string>
+  <string name="project_name">Ime projekta</string>
+  <string name="project_icon">Ikona projekta</string>
+  <string name="project_color">Barva projekta</string>
   <!--Toast text shown when the current project is changed-->
+  <string name="switched_project">Preklopil na %s</string>
   <!--Description for screen readers of which project is in use. This is part of the project selection dialog-->
+  <string name="using_project">Uporablja se %s</string>
   <!--Description for screen readers of the action to switch to a different existing project. This is part of the project selection dialog-->
+  <string name="switch_to_project">Preklopi na %s</string>
+  <string name="delete_project_confirm_message">Vsi prazni in poslani zaključeni obrazci ter nastavitve bodo trajno izbrisane.</string>
+  <string name="delete_project_yes">Da</string>
+  <string name="delete_project_no">Ne</string>
+  <string name="cannot_delete_project_title">Projekt se ne da izbrisati</string>
+  <string name="cannot_delete_project_message_one">Imate nesposlane zaključene obrazce. Za izbris projekta morate najprej poslati ali izbrisati te obrazce.</string>
+  <string name="cannot_delete_project_message_two">Procesiram naloge v ozadju. Prosimo, poskusite znova kasneje.</string>
+  <string name="or">ALI</string>
+  <string name="hex_color">Hex barva</string>
+  <string name="invalid_hex_code">Neveljaven hex koda</string>
   <!--##############################################
      # First launch and initial configuration
      ##############################################-->
   <!--Tag line displayed on the first launch screen. The text should be split into two lines with \n. Please
     select the wording and where to put the \n for maximum impact in your language.-->
+  <string name="tagline">Zbiraj podatke\nkjer koli</string>
   <!--Text for the button that allows for configuring a project by scanning a QR code. Should be short-->
+  <string name="configure_with_qr_code">Nastavi z QR kodo</string>
   <!--Text for the button that allows for manually entering project details. Should be short-->
+  <string name="configure_manually">Ročno vnesi projekt</string>
+  <string name="project_config_tip">Po dodajanju projekta ga lahko konfigurirate v Nastavitvah.</string>
   <!--Immediately followed by "Try Collect" which is a link to create a demo project-->
+  <string name="dont_have_project">Še nimate projekta?</string>
   <!--Preceded by "Don't have a project yet?" question-->
+  <string name="try_demo">Poskusite demo.</string>
+  <string name="scan_configuration_qr_code">Skenirajte konfiguracijsko QR kodo</string>
   <!--Error shown when a user tries to open a form that's in a different project-->
+  <string name="wrong_project_selected_for_form">Za odprtje tega obrazca morate najprej odpreti ODK Collect in preklopiti na projekt, ki ga vsebuje.</string>
   <!--Error shown when a user tries to open a form when there are no projects-->
+  <string name="app_not_configured">ODK Collect ni bil pravilno konfiguriran. Poskusite odpreti ODK Collect in ga konfigurirati.\n\nČe ste tapnili na bližnjico, jo boste morda morali ponovno ustvariti po konfiguriranju ODK Collect.</string>
   <!--##############################################
     # Errors
     ##############################################-->
+  <string name="show_details">Pokaži podrobnosti</string>
+  <string name="errors">Napake</string>
   <!--##############################################
     # Permissions
     ##############################################-->
+  <string name="open_settings">Odpri nastavitve</string>
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <string name="entities_title">Entitete</string>
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
+  <string name="crash_last_run">Ob zadnjem delovanju aplikacije je prišlo do kritične napake in zaustavitve aplikacije!</string>
+  <string name="cant_start_app">Ne morem zagnati aplikacije!</string>
   <!--##############################################
     # Google Drive deprecation
     ##############################################-->
+  <string name="google_drive_removed_message">Ta projekt je bil v preteklosti povezan z računom Google Drive. Podpora za Google Drive je bila odstranjena. Lahko ponastavite strežnik ali prenesete izpolnjene obrazce na računalnik.</string>
+  <string name="learn_more_button_text">Preberi več</string>
   <!--##############################################
     # Developer tools
     ##############################################-->
   <!--Section title in settings-->
+  <string name="dev_tools">Razvijalska orodja</string>
   <!--Option provided in the Developer tools settings to force an application crash-->
+  <string name="crash_app">Prisilno zaustavi aplikacijo</string>
   <!--An uncaught exception is an exception that is not handled by ODK Collect and so will force the application to close-->
+  <string name="crash_app_summary">Neujeta napaka zaustavila aplikacijo</string>
+  <string name="permission_dialog_title">O dovoljenjih</string>
+  <string name="permission_dialog_text">Če želite dovoliti dostop ODK Collect do spodaj navedenih funkcij, izberite \"dovoli\", če jih želite uporabljati.</string>
+  <string name="notifications">Obvestila</string>
+  <string name="required_for_notifications">Potrebno za prikaz posodobitev, ko se obrazci prenesejo, posodobijo in pošljejo.</string>
   <!--##############################################
     # Form saved Snackbar
     ##############################################-->
+  <string name="form_saved_as_draft">Vaš obrazec je bil shranjen kot osnutek.</string>
+  <string name="form_saved">Vaš obrazec je bil shranjen.</string>
+  <string name="form_sending">Pošiljam obrazec…</string>
+  <string name="edit_form">Uredi</string>
+  <string name="view_form">Poglej</string>
+  <string name="close_snackbar">Zapri snackbar</string>
   <!--##############################################
     # Forms ready to send banner
     ##############################################-->
+  <plurals name="last_form_sent_seconds_ago">
+    <item quantity="one">Zadnji obrazec poslan: %d sekundo nazaj</item>
+    <item quantity="two">Zadnji obrazec poslan: %d sekundi nazaj</item>
+    <item quantity="few">Zadnji obrazec poslan: %d sekund nazaj</item>
+    <item quantity="other">Zadnji obrazec poslan: %d sekund nazaj</item>
+  </plurals>
+  <plurals name="last_form_sent_minutes_ago">
+    <item quantity="one">Zadnji obrazec poslan: %d minuto nazaj</item>
+    <item quantity="two">Zadnji obrazec poslan: %d minuti nazaj</item>
+    <item quantity="few">Zadnji obrazec poslan: %d minut nazaj</item>
+    <item quantity="other">Zadnji obrazec poslan: %d minut nazaj</item>
+  </plurals>
+  <plurals name="last_form_sent_hours_ago">
+    <item quantity="one">Zadnji obrazec poslan: %d uro nazaj</item>
+    <item quantity="two">Zadnji obrazec poslan: %d uri nazaj</item>
+    <item quantity="few">Zadnji obrazec poslan: %d ur nazaj</item>
+    <item quantity="other">Zadnji obrazec poslan: %d ur nazaj</item>
+  </plurals>
+  <plurals name="last_form_sent_days_ago">
+    <item quantity="one">Zadnji obrazec poslan: %d dan nazaj</item>
+    <item quantity="two">Zadnji obrazec poslan: %d dni nazaj</item>
+    <item quantity="few">Zadnji obrazec poslan: %d dni nazaj</item>
+    <item quantity="other">Zadnji obrazec poslan: %d dni nazaj</item>
+  </plurals>
+  <plurals name="forms_ready_to_send">
+    <item quantity="one">%d obrazec pripravljen za pošiljanje</item>
+    <item quantity="two">%d obrazca pripravljena za pošiljanje</item>
+    <item quantity="few">%d obrazcev pripravljenih za pošiljanje</item>
+    <item quantity="other">%d obrazcev pripravljenih za pošiljanje</item>
+  </plurals>
+  <string name="edit_finalized_form_warning" tools:ignore="UnusedResources">V kasnejših različicah zaključenih obrazcev ne bo več mogoče urejati. Obrazce shranite kot osnutke, če jih želite kasneje še spreminjati. \n\nLahko ovrednotiti morebitne napake pri izpolnjevanju obrazca tako, da tapnete tri pike (⋮) in nato Preveri napake.</string>
   <!--Message showed on main menu to inform users that the ability to edit finalized forms is going away-->
+  <string name="edit_finalized_form_deprecation_message" tools:ignore="UnusedResources">V kasnejših različicah zaključenih obrazcev ne bo več mogoče urejati.</string>
   <!--Label for Drafts list option that attempts to finalize all the drafts the user is currently looking at. Finalizing a draft locks it so it can't be edited and makes it eligible for autosend-->
+  <string name="finalize_all_drafts">Zaključite vse osnutke</string>
   <!--Dialog title that asks if the user wants to finalize all drafts-->
+  <plurals name="bulk_finalize_confirmation">
+    <item quantity="one">Ali želite dokončati %d osnutek?</item>
+    <item quantity="two">Želite dokončati %d osnutka?</item>
+    <item quantity="few">Želite dokončati %d osnutkov?</item>
+    <item quantity="other">Želite dokončati %d osnutkov?</item>
+  </plurals>
   <!--Explanation for how bulk finalize works shown in a dialog before the user confirms if they want to proceed or cancel-->
+  <string name="bulk_finalize_explanation">Ko zaključite osnutke, bodo v stanju \"Pripravljeni za pošiljanje\" in jih ne boste mogli več urejati. Vsi osnutki z napakami ne bodo zaključeni.\n\nTega dejanja ne boste mogli razveljaviti.</string>
   <!--Message shown after bulk finalization when finalizing all drafts has succeeded-->
+  <plurals name="bulk_finalize_success">
+    <item quantity="one">Uspeh! %d osnutek je dokončan.</item>
+    <item quantity="two">Uspeh! %d osnutka sta dokončana.</item>
+    <item quantity="few">Uspeh! %d osnutkov je dokončanih.</item>
+    <item quantity="other">Uspeh! %d osnutkov je dokončanih.</item>
+  </plurals>
   <!--Message shown after bulk finalization when no drafts finalized successfully-->
+  <plurals name="bulk_finalize_failure">
+    <item quantity="one">%d osnutek ima napake, ki jih je treba odpraviti pred zaključitvijo.</item>
+    <item quantity="two">%d osnutka imata napake, ki jih je treba odpraviti pred zaključitvijo.</item>
+    <item quantity="few">%d osnutkov ima napake, ki jih je treba odpraviti pred zaključitvijo.</item>
+    <item quantity="other">%d osnutkov ima napake, ki jih je treba odpraviti pred zaključitvijo.</item>
+  </plurals>
   <!--Message shown after bulk finalization when some drafts finalize successfully and others fail-->
+  <string name="bulk_finalize_partial_success">%d osnutkov je dokončanih. %d osnutkov ima napake, ki jih je treba odpraviti pred zaključitivijo.</string>
   <!--Message shown when some drafts finalize successfully but others need to be finalized manually-->
+  <string name="bulk_finalize_unsupported">%d osnutkov zaključenih. Preostale osnutke bo potrebno zaključiti ročno.</string>
   <!--Displayed above a draft that has constraints that aren't met or required questions that aren't answered or both. Should match the wording for the 'Check for errors' feature.-->
+  <string name="draft_errors">Napake</string>
   <!--Displayed above a draft that has no constraint violations and in which all required questions have been answered. Should match the wording for the 'Check for errors' feature.-->
+  <string name="draft_no_errors">Brez napak</string>
   <!--Title of section of features that the user can uncheck to hide from the Drafts screen-->
+  <string name="uncheck_to_hide_from_drafts">Odkljukajte, da ne prikazujete v osnutkih</string>
   <!--Title for dialog explaining the drafts marked with "Error" shown to the user the first time they view the Drafts screen-->
+  <string name="new_feature">Nova funkcionalnost</string>
   <!--Message for dialog explaining the drafts marked with "Error" shown to the user the first time they view the Drafts screen-->
+  <string name="drafts_pills_education_message">Seznam osnutekov zdaj prikazuje zaznane napake. Vsakič, ko obrazec shranite kot osnutek, se izpolnjeni odgovori ponovno preverijo. \n\nOsnutki, označeni z \"Napake\", imajo manjkajoča zahtevana vprašanja ali imajo vrednosti, ki niso dovoljene.</string>
   <!--Message displayed when the list of questions is empty-->
+  <string name="empty_list_of_questions">Ničesar ni na voljo za prikaz</string>
   <!--Message displayed when the list of blank forms is empty-->
+  <string name="empty_list_of_blank_forms_title">Brez praznih obrazcev</string>
   <!--Subtext displayed when the list of blank forms is empty-->
+  <string name="empty_list_of_blank_forms_subtitle">Prenesite obrazec, da začnete.</string>
   <!--Message displayed when the list of drafts is empty-->
+  <string name="empty_list_of_drafts_title">Ničesar ni v osnutkih</string>
   <!--Subtext displayed when the list of drafts is empty-->
+  <string name="empty_list_of_drafts_subtitle">Ko shranite obrazec kot osnutek, se bodo pojavili tukaj</string>
   <!--Message displayed when the list of ready to send forms is empty-->
+  <string name="empty_list_of_finalized_forms_title">Nič ni pripravljenega za pošiljanje</string>
   <!--Subtext displayed when the list of ready to send forms is empty-->
+  <string name="empty_list_of_finalized_forms_subtitle">Ko zaključite osnutke, se bodo pojavili tukaj</string>
   <!--Message displayed when the list of sent forms is empty-->
+  <string name="empty_list_of_sent_forms_title">Nič ni bilo poslano</string>
   <!--Subtext of message displayed when the list of sent forms is empty-->
+  <string name="empty_list_of_sent_forms_subtitle">Ko pošljete zaključene obrazce, se bodo pojavili tukaj</string>
   <!--Message displayed when the list of forms to download is empty-->
+  <string name="empty_list_of_forms_to_download_title">Brez obrazcev za prenos.</string>
+  <string name="empty_list_of_forms_to_download_subtitle">Prenesite obrazec, da začnete</string>
   <!--Message displayed when the list of forms to delete is empty-->
+  <string name="empty_list_of_forms_to_delete_title">Ni obrazcev za izbris</string>
   <!--Subtext displayed when the list of blank forms to delete is empty-->
+  <string name="empty_list_of_blank_forms_to_delete_subtitle">Ko boste prenesli prazne obrazce, se bodo pojavili tukaj</string>
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <string name="empty_list_of_saved_forms_to_delete_subtitle">Ko boste imeli shranjene obrazce, se bodo pojavili tukaj</string>
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Zavrzi</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-so/strings.xml b/strings/src/main/res/values-so/strings.xml
index 3c2897a1749..f4a49d2f405 100644
--- a/strings/src/main/res/values-so/strings.xml
+++ b/strings/src/main/res/values-so/strings.xml
@@ -99,6 +99,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
   <!--Displayed in the form filling menu when a form has background location disabled-->
@@ -117,7 +128,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -241,6 +251,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -285,4 +300,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-sq/strings.xml b/strings/src/main/res/values-sq/strings.xml
index e113edd13d5..c61c6a2a27a 100644
--- a/strings/src/main/res/values-sq/strings.xml
+++ b/strings/src/main/res/values-sq/strings.xml
@@ -234,6 +234,17 @@
   <string name="hybrid">Hibride</string>
   <string name="satellite">Satelit</string>
   <string name="google_play_services_error_occured">E pamundur të aksesohen Google Maps. A është i instaluar Google Play Services?</string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">Ofruesit e vendndodhjes janë të ç\'aktivizuar!</string>
   <string name="gps_result">Gjerësi: %1$s\nGjatësi: %2$s\nLartësi: %3$sm\nSaktësi: %4$sm</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
@@ -269,7 +280,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -326,9 +336,9 @@
   <string name="delete_yes">Fshi format</string>
   <string name="form_delete_message">Duke fshirë formularët e përzgjedhur</string>
   <string name="file_deleted_ok">%s formë(a) u fshinë me sukses!</string>
-    <!--##############################################
-      # UNPROTECTED SETTINGS
-      ##############################################-->
+  <!--##############################################
+    # UNPROTECTED SETTINGS
+    ##############################################-->
   <!--Title of a settings section-->
   <string name="server_settings_title">Server</string>
   <!--Subtext of a settings section-->
@@ -556,6 +566,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -600,4 +615,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Elimino</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-sr/strings.xml b/strings/src/main/res/values-sr/strings.xml
index a5cb8dfd888..77e47f1553b 100644
--- a/strings/src/main/res/values-sr/strings.xml
+++ b/strings/src/main/res/values-sr/strings.xml
@@ -300,6 +300,17 @@
   <string name="hybrid">Hibrid</string>
   <string name="satellite">Satelit</string>
   <string name="google_play_services_error_occured">Ne mogu da pristupim Google Mapama. Je li Google Play Service instaliran?</string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">Zabilježi lokaciju</string>
   <string name="provider_disabled_error">Pronalaženje lokacije je isključeno!</string>
   <string name="gps_result">Geografska širina:%1$s\nGeografska dužina: %2$s\nVisina: %3$sm\nPreciznost: %4$sm</string>
@@ -371,7 +382,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -427,7 +437,7 @@
   <string name="delete_file">Obriši označeno</string>
   <string name="delete_no">Ne briši!</string>
   <string name="delete_yes">Obriši formulare</string>
-    <string name="form_delete_message">Brišem odabrane formulare</string>
+  <string name="form_delete_message">Brišem odabrane formulare</string>
   <string name="file_deleted_ok">%s formular(i) su uspješno obrisani!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -673,6 +683,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -717,4 +732,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Odbaci</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-sv-rSE/strings.xml b/strings/src/main/res/values-sv-rSE/strings.xml
index 5eb4dc6a311..14b97dfd22f 100644
--- a/strings/src/main/res/values-sv-rSE/strings.xml
+++ b/strings/src/main/res/values-sv-rSE/strings.xml
@@ -309,7 +309,18 @@
   <string name="google_play_services_error_occured">Åtkomst till Google Maps ej möjlig. Är Google Play Services installerad?</string>
   <string name="carto_map_style_positron">Positron</string>
   <string name="carto_map_style_dark_matter">Mörk materia</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">Referenslager</string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">Tyvärr, platstjänster är inaktiverade!</string>
   <string name="gps_result">Latitud: %1$s\nLongitud: %2$s\nAltitud: %3$sm\nNoggrannhet: %4$sm</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
@@ -350,7 +361,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -406,7 +416,7 @@
   <string name="delete_file">Radera vald</string>
   <string name="delete_no">Radera inte</string>
   <string name="delete_yes">Radera formulär</string>
-    <string name="form_delete_message">Raderar valda formulär</string>
+  <string name="form_delete_message">Raderar valda formulär</string>
   <string name="file_deleted_ok">%s formulär har raderats!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -654,6 +664,11 @@ Dela ODK Collect med dem.</string>
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -698,4 +713,22 @@ Dela ODK Collect med dem.</string>
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Ignorera</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-sw-rKE/strings.xml b/strings/src/main/res/values-sw-rKE/strings.xml
index 1d59756f472..4a8bd26df98 100644
--- a/strings/src/main/res/values-sw-rKE/strings.xml
+++ b/strings/src/main/res/values-sw-rKE/strings.xml
@@ -178,6 +178,17 @@
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
   <string name="streets">Barabara</string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">Samahani, viwekaji mahali/eneo vimezimwa!</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -199,7 +210,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -250,7 +260,7 @@
   <string name="delete_file">Futa/Ondoa zilizochaguliwa</string>
   <string name="delete_no">USIFUTE</string>
   <string name="delete_yes">Futa/Ondoa Fomu</string>
-    <string name="file_deleted_ok">Fomu() %s zimefutwa vilivyo!</string>
+  <string name="file_deleted_ok">Fomu() %s zimefutwa vilivyo!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -380,6 +390,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -424,4 +439,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-sw/strings.xml b/strings/src/main/res/values-sw/strings.xml
index 0090a98a265..8e2755e2d34 100644
--- a/strings/src/main/res/values-sw/strings.xml
+++ b/strings/src/main/res/values-sw/strings.xml
@@ -343,8 +343,18 @@
   <string name="google_play_services_error_occured">Upatikanaji wa ramani za google umeshindikana. Je, huduma ya Google Play imesakinishwa kwenye simu?</string>
   <string name="carto_map_style_positron">Positron</string>
   <string name="carto_map_style_dark_matter">Jambo la Giza</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">Safu ya Kumbukumbu</string>
-  <string name="layer_data_file">Safu ya faili la data</string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">Rekodi pointi</string>
   <string name="provider_disabled_error">Samahani, kionesha mahali hakijawezeshwa!</string>
   <string name="gps_result">Latitude: %1$s \nLongitude: %2$s \nUrefumwambao:%3$s m\nUsahihi: %4$s m</string>
@@ -391,7 +401,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -448,7 +457,7 @@
   <string name="delete_file">Futa iliyochaguliwa</string>
   <string name="delete_no">Usifute</string>
   <string name="delete_yes">Futa fomu</string>
-    <string name="form_delete_message">Inafuta fomu zilizochaguliwa</string>
+  <string name="form_delete_message">Inafuta fomu zilizochaguliwa</string>
   <string name="file_deleted_ok">%s fomu(s) zimefanikiwa kufutwa!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -702,6 +711,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -746,4 +760,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Sitisha</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-te/strings.xml b/strings/src/main/res/values-te/strings.xml
index 8231e9f259a..e028d66b2ab 100644
--- a/strings/src/main/res/values-te/strings.xml
+++ b/strings/src/main/res/values-te/strings.xml
@@ -330,8 +330,18 @@
   <string name="google_play_services_error_occured">Google మ్యాప్స్‌ను యాక్సెస్ చేయడం సాధ్యం కాట్లేదు. Google Play సేవలు ఇన్‌స్టాల్ చేయబడిందా?</string>
   <string name="carto_map_style_positron">Positron</string>
   <string name="carto_map_style_dark_matter">Dark Matter</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">రిఫరెన్స్ లేయర్</string>
-  <string name="layer_data_file">లేయర్ డేటా ఫైల్ </string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">ఒక పాయింట్ రికార్డ్ చేయండి</string>
   <string name="location_accuracy">%1$s ఖచ్చితత్వం</string>
   <string name="location_provider">%s ప్రదేశ అనుమతులు</string>
@@ -404,7 +414,6 @@
   <string name="view_data">సేవ్ చెయ్యబడిన ఫారంలు చూడండి</string>
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -463,7 +472,7 @@
   <string name="delete_file">ఎంచుకున్నదాన్ని తొలగించండి</string>
   <string name="delete_no">తొలగించవద్దు </string>
   <string name="delete_yes">ఫారంలను తొలగించు </string>
-    <string name="form_delete_message">ఎంచుకున్న ఫారమ్‌లను తొలగిస్తోంది</string>
+  <string name="form_delete_message">ఎంచుకున్న ఫారమ్‌లను తొలగిస్తోంది</string>
   <string name="file_deleted_ok">%sఫారం(లు) విజయవంతంగా తొలగించబడ్డాయి!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -719,6 +728,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -763,4 +777,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">విస్మరించండి</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-th-rTH/strings.xml b/strings/src/main/res/values-th-rTH/strings.xml
index 6a0b5b69d31..eff10a28022 100644
--- a/strings/src/main/res/values-th-rTH/strings.xml
+++ b/strings/src/main/res/values-th-rTH/strings.xml
@@ -198,6 +198,17 @@
   <string name="satellite">Satellite</string>
   <string name="google_play_services_error_occured">เปิด Google Maps ไม่ได้ ตรวจสอบว่ามี Google Play Services ติดตั้งหรือไม่
 </string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">ขออภัย GPS ถูกปิดการใช้งานไว้</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -231,7 +242,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -284,7 +294,7 @@
   <string name="delete_file">ลบแบบสำรวจที่เลือกไว้</string>
   <string name="delete_no">ไม่ลบ</string>
   <string name="delete_yes">ลบแบบสำรวจ</string>
-    <string name="file_deleted_ok">ลบแบบสำรวจ %s เรียบร้อยแล้ว</string>
+  <string name="file_deleted_ok">ลบแบบสำรวจ %s เรียบร้อยแล้ว</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -456,6 +466,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -500,4 +515,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">ยกเลิก</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-ti/strings.xml b/strings/src/main/res/values-ti/strings.xml
index e9975500423..859b8c3c22a 100644
--- a/strings/src/main/res/values-ti/strings.xml
+++ b/strings/src/main/res/values-ti/strings.xml
@@ -101,6 +101,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
   <!--Displayed in the form filling menu when a form has background location disabled-->
@@ -119,7 +130,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -234,6 +244,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -278,4 +293,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-tl/strings.xml b/strings/src/main/res/values-tl/strings.xml
index 289bd4d8cde..36c582395d9 100644
--- a/strings/src/main/res/values-tl/strings.xml
+++ b/strings/src/main/res/values-tl/strings.xml
@@ -146,6 +146,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">Paumanhin, ang mga provider ng Kinalalagyan ay hindi pinagana!</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -165,7 +176,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -216,7 +226,7 @@
   <string name="delete_file">Burahin ang mga napili</string>
   <string name="delete_no">Huwag burahin</string>
   <string name="delete_yes">Oo, Burahin</string>
-    <string name="file_deleted_ok">%s na (mga) form ay matagumpay na binura!</string>
+  <string name="file_deleted_ok">%s na (mga) form ay matagumpay na binura!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -340,6 +350,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -384,4 +399,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-tr/strings.xml b/strings/src/main/res/values-tr/strings.xml
index 024eead90c7..8d0ad0c0b6d 100644
--- a/strings/src/main/res/values-tr/strings.xml
+++ b/strings/src/main/res/values-tr/strings.xml
@@ -195,6 +195,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
   <!--Displayed in the form filling menu when a form has background location disabled-->
@@ -213,7 +224,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -410,6 +420,11 @@
     ##############################################-->
   <string name="open_settings">Ayarları aç</string>
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -455,4 +470,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-uk/strings.xml b/strings/src/main/res/values-uk/strings.xml
index cd71fb6040d..7208fc1729b 100644
--- a/strings/src/main/res/values-uk/strings.xml
+++ b/strings/src/main/res/values-uk/strings.xml
@@ -297,6 +297,17 @@
   <string name="hybrid">Змішана</string>
   <string name="satellite">Супутник</string>
   <string name="google_play_services_error_occured">Нема доступу до Google Карт. Чи встановлено Google Play Services?</string>
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">Записати точку</string>
   <string name="provider_disabled_error">Вибачте! Джерела місцезнаходження не доступні!</string>
   <string name="gps_result">Широта: %1$s\nДовгота: %2$s\nВисота: %3$sm\nТочність: %4$sm</string>
@@ -371,7 +382,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -427,7 +437,7 @@
   <string name="delete_file">Видалити обране</string>
   <string name="delete_no">Не видаляти</string>
   <string name="delete_yes">Видалити анкети</string>
-    <string name="form_delete_message">Видалення обраних анкет</string>
+  <string name="form_delete_message">Видалення обраних анкет</string>
   <string name="file_deleted_ok">%s анкет(у) успішно видалено!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -672,6 +682,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -716,4 +731,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">Скинути</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-ur/strings.xml b/strings/src/main/res/values-ur/strings.xml
index 1da1858a601..07e0b2e2f21 100644
--- a/strings/src/main/res/values-ur/strings.xml
+++ b/strings/src/main/res/values-ur/strings.xml
@@ -389,8 +389,18 @@
   <string name="google_play_services_error_occured">گوگل میپس تک رسائی حاصل کرنے میں ناکام۔ کیا گوگل پلے سروسز  انسٹالڈہے؟</string>
   <string name="carto_map_style_positron">Positron</string>
   <string name="carto_map_style_dark_matter">Dark Matter</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">ریفرنس Layer</string>
-  <string name="layer_data_file">Layer کی ڈیٹا فائل</string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">پوائنٹ کو ریکارڈ کریں</string>
   <string name="location_accuracy">درستگی: %1$s میٹر</string>
   <string name="location_provider">لوکیشن مہیا کرنے والا: %s</string>
@@ -483,8 +493,6 @@
   <string name="location_tracking_notification_channel_name">لوکیشن کو ٹریک کریں</string>
   <!--Title for notification that lets user know their location is currently being tracked-->
   <string name="location_tracking_notification_title">لوکیشن کا پتہ لگایا جا رہا ہے۔۔۔</string>
-  <!--Text of button user can press to get help when setting up Reference Layers-->
-  <string name="get_help_with_reference_layers">ریفرنس layers  کے متعلق مدد حاصل کریں</string>
   <!--Description for button that zooms to the user's current location on a map-->
   <string name="show_my_location">میری لوکیشن دکھایئں</string>
   <!--Description for button that zooms a map so that it shows all items-->
@@ -565,7 +573,7 @@
   <string name="delete_file">منتخب شدہ کو مٹادیں</string>
   <string name="delete_no">نہ مٹا ئیں</string>
   <string name="delete_yes">فارم کو مٹا دیں</string>
-    <string name="form_delete_message">منتخب کردہ فارم کو ڈیلیٹ کیا جارہا ہے</string>
+  <string name="form_delete_message">منتخب کردہ فارم کو ڈیلیٹ کیا جارہا ہے</string>
   <string name="file_deleted_ok">%s‏فارم (ز )‎‏ کامیابی سےڈیلیٹ کر دیے گئے</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -785,7 +793,7 @@ Constraint processing</string>
   <!--##############################################
      # ABOUT
      ##############################################-->
-  <string name="about_preferences">کے بارے میں</string>
+  <string name="about_preferences">مزید معلومات</string>
   <string name="tell_your_friends"> او ڈی کے کوللیکٹ شیئرکریں </string>
   <string name="tell_your_friends_msg">کیا آپ کے ساتھی  ابھی بھی کاغذ پر ڈیٹا جمع کرتے ہیں؟  ان کے ساتھ او ڈی کے کوللیکٹ شیئرکریں        </string>
   <string name="leave_a_review">پلے اسٹور پر رائے دیجیے</string>
@@ -916,6 +924,11 @@ Constraint processing</string>
   <string name="open_settings">سیٹنگز کھولیں</string>
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
   <string name="entities_title">Entities</string>
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -1026,4 +1039,22 @@ Constraint processing</string>
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">ختم کر دینا</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-vi/strings.xml b/strings/src/main/res/values-vi/strings.xml
index 406252b42d6..886f8509546 100644
--- a/strings/src/main/res/values-vi/strings.xml
+++ b/strings/src/main/res/values-vi/strings.xml
@@ -149,6 +149,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">Xin lỗi, Khả năng xác định vị trí không được kích hoạt!</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -168,7 +179,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -220,7 +230,7 @@
   <string name="delete_file">Xoá lựa chọn</string>
   <string name="delete_no">Không xoá</string>
   <string name="delete_yes">Xoá biểu mẫu</string>
-    <string name="file_deleted_ok">Biểu mẫu %s đã bị xoá!</string>
+  <string name="file_deleted_ok">Biểu mẫu %s đã bị xoá!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -344,6 +354,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -388,4 +403,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-zh/strings.xml b/strings/src/main/res/values-zh/strings.xml
index 91dc39e5a80..a4901ae3f2e 100644
--- a/strings/src/main/res/values-zh/strings.xml
+++ b/strings/src/main/res/values-zh/strings.xml
@@ -370,8 +370,18 @@
   <string name="google_play_services_error_occured">无法访问谷歌地图。是否安装了Google Play服务？</string>
   <string name="carto_map_style_positron">Positron</string>
   <string name="carto_map_style_dark_matter">Dark Matter</string>
+  <!--Title for the reference layer section of settings-->
   <string name="reference_layer">应用图层</string>
-  <string name="layer_data_file">图层数据文件</string>
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="record_geopoint">记录点</string>
   <string name="location_accuracy">精确度: %1$s m</string>
   <string name="location_provider">位置提供程序: %s</string>
@@ -461,8 +471,6 @@
   <string name="location_tracking_notification_channel_name">位置跟踪</string>
   <!--Title for notification that lets user know their location is currently being tracked-->
   <string name="location_tracking_notification_title">跟踪位置…</string>
-  <!--Text of button user can press to get help when setting up Reference Layers-->
-  <string name="get_help_with_reference_layers">获取引用图层帮助</string>
   <!--Description for button that zooms to the user's current location on a map-->
   <string name="show_my_location">显示位置</string>
   <!--Description for button that zooms a map so that it shows all items-->
@@ -543,7 +551,7 @@
   <string name="delete_file">删除选中</string>
   <string name="delete_no">不删除</string>
   <string name="delete_yes">删除表格</string>
-    <string name="form_delete_message">删除所选表单</string>
+  <string name="form_delete_message">删除所选表单</string>
   <string name="file_deleted_ok">%s 表格被成功删除!</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
@@ -872,6 +880,11 @@
   <string name="open_settings">打开设置</string>
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
   <string name="entities_title">实体</string>
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -926,4 +939,22 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <string name="do_not_recover">丢弃</string>
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>
diff --git a/strings/src/main/res/values-zu/strings.xml b/strings/src/main/res/values-zu/strings.xml
index dc8be499590..7e5c74c0bd5 100644
--- a/strings/src/main/res/values-zu/strings.xml
+++ b/strings/src/main/res/values-zu/strings.xml
@@ -160,6 +160,17 @@
   <!--TODO(ping): Delete these openmap_* strings when we're ready to move on from OSMDroid.
    These strings are only being used to preserve compatibility with pre-existing
     tile caches, and are not shown in the UI.-->
+  <!--Title for the reference layer section of settings-->
+  <!--Label for the reference layer setting-->
+  <!--Title for the screen that allows the user to select a reference layer for maps-->
+  <!--Description of how to add reference layers to the project-->
+  <!--Text of button user can press to get help when setting up Reference Layers-->
+  <!--Text for button that lets the user select a reference layer on their device to add-->
+  <!--Text for button that lets the user delete a reference layer-->
+  <!--Text for title above list of layers-->
+  <!--Text for title and subtitle above options for how the layer can be access-->
+  <!--Text for option where layer should be available to all projects-->
+  <!--Text for option where layer should be available to the current project only-->
   <string name="provider_disabled_error">Uxolo, indawo enikeziwe ayisebenzi</string>
   <!--Action to go to Android settings. Displayed when location providers are disabled.-->
   <!--Displayed in the form filling menu when a form has background location enabled-->
@@ -179,7 +190,6 @@
   <!--Name of an action button-->
   <!--Name for the location tracking notifications. Will be seen in Android settings.-->
   <!--Title for notification that lets user know their location is currently being tracked-->
-  <!--Text of button user can press to get help when setting up Reference Layers-->
   <!--Description for button that zooms to the user's current location on a map-->
   <!--Description for button that zooms a map so that it shows all items-->
   <!--Description for button that pauses automatic location recording-->
@@ -230,7 +240,7 @@
   <string name="delete_file">Susa okukhethiwe</string>
   <string name="delete_no">Ungasusi</string>
   <string name="delete_yes">Susa amafomu</string>
-    <string name="file_deleted_ok">%s ifomu lisuswe ngempumelelo</string>
+  <string name="file_deleted_ok">%s ifomu lisuswe ngempumelelo</string>
   <!--##############################################
     # UNPROTECTED SETTINGS
     ##############################################-->
@@ -356,6 +366,11 @@
     # Permissions
     ##############################################-->
   <!--An entity is any person, place or thing that a form can be about. This title appears on an experimental settings screen to view entities managed in the current project.-->
+  <!--Title for setting that controls whether local entity features are enabled or not-->
+  <!--Text for button that leads to browser for the user to view and manage entity lists-->
+  <!--Text for button that deletes all entities for the project-->
+  <!--Text for button that adds a new entity list-->
+  <!--Label for entity that has been created offline and is not on the server yet-->
   <!--##############################################
     # Crash handling
     ##############################################-->
@@ -400,4 +415,21 @@
   <!--Message displayed when the list of forms to delete is empty-->
   <!--Subtext displayed when the list of blank forms to delete is empty-->
   <!--Subtext displayed when the list of filled forms to delete is empty-->
+  <!--##############################################
+    # Savepoint recovery dialog
+    ##############################################-->
+  <!--Title displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Message displayed in a dialog before starting a form if there is a work to recover-->
+  <!--Text for the button that accepts the recovery of the work-->
+  <!--Text for the button that declines the recovery of the work-->
+  <!--Text for the button that initiates getting user location-->
+  <!--Text for the button that displays a map for viewing or changing an already existing location-->
+  <!--Text for the button that displays a map for viewing an already existing location-->
+  <!--Text for the button that initiates getting user location when one is already present-->
+  <!--Text for the button that displays a map for getting a new line-->
+  <!--Text for the button that displays a map for viewing or changing an already existing line-->
+  <!--Text for the button that displays a map for viewing an already existing line-->
+  <!--Text for the button that displays a map for getting a new polygon-->
+  <!--Text for the button that displays a map for viewing or changing an already existing polygon-->
+  <!--Text for the button that displays a map for viewing an already existing polygon-->
 </resources>