From 039ffb711266be240ab973587ebf698c81155401 Mon Sep 17 00:00:00 2001
From: Pablo <ppajueloc@gmail.com>
Date: Wed, 14 Feb 2024 10:21:33 +0100
Subject: [PATCH] [ANDROAPP-5894] Adapt enrollment label to be configurable
 from server (#3493)

Signed-off-by: Pablo <pablo@dhis2.org>
---
 .../eventDetails/EventInitialTest.kt          |  2 +-
 .../flow/searchFlow/SearchFlowTest.kt         |  3 ++
 .../dhis2/usescases/searchte/SearchTETest.kt  |  4 +++
 .../teidashboard/robot/TeiDashboardRobot.kt   | 14 ++++++--
 .../enrollment/EnrollmentActivity.kt          | 10 +++++-
 .../injection/EventDetailsModule.kt           |  2 +-
 .../providers/EventDetailResourcesProvider.kt |  7 +++-
 .../searchTrackEntity/SearchTEActivity.java   |  1 +
 .../searchTrackEntity/SearchTEModule.java     | 18 ++++++++--
 .../ui/mapper/TEICardMapper.kt                | 20 ++++++++---
 .../TeiDashboardMobileActivity.kt             | 29 ++++++++++++++--
 .../teiDashboard/ui/mapper/InfoBarMapper.kt   | 12 +++++--
 .../ui/mapper/TeiDashboardCardMapper.kt       | 10 +++++-
 .../java/org/dhis2/utils/D2EditionMapper.kt   | 33 -------------------
 .../customviews/BreakTheGlassBottomDialog.kt  | 21 ++++++++++++
 .../layout/break_the_glass_bottom_dialog.xml  |  2 --
 app/src/main/res/menu/dashboard_menu.xml      |  4 +--
 .../main/res/menu/dashboard_menu_group.xml    |  4 +--
 app/src/main/res/menu/dashboard_tei_menu.xml  |  2 +-
 app/src/main/res/values-ar/strings.xml        |  7 ----
 app/src/main/res/values-b+uz+Cyrl/strings.xml |  1 -
 app/src/main/res/values-b+uz+Latn/strings.xml |  6 ----
 app/src/main/res/values-cs/strings.xml        | 10 ------
 app/src/main/res/values-es/strings.xml        | 10 ------
 app/src/main/res/values-fr/strings.xml        |  9 -----
 app/src/main/res/values-id/strings.xml        |  8 -----
 app/src/main/res/values-km/strings.xml        |  2 --
 app/src/main/res/values-lo/strings.xml        |  7 ----
 app/src/main/res/values-nb/strings.xml        |  6 ----
 app/src/main/res/values-nl/strings.xml        | 10 ------
 app/src/main/res/values-pt/strings.xml        |  6 ----
 app/src/main/res/values-sv/strings.xml        |  2 --
 app/src/main/res/values-uk/strings.xml        | 10 ------
 app/src/main/res/values-uz/strings.xml        |  8 -----
 app/src/main/res/values-vi/strings.xml        | 10 ------
 app/src/main/res/values-zh-rCN/strings.xml    |  6 ----
 app/src/main/res/values-zh/strings.xml        | 10 ------
 app/src/main/res/values/strings.xml           | 14 +-------
 .../dhis2/data/filter/FilterRepositoryTest.kt |  4 +--
 .../EventDetailsIntegrationTest.kt            |  2 +-
 .../ui/mapper/TEICardMapperTest.kt            |  6 ++--
 .../ui/mapper/InfoBarMapperTest.kt            | 15 +++++++--
 .../dhis2/commons/filters/FilterResources.kt  | 18 ++++++++--
 .../commons/filters/data/FilterRepository.kt  |  4 +--
 .../dhis2/commons/resources/D2ErrorUtils.kt   |  9 +++--
 .../commons/resources/ResourceManager.kt      | 30 +++++++++++++++++
 commons/src/main/res/values-lo/strings.xml    |  1 -
 commons/src/main/res/values/strings.xml       | 28 +++++++++++++---
 .../org/dhis2/maps/layer/MapLayerDialog.kt    |  2 +-
 .../src/main/res/values-ar/strings.xml        |  1 -
 .../src/main/res/values-b+uz+Latn/strings.xml |  1 -
 .../src/main/res/values-cs/strings.xml        |  1 -
 .../src/main/res/values-es/strings.xml        |  1 -
 .../src/main/res/values-fr/strings.xml        |  1 -
 .../src/main/res/values-nb/strings.xml        |  1 -
 .../src/main/res/values-nl/strings.xml        |  1 -
 .../src/main/res/values-pt/strings.xml        |  1 -
 .../src/main/res/values-uk/strings.xml        |  1 -
 .../src/main/res/values-uz/strings.xml        |  1 -
 .../src/main/res/values-vi/strings.xml        |  1 -
 .../src/main/res/values-zh-rCN/strings.xml    |  1 -
 .../src/main/res/values-zh/strings.xml        |  1 -
 .../src/main/res/values/strings.xml           |  1 -
 .../dhis2/form/data/EnrollmentRepository.kt   |  6 ++--
 .../provider/EnrollmentFormLabelsProvider.kt  | 22 ++++++++++---
 form/src/main/res/values-ar/strings.xml       |  4 ---
 .../src/main/res/values-b+uz+Latn/strings.xml |  4 ---
 form/src/main/res/values-cs/strings.xml       |  4 ---
 form/src/main/res/values-es/strings.xml       |  4 ---
 form/src/main/res/values-fr/strings.xml       |  4 ---
 form/src/main/res/values-id/strings.xml       |  4 ---
 form/src/main/res/values-lo/strings.xml       |  3 --
 form/src/main/res/values-nb/strings.xml       |  4 ---
 form/src/main/res/values-nl/strings.xml       |  4 ---
 form/src/main/res/values-pt/strings.xml       |  4 ---
 form/src/main/res/values-uk/strings.xml       |  4 ---
 form/src/main/res/values-uz/strings.xml       |  4 ---
 form/src/main/res/values-vi/strings.xml       |  4 ---
 form/src/main/res/values-zh-rCN/strings.xml   |  4 ---
 form/src/main/res/values-zh/strings.xml       |  4 ---
 form/src/main/res/values/strings.xml          |  4 ---
 .../data/FormRepositoryIntegrationTest.kt     |  2 ++
 gradle/libs.versions.toml                     |  2 +-
 83 files changed, 263 insertions(+), 305 deletions(-)
 delete mode 100644 app/src/main/java/org/dhis2/utils/D2EditionMapper.kt

diff --git a/app/src/androidTest/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/EventInitialTest.kt b/app/src/androidTest/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/EventInitialTest.kt
index de6ebdd685..daa58140d4 100644
--- a/app/src/androidTest/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/EventInitialTest.kt
+++ b/app/src/androidTest/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/EventInitialTest.kt
@@ -154,7 +154,7 @@ class EventInitialTest {
         enrollmentStatus = enrollmentStatus,
     )
 
-    private fun provideEventResourcesProvider() = EventDetailResourcesProvider(resourceManager)
+    private fun provideEventResourcesProvider() = EventDetailResourcesProvider(PROGRAM_UID, resourceManager)
 
     private fun createOrUpdateEventDetails() = CreateOrUpdateEventDetails(
         repository = eventDetailsRepository,
diff --git a/app/src/androidTest/java/org/dhis2/usescases/flow/searchFlow/SearchFlowTest.kt b/app/src/androidTest/java/org/dhis2/usescases/flow/searchFlow/SearchFlowTest.kt
index 41d93c24c2..45730cfcb7 100644
--- a/app/src/androidTest/java/org/dhis2/usescases/flow/searchFlow/SearchFlowTest.kt
+++ b/app/src/androidTest/java/org/dhis2/usescases/flow/searchFlow/SearchFlowTest.kt
@@ -1,6 +1,8 @@
 package org.dhis2.usescases.flow.searchFlow
 
 import android.content.Intent
+import androidx.compose.ui.text.capitalize
+import androidx.compose.ui.text.intl.Locale
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
 import org.dhis2.R
@@ -27,6 +29,7 @@ class SearchFlowTest : BaseTest() {
         setDatePicker()
         val registerTEIDetails = createRegisterTEI()
         val enrollmentStatus = context.getString(R.string.filters_title_enrollment_status)
+            .format(context.resources.getQuantityString(R.plurals.enrollment, 1).capitalize(Locale.current))
         val filterCounter = "1"
         val filterTotalCount = "2"
         prepareWomanProgrammeIntentAndLaunchActivity(rule)
diff --git a/app/src/androidTest/java/org/dhis2/usescases/searchte/SearchTETest.kt b/app/src/androidTest/java/org/dhis2/usescases/searchte/SearchTETest.kt
index b7cf9e5d5f..b21921ed97 100644
--- a/app/src/androidTest/java/org/dhis2/usescases/searchte/SearchTETest.kt
+++ b/app/src/androidTest/java/org/dhis2/usescases/searchte/SearchTETest.kt
@@ -3,6 +3,8 @@ package org.dhis2.usescases.searchte
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
+import androidx.compose.ui.text.capitalize
+import androidx.compose.ui.text.intl.Locale
 import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.IdlingResourceTimeoutException
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -145,6 +147,7 @@ class SearchTETest : BaseTest() {
     @Test
     fun shouldSuccessfullyFilterByEnrollmentStatusActive() {
         val enrollmentStatusFilter = context.getString(R.string.filters_title_enrollment_status)
+            .format(context.resources.getQuantityString(R.plurals.enrollment, 1).capitalize(Locale.current))
         val totalFilterCount = "2"
         val filterCount = "1"
 
@@ -310,6 +313,7 @@ class SearchTETest : BaseTest() {
         val lastName = "Jones"
         val namePosition = 0
         val enrollmentStatus = context.getString(R.string.filters_title_enrollment_status)
+            .format(context.resources.getQuantityString(R.plurals.enrollment, 1).capitalize(Locale.current))
         val totalCount = "2"
         val totalFilterCount = "1"
 
diff --git a/app/src/androidTest/java/org/dhis2/usescases/teidashboard/robot/TeiDashboardRobot.kt b/app/src/androidTest/java/org/dhis2/usescases/teidashboard/robot/TeiDashboardRobot.kt
index 4b9540e94e..71ad0b6a95 100644
--- a/app/src/androidTest/java/org/dhis2/usescases/teidashboard/robot/TeiDashboardRobot.kt
+++ b/app/src/androidTest/java/org/dhis2/usescases/teidashboard/robot/TeiDashboardRobot.kt
@@ -319,7 +319,12 @@ class TeiDashboardRobot : BaseRobot() {
     }
 
     fun clickOnMenuProgramEnrollments() {
-        onView(withText(R.string.program_selector)).perform(click())
+        with(InstrumentationRegistry.getInstrumentation().targetContext){
+            val programSelectorLabel = getString(R.string.program_selector_V2)
+            val enrollmentLabel = resources.getQuantityString(R.plurals.enrollment,2)
+            val itemLabel = programSelectorLabel.format(enrollmentLabel)
+            onView(withText(itemLabel)).perform(click())
+        }
     }
 
     fun clickOnCreateNewEvent() {
@@ -376,7 +381,12 @@ class TeiDashboardRobot : BaseRobot() {
     }
 
     fun clickOnMenuDeleteEnrollment() {
-        onView(withText(R.string.dashboard_menu_delete_enrollment)).perform(click())
+        with(InstrumentationRegistry.getInstrumentation().targetContext){
+            val deleteEnrollmentLabel = getString(R.string.dashboard_menu_delete_enrollment_V2)
+            val enrollmentLabel = resources.getQuantityString(R.plurals.enrollment,1)
+            val itemLabel = deleteEnrollmentLabel.format(enrollmentLabel)
+            onView(withText(itemLabel)).perform(click())
+        }
     }
 
     fun clickOnGroupByStage() {
diff --git a/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentActivity.kt b/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentActivity.kt
index 2f6914d8af..c66b219182 100644
--- a/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentActivity.kt
+++ b/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentActivity.kt
@@ -22,6 +22,7 @@ import org.dhis2.commons.data.TeiAttributesInfo
 import org.dhis2.commons.dialogs.imagedetail.ImageDetailActivity
 import org.dhis2.commons.featureconfig.data.FeatureConfigRepository
 import org.dhis2.commons.featureconfig.model.Feature
+import org.dhis2.commons.resources.ResourceManager
 import org.dhis2.databinding.EnrollmentActivityBinding
 import org.dhis2.form.data.GeometryController
 import org.dhis2.form.data.GeometryParserImpl
@@ -51,6 +52,9 @@ class EnrollmentActivity : ActivityGlobalAbstract(), EnrollmentView {
     private var forRelationship: Boolean = false
     private lateinit var formView: FormView
 
+    @Inject
+    lateinit var resourceManager: ResourceManager
+
     @Inject
     lateinit var presenter: EnrollmentPresenterImpl
 
@@ -343,7 +347,11 @@ class EnrollmentActivity : ActivityGlobalAbstract(), EnrollmentView {
             binding.title.visibility = View.VISIBLE
             binding.teiDataHeader.root.visibility = View.GONE
             binding.title.text =
-                String.format(getString(R.string.enroll_in), presenter.getProgram()?.displayName())
+                resourceManager.formatWithEnrollmentLabel(
+                    programUid = presenter.getProgram()?.uid()!!,
+                    R.string.new_enrollment,
+                    1,
+                )
         }
     }
 
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/injection/EventDetailsModule.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/injection/EventDetailsModule.kt
index c1f6ff7c02..f96f130277 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/injection/EventDetailsModule.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/injection/EventDetailsModule.kt
@@ -61,7 +61,7 @@ class EventDetailsModule(
     fun provideEventDetailResourceProvider(
         resourceManager: ResourceManager,
     ): EventDetailResourcesProvider {
-        return EventDetailResourcesProvider(resourceManager)
+        return EventDetailResourcesProvider(programUid, resourceManager)
     }
 
     @Provides
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/providers/EventDetailResourcesProvider.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/providers/EventDetailResourcesProvider.kt
index f1230cd7f2..6a226ebe06 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/providers/EventDetailResourcesProvider.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/providers/EventDetailResourcesProvider.kt
@@ -5,6 +5,7 @@ import org.dhis2.commons.resources.ResourceManager
 import org.hisp.dhis.android.core.event.EventNonEditableReason
 
 class EventDetailResourcesProvider(
+    private val programUid: String,
     private val resourceManager: ResourceManager,
 ) {
     fun provideDueDate() = resourceManager.getString(R.string.due_date)
@@ -24,7 +25,11 @@ class EventDetailResourcesProvider(
             EventNonEditableReason.NO_CATEGORY_COMBO_ACCESS ->
                 resourceManager.getString(R.string.edition_no_catcombo_access)
             EventNonEditableReason.ENROLLMENT_IS_NOT_OPEN ->
-                resourceManager.getString(R.string.edition_enrollment_is_no_open)
+                resourceManager.formatWithEnrollmentLabel(
+                    programUid,
+                    R.string.edition_enrollment_is_no_open_V2,
+                    1,
+                )
             EventNonEditableReason.ORGUNIT_IS_NOT_IN_CAPTURE_SCOPE ->
                 resourceManager.getString(R.string.edition_orgunit_capture_scope)
         }
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEActivity.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEActivity.java
index e504510e75..90b6d03ed3 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEActivity.java
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEActivity.java
@@ -694,6 +694,7 @@ public void couldNotDownload(String typeName) {
     @Override
     public void showBreakTheGlass(String teiUid, String enrollmentUid) {
         new BreakTheGlassBottomDialog()
+                .setProgram(presenter.getProgram().uid())
                 .setPositiveButton(reason -> {
                     viewModel.onDownloadTei(teiUid, enrollmentUid, reason);
                     return Unit.INSTANCE;
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEModule.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEModule.java
index a6850bd3ab..55640a8dd7 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEModule.java
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEModule.java
@@ -225,11 +225,23 @@ EnrollmentUiDataHelper enrollmentUiDataHelper(Context context) {
 
     @Provides
     @PerActivity
-    SearchSortingValueSetter searchSortingValueSetter(Context context, D2 d2, EnrollmentUiDataHelper enrollmentUiDataHelper) {
+    SearchSortingValueSetter searchSortingValueSetter(
+            Context context,
+            D2 d2,
+            EnrollmentUiDataHelper enrollmentUiDataHelper,
+            ResourceManager resourceManager) {
         String unknownLabel = context.getString(R.string.unknownValue);
         String eventDateLabel = context.getString(R.string.most_recent_event_date);
-        String enrollmentStatusLabel = context.getString(R.string.filters_title_enrollment_status);
-        String enrollmentDateDefaultLabel = context.getString(R.string.enrollment_date);
+        String enrollmentStatusLabel = resourceManager.formatWithEnrollmentLabel(
+                initialProgram,
+                R.string.filters_title_enrollment_status,
+                1,
+                false);
+        String enrollmentDateDefaultLabel = resourceManager.formatWithEnrollmentLabel(
+                initialProgram,
+                R.string.enrollment_date_V2,
+                1,
+                false);
         String uiDateFormat = DateUtils.SIMPLE_DATE_FORMAT;
         return new SearchSortingValueSetter(d2,
                 unknownLabel,
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapper.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapper.kt
index 613307f91b..5badc599dc 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapper.kt
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapper.kt
@@ -130,6 +130,7 @@ class TEICardMapper(
                 enrolledPrograms = searchTEIModel.programInfo,
             )
             checkEnrollmentStatus(
+                programUid = searchTEIModel.selectedEnrollment.program()!!,
                 list = list,
                 status = searchTEIModel.selectedEnrollment?.status(),
             )
@@ -175,35 +176,46 @@ class TEICardMapper(
     }
 
     private fun checkEnrollmentStatus(
+        programUid: String,
         list: MutableList<AdditionalInfoItem>,
         status: EnrollmentStatus?,
     ) {
         val item = when (status) {
             EnrollmentStatus.COMPLETED -> {
+                val label = resourceManager.formatWithEnrollmentLabel(
+                    programUid,
+                    R.string.enrollment_completed_V2,
+                    1,
+                )
                 AdditionalInfoItem(
                     icon = {
                         Icon(
                             imageVector = Icons.Outlined.Check,
-                            contentDescription = resourceManager.getString(R.string.enrollment_completed),
+                            contentDescription = label,
                             tint = AdditionalInfoItemColor.SUCCESS.color,
                         )
                     },
-                    value = resourceManager.getString(R.string.enrollment_completed),
+                    value = label,
                     isConstantItem = true,
                     color = AdditionalInfoItemColor.SUCCESS.color,
                 )
             }
 
             EnrollmentStatus.CANCELLED -> {
+                val label = resourceManager.formatWithEnrollmentLabel(
+                    programUid,
+                    R.string.enrollment_cancelled_V2,
+                    1,
+                )
                 AdditionalInfoItem(
                     icon = {
                         Icon(
                             imageVector = Icons.Outlined.Close,
-                            contentDescription = resourceManager.getString(R.string.enrollment_cancelled),
+                            contentDescription = label,
                             tint = AdditionalInfoItemColor.DISABLED.color,
                         )
                     },
-                    value = resourceManager.getString(R.string.enrollment_cancelled),
+                    value = label,
                     isConstantItem = true,
                     color = AdditionalInfoItemColor.DISABLED.color,
                 )
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt
index a5df046799..e3ba3bf62a 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt
@@ -29,6 +29,7 @@ import org.dhis2.commons.filters.FilterManager
 import org.dhis2.commons.filters.Filters
 import org.dhis2.commons.network.NetworkUtils
 import org.dhis2.commons.popupmenu.AppMenuHelper
+import org.dhis2.commons.resources.ResourceManager
 import org.dhis2.commons.sync.OnDismissListener
 import org.dhis2.commons.sync.SyncContext
 import org.dhis2.databinding.ActivityDashboardMobileBinding
@@ -83,6 +84,9 @@ class TeiDashboardMobileActivity :
     @Inject
     lateinit var networkUtils: NetworkUtils
 
+    @Inject
+    lateinit var resourceManager: ResourceManager
+
     lateinit var programModel: DashboardProgramModel
     var teiUid: String? = null
     var programUid: String? = null
@@ -157,7 +161,8 @@ class TeiDashboardMobileActivity :
         super.onCreate(savedInstanceState)
         groupByStage = MutableLiveData(presenter.programGrouping)
         currentEnrollment = MutableLiveData()
-        dashboardViewModel = ViewModelProvider(this, viewModelFactory)[DashboardViewModel::class.java]
+        dashboardViewModel =
+            ViewModelProvider(this, viewModelFactory)[DashboardViewModel::class.java]
         binding = DataBindingUtil.setContentView(this, R.layout.activity_dashboard_mobile)
         showLoadingProgress(true)
         binding.presenter = presenter
@@ -290,7 +295,10 @@ class TeiDashboardMobileActivity :
                                 android.R.anim.fade_in,
                                 android.R.anim.fade_out,
                             )
-                            startActivity(intent(context, teiUid, programUid, enrollmentUid), activityOptions.toBundle())
+                            startActivity(
+                                intent(context, teiUid, programUid, enrollmentUid),
+                                activityOptions.toBundle(),
+                            )
                             finish()
                         }
                     }
@@ -578,6 +586,20 @@ class TeiDashboardMobileActivity :
                 deleteEnrollmentItem.isVisible = presenter.checkIfEnrollmentCanBeDeleted(enrollmentUid)
 
                 if (enrollmentUid != null) {
+                    popupMenu.menu.findItem(R.id.deleteEnrollment).let { deleteEnrollmentItem ->
+                        deleteEnrollmentItem.title = resourceManager.formatWithEnrollmentLabel(
+                            programUid!!,
+                            R.string.dashboard_menu_delete_enrollment_V2,
+                            1,
+                        )
+                    }
+                    popupMenu.menu.findItem(R.id.programSelector).let { programSelectorItem ->
+                        programSelectorItem.title = resourceManager.formatWithEnrollmentLabel(
+                            programUid!!,
+                            R.string.program_selector_V2,
+                            2,
+                        )
+                    }
                     val status = presenter.getEnrollmentStatus(enrollmentUid)
                     if (status == EnrollmentStatus.COMPLETED) {
                         popupMenu.menu.findItem(R.id.complete).isVisible = false
@@ -611,14 +633,17 @@ class TeiDashboardMobileActivity :
                             EnrollmentStatus.COMPLETED,
                         )
                     }
+
                     R.id.activate -> dashboardViewModel.updateEnrollmentStatus(
                         programModel,
                         EnrollmentStatus.ACTIVE,
                     )
+
                     R.id.deactivate -> dashboardViewModel.updateEnrollmentStatus(
                         programModel,
                         EnrollmentStatus.CANCELLED,
                     )
+
                     R.id.share -> startQRActivity()
                 }
                 true
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/ui/mapper/InfoBarMapper.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/ui/mapper/InfoBarMapper.kt
index 5050f21ff5..4c45d4c3ed 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/ui/mapper/InfoBarMapper.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/ui/mapper/InfoBarMapper.kt
@@ -58,9 +58,17 @@ class InfoBarMapper(
             InfoBarType.FOLLOW_UP -> resourceManager.getString(R.string.marked_follow_up)
             InfoBarType.ENROLLMENT_STATUS -> {
                 if (item.currentEnrollmentStatus == EnrollmentStatus.COMPLETED) {
-                    resourceManager.getString(R.string.enrollment_completed)
+                    resourceManager.formatWithEnrollmentLabel(
+                        item.currentProgram.uid(),
+                        R.string.enrollment_completed_V2,
+                        1,
+                    )
                 } else {
-                    resourceManager.getString(R.string.enrollment_cancelled)
+                    resourceManager.formatWithEnrollmentLabel(
+                        item.currentProgram.uid(),
+                        R.string.enrollment_cancelled_V2,
+                        1,
+                    )
                 }
             }
         }
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/ui/mapper/TeiDashboardCardMapper.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/ui/mapper/TeiDashboardCardMapper.kt
index cc7f2784f0..7090c90488 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/ui/mapper/TeiDashboardCardMapper.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/ui/mapper/TeiDashboardCardMapper.kt
@@ -144,6 +144,7 @@ class TeiDashboardCardMapper(
             }
         }.also { list ->
             addEnrollmentDate(
+                item.currentProgram.uid(),
                 list,
                 item.currentProgram.enrollmentDateLabel(),
                 item.currentEnrollment.enrollmentDate(),
@@ -211,13 +212,20 @@ class TeiDashboardCardMapper(
     }
 
     private fun addEnrollmentDate(
+        programUid: String,
         list: MutableList<AdditionalInfoItem>,
         programLabel: String?,
         enrollmentDate: Date?,
     ) {
         list.add(
             AdditionalInfoItem(
-                key = "${programLabel ?: resourceManager.getString(R.string.enrollment_date)}:",
+                key = "${
+                    programLabel ?: resourceManager.formatWithEnrollmentLabel(
+                        programUid,
+                        R.string.enrollment_date_V2,
+                        1,
+                    )
+                }:",
                 value = enrollmentDate.toUi() ?: "",
                 isConstantItem = true,
             ),
diff --git a/app/src/main/java/org/dhis2/utils/D2EditionMapper.kt b/app/src/main/java/org/dhis2/utils/D2EditionMapper.kt
deleted file mode 100644
index 838190dc23..0000000000
--- a/app/src/main/java/org/dhis2/utils/D2EditionMapper.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.dhis2.utils
-
-import android.content.Context
-import org.dhis2.R
-import org.hisp.dhis.android.core.event.EventNonEditableReason
-import org.hisp.dhis.android.core.event.EventNonEditableReason.BLOCKED_BY_COMPLETION
-import org.hisp.dhis.android.core.event.EventNonEditableReason.ENROLLMENT_IS_NOT_OPEN
-import org.hisp.dhis.android.core.event.EventNonEditableReason.EVENT_DATE_IS_NOT_IN_ORGUNIT_RANGE
-import org.hisp.dhis.android.core.event.EventNonEditableReason.EXPIRED
-import org.hisp.dhis.android.core.event.EventNonEditableReason.NO_CATEGORY_COMBO_ACCESS
-import org.hisp.dhis.android.core.event.EventNonEditableReason.NO_DATA_WRITE_ACCESS
-import org.hisp.dhis.android.core.event.EventNonEditableReason.ORGUNIT_IS_NOT_IN_CAPTURE_SCOPE
-
-class D2EditionMapper {
-
-    companion object {
-
-        @JvmStatic
-        fun mapEditionStatus(context: Context, reason: EventNonEditableReason): String {
-            return when (reason) {
-                BLOCKED_BY_COMPLETION -> context.getString(R.string.blocked_by_completion)
-                EXPIRED -> context.getString(R.string.edition_expired)
-                NO_DATA_WRITE_ACCESS -> context.getString(R.string.edition_no_write_access)
-                EVENT_DATE_IS_NOT_IN_ORGUNIT_RANGE ->
-                    context.getString(R.string.event_date_not_in_orgunit_range)
-                NO_CATEGORY_COMBO_ACCESS -> context.getString(R.string.edition_no_catcombo_access)
-                ENROLLMENT_IS_NOT_OPEN -> context.getString(R.string.edition_enrollment_is_no_open)
-                ORGUNIT_IS_NOT_IN_CAPTURE_SCOPE ->
-                    context.getString(R.string.edition_orgunit_capture_scope)
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/org/dhis2/utils/customviews/BreakTheGlassBottomDialog.kt b/app/src/main/java/org/dhis2/utils/customviews/BreakTheGlassBottomDialog.kt
index 2217d01c52..02d18c824b 100644
--- a/app/src/main/java/org/dhis2/utils/customviews/BreakTheGlassBottomDialog.kt
+++ b/app/src/main/java/org/dhis2/utils/customviews/BreakTheGlassBottomDialog.kt
@@ -13,12 +13,23 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import org.dhis2.R
 import org.dhis2.commons.resources.ColorType
 import org.dhis2.commons.resources.ColorUtils
+import org.dhis2.commons.resources.ResourceManager
 import org.dhis2.databinding.BreakTheGlassBottomDialogBindingImpl
+import javax.inject.Inject
 
 class BreakTheGlassBottomDialog : BottomSheetDialogFragment() {
 
+    private lateinit var programUid: String
+
+    @Inject
+    lateinit var resourceManager: ResourceManager
+
     val colorUtils: ColorUtils = ColorUtils()
 
+    fun setProgram(programUid: String) = apply {
+        this.programUid = programUid
+    }
+
     fun setPositiveButton(onClick: ((String) -> Unit)? = null) = apply {
         this.positiveOnclick = onClick
     }
@@ -37,6 +48,16 @@ class BreakTheGlassBottomDialog : BottomSheetDialogFragment() {
         savedInstanceState: Bundle?,
     ): View? {
         return BreakTheGlassBottomDialogBindingImpl.inflate(inflater, container, false).apply {
+            message.text = resourceManager.formatWithEnrollmentLabel(
+                programUid,
+                R.string.break_glass_dialog_description_V2,
+                1,
+            )
+            label.text = resourceManager.formatWithEnrollmentLabel(
+                programUid,
+                R.string.break_glass_reason_V2,
+                1,
+            )
             positive.apply {
                 setOnClickListener {
                     positiveOnclick?.invoke(inputEditText.text.toString())
diff --git a/app/src/main/res/layout/break_the_glass_bottom_dialog.xml b/app/src/main/res/layout/break_the_glass_bottom_dialog.xml
index 4e20cfba6e..1ccc39c20a 100644
--- a/app/src/main/res/layout/break_the_glass_bottom_dialog.xml
+++ b/app/src/main/res/layout/break_the_glass_bottom_dialog.xml
@@ -33,7 +33,6 @@
             android:layout_marginStart="24dp"
             android:layout_marginTop="4dp"
             android:layout_marginEnd="14dp"
-            android:text="@string/break_glass_dialog_description"
             android:textColor="@color/gray_990"
             android:textSize="14sp"
             app:layout_constraintTop_toBottomOf="@id/title" />
@@ -81,7 +80,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
-                android:text="@string/break_glass_reason"
                 app:layout_constraintStart_toStartOf="@id/fieldBackground"
                 app:layout_constraintTop_toTopOf="@id/fieldBackground" />
 
diff --git a/app/src/main/res/menu/dashboard_menu.xml b/app/src/main/res/menu/dashboard_menu.xml
index f7222fd950..58c258d91e 100644
--- a/app/src/main/res/menu/dashboard_menu.xml
+++ b/app/src/main/res/menu/dashboard_menu.xml
@@ -15,11 +15,11 @@
     <item
         android:id="@+id/deleteEnrollment"
         android:icon="@drawable/ic_delete"
-        android:title="@string/dashboard_menu_delete_enrollment" />
+        android:title="@string/dashboard_menu_delete_enrollment_V2" />
     <item
         android:id="@+id/programSelector"
         android:icon="@drawable/ic_program_border"
-        android:title="@string/program_selector" />
+        android:title="@string/program_selector_V2" />
     <item
         android:id="@+id/groupEvents"
         android:icon="@drawable/ic_group_view"
diff --git a/app/src/main/res/menu/dashboard_menu_group.xml b/app/src/main/res/menu/dashboard_menu_group.xml
index 3d3316d0fd..0f02e63f14 100644
--- a/app/src/main/res/menu/dashboard_menu_group.xml
+++ b/app/src/main/res/menu/dashboard_menu_group.xml
@@ -15,11 +15,11 @@
     <item
         android:id="@+id/deleteEnrollment"
         android:icon="@drawable/ic_delete"
-        android:title="@string/dashboard_menu_delete_enrollment" />
+        android:title="@string/dashboard_menu_delete_enrollment_V2" />
     <item
         android:id="@+id/programSelector"
         android:icon="@drawable/ic_program_border"
-        android:title="@string/program_selector" />
+        android:title="@string/program_selector_V2" />
     <item
         android:id="@+id/showTimeline"
         android:icon="@drawable/ic_list_view"
diff --git a/app/src/main/res/menu/dashboard_tei_menu.xml b/app/src/main/res/menu/dashboard_tei_menu.xml
index 35941e58d5..8839a044bc 100644
--- a/app/src/main/res/menu/dashboard_tei_menu.xml
+++ b/app/src/main/res/menu/dashboard_tei_menu.xml
@@ -7,5 +7,5 @@
     <item
         android:id="@+id/programSelector"
         android:icon="@drawable/ic_program_border"
-        android:title="@string/program_selector" />
+        android:title="@string/program_selector_V2" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index b9afbe9b74..5c3fec878c 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -164,7 +164,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">انظر التفاصيل</string>
     <string name="view_more">عرض المزيد</string>
-    <string name="enrolling_ou">الوحدة التنظيمية المسجلة</string>
     <string name="follow_up">متابعة</string>
     <string name="follow_up_enabled">تم تمكين المتابعة</string>
     <string name="follow_up_disabled">تم ايقاف المتابعة</string>
@@ -253,7 +252,6 @@
     <string name="add_note">أضف ملاحظة</string>
     <string name="revert">العودة</string>
     <string name="activated">نشط</string>
-    <string name="enroll_in">تسجيل في %s</string>
     <string name="missing_mandatory_fields_title">بعض الحقول الإلزامية مفقودة</string>
     <string name="missing_mandatory_fields_text">بعض الحقول الإلزامية مفقودة. إذا كنت تريد الرجوع الآن ، فسيتم حذف جميع المعلومات المحفوظة.</string>
     <string name="missing_mandatory_fields_text_not_delete">بعض الحقول الإلزامية مفقودة. إذا كنت تريد العودة ، يرجى ملؤها.</string>
@@ -264,7 +262,6 @@
     <string name="missing_mandatory_fields_go_back">الحذف والرجوع للخلف</string>
     <string name="error_fields">تحتوي بعض الحقول على أخطاء:\n%s\n يرجى التحقق منها.</string>
     <string name="missing_mandatory_fields_finish">بعض الحقول الإلزامية مفقودة. يمكنك إنهاء إدخال البيانات والخروج، لكن لا يمكن تعيين الحدث كمكتمل.</string>
-    <string name="enrollment_coordinates">إحداثيات التسجيل</string>
     <string name="tei_coordinates">إحداثيات لـ </string>
 
     <!--EVENT SUMMARY-->
@@ -533,7 +530,6 @@
     <string name="relationship_without_enrollment">السجل الذي تحاول الوصول إليه ليس لديه تسجيل. لا يمكنك الوصول إلى لوحة المعلومات.</string>
     <string name="formatting_error">خطأ في التنسيق</string>
     <string name="dashboard_menu_delete_tei_v2">حذف %s</string>
-    <string name="dashboard_menu_delete_enrollment">حذف التسجيل فقط</string>
     <string name="delete_authority_error">ليس لديك الصلاحية لحذف هذا السجل</string>
     <string name="validation_url">هذا ليس عنوان url صالحاً</string>
     <string name="uncomplete_authority_error">ليس لديك الصلاحية لإعادة فتح هذا الحدث</string>
@@ -628,7 +624,6 @@
     <string name="event_tei_limits_v2">الإعدادات محدودة %s\n الأحداث: %s/%s، TEI: %s/%s</string>
     <string name="enrollment_data_hide">إخفاء بيانات التسجيل</string>
     <string name="enrollment_data_show">إظهار بيانات التسجيل</string>
-    <string name="enrollment_data_section_label">بيانات التسجيل</string>
     <string name="sms_enabled">وحدة الرسائل القصيرة مفعلة</string>
     <string name="sms_disabled">وحدة الرسائل القصيرة غير مفعلة</string>
     <string name="sms_downloading_data">تحميل البيانات لوحدة الرسائل القصيرة. يرجى الإنتظار</string>
@@ -652,7 +647,6 @@
     <string name="interval_hour_ago">منذ %d ساعة</string>
     <string name="interval_yesterday">الأمس</string>
     <string name="enrollment_single_section_label">السمات - %s</string>
-    <string name="program_selector">التسجيلات في البرنامج</string>
     <string name="select_time">إختر الوقت</string>
     <string name="enter_letter">ادخل حرف</string>
     <string name="enter_unit_interval">أدخل رقماً من 0 إلى 1</string>
@@ -816,7 +810,6 @@
     <string name="edition_no_write_access">ليس لديك إذن لتحرير هذه البيانات</string>
     <string name="event_date_not_in_orgunit_range">هذه البيانات غير قابلة للتعديل لأنه تم اغلاق الوحدة التنظيمية</string>
     <string name="edition_no_catcombo_access">ليس لديك إذن لتحرير هذه البيانات</string>
-    <string name="edition_enrollment_is_no_open">هذه البيانات غير قابلة للتعديل بسبب اكتمال التسجيل أو إلغاؤه</string>
     <string name="edition_orgunit_capture_scope">لا يمكنك تحرير البيانات من هذه الوحدة التنظيمية</string>
     <string name="reload_list">إعادة البحث</string>
     <string name="error_tei_online_search_title">البحث عبر الإتصال بالسيرفر عن طريق الإنترنت ارجع الرسالة التالية:</string>
diff --git a/app/src/main/res/values-b+uz+Cyrl/strings.xml b/app/src/main/res/values-b+uz+Cyrl/strings.xml
index 837527f10b..b3069ac81c 100644
--- a/app/src/main/res/values-b+uz+Cyrl/strings.xml
+++ b/app/src/main/res/values-b+uz+Cyrl/strings.xml
@@ -164,7 +164,6 @@
     <string name="see_details">Тафсилотларни кўринг</string>
     <string name="view_more">КЎПРОҚ КЎРИШ</string>
     <string name="edit">ТАҲРИРЛАШ</string>
-    <string name="enrolling_ou">OUга рўйхатга олиш</string>
     <string name="follow_up">Кузатиб бориш</string>
     <string name="follow_up_enabled">Кузатув ёқилган</string>
     <string name="follow_up_disabled">Кузатув ўчирилган</string>
diff --git a/app/src/main/res/values-b+uz+Latn/strings.xml b/app/src/main/res/values-b+uz+Latn/strings.xml
index 6257a77ffe..da7d418216 100644
--- a/app/src/main/res/values-b+uz+Latn/strings.xml
+++ b/app/src/main/res/values-b+uz+Latn/strings.xml
@@ -146,7 +146,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">Tafsilotlarni koʼring</string>
     <string name="view_more">KOʼPROQ KOʼRISh</string>
-    <string name="enrolling_ou">OUga roʼyxatga olish</string>
     <string name="follow_up">Kuzatib borish</string>
     <string name="follow_up_enabled">Kuzatuv yoqilgan</string>
     <string name="follow_up_disabled">Kuzatuv oʼchirilgan</string>
@@ -224,7 +223,6 @@
     <string name="add_note">Izoh qoldirish</string>
     <string name="revert">Qaytish</string>
     <string name="activated">Faollashtirildi</string>
-    <string name="enroll_in">Qayd qilingan %s</string>
     <string name="missing_mandatory_fields_title">Majburiy maydonlar qoldirib ketilgan</string>
     <string name="missing_mandatory_fields_text">Baʼzi majburiy maydonlar qoldirib ketilgan. Аgar hozir orqaga qaytsangiz, barcha saqlangan maʼlumotlar oʼchib ketadi.</string>
     <string name="missing_mandatory_fields_text_not_delete">Baʼzi majburiy maydonlar qoldirib ketilgan. Аgar orqaga qaytmoqchi boʼlsangiz, Iltimos, ularni toʼldiring.</string>
@@ -234,7 +232,6 @@
     <string name="missing_mandatory_fields_go_back">Oʼchirib tashlash va orqaga qaytish</string>
     <string name="error_fields">Baʼzi maʼlumotlarda xatoliklar mavjud: \n%s\. Iltimos, ularni tekshiring.</string>
     <string name="missing_mandatory_fields_finish">Baʼzi majburiy maydonlar qoldirib ketilgan. Siz maʼlumotlarni kiritishni yakunlab chiqishingiz mumkin. Аmmo bu holda hodisa/tadbirni yakunlab boʼlmaydi.</string>
-    <string name="enrollment_coordinates">Roʼyxatdan oʼtish koordinatalari</string>
     <string name="tei_coordinates">Uchun koordinatalar</string>
 
     <!--EVENT SUMMARY-->
@@ -493,7 +490,6 @@
     <string name="sync_setting">Sinxronizatsiya sozlanmasi: %s</string>
     <string name="relationship_without_enrollment">Siz kirib koʼrmoqchi boʼlgan yozuv qayd etilmagan. Siz boshqaruv paneliga kira olmaysiz</string>
     <string name="formatting_error">Formatlashda xatolik</string>
-    <string name="dashboard_menu_delete_enrollment">Faqat qaydlarni oʼchirib tashlash</string>
     <string name="delete_authority_error">Ushbu yozuvni oʼchirib tashlash huquqiga ega emassiz</string>
     <string name="validation_url">Bu haqiqiy URL emas</string>
     <string name="uncomplete_authority_error">Ushbu hodisa/tadbirni qayta ochishga vakolatingiz yoʼq</string>
@@ -588,7 +584,6 @@
     <string name="event_tei_limits_v2">Sozlamalar cheklangan %s \n Hodisa/tadbirlar: %s / %s TEI: %s / %s</string>
     <string name="enrollment_data_hide">Qayd qilish maʼlumotlarini berkitish</string>
     <string name="enrollment_data_show">Qayd qilish maʼlumotlarini koʼrsatish</string>
-    <string name="enrollment_data_section_label">Qayd qilish maʼlumotlari</string>
     <string name="sms_enabled">SMS modul yoqib qoʼyilgan</string>
     <string name="sms_disabled">SMS modul oʼchirib qoʼyilgan</string>
     <string name="sms_downloading_data">SMS modul uchun maʼlumotlar yuklanmoqda. Iltimos, kuting</string>
@@ -612,7 +607,6 @@
     <string name="interval_hour_ago">%d soat oldin</string>
     <string name="interval_yesterday">Кеча</string>
     <string name="enrollment_single_section_label">Аtribatlar - %s</string>
-    <string name="program_selector">Dastur qaydlari</string>
     <string name="select_time">Vaqtni tanlang</string>
     <string name="enter_letter">Xatni kiriting</string>
     <string name="enter_unit_interval">0 dan 1 gacha raqamni kiriting</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 54cd8a601d..39c6468a99 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -162,7 +162,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">Prohlednout detaily</string>
     <string name="view_more">UKÁZAT VÍCE</string>
-    <string name="enrolling_ou">Zápis Org. J.:</string>
     <string name="follow_up">Následovat</string>
     <string name="follow_up_enabled">Sledování povoleno</string>
     <string name="follow_up_disabled">Sledování zakázáno</string>
@@ -249,7 +248,6 @@
     <string name="add_note">Přidat poznámku</string>
     <string name="revert">Vrátit zpět</string>
     <string name="activated">Aktivováno</string>
-    <string name="enroll_in">Zapsat do %s</string>
     <string name="missing_mandatory_fields_title">Chybí povinná pole</string>
     <string name="missing_mandatory_fields_text">Některá povinná pole chybí. Pokud se chcete vrátit zpět, budou všechny uložené informace odstraněny.</string>
     <string name="missing_mandatory_fields_text_not_delete">Některá povinná pole chybí. Pokud se chcete vrátit, vyplňte je prosím.</string>
@@ -260,7 +258,6 @@
     <string name="missing_mandatory_fields_go_back">Smazat a vrátit se zpět</string>
     <string name="error_fields">Některá pole obsahují chyby:\n%s\nProsím zkontrolujte je.</string>
     <string name="missing_mandatory_fields_finish">Některá povinná pole chybí. Zadávání a ukončení dat můžete dokončit, ale událost nelze dokončit.</string>
-    <string name="enrollment_coordinates">Souřadnice registrace</string>
     <string name="tei_coordinates">Souřadnice pro</string>
 
     <!--EVENT SUMMARY-->
@@ -529,7 +526,6 @@
     <string name="relationship_without_enrollment">Záznam, ke kterému se pokoušíte získat přístup, nemá žádnou registraci. K hlavnímu panelu nemáte přístup.</string>
     <string name="formatting_error">Chyba formátování</string>
     <string name="dashboard_menu_delete_tei_v2">Smazat %s</string>
-    <string name="dashboard_menu_delete_enrollment">Smazat pouze zápis</string>
     <string name="delete_authority_error">Nemáte oprávnění tento záznam mazat</string>
     <string name="validation_url">Toto není platné URL</string>
     <string name="uncomplete_authority_error">Nemáte oprávnění znovu otevřít tuto událost</string>
@@ -624,7 +620,6 @@
     <string name="event_tei_limits_v2">Nastavení omezeno %s\nUdálosti: %s/%s TEI: %s/%s</string>
     <string name="enrollment_data_hide">Skrýt údaje o zápisu</string>
     <string name="enrollment_data_show">Zobrazit údaje o zápisu</string>
-    <string name="enrollment_data_section_label">Údaje o zápisu</string>
     <string name="sms_enabled">SMS modul povolen</string>
     <string name="sms_disabled">SMS modul deaktivován</string>
     <string name="sms_downloading_data">Stahování dat pro modul SMS. Prosím, čekejte</string>
@@ -648,7 +643,6 @@
     <string name="interval_hour_ago">před %d hodinami</string>
     <string name="interval_yesterday">Včera</string>
     <string name="enrollment_single_section_label">Atributy - %s</string>
-    <string name="program_selector">Programové zápisy</string>
     <string name="select_time">Vyberte čas</string>
     <string name="enter_letter">Zadejte písmeno</string>
     <string name="enter_unit_interval">Zadejte číslo od 0 do 1</string>
@@ -794,8 +788,6 @@
     <string name="from_gallery">Vybrat z galerie</string>
     <string name="data_set_quality_check_done">Hotovo!</string>
     <string name="break_glass_dialog_title">Tento program je chráněn</string>
-    <string name="break_glass_dialog_description">Musíte uvést důvod ke kontrole registrace v tomto chráněném programu. Veškerá aktivita bude zaznamenána.</string>
-    <string name="break_glass_reason">Důvod ke kontrole zápisu</string>
     <string name="break_glass_hint">Zde popište důvod</string>
     <string name="authenticating">Ověření</string>
     <string name="login_error_no_dhis_instance">Zadaná adresa URL serveru není instance dhis</string>
@@ -820,7 +812,6 @@
     <string name="edition_no_write_access">K úpravě těchto údajů nemáte oprávnění</string>
     <string name="event_date_not_in_orgunit_range">Tato data nelze upravovat, protože organizační jednotka je zavřená</string>
     <string name="edition_no_catcombo_access">K úpravě těchto údajů nemáte oprávnění</string>
-    <string name="edition_enrollment_is_no_open">Tato data nelze upravovat, protože zápis je dokončen nebo zrušen</string>
     <string name="edition_orgunit_capture_scope">Data z této organizační jednotky nemůžete upravovat</string>
     <string name="reload_list">Obnovit vyhledávání</string>
     <string name="error_tei_online_search_title">Online vyhledávání vrátilo následující zprávu:</string>
@@ -865,7 +856,6 @@
     <string name="account_disable_title">Účet zakázán</string>
     <string name="account_disable_message">Váš účet byl zakázán správcem.</string>
     <string name="search_unable_search_outside">Chcete-li vyhledávat mimo tento program, otevřete vyhledávací formulář a vyplňte jedno z následujících %s polí:</string>
-    <string name="enrollment_org_unit">Zápis Organizační jednotky</string>
     <string name="customactivityoncrash_error_activity_build_version">Verze sestavení: %s</string>
     <string name="customactivityoncrash_error_activity_buid_date">Datum sestavení: %s</string>
     <string name="customactivityoncrash_error_activity_current_date">Aktuální datum: %s</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d690c50e6f..dad9348bfe 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -161,7 +161,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">Ver detalles</string>
     <string name="view_more">Ver mas</string>
-    <string name="enrolling_ou">OU de admision:</string>
     <string name="follow_up">Seguimiento</string>
     <string name="follow_up_enabled">Seguimiento activado</string>
     <string name="follow_up_disabled">Seguimiento desactivado</string>
@@ -247,7 +246,6 @@
     <string name="add_note">Añadir nota</string>
     <string name="revert">Deshacer</string>
     <string name="activated">Activado</string>
-    <string name="enroll_in">Enrolar en %s</string>
     <string name="missing_mandatory_fields_title">Los campos obligatorios no pueden estar vacios</string>
     <string name="missing_mandatory_fields_text">Algunos campos obligatorios están vacíos. Si desea ir atrás ahora, toda la información guardada se borrará.</string>
     <string name="missing_mandatory_fields_text_not_delete">Faltan campos obligatorios. Rellénelos para ir atrás. </string>
@@ -258,7 +256,6 @@
     <string name="missing_mandatory_fields_go_back">Borrar y salir.</string>
     <string name="error_fields">Algunos campos tienen errores:\n%s\nRevíselos, por favor.</string>
     <string name="missing_mandatory_fields_finish">Algunos campos obligatorios están vacíos. Puede terminar la entrada de datos y salir, pero el evento no podrá ser completado.</string>
-    <string name="enrollment_coordinates">Coordenadas de admisión </string>
     <string name="tei_coordinates">Coordenadas para</string>
 
     <!--EVENT SUMMARY-->
@@ -527,7 +524,6 @@
     <string name="relationship_without_enrollment">Este registro no tiene ninguna inscripción. No se puede acceder al dashboard.</string>
     <string name="formatting_error">Error de formato</string>
     <string name="dashboard_menu_delete_tei_v2">Eliminar %s</string>
-    <string name="dashboard_menu_delete_enrollment">Borrar solo la admisión </string>
     <string name="delete_authority_error">No tienes permisos para borrar este registro</string>
     <string name="validation_url">La URL no es válida</string>
     <string name="uncomplete_authority_error">No tiene permisos para abrir este evento</string>
@@ -622,7 +618,6 @@
     <string name="event_tei_limits_v2">Configuración limitada %s\nEventos: %s/%s Entidades: %s/%s</string>
     <string name="enrollment_data_hide">Ocultar datos de registro</string>
     <string name="enrollment_data_show">Mostrar datos de registro</string>
-    <string name="enrollment_data_section_label">Datos de registro</string>
     <string name="sms_enabled">Módulo de SMS activado</string>
     <string name="sms_disabled">Módulo de SMS desactivado</string>
     <string name="sms_downloading_data">Descargando datos para el módulo de SMS. Por favor espere.</string>
@@ -646,7 +641,6 @@
     <string name="interval_hour_ago">Hace %d horas</string>
     <string name="interval_yesterday">Ayer</string>
     <string name="enrollment_single_section_label">Atributos - %s</string>
-    <string name="program_selector">Registros en programas</string>
     <string name="select_time">Selecciona hora</string>
     <string name="enter_letter">Introduzca una letra</string>
     <string name="enter_unit_interval">Introduzca un número de 0 a 1</string>
@@ -792,8 +786,6 @@
     <string name="from_gallery">Elija de la galería</string>
     <string name="data_set_quality_check_done">¡Listo!</string>
     <string name="break_glass_dialog_title">Este programa está protegido</string>
-    <string name="break_glass_dialog_description">Debe proporcionar una razón para comprobar la inscripción en este programa protegido. Se registrará toda la actividad.</string>
-    <string name="break_glass_reason">Razón para verificar la inscripción</string>
     <string name="break_glass_hint">Describe aquí la razón</string>
     <string name="authenticating">Autentificando</string>
     <string name="login_error_no_dhis_instance">El enlace del servidor proporcionada no es una instancia de dhis</string>
@@ -818,7 +810,6 @@
     <string name="edition_no_write_access">No tiene permisos de edición para estos datos.</string>
     <string name="event_date_not_in_orgunit_range">Los datos no son editables por que la unidad organizativa está cerrada.</string>
     <string name="edition_no_catcombo_access">No tiene permisos de edición para estos datos.</string>
-    <string name="edition_enrollment_is_no_open">Los datos no son editables por que el registro está cerrado o cancelado.</string>
     <string name="edition_orgunit_capture_scope">No puede editar datos en esta unidad organizativa.</string>
     <string name="reload_list">Reiniciar búsqueda</string>
     <string name="error_tei_online_search_title">La búsqueda online a devuelto este mensaje:</string>
@@ -863,7 +854,6 @@
     <string name="account_disable_title">Cuenta deshabilitada</string>
     <string name="account_disable_message">Tu cuenta ha sido deshabilitada por un administrador</string>
     <string name="search_unable_search_outside">Para hacer una búsqueda fuera del programa, debe abrir el formulario de búsqueda y llenar uno de los siguientes campos %s :</string>
-    <string name="enrollment_org_unit">Unid. Org. del registro</string>
     <string name="customactivityoncrash_error_activity_build_version">Versión de compilación: %s</string>
     <string name="customactivityoncrash_error_activity_buid_date">Fecha de compilación: %s</string>
     <string name="customactivityoncrash_error_activity_current_date">Fecha actual: %s</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f1431b0179..ec95312983 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -159,7 +159,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">Voir les détails</string>
     <string name="view_more">Afficher plus</string>
-    <string name="enrolling_ou">Entité Org d´admission</string>
     <string name="follow_up">Suivi</string>
     <string name="follow_up_enabled">Suivi activé</string>
     <string name="follow_up_disabled">Suivi désactivé</string>
@@ -245,7 +244,6 @@
     <string name="add_note">Ajouter une note</string>
     <string name="revert">Annuler</string>
     <string name="activated">Activé</string>
-    <string name="enroll_in">S´inscrire à %s</string>
     <string name="missing_mandatory_fields_title">Les champs obligatoires sont manquant</string>
     <string name="missing_mandatory_fields_text">Certains des champs obligatoires sont manquant. Si vous voulez retourner, tout l´information sera supprimer</string>
     <string name="missing_mandatory_fields_text_not_delete">Certains champs obligatoires sont vides. Si vous voulez retourner, veuillez les renseigner. </string>
@@ -256,7 +254,6 @@
     <string name="missing_mandatory_fields_go_back">Supprimer et retourner</string>
     <string name="error_fields">Certains champs ont des erreurs:\n%s\nVeuillez les vérifier.</string>
     <string name="missing_mandatory_fields_finish">Des champs obligatoires ne sont pas renseignés. Vous pouvez terminer la saisie et quitter, mais l\'évènement ne peut être complété.</string>
-    <string name="enrollment_coordinates">Coordonnées de l\'enrôlement</string>
     <string name="tei_coordinates">Coordonnées pour</string>
 
     <!--EVENT SUMMARY-->
@@ -524,7 +521,6 @@
     <string name="relationship_without_enrollment">La donnée à laquelle vous essayer d\'acceéer n\'a pas d\'enrôlement. Vous ne pouvez pas accéder au tableau de bord.</string>
     <string name="formatting_error">Erreur de formattage</string>
     <string name="dashboard_menu_delete_tei_v2">Supprimer 1%s</string>
-    <string name="dashboard_menu_delete_enrollment">Supprimer seulement l\'enrôlement</string>
     <string name="delete_authority_error">Vous n\'avez pas l\'autorité pour supprimer cette donnée</string>
     <string name="validation_url">Ceci n\'est pas un lien URL valide</string>
     <string name="uncomplete_authority_error">Vous n\'avez pas l\'autorité pour rouvrir cet évènement</string>
@@ -619,7 +615,6 @@
     <string name="event_tei_limits_v2">Paramètres limités %s \nEvénements: %s/%s TEI: %s/%s</string>
     <string name="enrollment_data_hide">Masquer les données d\'inscription</string>
     <string name="enrollment_data_show">Afficher les données d\'inscription</string>
-    <string name="enrollment_data_section_label">Données d\'inscription</string>
     <string name="sms_enabled">Le module SMS est activé</string>
     <string name="sms_disabled">Le module SMS est désactivé</string>
     <string name="sms_downloading_data">Téléchargement des données pour le module SMS. S\'il vous plaît, attendez</string>
@@ -643,7 +638,6 @@
     <string name="interval_hour_ago">%d heures depuis</string>
     <string name="interval_yesterday">Hier</string>
     <string name="enrollment_single_section_label">Attributs - %s</string>
-    <string name="program_selector">Inscriptions au programme</string>
     <string name="select_time">Sélectionnez l\'heure</string>
     <string name="enter_letter">Entrez une lettre</string>
     <string name="enter_unit_interval">Entrez un numéro de 0 à 1</string>
@@ -787,8 +781,6 @@
     <string name="from_gallery">Choisir depuis la galerie</string>
     <string name="data_set_quality_check_done">Terminé!</string>
     <string name="break_glass_dialog_title">Ce programme est protégé</string>
-    <string name="break_glass_dialog_description">Vous devez fournir une raison pour vérifier l\'inscription à ce programme protégé. Toutes les activités seront enregistrées.</string>
-    <string name="break_glass_reason">Raison de vérifier l\'inscription</string>
     <string name="break_glass_hint">Décrivez la raison ici</string>
     <string name="authenticating">En cours d\'authentification</string>
     <string name="login_error_no_dhis_instance">L\'URL du serveur fournie n\'est pas une instance dhis</string>
@@ -805,7 +797,6 @@
     <string name="blocked_by_completion">Ces données ne sont pas modifiables car elles sont marquées comme terminées</string>
     <string name="edition_no_write_access">Vous n\'êtes pas autorisé à modifier ces données</string>
     <string name="edition_no_catcombo_access">Vous n\'êtes pas autorisé à modifier ces données</string>
-    <string name="edition_enrollment_is_no_open">Ces données ne sont pas modifiables car l\'inscription est terminée ou annulée</string>
     <string name="reload_list">Réinitialiser la recherche</string>
     <string name="error_tei_online_search_title">La recherche en ligne a renvoyé le message suivant :</string>
     <string name="program_rules_loop_warning_title">Avertissement relatif aux règles du programme</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 534ef51df3..e62ee19f54 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -156,7 +156,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">Lihat rincian</string>
     <string name="view_more">LIHAT LAINNYA</string>
-    <string name="enrolling_ou">Daftarkan OU:</string>
     <string name="follow_up">Tindak lanjut</string>
     <string name="follow_up_enabled">Tindak lanjut diterapkan</string>
     <string name="follow_up_disabled">Tindak lanjut ditutup</string>
@@ -240,7 +239,6 @@
     <string name="add_note">Tambah catatan</string>
     <string name="revert">Kembali</string>
     <string name="activated">Diaktifkan</string>
-    <string name="enroll_in">Mendaftar %s</string>
     <string name="missing_mandatory_fields_title">Bidang wajib tidak ada</string>
     <string name="missing_mandatory_fields_text">Beberapa bidang wajib tidak ada. Jika Anda ingin kembali sekarang, semua informasi yang disimpan akan dihapus.</string>
     <string name="missing_mandatory_fields_text_not_delete">Beberapa bidang wajib tidak ada. Jika Anda ingin kembali, silakan isi.</string>
@@ -250,7 +248,6 @@
     <string name="missing_mandatory_fields_go_back">Hapus dan kembali</string>
     <string name="error_fields">Beberapa parameter terjadi kesalahan:\n 1 %s \n Mohon, diperiksa</string>
     <string name="missing_mandatory_fields_finish">Beberapa bidang wajib tidak ada. Anda dapat menyelesaikan entri data dan keluar, tetapi even tidak dapat diselesaikan.</string>
-    <string name="enrollment_coordinates">Koordinat pendaftaran</string>
     <string name="tei_coordinates">Koordinat untuk</string>
 
     <!--EVENT SUMMARY-->
@@ -514,7 +511,6 @@
     <string name="sync_setting">Pengaturan sinkronisasi: %s</string>
     <string name="relationship_without_enrollment">Catatan yang Anda coba akses tidak memiliki pendaftaran. Anda tidak dapat mengakses dasbor.</string>
     <string name="formatting_error">Memformat kesalahan</string>
-    <string name="dashboard_menu_delete_enrollment">Hapus pendaftaran saja</string>
     <string name="delete_authority_error">Anda tidak memiliki wewenang untuk menghapus catatan ini</string>
     <string name="validation_url">Ini bukan url yang valid</string>
     <string name="uncomplete_authority_error">Anda tidak memiliki wewenang untuk membuka kembali acara ini</string>
@@ -719,7 +715,6 @@
     <string name="event_tei_limits_v2">Pengaturan terbatas %s\nAcara: %s/%s TEI: %s/%s</string>
     <string name="enrollment_data_hide">Sembunyikan data pendaftaran</string>
     <string name="enrollment_data_show">Tampilkan data pendaftaran</string>
-    <string name="enrollment_data_section_label">Data pendaftaran</string>
     <string name="sms_enabled">Modul SMS diaktifkan</string>
     <string name="sms_disabled">Modul SMS dinonaktifkan</string>
     <string name="sms_downloading_data">Mengunduh data untuk modul SMS. Mohon tunggu</string>
@@ -743,7 +738,6 @@
     <string name="interval_hour_ago">%d jam yang lalu</string>
     <string name="interval_yesterday">Kemarin</string>
     <string name="enrollment_single_section_label">Atribut - %s</string>
-    <string name="program_selector">Pendaftaran program</string>
     <string name="select_time">Pilih waktu</string>
     <string name="enter_letter">Masukkan huruf</string>
     <string name="enter_unit_interval">Masukkan nomor dari 0 hingga 1</string>
@@ -884,8 +878,6 @@
     <string name="from_gallery">Pilih dari galeri</string>
     <string name="data_set_quality_check_done">Selesai!</string>
     <string name="break_glass_dialog_title">Program ini dilindungi</string>
-    <string name="break_glass_dialog_description">Anda harus memberikan alasan untuk memeriksa pendaftaran dalam program yang dilindungi ini. Semua aktivitas akan dicatat.</string>
-    <string name="break_glass_reason">Alasan untuk memeriksa pendaftaran</string>
     <string name="break_glass_hint">Jelaskan alasannya di sini</string>
     <string name="authenticating">Otentikasi</string>
     <string name="login_error_no_dhis_instance">URL server yang disediakan bukan instance dhis</string>
diff --git a/app/src/main/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml
index def272d7ef..267336207f 100644
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@@ -117,7 +117,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">មើលលំអិត</string>
     <string name="view_more">មើលច្រើនទៀត</string>
-    <string name="enrolling_ou">ចុះឈ្មោះអង្គភាព</string>
     <string name="follow_up">តាមដាន</string>
     <string name="follow_up_enabled">ការតាមដានដំណើរការ</string>
     <string name="follow_up_disabled">ការតាមដានមិនដំណើរការ</string>
@@ -164,7 +163,6 @@
     <string name="add_note">បន្ថែមការកត់ចំណាំ</string>
     <string name="revert">ត្រលប់ក្រោយ</string>
     <string name="activated">បានដាក់អោយដំណើរការ</string>
-    <string name="enroll_in">ចុះឈ្មោះក្នុង %s</string>
     <string name="missing_mandatory_fields_title">ទិន្នន័យចាំបាច់មិនមាន</string>
     <string name="missing_mandatory_fields_text">ឈ្មោះទិន្នន័យចាំបាច់ខ្លះមិនមាន, ប្រសិនបើអ្នកចង់ត្រឡប់ទៅវិញ រាល់ពត៏មាននិងត្រូវលុយចោល</string>
     <string name="missing_mandatory_fields_go_back">លុប ហើយត្រឡប់ទៅវិញ</string>
diff --git a/app/src/main/res/values-lo/strings.xml b/app/src/main/res/values-lo/strings.xml
index cf91325607..a6fe6d81c6 100644
--- a/app/src/main/res/values-lo/strings.xml
+++ b/app/src/main/res/values-lo/strings.xml
@@ -152,7 +152,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">ເບິ່ງຂໍ້ມູນເພີ່ມຕື່ມ</string>
     <string name="view_more">ເບີ່ງຕື່ມ</string>
-    <string name="enrolling_ou">ລົງທະບຽນໜ່ວຍງານ</string>
     <string name="follow_up">ຕິດຕາມ</string>
     <string name="follow_up_enabled">ເປີດການຕິດຕາມ</string>
     <string name="follow_up_disabled">ການຕິດຕາມບໍ່ສາມາດນໍາໃຊ້ໄດ້</string>
@@ -235,7 +234,6 @@
     <string name="add_note">ຂຽນບັນທຶກລົງ</string>
     <string name="revert">ກັບຄືນສູ່ສະພາບເດີມ</string>
     <string name="activated">ເປີດການນໍາໃຊ້ແລ້ວ</string>
-    <string name="enroll_in">ຂື້ນທະບຽນມີ %s</string>
     <string name="missing_mandatory_fields_title">ຫ້ອງປ້ອນຂໍ້ມູນທີ່ຈໍາເປັນ ບໍ່ເຫັນ</string>
     <string name="missing_mandatory_fields_text">ຫ້ອງປ້ອນຂໍ້ມູນຈໍານວນໜື່ງບໍ່ເຫັນ. ຖ້າທ່ານຕ້ອງການກັບຄືນດຽວນີ້, ຂໍ້ມູນທັງໝົດທີ່ໄດ້ບັນທຶກແລ້ວຈະຖືກລືບ</string>
     <string name="missing_mandatory_fields_events">ບາງຊ່ອງຂໍ້ມູນຈຳເປັນຕ້ອງດຳເນີນການຂອງທ່ານ.\n ທ່ານຕ້ອງການກວດສອບແບບຟອມຫຼືບໍ?</string>
@@ -245,7 +243,6 @@
     <string name="missing_mandatory_fields_go_back">ລືບຂໍ້ມູນ ແລະ ກັບຄືນ</string>
     <string name="error_fields">ບາງຊ່ອງມີຂໍ້ຜິດພາດ, %s ກະລຸນາກວດສອບ</string>
     <string name="missing_mandatory_fields_finish">ຊ່ອງປ້ອນຂໍ້ມູນຈໍານວນໜື່ງບໍ່ເຫັນ. ທ່ານສາມາດປ້ອນຂໍ້ມູນ ແລະ ອອກໄດ້, ແຕ່ເຫດການຈະບໍ່ສາມາດເຮັດໃຫ້ສຳເລັດໄດ້</string>
-    <string name="enrollment_coordinates">ປະສານງານການລົງທະບຽນ</string>
     <string name="tei_coordinates">ປະສານງານຫາ</string>
 
     <!--EVENT SUMMARY-->
@@ -509,7 +506,6 @@
     <string name="relationship_without_enrollment">ບັນທຶກທີ່ທ່ານພະຍາຍາມເຂົ້າບໍ່ມີການລົງທະບຽນ. ທ່ານບໍສາມາດເຂົ້າເຖີງໜ້າກະດານຂ່າວໄດ້</string>
     <string name="formatting_error">ຂໍ້ຜິດພາດໃນການຈັດຮູບແບບ</string>
     <string name="dashboard_menu_delete_tei_v2">ລົບ%s</string>
-    <string name="dashboard_menu_delete_enrollment">ລົບການລົງທະບຽນເທົ່ານັ້ນ</string>
     <string name="delete_authority_error">ທ່ານບໍສາມາດທີ່ຈະລົບບັນທຶກນີ້ໄດ້</string>
     <string name="validation_url">ຊື່ url ບໍ່ຖຶກຕ້ອງ</string>
     <string name="uncomplete_authority_error">ທ່ານບໍສາມາດເປິດເຫດການນີ້ຄືນໄດ້</string>
@@ -600,7 +596,6 @@
     <string name="event_tei_limits_v2">ຈຳກັດການຕັ້ງຄ່າ%s\nເຫດການ:%s/%sTEI:%s/%s</string>
     <string name="enrollment_data_hide">ເຊື່ອງຂໍ້ມູນການລົງທະບຽນ</string>
     <string name="enrollment_data_show">ສະແດງຂໍ້ມູນການລົງທະບຽນ</string>
-    <string name="enrollment_data_section_label">ຂໍ້ມູນການລົງທະບຽນ</string>
     <string name="sms_enabled">ເປິດໃຊ້ງານໂມດູນຂໍ້ຄວາມ</string>
     <string name="sms_disabled">ໂມດູນຂໍ້ຄວາມຖືກປິດໃຊ້ງານ</string>
     <string name="sms_downloading_data">ກຳລັງດາວໂຫຼດຂໍ້ມູນສຳລັບໂມດູນຂໍ້ຄວາມ. ກະ​ລຸ​ນາ​ລໍ​ຖ້າ</string>
@@ -622,7 +617,6 @@
     <string name="interval_minute_ago">%dນາທີທີ່ຜ່ານມາ</string>
     <string name="interval_hour_ago">%dຊົ່ວໂມງທີ່ຜ່ານມາ</string>
     <string name="interval_yesterday">ມື້ວານນີ</string>
-    <string name="program_selector">ການລົງທະບຽນໂປຣແກຣມ</string>
     <string name="select_time">ເລືອກເວລາ</string>
     <string name="enter_letter">ປ້ອນຕົວອັກສອນ</string>
     <string name="enter_unit_interval">ປ້ອນຕົວເລກຈາກ 0 ຫາ 1</string>
@@ -717,7 +711,6 @@
     <string name="from_gallery">ເລືອກຈາກຄັງຮູບ</string>
     <string name="data_set_quality_check_done">ສຳເລັດແລ້ວ!</string>
     <string name="break_glass_dialog_title">ໂປຣແກຣມນີ້ໄດ້ຮັບການຄຸ້ມຄອງ</string>
-    <string name="break_glass_reason">ເຫດຜົນໃນການກວດສອບການລົງທະບຽນ</string>
     <string name="break_glass_hint">ອະທິບາຍເຫດຜົນຢູ່ບ່ອນນີ້</string>
     <string name="login_error_bad_credentials">ຄວາມຜິດພາດຈາກຢັ້ງຢືນເອກະລັກບຸກຄົນ</string>
     <string name="login_error_unknown_host">ບໍ່ຮູ້ເຄື່ອງຄອມພິວເຕິ້ໜ່ວຍແມ່</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index e389731bb8..6c4df3e660 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -155,7 +155,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">Se detaljer</string>
     <string name="view_more">VIS MER</string>
-    <string name="enrolling_ou">Registrerer OU:</string>
     <string name="follow_up">Oppfølging</string>
     <string name="follow_up_enabled">Oppfølging er aktivert</string>
     <string name="follow_up_disabled">Oppfølging er deaktivert</string>
@@ -240,7 +239,6 @@
     <string name="add_note">Legg til notat</string>
     <string name="revert">Reverser</string>
     <string name="activated">Aktivert</string>
-    <string name="enroll_in">Registrer i %s</string>
     <string name="missing_mandatory_fields_title">Obligatoriske felter mangler</string>
     <string name="missing_mandatory_fields_text">Noen obligatoriske felt mangler. Hvis du vil gå tilbake nå, all lagret informasjon vil bli slettet.</string>
     <string name="missing_mandatory_fields_text_not_delete">Noen obligatoriske felt mangler. Hvis du vil gå tilbake, vennligst fyll inn dem.</string>
@@ -250,7 +248,6 @@
     <string name="missing_mandatory_fields_go_back">Slett og gå tilbake</string>
     <string name="error_fields">Noen felt har feil:\n%s\nVennligst, sjekk dem.</string>
     <string name="missing_mandatory_fields_finish">Noen obligatoriske felter mangler. Du kan fullføre dataregistrering og gå ut, men hendelsen kan ikke fullføres.</string>
-    <string name="enrollment_coordinates">Innmeldingskoordinater</string>
     <string name="tei_coordinates">Koordinater for</string>
 
     <!--EVENT SUMMARY-->
@@ -513,7 +510,6 @@
     <string name="sync_setting">Synkroniseringsinnstillinger: %s</string>
     <string name="relationship_without_enrollment">Oppføringen du prøver å gå inn på har ingen registrering. Du kan ikke gå til dashbord.</string>
     <string name="formatting_error">Formateringsfeil</string>
-    <string name="dashboard_menu_delete_enrollment">Slett kun registrering</string>
     <string name="delete_authority_error">Du har ikke autoritet til å slette denne oppføringen</string>
     <string name="validation_url">Dette er ikke en gyldig URL</string>
     <string name="uncomplete_authority_error">Du har ikke autoritet til å gjenåpne denne hendelsen</string>
@@ -608,7 +604,6 @@
     <string name="event_tei_limits_v2">Begrensede innstillinger : %s\nEvents: %s/%sTEI: %s/%s</string>
     <string name="enrollment_data_hide">Skjul registreringsdata</string>
     <string name="enrollment_data_show">Vis registreringsdata</string>
-    <string name="enrollment_data_section_label">Registreringsdata</string>
     <string name="sms_enabled">SMS modul er aktivert.</string>
     <string name="sms_disabled">SMS modul er deaktivert.</string>
     <string name="sms_downloading_data">Laster ned data for SMS modul. Vennligst vent</string>
@@ -632,7 +627,6 @@
     <string name="interval_hour_ago">%dtimer siden</string>
     <string name="interval_yesterday">I går</string>
     <string name="enrollment_single_section_label">Attributter - %s</string>
-    <string name="program_selector">Programregistreringer</string>
     <string name="select_time">Velg klokkeslett</string>
     <string name="enter_letter">Skriv inn brev</string>
     <string name="enter_unit_interval">Angi nummer fra 0 til 1</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 6d2e531c19..d7cae1f2e9 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -160,7 +160,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">Zie de details</string>
     <string name="view_more">BEKIJK MEER</string>
-    <string name="enrolling_ou">OU inschrijven:</string>
     <string name="follow_up">Volg op</string>
     <string name="follow_up_enabled">Vervolg ingeschakeld</string>
     <string name="follow_up_disabled">Opvolging uitgeschakeld</string>
@@ -248,7 +247,6 @@
     <string name="add_note">Notitie toevoegen</string>
     <string name="revert">Terugdraaien</string>
     <string name="activated">Geactiveerd</string>
-    <string name="enroll_in">Schrijf je in bij %s</string>
     <string name="missing_mandatory_fields_title">Verplichte velden ontbreken</string>
     <string name="missing_mandatory_fields_text">Sommige verplichte velden ontbreken. Als u nu terug wilt gaan, wordt alle opgeslagen informatie verwijderd.</string>
     <string name="missing_mandatory_fields_text_not_delete">Sommige verplichte velden ontbreken. Als je terug wilt gaan, vul ze dan in.</string>
@@ -259,7 +257,6 @@
     <string name="missing_mandatory_fields_go_back">Verwijderen en teruggaan</string>
     <string name="error_fields">Sommige velden bevatten fouten:\n%s\nControleer ze alsjeblieft.</string>
     <string name="missing_mandatory_fields_finish">Sommige verplichte velden ontbreken. U kunt het invoeren en afsluiten van gegevens voltooien, maar de gebeurtenis kan niet worden voltooid.</string>
-    <string name="enrollment_coordinates">Inschrijving coördinaten</string>
     <string name="tei_coordinates">Coördinaten voor de</string>
 
     <!--EVENT SUMMARY-->
@@ -531,7 +528,6 @@
     <string name="relationship_without_enrollment">Het record dat u probeert te openen heeft geen inschrijving. U heeft geen toegang tot het dashboard.</string>
     <string name="formatting_error">Formatteringsfout</string>
     <string name="dashboard_menu_delete_tei_v2">Verwijder %s</string>
-    <string name="dashboard_menu_delete_enrollment">Alleen inschrijving verwijderen</string>
     <string name="delete_authority_error">U bent niet bevoegd om dit record te verwijderen</string>
     <string name="validation_url">Dit is geen geldige URL</string>
     <string name="uncomplete_authority_error">Je hebt niet de bevoegdheid om dit evenement opnieuw te openen</string>
@@ -625,7 +621,6 @@
     <string name="event_tei_limits_v2">Instellingen beperkt %s\nevenementen: %s/%s TEI: %s/%s</string>
     <string name="enrollment_data_hide">Inschrijvingsgegevens verbergen</string>
     <string name="enrollment_data_show">Toon inschrijvingsgegevens</string>
-    <string name="enrollment_data_section_label">Inschrijving gegevens</string>
     <string name="sms_enabled">SMS-module ingeschakeld</string>
     <string name="sms_disabled">SMS-module uitgeschakeld</string>
     <string name="sms_downloading_data">Gegevens downloaden voor SMS-module. Even geduld aub</string>
@@ -649,7 +644,6 @@
     <string name="interval_hour_ago">%d uur geleden</string>
     <string name="interval_yesterday">Gisteren</string>
     <string name="enrollment_single_section_label">Kenmerken - %s</string>
-    <string name="program_selector">Programma inschrijvingen</string>
     <string name="select_time">Selecteer tijd</string>
     <string name="enter_letter">Voer brief in</string>
     <string name="enter_unit_interval">Voer een getal in van 0 tot 1</string>
@@ -795,8 +789,6 @@
     <string name="from_gallery">Kies uit gallerij</string>
     <string name="data_set_quality_check_done">Klaar!</string>
     <string name="break_glass_dialog_title">Dit programma is beveiligd</string>
-    <string name="break_glass_dialog_description">U moet een reden opgeven om te controleren op inschrijving voor dit beschermde programma. Alle activiteiten worden geregistreerd.</string>
-    <string name="break_glass_reason">Reden om te controleren op inschrijving</string>
     <string name="break_glass_hint">Omschrijf hier de reden</string>
     <string name="authenticating">Verificatie</string>
     <string name="login_error_no_dhis_instance">De opgegeven server-URL is geen dhis-instantie</string>
@@ -821,7 +813,6 @@
     <string name="edition_no_write_access">U heeft geen toestemming om deze gegevens te bewerken</string>
     <string name="event_date_not_in_orgunit_range">Deze gegevens zijn niet bewerkbaar omdat de organisatie-eenheid gesloten is</string>
     <string name="edition_no_catcombo_access">U heeft geen toestemming om deze gegevens te bewerken</string>
-    <string name="edition_enrollment_is_no_open">Deze gegevens kunnen niet worden bewerkt omdat de inschrijving is voltooid of geannuleerd</string>
     <string name="edition_orgunit_capture_scope">U kunt gegevens van deze organisatie-eenheid niet bewerken</string>
     <string name="reload_list">Zoeken resetten</string>
     <string name="error_tei_online_search_title">De online zoekopdracht leverde het volgende bericht op:</string>
@@ -866,7 +857,6 @@
     <string name="account_disable_title">Account ongebruikelijk gemaakt</string>
     <string name="account_disable_message">Uw account is uitgeschakeld door een beheerder.</string>
     <string name="search_unable_search_outside">Om buiten dit programma te zoeken, opent u het zoekformulier en vult u een van de volgende %s-velden in:</string>
-    <string name="enrollment_org_unit">Inschrijvingsorganisatie-eenheid</string>
     <string name="customactivityoncrash_error_activity_build_version">Bouw versie: %s</string>
     <string name="customactivityoncrash_error_activity_buid_date">Bouwjaar: %s</string>
     <string name="customactivityoncrash_error_activity_current_date">Huidige datum: %s</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 9b9773f1ba..ba2925db42 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -156,7 +156,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">Veja detalhes</string>
     <string name="view_more">VEJA MAIS</string>
-    <string name="enrolling_ou">Inscrição UO:</string>
     <string name="follow_up">Acompanhamento</string>
     <string name="follow_up_enabled">Acompanhamento ativado</string>
     <string name="follow_up_disabled">Acompanhamento desativado</string>
@@ -242,7 +241,6 @@
     <string name="add_note">Adicionar uma nota</string>
     <string name="revert">Reverter</string>
     <string name="activated">Ativado</string>
-    <string name="enroll_in">Inscreva-se %s</string>
     <string name="missing_mandatory_fields_title">Faltam campos obrigatórios</string>
     <string name="missing_mandatory_fields_text">Alguns campos obrigatórios estão ausentes. Se você quiser voltar agora, todas as informações salvas serão excluídas.</string>
     <string name="missing_mandatory_fields_text_not_delete">Alguns campos obrigatórios estão ausentes. Se você quiser voltar, por favor preencha-os. </string>
@@ -252,7 +250,6 @@
     <string name="missing_mandatory_fields_go_back">Suprimir e voltar</string>
     <string name="error_fields">Alguns campos têm erros:/n%s/nPor favor, verifique-os.</string>
     <string name="missing_mandatory_fields_finish">Alguns campos obrigatórios estão ausentes. Você pode concluir a entrada e saída de dados, mas o evento não pode ser concluído.</string>
-    <string name="enrollment_coordinates">Coordenadas de inscrição</string>
     <string name="tei_coordinates">Coordenadas para o</string>
 
     <!--EVENT SUMMARY-->
@@ -515,7 +512,6 @@
     <string name="sync_setting">Configuração de sincronização: %s</string>
     <string name="relationship_without_enrollment">O registro que você está tentando acessar não tem inscrição. Você não pode acessar o painel.</string>
     <string name="formatting_error">Erro de formatação</string>
-    <string name="dashboard_menu_delete_enrollment">Suprimir somente inscrição</string>
     <string name="delete_authority_error">Você não tem autoridade para suprimir este registro</string>
     <string name="validation_url">Este url não é válido</string>
     <string name="uncomplete_authority_error">Você não tem autoridade para reabrir este evento</string>
@@ -610,7 +606,6 @@
     <string name="event_tei_limits_v2">Configurações limitadas %s \nEventos: %s/%s TEI: %s/%s</string>
     <string name="enrollment_data_hide">Ocultar dados de inscrição</string>
     <string name="enrollment_data_show">Mostrar dados de inscrição</string>
-    <string name="enrollment_data_section_label">Dados de inscrição</string>
     <string name="sms_enabled">Módulo SMS ativado</string>
     <string name="sms_disabled">Módulo SMS desativado</string>
     <string name="sms_downloading_data">Baixando dados para o módulo SMS. Por favor espere.</string>
@@ -634,7 +629,6 @@
     <string name="interval_hour_ago">%d horas atrás</string>
     <string name="interval_yesterday">Ontém</string>
     <string name="enrollment_single_section_label">Atributos - %s</string>
-    <string name="program_selector">Inscrições no programa</string>
     <string name="select_time">Selecionar hora</string>
     <string name="enter_letter">Inserir letra</string>
     <string name="enter_unit_interval">Digite o número de 0 a 1</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 740daf2969..a87f65ad90 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -114,7 +114,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">Se detaljer</string>
     <string name="view_more">VISA MER</string>
-    <string name="enrolling_ou">Inskrivningsorganisationsenhet</string>
     <string name="follow_up">Följ upp</string>
     <string name="follow_up_enabled">Uppföljning aktiverad</string>
     <string name="follow_up_disabled">Uppföljning avaktiverad</string>
@@ -161,7 +160,6 @@
     <string name="add_note">Lägg till anteckning</string>
     <string name="revert">Återställ</string>
     <string name="activated">Aktiverad</string>
-    <string name="enroll_in">Registreras %s</string>
     <string name="missing_mandatory_fields_title">Obligatoriska fält saknas</string>
     <string name="missing_mandatory_fields_text">Några obligatoriska fält saknas. Om du vill gå tillbaka nu raderas alla sparade uppgifter.</string>
     <string name="missing_mandatory_fields_go_back">Ta bort och gå tillbaka</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 3d5dacdfac..3fe9866ecd 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -162,7 +162,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">Подивитись подробиці</string>
     <string name="view_more">ДИВИТИСЬ БІЛЬШЕ</string>
-    <string name="enrolling_ou">Організаційний підрозділ, який здійснює реєстрацію:</string>
     <string name="follow_up">Подальші дії</string>
     <string name="follow_up_enabled">Подальші дії увімкнено</string>
     <string name="follow_up_disabled">Подальші дії вимкнено</string>
@@ -249,7 +248,6 @@
     <string name="add_note">Додати нотатку</string>
     <string name="revert">Повернути</string>
     <string name="activated">Активовано</string>
-    <string name="enroll_in">Реєстрація в %s</string>
     <string name="missing_mandatory_fields_title">Не заповнено обов\'язкові поля</string>
     <string name="missing_mandatory_fields_text">Деякі обов’язкові поля не заповнено. Якщо Ви хочете повернутися зараз, уся збережена інформація буде видалена.</string>
     <string name="missing_mandatory_fields_text_not_delete">Деякі обов’язкові поля не заповнено. Якщо Ви хочете повернутися, заповніть їх. </string>
@@ -260,7 +258,6 @@
     <string name="missing_mandatory_fields_go_back">Видалити та повернутися назад</string>
     <string name="error_fields">У деяких полях є помилки:%s Будь ласка, перевірте їх.</string>
     <string name="missing_mandatory_fields_finish">Деякі обов’язкові поля не заповнено. Ви можете завершити введення даних і вийти, але випадок не може бути завершений.</string>
-    <string name="enrollment_coordinates">Координати реєстрації</string>
     <string name="tei_coordinates">Координати для</string>
 
     <!--EVENT SUMMARY-->
@@ -529,7 +526,6 @@
     <string name="relationship_without_enrollment">Запис, до якого Ви намагаєтеся отримати доступ, не зареєстрований. Ви не можете отримати доступ до інформаційної панелі.</string>
     <string name="formatting_error">Помилка форматування</string>
     <string name="dashboard_menu_delete_tei_v2">Видалити %s</string>
-    <string name="dashboard_menu_delete_enrollment">Видалити лише реєстрацію</string>
     <string name="delete_authority_error">Ви не маєте повноважень видаляти цей запис</string>
     <string name="validation_url">Це недійсна URL-адреса</string>
     <string name="uncomplete_authority_error">Ви не маєте повноважень повторно відкривати цей випадок</string>
@@ -624,7 +620,6 @@
     <string name="event_tei_limits_v2">Налаштування обмежено%sВипадки: %s/%s Об\'єкти: %s/%s</string>
     <string name="enrollment_data_hide">Приховати дані реєстрації</string>
     <string name="enrollment_data_show">Показати дані реєстрації</string>
-    <string name="enrollment_data_section_label">Дані реєстрації</string>
     <string name="sms_enabled">SMS-модуль включений</string>
     <string name="sms_disabled">SMS-модуль відключений</string>
     <string name="sms_downloading_data">Завантаження даних для модуля SMS. Будь ласка, зачекайте</string>
@@ -648,7 +643,6 @@
     <string name="interval_hour_ago">%d годин тому</string>
     <string name="interval_yesterday">Вчора</string>
     <string name="enrollment_single_section_label">Атрибути - %s</string>
-    <string name="program_selector">Програми реєстрації</string>
     <string name="select_time">Оберіть час</string>
     <string name="enter_letter">Введіть літеру</string>
     <string name="enter_unit_interval">Введіть число від 0 до 1</string>
@@ -794,8 +788,6 @@
     <string name="from_gallery">Обрати з галереї</string>
     <string name="data_set_quality_check_done">Готово!</string>
     <string name="break_glass_dialog_title">Ця програма закрита для Вас</string>
-    <string name="break_glass_dialog_description">Ви повинні вказати причину для перевірки реєстрації в цій програмі, яка є для Вас закритою. Уся активність буде зареєстрована.</string>
-    <string name="break_glass_reason">Причина для перевірки реєстрації</string>
     <string name="break_glass_hint">Опишіть причину тут</string>
     <string name="authenticating">Автентифікація</string>
     <string name="login_error_no_dhis_instance">Надана URL-адреса сервера не є екземпляром dhis</string>
@@ -820,7 +812,6 @@
     <string name="edition_no_write_access">Ви не маєте дозволу редагувати ці дані</string>
     <string name="event_date_not_in_orgunit_range">Ці дані не можна редагувати, оскільки організаційний підрозділ закрито</string>
     <string name="edition_no_catcombo_access">Ви не маєте дозволу редагувати ці дані</string>
-    <string name="edition_enrollment_is_no_open">Ці дані не можна редагувати, оскільки реєстрацію завершено або скасовано</string>
     <string name="edition_orgunit_capture_scope">Ви не можете редагувати дані з цього організаційного підрозділу</string>
     <string name="reload_list">Скинути пошук</string>
     <string name="error_tei_online_search_title">Онлайн-пошук дав таке повідомлення:</string>
@@ -865,7 +856,6 @@
     <string name="account_disable_title">Обліковий запис вимкнено</string>
     <string name="account_disable_message">Ваш обліковий запис було вимкнено адміністратором.</string>
     <string name="search_unable_search_outside">Для пошуку за межами цієї програми відкрийте форму пошуку та заповніть одне з наступних %s полів:</string>
-    <string name="enrollment_org_unit">Організаційний підрозділ, який здійснює реєстрацію</string>
     <string name="customactivityoncrash_error_activity_build_version">Версія збірки: %s</string>
     <string name="customactivityoncrash_error_activity_buid_date">Дата збірки: %s</string>
     <string name="customactivityoncrash_error_activity_current_date">Поточна дата: %s</string>
diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
index f6fae6ecd4..847d78e89f 100644
--- a/app/src/main/res/values-uz/strings.xml
+++ b/app/src/main/res/values-uz/strings.xml
@@ -156,7 +156,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">Тафсилотларни кўринг</string>
     <string name="view_more">КЎПРОҚ КЎРИШ</string>
-    <string name="enrolling_ou">OUга рўйхатга олиш</string>
     <string name="follow_up">Кузатиб бориш</string>
     <string name="follow_up_enabled">Кузатув ёқилган</string>
     <string name="follow_up_disabled">Кузатув ўчирилган</string>
@@ -240,7 +239,6 @@
     <string name="add_note">Изоҳ қолдириш</string>
     <string name="revert">Қайтиш</string>
     <string name="activated">Фаоллаштирилди</string>
-    <string name="enroll_in">Қайд қилинган %s</string>
     <string name="missing_mandatory_fields_title">Мажбурий майдонлар қолдириб кетилган</string>
     <string name="missing_mandatory_fields_text">Баъзи мажбурий майдонлар қолдириб кетилган. Агар ҳозир орқага қайтсангиз, барча сақланган маълумотлар ўчиб кетади.</string>
     <string name="missing_mandatory_fields_text_not_delete">Баъзи мажбурий майдонлар қолдириб кетилган. Агар орқага қайтмоқчи бўлсангиз, Илтимос, уларни тўлдиринг.</string>
@@ -250,7 +248,6 @@
     <string name="missing_mandatory_fields_go_back">Ўчириб ташлаш ва орқага қайтиш</string>
     <string name="error_fields">Баъзи маълумотларда хатоликлар мавжуд: \n%s\. Илтимос, уларни текширинг.</string>
     <string name="missing_mandatory_fields_finish">Баъзи мажбурий майдонлар қолдириб кетилган. Сиз маълумотларни киритишни якунлаб чиқишингиз мумкин. Аммо бу ҳолда ҳодиса/тадбирни якунлаб бўлмайди.</string>
-    <string name="enrollment_coordinates">Рўйхатдан ўтиш координаталари</string>
     <string name="tei_coordinates">Учун координаталар</string>
 
     <!--EVENT SUMMARY-->
@@ -515,7 +512,6 @@
     <string name="sync_setting">Синхронизация созланмаси: %s</string>
     <string name="relationship_without_enrollment">Сиз кириб кўрмоқчи бўлган ёзув қайд этилмаган. Сиз бошқарув панелига кира олмайсиз</string>
     <string name="formatting_error">Форматлашда хатолик</string>
-    <string name="dashboard_menu_delete_enrollment">Фақат қайдларни ўчириб ташлаш</string>
     <string name="delete_authority_error">Ҳуқуқингиз чегараланганлиги сабабни ушбу ёзувни ўчириб ташлолмайсиз</string>
     <string name="validation_url">Бу ҳақиқий URL эмас</string>
     <string name="uncomplete_authority_error">Ушбу ҳодиса/тадбирни қайта очишга ваколатингиз йўқ</string>
@@ -610,7 +606,6 @@
     <string name="event_tei_limits_v2">Созламалар чекланган %s \n  Ҳодиса/тадбирлар: %s / %s TEI: %s / %s</string>
     <string name="enrollment_data_hide">Қайд қилиш маълумотларини беркитиш</string>
     <string name="enrollment_data_show">Қайд қилиш маълумотларини кўрсатиш</string>
-    <string name="enrollment_data_section_label">Қайд қилиш маълумотлари</string>
     <string name="sms_enabled">СМС модуль ёқиб қўйилган</string>
     <string name="sms_disabled">СМС модуль ўчириб қўйилган</string>
     <string name="sms_downloading_data">СМС модуль учун маълумотлар юкланмоқда. Илтимос, кутинг</string>
@@ -634,7 +629,6 @@
     <string name="interval_hour_ago">%d соат олдин</string>
     <string name="interval_yesterday">Кеча</string>
     <string name="enrollment_single_section_label">Атрибатлар - %s</string>
-    <string name="program_selector">Дастур қайдлари</string>
     <string name="select_time">Вақтни танланг</string>
     <string name="enter_letter">Хатни киритинг</string>
     <string name="enter_unit_interval">0 дан 1 гача рақамни киритинг</string>
@@ -768,8 +762,6 @@
     <string name="from_gallery">Галереядан танлаш</string>
     <string name="data_set_quality_check_done">Бажарилди!</string>
     <string name="break_glass_dialog_title">Ушбу дастур ҳимояланган</string>
-    <string name="break_glass_dialog_description">Ушбу дастурда қайд этишни текшириш учун сабаб кўрсатишингиз керак. Барча ҳаракатлар ёзиб борилади.</string>
-    <string name="break_glass_reason">Қайд этишни текшириш учун сабаб</string>
     <string name="break_glass_hint">Сабабини шу ерда ёзиб қолдиринг</string>
     <string name="authenticating">Аутентификация қилинмоқда</string>
     <string name="login_error_no_dhis_instance">Кўрсатиб ўтилган URL манзил DHIS шаблонида эмас</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 83c4c331b6..706d0a5247 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -157,7 +157,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">Xem Chi Tiết</string>
     <string name="view_more">XEM THÊM</string>
-    <string name="enrolling_ou">Đơn Vị Đăng Ký:</string>
     <string name="follow_up">Theo dõi</string>
     <string name="follow_up_enabled">Đã bật theo dõi</string>
     <string name="follow_up_disabled">Đã tắt theo dõi</string>
@@ -241,7 +240,6 @@
     <string name="add_note">Thêm ghi chú</string>
     <string name="revert">Hoàn tác</string>
     <string name="activated">Đã hoạt động</string>
-    <string name="enroll_in">Đăng ký vào %s</string>
     <string name="missing_mandatory_fields_title">Thiếu trường dữ liệu bắt buộc</string>
     <string name="missing_mandatory_fields_text">Một số trường bắt buộc bị thiếu. Nếu bạn muốn quay lại, tất cả các thông tin đã lưu sẽ bị xóa.</string>
     <string name="missing_mandatory_fields_text_not_delete">Một số trường bắt buộc nhập bị thiếu. Nếu bạn muốn quay lại, vui lòng nhập giá trị cho chúng</string>
@@ -252,7 +250,6 @@
     <string name="missing_mandatory_fields_go_back">Xóa và quay lại</string>
     <string name="error_fields">Một vài trường dữ liệu có lỗi:\n %s\nVui lòng kiểm tra.</string>
     <string name="missing_mandatory_fields_finish">Một số trường bắt buộc bị thiếu. Bạn có thể lưu biểu nhập và tắt, nhưng sự kiện chưa hoàn tất.</string>
-    <string name="enrollment_coordinates">Tọa độ đăng ký</string>
     <string name="tei_coordinates">Tọa độ của </string>
 
     <!--EVENT SUMMARY-->
@@ -521,7 +518,6 @@
     <string name="relationship_without_enrollment">Hồ sơ bạn đang truy suất không có đăng ký. Bạn không thể mở bảng trình bày dữ liệu</string>
     <string name="formatting_error">Lỗi định dạng</string>
     <string name="dashboard_menu_delete_tei_v2">Xóa %s</string>
-    <string name="dashboard_menu_delete_enrollment">Chỉ xóa đăng ký</string>
     <string name="delete_authority_error">Bạn không có quyền để xóa dữ liệu này</string>
     <string name="validation_url">Đường dẫn liên kết không đúng</string>
     <string name="uncomplete_authority_error">Bạn không có quyền để mở-lại sự kiện này.</string>
@@ -616,7 +612,6 @@
     <string name="event_tei_limits_v2">Cài đặt bị giới hạn %s\n Sự kiện: %s/%s Đối tượng theo dõi: %s/%s</string>
     <string name="enrollment_data_hide">Ẩn dữ liệu đăng ký</string>
     <string name="enrollment_data_show">Hiển thị dữ liệu đăng ký</string>
-    <string name="enrollment_data_section_label">Dữ liệu đăng ký</string>
     <string name="sms_enabled">Mô đun SMS đã bật</string>
     <string name="sms_disabled">Mô đun SMS đã tắt</string>
     <string name="sms_downloading_data">Đang tải xuống dữ liệu cho mô đun SMS. Vui lòng đợi</string>
@@ -640,7 +635,6 @@
     <string name="interval_hour_ago">%d giờ trước</string>
     <string name="interval_yesterday">Hôm Qua</string>
     <string name="enrollment_single_section_label">Thuộc tính - %s</string>
-    <string name="program_selector">Các chương trình đăng ký</string>
     <string name="select_time">Chọn thời gian</string>
     <string name="enter_letter">Nhập ký tự</string>
     <string name="enter_unit_interval">Nhập số từ 0 đến 1</string>
@@ -786,8 +780,6 @@
     <string name="from_gallery">Chọn từ thư viện ảnh</string>
     <string name="data_set_quality_check_done">Hoàn thành!</string>
     <string name="break_glass_dialog_title">Chương trình này đã được bảo vệ</string>
-    <string name="break_glass_dialog_description">Bạn phải cung cấp lý do để kiểm tra đăng ký trong chương trình được bảo vệ này. Tất cả các thay đổi sẽ được lưu lại. </string>
-    <string name="break_glass_reason">Lý do để kiểm tra đăng ký</string>
     <string name="break_glass_hint">Mô tả lý do ở đây</string>
     <string name="authenticating">Đang xác thực</string>
     <string name="login_error_no_dhis_instance">Đường dẫn liên kết đã cung cấp không phải là đường dẫn đến máy chủ DHIS2</string>
@@ -812,7 +804,6 @@
     <string name="edition_no_write_access">Bạn không có quyền chỉnh sửa dữ liệu này</string>
     <string name="event_date_not_in_orgunit_range">Dữ liệu này không thể sửa bởi vì đơn vị đã bị đóng</string>
     <string name="edition_no_catcombo_access">Bạn không có quyền chỉnh sửa dữ liệu này</string>
-    <string name="edition_enrollment_is_no_open">Dữ liệu này không thể chỉnh sửa vì các đăng ký đã hoàn tất hoặc đã hủy. </string>
     <string name="edition_orgunit_capture_scope">Bạn không thể chỉnh sửa dữ liệu từ đơn vị này</string>
     <string name="reload_list">Đặt lại Tìm Kiếm</string>
     <string name="error_tei_online_search_title">Tìm kiếm trực tuyến trả về tin nhắn sau: </string>
@@ -857,7 +848,6 @@
     <string name="account_disable_title">Tài khoản đã bị vô hiệu hóa</string>
     <string name="account_disable_message">Tài khoản của bạn đã bị vô hiệu hóa bởi quản lý chương trình.</string>
     <string name="search_unable_search_outside">Để tìm kiếm bên ngoài chương trình này, mở biểu tìm kiếm và điền một trong những trường %ssau:</string>
-    <string name="enrollment_org_unit">Đơn vị đăng ký</string>
     <string name="customactivityoncrash_error_activity_build_version">Phiên bản cài đặt: %s</string>
     <string name="customactivityoncrash_error_activity_buid_date">Ngày cài đặt: %s</string>
     <string name="customactivityoncrash_error_activity_current_date">Ngày hiện tại: %s</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index c5300ba88a..a59be5b3da 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -154,7 +154,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">查看详情</string>
     <string name="view_more">更多</string>
-    <string name="enrolling_ou">注册机构</string>
     <string name="follow_up">后续跟踪</string>
     <string name="follow_up_enabled">使能后续跟踪</string>
     <string name="follow_up_disabled">后续跟踪关闭</string>
@@ -239,7 +238,6 @@
     <string name="add_note">添加笔记</string>
     <string name="revert">反转</string>
     <string name="activated">激活</string>
-    <string name="enroll_in">注册 %s</string>
     <string name="missing_mandatory_fields_title">强制字段缺失</string>
     <string name="missing_mandatory_fields_text">有些强制字段缺失，如果你后退，所有保存的信息将被删除。</string>
     <string name="missing_mandatory_fields_text_not_delete">有些强制字段缺失，如果你后退，请填充他们</string>
@@ -249,7 +247,6 @@
     <string name="missing_mandatory_fields_go_back">删除并后退</string>
     <string name="error_fields">有些字段有错误：%s。 \n 请检查。</string>
     <string name="missing_mandatory_fields_finish">有些强制字段缺失。你可以完成数据录入并退出，但不能完成该事件。</string>
-    <string name="enrollment_coordinates">注册坐标</string>
     <string name="tei_coordinates">坐标</string>
 
     <!--EVENT SUMMARY-->
@@ -512,7 +509,6 @@
     <string name="sync_setting">同步设置：%s</string>
     <string name="relationship_without_enrollment">你试图访问的记录还没有注册。你不能访问仪表盘。</string>
     <string name="formatting_error">格式化错误</string>
-    <string name="dashboard_menu_delete_enrollment">仅仅删除注册</string>
     <string name="delete_authority_error">你没有删除记录的权限</string>
     <string name="validation_url">没有有效的URL</string>
     <string name="uncomplete_authority_error">你没有打开该事件的权限。</string>
@@ -607,7 +603,6 @@
     <string name="event_tei_limits_v2">设置限制：%s。\n 事件：%s/%s  实体：%s/%s</string>
     <string name="enrollment_data_hide">隐藏注册数据</string>
     <string name="enrollment_data_show">显示注册数据</string>
-    <string name="enrollment_data_section_label">注册数据</string>
     <string name="sms_enabled">短信模块被激活</string>
     <string name="sms_disabled">短信模块被关闭</string>
     <string name="sms_downloading_data">下载短信模块，请等待。</string>
@@ -631,7 +626,6 @@
     <string name="interval_hour_ago">%d小时前</string>
     <string name="interval_yesterday">昨天</string>
     <string name="enrollment_single_section_label">属性- %s</string>
-    <string name="program_selector">项目注册</string>
     <string name="select_time">选择时间</string>
     <string name="enter_letter">输入字符</string>
     <string name="enter_unit_interval">输入0-1之间的数</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 724625f380..87c816c694 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -159,7 +159,6 @@
     <!--TEI DASHBOARD-->
     <string name="see_details">查看详情</string>
     <string name="view_more">更多</string>
-    <string name="enrolling_ou">注册机构</string>
     <string name="follow_up">后续跟踪</string>
     <string name="follow_up_enabled">使能后续跟踪</string>
     <string name="follow_up_disabled">后续跟踪关闭</string>
@@ -243,7 +242,6 @@
     <string name="add_note">添加笔记</string>
     <string name="revert">反转</string>
     <string name="activated">激活</string>
-    <string name="enroll_in">注册 %s</string>
     <string name="missing_mandatory_fields_title">强制字段缺失</string>
     <string name="missing_mandatory_fields_text">有些强制字段缺失，如果你后退，所有保存的信息将被删除。</string>
     <string name="missing_mandatory_fields_text_not_delete">有些强制字段缺失，如果你后退，请填充他们</string>
@@ -254,7 +252,6 @@
     <string name="missing_mandatory_fields_go_back">删除并后退</string>
     <string name="error_fields">有些字段有错误：%s。 \n 请检查。</string>
     <string name="missing_mandatory_fields_finish">有些强制字段缺失。你可以完成数据录入并退出，但不能完成该事件。</string>
-    <string name="enrollment_coordinates">注册坐标</string>
     <string name="tei_coordinates">坐标</string>
 
     <!--EVENT SUMMARY-->
@@ -523,7 +520,6 @@
     <string name="relationship_without_enrollment">你试图访问的记录还没有注册。你不能访问仪表盘。</string>
     <string name="formatting_error">格式化错误</string>
     <string name="dashboard_menu_delete_tei_v2">删除 %s</string>
-    <string name="dashboard_menu_delete_enrollment">仅仅删除注册</string>
     <string name="delete_authority_error">你没有删除记录的权限</string>
     <string name="validation_url">没有有效的URL</string>
     <string name="uncomplete_authority_error">你没有打开该事件的权限。</string>
@@ -618,7 +614,6 @@
     <string name="event_tei_limits_v2">设置限制：%s。\n 事件：%s/%s  实体：%s/%s</string>
     <string name="enrollment_data_hide">隐藏注册数据</string>
     <string name="enrollment_data_show">显示注册数据</string>
-    <string name="enrollment_data_section_label">注册数据</string>
     <string name="sms_enabled">短信模块被激活</string>
     <string name="sms_disabled">短信模块被关闭</string>
     <string name="sms_downloading_data">下载短信模块，请等待。</string>
@@ -642,7 +637,6 @@
     <string name="interval_hour_ago">%d小时前</string>
     <string name="interval_yesterday">昨天</string>
     <string name="enrollment_single_section_label">属性- %s</string>
-    <string name="program_selector">项目注册</string>
     <string name="select_time">选择时间</string>
     <string name="enter_letter">输入字符</string>
     <string name="enter_unit_interval">输入0-1之间的数</string>
@@ -788,8 +782,6 @@
     <string name="from_gallery">从图库中选择</string>
     <string name="data_set_quality_check_done">完成！</string>
     <string name="break_glass_dialog_title">该项目受保护</string>
-    <string name="break_glass_dialog_description">您必须提供一个理由来检查是否注册了该受保护项目。所有活动将被记录。</string>
-    <string name="break_glass_reason">注册原因</string>
     <string name="break_glass_hint">在此说明原因</string>
     <string name="authenticating">验证中</string>
     <string name="login_error_no_dhis_instance">提供的服务器URL不是dhis实例</string>
@@ -814,7 +806,6 @@
     <string name="edition_no_write_access">您无权编辑此数据</string>
     <string name="event_date_not_in_orgunit_range">此数据不可修改，因为单位部门已关闭</string>
     <string name="edition_no_catcombo_access">您无权编辑此数据</string>
-    <string name="edition_enrollment_is_no_open">此数据不可编辑，因为注册已完成或取消</string>
     <string name="edition_orgunit_capture_scope">您无法编辑此机构的数据</string>
     <string name="reload_list">重置搜索</string>
     <string name="error_tei_online_search_title">网上搜索返回如下信息：</string>
@@ -859,7 +850,6 @@
     <string name="account_disable_title">帐户已禁用</string>
     <string name="account_disable_message">您的帐户已被管理员禁用。</string>
     <string name="search_unable_search_outside">要在此项目之外进行搜索，请打开搜索表单并填写以下 %s 字段之一：</string>
-    <string name="enrollment_org_unit">注册机构</string>
     <string name="customactivityoncrash_error_activity_build_version">构建版本：%s</string>
     <string name="customactivityoncrash_error_activity_buid_date">构建日期：%s</string>
     <string name="customactivityoncrash_error_activity_current_date">当前日期：%s</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1fd729cee1..5523c9fb57 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -174,7 +174,6 @@
     <string name="see_details">See Details</string>
     <string name="view_more">VIEW MORE</string>
     <string name="edit">Edit</string>
-    <string name="enrolling_ou">Enrolling OU:</string>
     <string name="follow_up">Follow up</string>
     <string name="follow_up_enabled">Follow up enabled</string>
     <string name="follow_up_disabled">Follow up disabled</string>
@@ -262,7 +261,6 @@
     <string name="add_note">Add note</string>
     <string name="revert">Revert</string>
     <string name="activated">Activated</string>
-    <string name="enroll_in">Enroll in %s</string>
     <string name="missing_mandatory_fields_title">Mandatory fields are missing</string>
     <string name="missing_mandatory_fields_text">Some mandatory fields are missing. If you want to go back now, all saved information will be deleted.</string>
     <string name="missing_mandatory_fields_text_not_delete">Some mandatory fields are missing. If you want to go back, please fill them.</string>
@@ -273,7 +271,6 @@
     <string name="missing_mandatory_fields_go_back">Delete and go back</string>
     <string name="error_fields">Some fields have errors:\n%s\nPlease, check them.</string>
     <string name="missing_mandatory_fields_finish">Some mandatory fields are missing. You can finish data entry and exit, but the event cannot be completed.</string>
-    <string name="enrollment_coordinates">Enrollment coordinates</string>
     <string name="tei_coordinates">Coordinates for the</string>
 
     <!--EVENT SUMMARY-->
@@ -545,7 +542,6 @@
     <string name="relationship_without_enrollment">The record you are trying to access has no enrollment. You can\'t access the dashboard.</string>
     <string name="formatting_error">Formatting error</string>
     <string name="dashboard_menu_delete_tei_v2">Delete %s</string>
-    <string name="dashboard_menu_delete_enrollment">Delete enrollment only</string>
     <string name="delete_authority_error">You do not have the authority to delete this record</string>
     <string name="validation_url">This is not a valid url</string>
     <string name="uncomplete_authority_error">You do not have the authority to re-open this event</string>
@@ -640,7 +636,6 @@
     <string name="event_tei_limits_v2">Settings limited %s\nEvents: %s/%s TEI: %s/%s</string>
     <string name="enrollment_data_hide">Hide enrollment data</string>
     <string name="enrollment_data_show">Show enrollment data</string>
-    <string name="enrollment_data_section_label">Enrollment data</string>
     <string name="sms_enabled">SMS module enabled</string>
     <string name="sms_disabled">SMS module disabled</string>
     <string name="sms_downloading_data">Downloading data for SMS module. Please wait</string>
@@ -669,7 +664,6 @@
     <string name="interval_hour_ago">%d hours ago</string>
     <string name="interval_yesterday">Yesterday</string>
     <string name="enrollment_single_section_label">Attributes - %s</string>
-    <string name="program_selector">Program enrollments</string>
     <string name="select_time">Select time</string>
     <string name="enter_letter">Enter letter</string>
     <string name="enter_unit_interval">Enter number from 0 to 1</string>
@@ -715,7 +709,7 @@
     <string name="complete_anyway">Complete anyway</string>
     <string name="fk_message">Missing %s %s from %s %s</string>
     <string name="filters_title_event_status">Event status</string>
-    <string name="filters_title_enrollment_status">Enrollment status</string>
+    <string name="filters_title_enrollment_status">@string/enrollment_status</string>
     <string name="enrollment_date">Enrollment date</string>
     <string name="dataset_empty_list_can_create">There are no data. Click \"+\" to add new a new record</string>
     <string name="dataset_emtpy_list_can_not_create">There are no data. You don\'t have permission to add new records.</string>
@@ -817,8 +811,6 @@
     <string name="from_gallery">Choose from gallery</string>
     <string name="data_set_quality_check_done">Done!</string>
     <string name="break_glass_dialog_title">This program is protected</string>
-    <string name="break_glass_dialog_description">You must provide a reason to check for enrollment in this protected program. All activity will be logged.</string>
-    <string name="break_glass_reason">Reason to check for enrollment</string>
     <string name="break_glass_hint">Describe the reason here</string>
     <string name="authenticating">Authenticating</string>
     <string name="login_error_no_dhis_instance">Provided server url is not a dhis instance</string>
@@ -845,7 +837,6 @@
     <string name="edition_no_write_access">You do not have permission to edit this data</string>
     <string name="event_date_not_in_orgunit_range">This data is not editable because the organization unit is closed</string>
     <string name="edition_no_catcombo_access">You do not have permission to edit this data</string>
-    <string name="edition_enrollment_is_no_open">This data is not editable because the enrollment is completed or cancelled</string>
     <string name="edition_orgunit_capture_scope">You cannot edit data from this organisation unit</string>
     <string name="reload_list">Reset search</string>
     <string name="error_tei_online_search_title">The online search returned the following message:</string>
@@ -890,7 +881,6 @@
     <string name="account_disable_title">Account disabled</string>
     <string name="account_disable_message">Your account has been disabled by an administrator.</string>
     <string name="search_unable_search_outside">To search outside this program open the search form and fill one of the following %s fields:</string>
-    <string name="enrollment_org_unit">Enrollment Org Unit</string>
     <string name="customactivityoncrash_error_activity_build_version">Build version: %s</string>
     <string name="customactivityoncrash_error_activity_buid_date">Build date: %s</string>
     <string name="customactivityoncrash_error_activity_current_date">Current date: %s</string>
@@ -959,8 +949,6 @@
     <string name="permission_notification_granted">Notification permission granted.</string>
     <string name="not_synced">Not synced</string>
     <string name="sync_retry">Retry sync</string>
-    <string name="enrollment_completed">Enrollment completed</string>
-    <string name="enrollment_cancelled">Enrollment cancelled</string>
     <string name="marked_follow_up">Marked for follow-up</string>
     <string name="overdue">Overdue %s</string>
     <string name="registered_in">Registered in:</string>
diff --git a/app/src/test/java/org/dhis2/data/filter/FilterRepositoryTest.kt b/app/src/test/java/org/dhis2/data/filter/FilterRepositoryTest.kt
index 40a8021db2..ca9cdbb874 100644
--- a/app/src/test/java/org/dhis2/data/filter/FilterRepositoryTest.kt
+++ b/app/src/test/java/org/dhis2/data/filter/FilterRepositoryTest.kt
@@ -74,11 +74,11 @@ class FilterRepositoryTest {
     private fun mockFilterLabels() {
         whenever(filterResources.filterOrgUnitLabel()) doReturn ORG_UNIT
         whenever(filterResources.filterSyncLabel()) doReturn SYNC_STATUS
-        whenever(filterResources.filterEnrollmentStatusLabel()) doReturn
+        whenever(filterResources.filterEnrollmentStatusLabel(any())) doReturn
             ENROLLMENT_STATUS
         whenever(filterResources.filterDateLabel()) doReturn EVENT_DATE
         whenever(filterResources.filterEventStatusLabel()) doReturn EVENT_STATUS
-        whenever(filterResources.filterEnrollmentDateLabel()) doReturn
+        whenever(filterResources.filterEnrollmentDateLabel(any())) doReturn
             ENROLLMENT_DATE
         whenever(filterResources.filterAssignedToMeLabel()) doReturn ASSIGN_TO_ME
         whenever(filterResources.filterEventDateLabel()) doReturn EVENT_DATE
diff --git a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/EventDetailsIntegrationTest.kt b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/EventDetailsIntegrationTest.kt
index 4456be2091..0f88359ccc 100644
--- a/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/EventDetailsIntegrationTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/EventDetailsIntegrationTest.kt
@@ -179,7 +179,7 @@ class EventDetailsIntegrationTest {
         enrollmentStatus = enrollmentStatus,
     )
 
-    private fun provideEventResourcesProvider() = EventDetailResourcesProvider(resourceManager)
+    private fun provideEventResourcesProvider() = EventDetailResourcesProvider(PROGRAM_UID, resourceManager)
 
     private fun createOrUpdateEventDetails() = CreateOrUpdateEventDetails(
         repository = eventDetailsRepository,
diff --git a/app/src/test/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapperTest.kt b/app/src/test/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapperTest.kt
index 2e4dcb6df9..c4b913728e 100644
--- a/app/src/test/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapperTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapperTest.kt
@@ -15,6 +15,7 @@ import org.hisp.dhis.android.core.trackedentity.TrackedEntityInstance
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
+import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.whenever
@@ -36,7 +37,7 @@ class TEICardMapperTest {
         whenever(resourceManager.getString(R.string.show_less)) doReturn "Show less"
         whenever(resourceManager.getString(R.string.completed)) doReturn "Completed"
         whenever(
-            resourceManager.getString(R.string.enrollment_completed),
+            resourceManager.formatWithEnrollmentLabel(any(), any(), any(), any()),
         ) doReturn "Enrollment Completed"
         whenever(
             resourceManager.getString(R.string.overdue_today),
@@ -67,7 +68,7 @@ class TEICardMapperTest {
         )
         assertEquals(
             result.additionalInfo[3].value,
-            resourceManager.getString(R.string.enrollment_completed),
+            "Enrollment Completed",
         )
 
         assertEquals(
@@ -99,6 +100,7 @@ class TEICardMapperTest {
             setCurrentEnrollment(
                 Enrollment.builder()
                     .uid("EnrollmentUid")
+                    .program("programUid")
                     .status(EnrollmentStatus.COMPLETED)
                     .build(),
             )
diff --git a/app/src/test/java/org/dhis2/usescases/teiDashboard/ui/mapper/InfoBarMapperTest.kt b/app/src/test/java/org/dhis2/usescases/teiDashboard/ui/mapper/InfoBarMapperTest.kt
index bb03673827..8d782544ae 100644
--- a/app/src/test/java/org/dhis2/usescases/teiDashboard/ui/mapper/InfoBarMapperTest.kt
+++ b/app/src/test/java/org/dhis2/usescases/teiDashboard/ui/mapper/InfoBarMapperTest.kt
@@ -33,8 +33,19 @@ class InfoBarMapperTest {
         whenever(resourceManager.getString(R.string.sync_warning)) doReturn "Sync warning"
         whenever(resourceManager.getString(R.string.sync_error)) doReturn "Sync Error"
         whenever(resourceManager.getString(R.string.marked_follow_up)) doReturn "Marked for follow up"
-        whenever(resourceManager.getString(R.string.enrollment_completed)) doReturn "Enrollment completed"
-        whenever(resourceManager.getString(R.string.enrollment_cancelled)) doReturn "Enrollment cancelled"
+        setPrograms().forEach {
+            whenever(
+                resourceManager.formatWithEnrollmentLabel(
+                    it.uid(), R.string.enrollment_completed_V2, 1,
+                ),
+            ) doReturn "Enrollment completed"
+            whenever(
+                resourceManager.formatWithEnrollmentLabel(
+                    it.uid(), R.string.enrollment_cancelled_V2, 1,
+                ),
+            ) doReturn "Enrollment cancelled"
+        }
+
         whenever(resourceManager.getString(R.string.sync)) doReturn "Sync"
         whenever(resourceManager.getString(R.string.sync_retry)) doReturn "Retry sync"
         whenever(resourceManager.getString(R.string.remove)) doReturn "remove"
diff --git a/commons/src/main/java/org/dhis2/commons/filters/FilterResources.kt b/commons/src/main/java/org/dhis2/commons/filters/FilterResources.kt
index 5ebe974d1a..944c431aad 100644
--- a/commons/src/main/java/org/dhis2/commons/filters/FilterResources.kt
+++ b/commons/src/main/java/org/dhis2/commons/filters/FilterResources.kt
@@ -81,7 +81,12 @@ class FilterResources(val resourceManager: ResourceManager) {
     fun span(): String = resourceManager.getString(R.string.filter_period_from_to)
     fun filterPeriodLabel(): String = resourceManager.getString(R.string.filters_title_period)
     fun filterDateLabel(): String = resourceManager.getString(R.string.filters_title_date)
-    fun filterEnrollmentDateLabel(): String = resourceManager.getString(R.string.enrollment_date)
+    fun filterEnrollmentDateLabel(programUid: String): String = resourceManager.formatWithEnrollmentLabel(
+        programUid,
+        R.string.enrollment_date_V2,
+        1,
+    )
+
     fun filterEventDateLabel(): String =
         resourceManager.getString(R.string.filters_title_event_date)
 
@@ -90,8 +95,12 @@ class FilterResources(val resourceManager: ResourceManager) {
     fun filterAssignedToMeLabel(): String =
         resourceManager.getString(R.string.filters_title_assigned)
 
-    fun filterEnrollmentStatusLabel(): String =
-        resourceManager.getString(R.string.filters_title_enrollment_status)
+    fun filterEnrollmentStatusLabel(programUid: String): String =
+        resourceManager.formatWithEnrollmentLabel(
+            programUid,
+            R.string.filters_title_enrollment_status,
+            1,
+        )
 
     fun filterFollowUpLabel(teTypeName: String): String =
         resourceManager.getString(R.string.filter_follow_up_label).format(teTypeName)
@@ -104,8 +113,10 @@ class FilterResources(val resourceManager: ResourceManager) {
             when (it) {
                 EnrollmentStatus.ACTIVE ->
                     resourceManager.getString(R.string.enrollment_status_active)
+
                 EnrollmentStatus.COMPLETED ->
                     resourceManager.getString(R.string.enrollment_status_completed)
+
                 EnrollmentStatus.CANCELLED ->
                     resourceManager.getString(R.string.enrollment_status_cancelled)
             }
@@ -130,6 +141,7 @@ class FilterResources(val resourceManager: ResourceManager) {
         EventStatus.ACTIVE -> resourceManager.getString(R.string.filter_event_status_open)
         EventStatus.COMPLETED ->
             resourceManager.getString(R.string.filter_event_status_completed)
+
         EventStatus.SCHEDULE -> resourceManager.getString(R.string.filter_event_status_schedule)
         EventStatus.SKIPPED -> resourceManager.getString(R.string.filter_event_status_skipped)
         EventStatus.VISITED -> resourceManager.getString(R.string.filter_event_status_visited)
diff --git a/commons/src/main/java/org/dhis2/commons/filters/data/FilterRepository.kt b/commons/src/main/java/org/dhis2/commons/filters/data/FilterRepository.kt
index 8f049bcba8..7bc78fdb82 100644
--- a/commons/src/main/java/org/dhis2/commons/filters/data/FilterRepository.kt
+++ b/commons/src/main/java/org/dhis2/commons/filters/data/FilterRepository.kt
@@ -539,7 +539,7 @@ class FilterRepository @Inject constructor(
             observableSortingInject,
             observableOpenFilter,
             program.enrollmentDateLabel() ?: resources
-                .filterEnrollmentDateLabel(),
+                .filterEnrollmentDateLabel(program.uid()),
         )
         defaultTrackerFilters[ProgramFilter.ORG_UNIT] = OrgUnitFilter(
             FilterManager.getInstance().observeOrgUnitFilters(),
@@ -558,7 +558,7 @@ class FilterRepository @Inject constructor(
             ProgramType.TRACKER,
             observableSortingInject,
             observableOpenFilter,
-            resources.filterEnrollmentStatusLabel(),
+            resources.filterEnrollmentStatusLabel(program.uid()),
         )
         defaultTrackerFilters[ProgramFilter.EVENT_STATUS] = EventStatusFilter(
             ProgramType.TRACKER,
diff --git a/commons/src/main/java/org/dhis2/commons/resources/D2ErrorUtils.kt b/commons/src/main/java/org/dhis2/commons/resources/D2ErrorUtils.kt
index aa6332b5ba..0acd6fe21c 100644
--- a/commons/src/main/java/org/dhis2/commons/resources/D2ErrorUtils.kt
+++ b/commons/src/main/java/org/dhis2/commons/resources/D2ErrorUtils.kt
@@ -144,14 +144,19 @@ class D2ErrorUtils(
                 context.getString(R.string.error_org_unit_scope)
             D2ErrorCode.INVALID_CHARACTERS ->
                 context.getString(R.string.error_invalid_characters)
-            D2ErrorCode.PROGRAM_ACCESS_CLOSED ->
-                TODO("Implement for ANDROAPP-657")
+            D2ErrorCode.PROGRAM_ACCESS_CLOSED -> defaultError()
             D2ErrorCode.SERVER_CONNECTION_ERROR ->
                 if (networkUtils.isOnline()) {
                     context.getString(R.string.error_server_unavailable)
                 } else {
                     context.getString(R.string.error_no_internet_connection)
                 }
+
+            D2ErrorCode.DATABASE_IMPORT_FAILED -> defaultError()
+            D2ErrorCode.DATABASE_IMPORT_INVALID_FILE -> defaultError()
         }
     }
+
+    private fun defaultError() =
+        context.getString(R.string.error_unexpected)
 }
diff --git a/commons/src/main/java/org/dhis2/commons/resources/ResourceManager.kt b/commons/src/main/java/org/dhis2/commons/resources/ResourceManager.kt
index 7b19d4ec53..b6a257e0b1 100644
--- a/commons/src/main/java/org/dhis2/commons/resources/ResourceManager.kt
+++ b/commons/src/main/java/org/dhis2/commons/resources/ResourceManager.kt
@@ -4,6 +4,8 @@ import android.content.Context
 import androidx.annotation.DrawableRes
 import androidx.annotation.PluralsRes
 import androidx.annotation.StringRes
+import androidx.compose.ui.text.capitalize
+import androidx.compose.ui.text.intl.Locale
 import androidx.core.content.ContextCompat
 import org.dhis2.commons.R
 import org.dhis2.commons.network.NetworkUtils
@@ -25,6 +27,34 @@ class ResourceManager(
     fun getPlural(@PluralsRes pluralResource: Int, quantity: Int, vararg arguments: Any) =
         getWrapperContext().resources.getQuantityString(pluralResource, quantity, *arguments)
 
+    fun formatWithEnrollmentLabel(
+        programUid: String,
+        @StringRes stringResource: Int,
+        quantity: Int,
+        formatWithQuantity: Boolean = false,
+    ): String {
+        val enrollmentLabel = try {
+            D2Manager.getD2().programModule().programs().uid(programUid).blockingGet()
+                ?.enrollmentLabel()
+        } catch (e: Exception) {
+            null
+        } ?: getPlural(R.plurals.enrollment, quantity)
+
+        return with(getString(stringResource)) {
+            val finalLabel = if (this@with.startsWith("%s")) {
+                enrollmentLabel.capitalize(Locale.current)
+            } else {
+                enrollmentLabel
+            }
+
+            if (formatWithQuantity) {
+                format(quantity, finalLabel)
+            } else {
+                format(finalLabel)
+            }
+        }
+    }
+
     fun getObjectStyleDrawableResource(icon: String?, @DrawableRes defaultResource: Int): Int {
         return icon?.let {
             val iconName = if (icon.startsWith("ic_")) icon else "ic_$icon"
diff --git a/commons/src/main/res/values-lo/strings.xml b/commons/src/main/res/values-lo/strings.xml
index 408f6ab088..ca1059c17d 100644
--- a/commons/src/main/res/values-lo/strings.xml
+++ b/commons/src/main/res/values-lo/strings.xml
@@ -66,7 +66,6 @@
     <string name="enrollment_status_active">ເປີດ</string>
     <string name="enrollment_status_completed">ສຳເລັດແລ້ວ</string>
     <string name="enrollment_status_cancelled">ຍົກເລີກແລ້ວ</string>
-    <string name="enrollment_org_unit">ລົງທະບຽນຫົວໜ່ວຍການຈັດຕັ້ງ</string>
 
     <!-- Periods -->
     <string name="filter_period_today">ມື້ນີ້</string>
diff --git a/commons/src/main/res/values/strings.xml b/commons/src/main/res/values/strings.xml
index 537fd500d8..4463adf3c6 100644
--- a/commons/src/main/res/values/strings.xml
+++ b/commons/src/main/res/values/strings.xml
@@ -45,9 +45,8 @@
     <string name="filters_title_assigned">Assigned to me</string>
     <string name="filters_title_date">Date</string>
     <string name="filters_title_event_date">Event date</string>
-    <string name="enrollment_date">Enrollment date</string>
     <string name="filters_title_event_status">Event status</string>
-    <string name="filters_title_enrollment_status">Enrollment status</string>
+    <string name="filters_title_enrollment_status">@string/enrollment_status</string>
     <string name="filter_follow_up_label">Followed up %s</string>
 
     <!-- State -->
@@ -76,8 +75,6 @@
     <string name="enrollment_status_cancelled">Cancelled</string>
     <string name="record_marked_for_deletion">This record is marked for deletion. You can\'t access it.</string>
 
-    <string name="enrollment_org_unit">Enrollment Org Unit</string>
-
     <!-- Periods -->
     <string name="filter_period_today">Today</string>
     <string name="filter_period_yesterday">Yesterday</string>
@@ -240,4 +237,27 @@
         <item quantity="other">%d years overdue</item>
     </plurals>
     <string name="open_with">Open with</string>
+
+
+    <!--Enrollment labels-->
+    <plurals name="enrollment">
+        <item quantity="many">enrollments</item>
+        <item quantity="other">enrollment</item>
+    </plurals>
+    <string name="dialog_layer_enrollment_coordinates_v2">Show %s coordinates</string>
+
+    <string name="enrollment_data_section_label_V2">%s data</string>
+    <string name="enrollment_coordinates_V2">%s coordinates</string>
+    <string name="enrollment_date_V2">%s date</string>
+    <string name="enrollment_status">%s status</string>
+    <string name="break_glass_dialog_description_V2">You must provide a reason to check for %s in this protected program. All activity will be logged.</string>
+    <string name="break_glass_reason_V2">Reason to check for %s</string>
+    <string name="edition_enrollment_is_no_open_V2">This data is not editable because the %s is completed or cancelled</string>
+    <string name="enrollment_completed_V2">%s completed</string>
+    <string name="enrollment_cancelled_V2">%s cancelled</string>
+    <string name="new_enrollment">New %s</string>
+    <string name="enrolling_ou">Enrolled in:</string> <!--TODO: Remove this once ANDROAPP-5901 has been merged. Also remove unused TEI card xmls-->
+    <string name="dashboard_menu_delete_enrollment_V2">Delete %s only</string>
+    <string name="program_selector_V2">Program %s</string>
+
 </resources>
diff --git a/dhis2_android_maps/src/main/java/org/dhis2/maps/layer/MapLayerDialog.kt b/dhis2_android_maps/src/main/java/org/dhis2/maps/layer/MapLayerDialog.kt
index 80cc3216ea..c783898064 100644
--- a/dhis2_android_maps/src/main/java/org/dhis2/maps/layer/MapLayerDialog.kt
+++ b/dhis2_android_maps/src/main/java/org/dhis2/maps/layer/MapLayerDialog.kt
@@ -124,7 +124,7 @@ class MapLayerDialog(
                 is EnrollmentMapLayer -> layerMap["ENROLLMENT"]?.add(
                     addCheckBox(
                         source,
-                        requireContext().getString(R.string.dialog_layer_enrollment_coordinates),
+                        requireContext().getString(R.string.dialog_layer_enrollment_coordinates_v2), // TODO:5894 programUid not available
                         MapLayerManager.ENROLLMENT_ICON_ID,
                     ),
                 )
diff --git a/dhis2_android_maps/src/main/res/values-ar/strings.xml b/dhis2_android_maps/src/main/res/values-ar/strings.xml
index 922f438622..41886620a6 100644
--- a/dhis2_android_maps/src/main/res/values-ar/strings.xml
+++ b/dhis2_android_maps/src/main/res/values-ar/strings.xml
@@ -5,6 +5,5 @@
     <string name="dialog_layer_satellite">إظهار عرض القمر الصناعي</string>
     <string name="dialog_layer_event">إظهار الأحداث</string>
     <string name="dialog_layer_tei_coordinates">إظهار إحداثيات tei</string>
-    <string name="dialog_layer_enrollment_coordinates">عرض إحداثيات التسجيل</string>
     <string name="dialog_layer_heatmap">إظهار طبقة مخطط الحرارة</string>
 </resources>
\ No newline at end of file
diff --git a/dhis2_android_maps/src/main/res/values-b+uz+Latn/strings.xml b/dhis2_android_maps/src/main/res/values-b+uz+Latn/strings.xml
index eb607fe484..df2739e899 100644
--- a/dhis2_android_maps/src/main/res/values-b+uz+Latn/strings.xml
+++ b/dhis2_android_maps/src/main/res/values-b+uz+Latn/strings.xml
@@ -6,6 +6,5 @@
     <string name="dialog_layer_satellite">Suniy yoʼldosh koʼrinishini koʼrsatish</string>
     <string name="dialog_layer_event">Hodisa/tadbirlarni koʼrsatish</string>
     <string name="dialog_layer_tei_coordinates">TEI koordinatalarini koʼrsatish</string>
-    <string name="dialog_layer_enrollment_coordinates">Qayd etilganlar koordinatalarini koʼrsatish</string>
     <string name="dialog_layer_heatmap">Issiqlik xaritasi qatlamini koʼrsatish</string>
     </resources>
\ No newline at end of file
diff --git a/dhis2_android_maps/src/main/res/values-cs/strings.xml b/dhis2_android_maps/src/main/res/values-cs/strings.xml
index 5fe9efe6b4..a30850cf4f 100644
--- a/dhis2_android_maps/src/main/res/values-cs/strings.xml
+++ b/dhis2_android_maps/src/main/res/values-cs/strings.xml
@@ -6,6 +6,5 @@
     <string name="dialog_layer_satellite">Zobrazit satelitní pohled</string>
     <string name="dialog_layer_event">Zobrazit události</string>
     <string name="dialog_layer_tei_coordinates">Zobrazit TEI souřadnice</string>
-    <string name="dialog_layer_enrollment_coordinates">Zobrazit souřadnice zápisu</string>
     <string name="dialog_layer_heatmap">Zobrazit vrstvu teplotní mapy</string>
     </resources>
\ No newline at end of file
diff --git a/dhis2_android_maps/src/main/res/values-es/strings.xml b/dhis2_android_maps/src/main/res/values-es/strings.xml
index 2fe50ae794..714a3f1190 100644
--- a/dhis2_android_maps/src/main/res/values-es/strings.xml
+++ b/dhis2_android_maps/src/main/res/values-es/strings.xml
@@ -12,6 +12,5 @@
     <string name="dialog_layer_satellite">Mostrar vista satélite</string>
     <string name="dialog_layer_event">Mostrar eventos</string>
     <string name="dialog_layer_tei_coordinates">Mostrar coordenadas de la entidad</string>
-    <string name="dialog_layer_enrollment_coordinates">Mostrar coordinadas del registro</string>
     <string name="dialog_layer_heatmap">Mostrar mapa de calor</string>
     </resources>
\ No newline at end of file
diff --git a/dhis2_android_maps/src/main/res/values-fr/strings.xml b/dhis2_android_maps/src/main/res/values-fr/strings.xml
index 2307e8ce4b..a0c1673d79 100644
--- a/dhis2_android_maps/src/main/res/values-fr/strings.xml
+++ b/dhis2_android_maps/src/main/res/values-fr/strings.xml
@@ -6,6 +6,5 @@
     <string name="dialog_layer_satellite">Afficher la vue satellite</string>
     <string name="dialog_layer_event">Afficher les événements</string>
     <string name="dialog_layer_tei_coordinates">Afficher les coordonnées tei</string>
-    <string name="dialog_layer_enrollment_coordinates">Afficher les coordonnées d\'inscription</string>
     <string name="dialog_layer_heatmap">Afficher la couche de carte thermique</string>
     </resources>
\ No newline at end of file
diff --git a/dhis2_android_maps/src/main/res/values-nb/strings.xml b/dhis2_android_maps/src/main/res/values-nb/strings.xml
index bd74aa749c..b499f469d2 100644
--- a/dhis2_android_maps/src/main/res/values-nb/strings.xml
+++ b/dhis2_android_maps/src/main/res/values-nb/strings.xml
@@ -6,6 +6,5 @@
     <string name="dialog_layer_satellite">Vis satelittvisning</string>
     <string name="dialog_layer_event">Vis hendelser</string>
     <string name="dialog_layer_tei_coordinates">Vis tei koordinater</string>
-    <string name="dialog_layer_enrollment_coordinates">Vis registreringskoordinater</string>
     <string name="dialog_layer_heatmap">Vis varmekartlag</string>
     </resources>
\ No newline at end of file
diff --git a/dhis2_android_maps/src/main/res/values-nl/strings.xml b/dhis2_android_maps/src/main/res/values-nl/strings.xml
index 5265f81e29..b0746c898e 100644
--- a/dhis2_android_maps/src/main/res/values-nl/strings.xml
+++ b/dhis2_android_maps/src/main/res/values-nl/strings.xml
@@ -12,6 +12,5 @@
     <string name="dialog_layer_satellite">Satellietweergave tonen</string>
     <string name="dialog_layer_event">Toon evenementen</string>
     <string name="dialog_layer_tei_coordinates">Toon tei-coördinaten</string>
-    <string name="dialog_layer_enrollment_coordinates">Toon inschrijvingscoördinaten</string>
     <string name="dialog_layer_heatmap">Warmtebeeld weergeven</string>
 </resources>
\ No newline at end of file
diff --git a/dhis2_android_maps/src/main/res/values-pt/strings.xml b/dhis2_android_maps/src/main/res/values-pt/strings.xml
index 8d4e1b85a2..59a77532f3 100644
--- a/dhis2_android_maps/src/main/res/values-pt/strings.xml
+++ b/dhis2_android_maps/src/main/res/values-pt/strings.xml
@@ -6,6 +6,5 @@
     <string name="dialog_layer_satellite">Mostrar vista de satélite</string>
     <string name="dialog_layer_event">Mostrar eventos</string>
     <string name="dialog_layer_tei_coordinates">Mostrar coordenadas tei</string>
-    <string name="dialog_layer_enrollment_coordinates">Mostrar coordenadas de inscrição</string>
     <string name="dialog_layer_heatmap">Mostrar camada do mapa de calor</string>
     </resources>
\ No newline at end of file
diff --git a/dhis2_android_maps/src/main/res/values-uk/strings.xml b/dhis2_android_maps/src/main/res/values-uk/strings.xml
index f1db1ff5fd..97e4b1acbd 100644
--- a/dhis2_android_maps/src/main/res/values-uk/strings.xml
+++ b/dhis2_android_maps/src/main/res/values-uk/strings.xml
@@ -6,6 +6,5 @@
     <string name="dialog_layer_satellite">Показати як вид із супутника</string>
     <string name="dialog_layer_event">Показати випадки</string>
     <string name="dialog_layer_tei_coordinates">Показати координати об\'єкту, який відстежується</string>
-    <string name="dialog_layer_enrollment_coordinates">Показати координати реєстрації</string>
     <string name="dialog_layer_heatmap">Показати шар теплової карти</string>
     </resources>
\ No newline at end of file
diff --git a/dhis2_android_maps/src/main/res/values-uz/strings.xml b/dhis2_android_maps/src/main/res/values-uz/strings.xml
index 966f884aab..68effdaef4 100644
--- a/dhis2_android_maps/src/main/res/values-uz/strings.xml
+++ b/dhis2_android_maps/src/main/res/values-uz/strings.xml
@@ -12,7 +12,6 @@
     <string name="dialog_layer_satellite">Суньий йўлдош кўринишини кўрсатиш</string>
     <string name="dialog_layer_event">Ҳодиса/тадбирларни кўрсатиш</string>
     <string name="dialog_layer_tei_coordinates">TEI координаталарини кўрсатиш</string>
-    <string name="dialog_layer_enrollment_coordinates">Қайд этилганлар координаталарини кўрсатиш</string>
     <string name="dialog_layer_heatmap">Иссиқлик харитаси қатламини кўрсатиш</string>
     <string name="map_attributionErrorNoBrowser">Қурилмада Веб браузер ўрнатилмаган, веб саҳифани очишнинг иложи йўқ.</string>
 </resources>
\ No newline at end of file
diff --git a/dhis2_android_maps/src/main/res/values-vi/strings.xml b/dhis2_android_maps/src/main/res/values-vi/strings.xml
index d13414b704..1c7e5b60b9 100644
--- a/dhis2_android_maps/src/main/res/values-vi/strings.xml
+++ b/dhis2_android_maps/src/main/res/values-vi/strings.xml
@@ -6,6 +6,5 @@
     <string name="dialog_layer_satellite">Xem Vệ Tinh</string>
     <string name="dialog_layer_event">Hiển thị sự kiện</string>
     <string name="dialog_layer_tei_coordinates">Hiển thị tọa độ đối tượng theo dõi</string>
-    <string name="dialog_layer_enrollment_coordinates">Hiển thị tọa độ của đăng ký này</string>
     <string name="dialog_layer_heatmap">Hiển thị lớp bản đồ nhiệt độ</string>
     </resources>
\ No newline at end of file
diff --git a/dhis2_android_maps/src/main/res/values-zh-rCN/strings.xml b/dhis2_android_maps/src/main/res/values-zh-rCN/strings.xml
index 4fec9eb63c..08d2e22b2f 100644
--- a/dhis2_android_maps/src/main/res/values-zh-rCN/strings.xml
+++ b/dhis2_android_maps/src/main/res/values-zh-rCN/strings.xml
@@ -6,6 +6,5 @@
     <string name="dialog_layer_satellite">显示卫星视图</string>
     <string name="dialog_layer_event">显示事件</string>
     <string name="dialog_layer_tei_coordinates">显示跟踪实体坐标</string>
-    <string name="dialog_layer_enrollment_coordinates">显示注册坐标</string>
     <string name="dialog_layer_heatmap">显示热力图</string>
     </resources>
\ No newline at end of file
diff --git a/dhis2_android_maps/src/main/res/values-zh/strings.xml b/dhis2_android_maps/src/main/res/values-zh/strings.xml
index 4fec9eb63c..08d2e22b2f 100644
--- a/dhis2_android_maps/src/main/res/values-zh/strings.xml
+++ b/dhis2_android_maps/src/main/res/values-zh/strings.xml
@@ -6,6 +6,5 @@
     <string name="dialog_layer_satellite">显示卫星视图</string>
     <string name="dialog_layer_event">显示事件</string>
     <string name="dialog_layer_tei_coordinates">显示跟踪实体坐标</string>
-    <string name="dialog_layer_enrollment_coordinates">显示注册坐标</string>
     <string name="dialog_layer_heatmap">显示热力图</string>
     </resources>
\ No newline at end of file
diff --git a/dhis2_android_maps/src/main/res/values/strings.xml b/dhis2_android_maps/src/main/res/values/strings.xml
index e8e8de0c07..f7e43c8a53 100644
--- a/dhis2_android_maps/src/main/res/values/strings.xml
+++ b/dhis2_android_maps/src/main/res/values/strings.xml
@@ -12,7 +12,6 @@
     <string name="dialog_layer_satellite">Show satellite view</string>
     <string name="dialog_layer_event">Show events</string>
     <string name="dialog_layer_tei_coordinates">Show tei coordinates</string>
-    <string name="dialog_layer_enrollment_coordinates">Show enrollment coordinates</string>
     <string name="dialog_layer_heatmap">Show heatmap layer</string>
     <string name="map_attributionErrorNoBrowser">No web browser installed on device, can\'t open web page.</string>
 </resources>
\ No newline at end of file
diff --git a/form/src/main/java/org/dhis2/form/data/EnrollmentRepository.kt b/form/src/main/java/org/dhis2/form/data/EnrollmentRepository.kt
index 5dc3066aa0..fc1fb515a9 100644
--- a/form/src/main/java/org/dhis2/form/data/EnrollmentRepository.kt
+++ b/form/src/main/java/org/dhis2/form/data/EnrollmentRepository.kt
@@ -267,7 +267,7 @@ class EnrollmentRepository(
         enrollmentDataList.add(
             getEnrollmentDateField(
                 conf.program()?.enrollmentDateLabel()
-                    ?: enrollmentFormLabelsProvider.provideEnrollmentDateDefaultLabel(),
+                    ?: enrollmentFormLabelsProvider.provideEnrollmentDateDefaultLabel(programUid!!),
                 conf.program()?.selectEnrollmentDatesInFuture(),
             ),
         )
@@ -307,7 +307,7 @@ class EnrollmentRepository(
     private fun getEnrollmentDataSection(description: String?): FieldUiModel {
         return fieldFactory.createSection(
             ENROLLMENT_DATA_SECTION_UID,
-            enrollmentFormLabelsProvider.provideEnrollmentDataSectionLabel(),
+            enrollmentFormLabelsProvider.provideEnrollmentDataSectionLabel(programUid!!),
             description,
             false,
             0,
@@ -419,7 +419,7 @@ class EnrollmentRepository(
     private fun getEnrollmentCoordinatesField(featureType: FeatureType?): FieldUiModel {
         return fieldFactory.create(
             ENROLLMENT_COORDINATES_UID,
-            enrollmentFormLabelsProvider.provideEnrollmentCoordinatesLabel(),
+            enrollmentFormLabelsProvider.provideEnrollmentCoordinatesLabel(programUid!!),
             ValueType.COORDINATE,
             false,
             null,
diff --git a/form/src/main/java/org/dhis2/form/ui/provider/EnrollmentFormLabelsProvider.kt b/form/src/main/java/org/dhis2/form/ui/provider/EnrollmentFormLabelsProvider.kt
index 6fcbd42a7f..6e8abcc496 100644
--- a/form/src/main/java/org/dhis2/form/ui/provider/EnrollmentFormLabelsProvider.kt
+++ b/form/src/main/java/org/dhis2/form/ui/provider/EnrollmentFormLabelsProvider.kt
@@ -5,8 +5,12 @@ import org.dhis2.form.R
 
 class EnrollmentFormLabelsProvider(val resourceManager: ResourceManager) {
 
-    fun provideEnrollmentDataSectionLabel() =
-        resourceManager.getString(R.string.enrollment_data_section_label)
+    fun provideEnrollmentDataSectionLabel(programUid: String) =
+        resourceManager.formatWithEnrollmentLabel(
+            programUid,
+            R.string.enrollment_data_section_label_V2,
+            1,
+        )
 
     fun provideSingleSectionLabel() =
         resourceManager.getString(R.string.enrollment_single_section_label)
@@ -15,12 +19,20 @@ class EnrollmentFormLabelsProvider(val resourceManager: ResourceManager) {
 
     fun provideTeiCoordinatesLabel() = resourceManager.getString(R.string.tei_coordinates)
 
-    fun provideEnrollmentCoordinatesLabel() =
-        resourceManager.getString(R.string.enrollment_coordinates)
+    fun provideEnrollmentCoordinatesLabel(programUid: String) =
+        resourceManager.formatWithEnrollmentLabel(
+            programUid,
+            R.string.enrollment_coordinates_V2,
+            1,
+        )
 
     fun provideReservedValueWarning() = resourceManager.getString(R.string.no_reserved_values)
 
-    fun provideEnrollmentDateDefaultLabel() = resourceManager.getString(R.string.enrollmment_date)
+    fun provideEnrollmentDateDefaultLabel(programUid: String) = resourceManager.formatWithEnrollmentLabel(
+        programUid,
+        R.string.enrollment_date_V2,
+        1,
+    )
 
     fun provideIncidentDateDefaultLabel() = resourceManager.getString(R.string.incident_date)
 }
diff --git a/form/src/main/res/values-ar/strings.xml b/form/src/main/res/values-ar/strings.xml
index ec8a58118f..e4c00feea0 100644
--- a/form/src/main/res/values-ar/strings.xml
+++ b/form/src/main/res/values-ar/strings.xml
@@ -82,12 +82,8 @@
     <string name="error_true_only_one_is_not_true">حرف غير صالح 1</string>
     <string name="data_values_save_error">لا يمكن حفظ DataValues باستخدام هذه المدخلات. استخدم المدخل الآخر.</string>
     <string name="leading_zero_error">غير مسموح بأرقام الصفر في البداية</string>
-    <string name="enrollment_data_section_label">بيانات التسجيل</string>
     <string name="enrollment_single_section_label">السمات - %s</string>
-    <string name="enrolling_ou">الوحدة التنظيمية المسجلة</string>
     <string name="tei_coordinates">إحداثيات لـ </string>
-    <string name="enrollment_coordinates">إحداثيات التسجيل</string>
     <string name="no_reserved_values">لا يوجد المزيد من القيم المحجوزة. اتصل بمسؤول النظام</string>
-    <string name="enrollmment_date">تاريخ التسجيل</string>
     <string name="incident_date">تاريخ الحدوث</string>
     </resources>
\ No newline at end of file
diff --git a/form/src/main/res/values-b+uz+Latn/strings.xml b/form/src/main/res/values-b+uz+Latn/strings.xml
index 713e62325d..4d6a317813 100644
--- a/form/src/main/res/values-b+uz+Latn/strings.xml
+++ b/form/src/main/res/values-b+uz+Latn/strings.xml
@@ -50,12 +50,8 @@
     <string name="copied_text">Nusxa olindi</string>
     <string name="empty_description">Ushbu maydon uchun maʼlumot yoʼq</string>
     <string name="warning_error_on_complete_title">Buni tekshiring!</string>
-    <string name="enrollment_data_section_label">Qayd qilish maʼlumotlari</string>
     <string name="enrollment_single_section_label">Аtribatlar - %s</string>
-    <string name="enrolling_ou">OUga roʼyxatga olish</string>
     <string name="tei_coordinates">Uchun koordinatalar</string>
-    <string name="enrollment_coordinates">Roʼyxatdan oʼtish koordinatalari</string>
     <string name="no_reserved_values">Saqlangan boshqa qiymatlar yoʼq. Tizim administratoriga murojaat qiling.</string>
-    <string name="enrollmment_date">Qayd qilingan sana</string>
     <string name="incident_date">Hodisa sanasi</string>
     </resources>
\ No newline at end of file
diff --git a/form/src/main/res/values-cs/strings.xml b/form/src/main/res/values-cs/strings.xml
index 9f2d9d0f62..e30ba95a58 100644
--- a/form/src/main/res/values-cs/strings.xml
+++ b/form/src/main/res/values-cs/strings.xml
@@ -90,12 +90,8 @@
     <string name="error_true_only_one_is_not_true">Neplatný znak 1</string>
     <string name="data_values_save_error">DataValues nelze uložit pomocí těchto argumentů. Použijte ten druhý.</string>
     <string name="leading_zero_error">Čísla s úvodní nulou nejsou povolena</string>
-    <string name="enrollment_data_section_label">Údaje o zápisu</string>
     <string name="enrollment_single_section_label">Atributy - %s</string>
-    <string name="enrolling_ou">Zápis Org. J.:</string>
     <string name="tei_coordinates">Souřadnice pro</string>
-    <string name="enrollment_coordinates">Souřadnice registrace</string>
     <string name="no_reserved_values">Neexistují žádné další rezervované hodnoty. Obraťte se na správce systému</string>
-    <string name="enrollmment_date">Datum zápisu</string>
     <string name="incident_date">Datum incidentu</string>
     </resources>
\ No newline at end of file
diff --git a/form/src/main/res/values-es/strings.xml b/form/src/main/res/values-es/strings.xml
index 6cf2b91b3c..b055e59f4f 100644
--- a/form/src/main/res/values-es/strings.xml
+++ b/form/src/main/res/values-es/strings.xml
@@ -90,12 +90,8 @@
     <string name="error_true_only_one_is_not_true">Carácter 1 no es válido</string>
     <string name="data_values_save_error">Los DataValues no pueden guardarse con estos argumentos. Use el otro método.</string>
     <string name="leading_zero_error">No se permiten números con ceros a la izquierda</string>
-    <string name="enrollment_data_section_label">Datos de registro</string>
     <string name="enrollment_single_section_label">Atributos - %s</string>
-    <string name="enrolling_ou">OU de admision:</string>
     <string name="tei_coordinates">Coordenadas para</string>
-    <string name="enrollment_coordinates">Coordenadas de admisión </string>
     <string name="no_reserved_values">No quedan valores reservados. Contacte con el administrador del sistema.</string>
-    <string name="enrollmment_date">Fecha de inscripción</string>
     <string name="incident_date">Fecha del incidente</string>
     </resources>
\ No newline at end of file
diff --git a/form/src/main/res/values-fr/strings.xml b/form/src/main/res/values-fr/strings.xml
index 511ba74be4..cef225c80c 100644
--- a/form/src/main/res/values-fr/strings.xml
+++ b/form/src/main/res/values-fr/strings.xml
@@ -70,12 +70,8 @@
     <string name="from_gallery">Choisir depuis la galerie</string>
     <string name="warning_error_on_complete_title">Attention. Vérifiez ceci!</string>
     <string name="action_do_not_show_again">Ne pas montrer de nouveau</string>
-    <string name="enrollment_data_section_label">Données d\'inscription</string>
     <string name="enrollment_single_section_label">Attributs - %s</string>
-    <string name="enrolling_ou">Unté d\'organisation d\'enrôlement</string>
     <string name="tei_coordinates">Coordonnées pour</string>
-    <string name="enrollment_coordinates">Coordonnées de l\'enrôlement</string>
     <string name="no_reserved_values">Il n\'y a plus de valeurs réservées. Veuillez contacter votre administrateur système.</string>
-    <string name="enrollmment_date">Date d\'enrôlement</string>
     <string name="incident_date">Date de l´incident</string>
     </resources>
\ No newline at end of file
diff --git a/form/src/main/res/values-id/strings.xml b/form/src/main/res/values-id/strings.xml
index a78b4de8ea..329cac7a3b 100644
--- a/form/src/main/res/values-id/strings.xml
+++ b/form/src/main/res/values-id/strings.xml
@@ -52,12 +52,8 @@
     <string name="from_gallery">Pilih dari galeri</string>
     <string name="warning_error_on_complete_title">Periksa ini!</string>
     <string name="action_do_not_show_again">Jangan perlihatkan lagi</string>
-    <string name="enrollment_data_section_label">Data pendaftaran</string>
     <string name="enrollment_single_section_label">Atribut - %s</string>
-    <string name="enrolling_ou">Daftarkan OU:</string>
     <string name="tei_coordinates">Koordinat untuk</string>
-    <string name="enrollment_coordinates">Koordinat pendaftaran</string>
     <string name="no_reserved_values">Tidak ada nilai lainnya. Hubungi admin sistem Anda.</string>
-    <string name="enrollmment_date">Tanggal pendaftaran</string>
     <string name="incident_date">Tanggal insiden</string>
     </resources>
\ No newline at end of file
diff --git a/form/src/main/res/values-lo/strings.xml b/form/src/main/res/values-lo/strings.xml
index d401ba5b51..40d2a27df6 100644
--- a/form/src/main/res/values-lo/strings.xml
+++ b/form/src/main/res/values-lo/strings.xml
@@ -51,9 +51,6 @@
     <string name="from_gallery">ເລືອກຈາກຄັງຮູບ</string>
     <string name="warning_error_on_complete_title">ກວດເບີ່ງອັນນີ້</string>
     <string name="action_do_not_show_again">ບໍ່ຕ້ອງສະແດງອີກ</string>
-    <string name="enrollment_data_section_label">ຂໍ້ມູນການລົງທະບຽນ</string>
-    <string name="enrolling_ou">ລົງທະບຽນໜ່ວຍງານ</string>
     <string name="tei_coordinates">ປະສານງານຫາ</string>
-    <string name="enrollmment_date">ວັນທີ່ລົງທະບຽນ</string>
     <string name="incident_date">ວັນທີເດືອນປີທີ່ເຫດການເກີດຂື້ນ</string>
     </resources>
\ No newline at end of file
diff --git a/form/src/main/res/values-nb/strings.xml b/form/src/main/res/values-nb/strings.xml
index f1c26d5043..573f04005c 100644
--- a/form/src/main/res/values-nb/strings.xml
+++ b/form/src/main/res/values-nb/strings.xml
@@ -50,12 +50,8 @@
     <string name="copied_text">Kopiert</string>
     <string name="empty_description">Ingen info for dette feltet</string>
     <string name="warning_error_on_complete_title">Sjekk dette!</string>
-    <string name="enrollment_data_section_label">Registreringsdata</string>
     <string name="enrollment_single_section_label">Attributter - %s</string>
-    <string name="enrolling_ou">Registrerer OU:</string>
     <string name="tei_coordinates">Koordinater for</string>
-    <string name="enrollment_coordinates">Innmeldingskoordinater</string>
     <string name="no_reserved_values">Det er ingen flere reserverte verdier. Kontakt din systemadministrator</string>
-    <string name="enrollmment_date">Registreringsdato</string>
     <string name="incident_date">Forekomstdato</string>
     </resources>
\ No newline at end of file
diff --git a/form/src/main/res/values-nl/strings.xml b/form/src/main/res/values-nl/strings.xml
index 2551863b15..f8ba1502a3 100644
--- a/form/src/main/res/values-nl/strings.xml
+++ b/form/src/main/res/values-nl/strings.xml
@@ -90,13 +90,9 @@
     <string name="error_true_only_one_is_not_true">Ongeldig teken 1</string>
     <string name="data_values_save_error">DataValues kunnen niet worden opgeslagen met deze argumenten. Gebruik de andere.</string>
     <string name="leading_zero_error">Voorloopnullen zijn niet toegestaan</string>
-    <string name="enrollment_data_section_label">Inschrijving gegevens</string>
     <string name="enrollment_single_section_label">Kenmerken - %s</string>
-    <string name="enrolling_ou">OU inschrijven:</string>
     <string name="tei_coordinates">Coördinaten voor de</string>
-    <string name="enrollment_coordinates">Inschrijving coördinaten</string>
     <string name="no_reserved_values">Er zijn geen gereserveerde waarden meer. Neem contact op met uw systeembeheerder</string>
-    <string name="enrollmment_date">Inschrijvingsdatum</string>
     <string name="incident_date">Incident datum</string>
     <string name="location_permission_denied">De locatietoestemming is nodig voor het vastleggen van coördinaten. Schakel ze alstublieft in de applicatie-instellingen in</string>
     <string name="open_with">Openen met</string>
diff --git a/form/src/main/res/values-pt/strings.xml b/form/src/main/res/values-pt/strings.xml
index 4d832aa450..5833e6ded1 100644
--- a/form/src/main/res/values-pt/strings.xml
+++ b/form/src/main/res/values-pt/strings.xml
@@ -50,12 +50,8 @@
     <string name="copied_text">Copiado</string>
     <string name="empty_description">Nenhuma informação para este campo</string>
     <string name="warning_error_on_complete_title">Verifique isso!</string>
-    <string name="enrollment_data_section_label">Dados de inscrição</string>
     <string name="enrollment_single_section_label">Atributos - %s</string>
-    <string name="enrolling_ou">Inscrição UO:</string>
     <string name="tei_coordinates">Coordenadas para o</string>
-    <string name="enrollment_coordinates">Coordenadas de inscrição</string>
     <string name="no_reserved_values">Não há mais valores reservados. Entre em contato com o administrador do sistema</string>
-    <string name="enrollmment_date">Data de inscrição</string>
     <string name="incident_date">Data do incidente</string>
     </resources>
\ No newline at end of file
diff --git a/form/src/main/res/values-uk/strings.xml b/form/src/main/res/values-uk/strings.xml
index 4f93caa4a4..b225b73ba2 100644
--- a/form/src/main/res/values-uk/strings.xml
+++ b/form/src/main/res/values-uk/strings.xml
@@ -90,12 +90,8 @@
     <string name="error_true_only_one_is_not_true">Недійсний символ 1</string>
     <string name="data_values_save_error">Значення даних не можна зберегти за допомогою цих аргументів. Використовуйте інші.</string>
     <string name="leading_zero_error">Нульові цифри на початку не допускаються</string>
-    <string name="enrollment_data_section_label">Дані реєстрації</string>
     <string name="enrollment_single_section_label">Атрибути - %s</string>
-    <string name="enrolling_ou">Організаційний підрозділ, який здійснює реєстрацію:</string>
     <string name="tei_coordinates">Координати для</string>
-    <string name="enrollment_coordinates">Координати реєстрації</string>
     <string name="no_reserved_values">Більше немає зарезервованих значень. Зверніться до свого системного адміністратора</string>
-    <string name="enrollmment_date">Дата реєстрації</string>
     <string name="incident_date">Дата інциденту</string>
     </resources>
\ No newline at end of file
diff --git a/form/src/main/res/values-uz/strings.xml b/form/src/main/res/values-uz/strings.xml
index 23824336f8..7b4570df5c 100644
--- a/form/src/main/res/values-uz/strings.xml
+++ b/form/src/main/res/values-uz/strings.xml
@@ -53,12 +53,8 @@
     <string name="take_photo">Суратга олиш</string>
     <string name="from_gallery">Галереядан танлаш</string>
     <string name="warning_error_on_complete_title">Буни текширинг!</string>
-    <string name="enrollment_data_section_label">Қайд қилиш маълумотлари</string>
     <string name="enrollment_single_section_label">Атрибатлар - %s</string>
-    <string name="enrolling_ou">OUга рўйхатга олиш</string>
     <string name="tei_coordinates">Учун координаталар</string>
-    <string name="enrollment_coordinates">Рўйхатдан ўтиш координаталари</string>
     <string name="no_reserved_values">Сақланган бошқа қийматлар йўқ. Тизим администраторига мурожаат қилинг.</string>
-    <string name="enrollmment_date">Қайд этилган сана</string>
     <string name="incident_date">Ҳодиса санаси</string>
     </resources>
\ No newline at end of file
diff --git a/form/src/main/res/values-vi/strings.xml b/form/src/main/res/values-vi/strings.xml
index a15eefa8c1..46dbd21a81 100644
--- a/form/src/main/res/values-vi/strings.xml
+++ b/form/src/main/res/values-vi/strings.xml
@@ -74,12 +74,8 @@
     <string name="from_gallery">Chọn từ thư viện ảnh</string>
     <string name="warning_error_on_complete_title">Kiểm tra cái này!</string>
     <string name="action_do_not_show_again">Không hiển thị lại</string>
-    <string name="enrollment_data_section_label">Dữ liệu đăng ký</string>
     <string name="enrollment_single_section_label">Thuộc tính - %s</string>
-    <string name="enrolling_ou">Đơn vị đăng ký</string>
     <string name="tei_coordinates">Tọa độ của </string>
-    <string name="enrollment_coordinates">Tọa độ đăng ký</string>
     <string name="no_reserved_values">Không có giá trị dành riêng nào nữa. Liên hệ với quản lý của bạn</string>
-    <string name="enrollmment_date">Ngày đăng ký</string>
     <string name="incident_date">Ngày khởi phát</string>
     </resources>
\ No newline at end of file
diff --git a/form/src/main/res/values-zh-rCN/strings.xml b/form/src/main/res/values-zh-rCN/strings.xml
index 3c12ee3f99..5489af4312 100644
--- a/form/src/main/res/values-zh-rCN/strings.xml
+++ b/form/src/main/res/values-zh-rCN/strings.xml
@@ -48,12 +48,8 @@
     <string name="copied_text">副本</string>
     <string name="empty_description">该字段没有相关信息</string>
     <string name="warning_error_on_complete_title">检查</string>
-    <string name="enrollment_data_section_label">注册数据</string>
     <string name="enrollment_single_section_label">属性- %s</string>
-    <string name="enrolling_ou">注册机构</string>
     <string name="tei_coordinates">坐标</string>
-    <string name="enrollment_coordinates">注册坐标</string>
     <string name="no_reserved_values">没有更多保留值，请联系管理员</string>
-    <string name="enrollmment_date">报名日期</string>
     <string name="incident_date">事件日期</string>
     </resources>
\ No newline at end of file
diff --git a/form/src/main/res/values-zh/strings.xml b/form/src/main/res/values-zh/strings.xml
index 67b33d6384..3bdc714233 100644
--- a/form/src/main/res/values-zh/strings.xml
+++ b/form/src/main/res/values-zh/strings.xml
@@ -90,13 +90,9 @@
     <string name="error_true_only_one_is_not_true">无效字符 1</string>
     <string name="data_values_save_error">无法使用这些参数保存 DataValues。使用另一个。</string>
     <string name="leading_zero_error">不允许前导零数字</string>
-    <string name="enrollment_data_section_label">注册数据</string>
     <string name="enrollment_single_section_label">属性- %s</string>
-    <string name="enrolling_ou">注册机构</string>
     <string name="tei_coordinates">坐标</string>
-    <string name="enrollment_coordinates">注册坐标</string>
     <string name="no_reserved_values">没有更多保留值，请联系管理员</string>
-    <string name="enrollmment_date">报名日期</string>
     <string name="incident_date">事件日期</string>
     <string name="scan">扫描</string>
     <string name="qr_code">二维码</string>
diff --git a/form/src/main/res/values/strings.xml b/form/src/main/res/values/strings.xml
index f02c6f7d84..c5db5c81bb 100644
--- a/form/src/main/res/values/strings.xml
+++ b/form/src/main/res/values/strings.xml
@@ -92,13 +92,9 @@
     <string name="error_true_only_one_is_not_true">Invalid character 1</string>
     <string name="data_values_save_error">DataValues can\'t be saved using these arguments. Use the other one.</string>
     <string name="leading_zero_error">Leading zero numbers are not allowed</string>
-    <string name="enrollment_data_section_label">Enrollment data</string>
     <string name="enrollment_single_section_label">Attributes - %s</string>
-    <string name="enrolling_ou">Enrolling OU:</string>
     <string name="tei_coordinates">Coordinates for the</string>
-    <string name="enrollment_coordinates">Enrollment coordinates</string>
     <string name="no_reserved_values">There are no more reserved values. Contact your system administrator</string>
-    <string name="enrollmment_date">Enrollment date</string>
     <string name="incident_date">Incident date</string>
     <string name="location_permission_denied">The location permission is needed for capturing coordinates. Please, enable them in the application settings</string>
     <string name="open_with">Open with</string>
diff --git a/form/src/test/java/org/dhis2/form/data/FormRepositoryIntegrationTest.kt b/form/src/test/java/org/dhis2/form/data/FormRepositoryIntegrationTest.kt
index 588888961a..ebc64ee083 100644
--- a/form/src/test/java/org/dhis2/form/data/FormRepositoryIntegrationTest.kt
+++ b/form/src/test/java/org/dhis2/form/data/FormRepositoryIntegrationTest.kt
@@ -40,9 +40,11 @@ class FormRepositoryIntegrationTest {
     private val conf: EnrollmentConfiguration = mock()
     private val enrollmentFormLabelsProvider: EnrollmentFormLabelsProvider = mock {
         on { provideEnrollmentOrgUnitLabel() } doReturn "OrgUnit label"
+        on { provideEnrollmentDataSectionLabel(any()) } doReturn "Enrollment data"
     }
 
     private val program: Program = mock {
+        on { uid() } doReturn "programUid"
         on { description() } doReturn "program description"
         on { enrollmentDateLabel() } doReturn "enrollment date label"
         on { selectEnrollmentDatesInFuture() } doReturn false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 06b1bb0691..baa59ad61f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ hilt = '2.47'
 hiltCompiler = '1.0.0'
 jacoco = '0.8.10'
 designSystem = "0.2-20240208.105715-18"
-dhis2sdk = "1.10.0-20240129.132841-8"
+dhis2sdk = "1.10.0-20240207.110936-11"
 ruleEngine = "2.1.9"
 appcompat = "1.6.1"
 annotation = "1.6.0"