From dc11a07be7c524f402f3be89f9e21ac27143a38b Mon Sep 17 00:00:00 2001
From: manu <mmunoz@quadram.mobi>
Date: Mon, 12 Feb 2024 13:24:40 +0100
Subject: [PATCH] feat: [ANDROAPP-5896] configurable event label

---
 .../eventDetails/EventInitialTest.kt          |  3 +-
 .../java/org/dhis2/bindings/Bindings.java     | 88 -------------------
 .../eventCapture/EventCaptureActivity.kt      | 67 +++++++++-----
 .../eventCapture/EventCaptureContract.java    |  4 +-
 .../EventCapturePagerAdapter.java             |  5 ++
 .../eventCapture/EventCapturePresenterImpl.kt |  6 +-
 .../injection/EventDetailsModule.kt           |  2 +-
 .../providers/EventDetailResourcesProvider.kt | 16 +++-
 .../eventInitial/EventInitialActivity.java    | 41 +++++++--
 .../eventInitial/EventInitialContract.java    |  2 +
 .../eventInitial/EventInitialPresenter.java   |  2 +-
 .../teidata/TEIDataFragment.kt                |  9 +-
 .../teidata/teievents/StageViewHolder.kt      | 12 ++-
 app/src/main/res/values-ar/strings.xml        | 16 +---
 app/src/main/res/values-b+uz+Cyrl/strings.xml | 16 ----
 app/src/main/res/values-b+uz+Latn/strings.xml | 14 ---
 app/src/main/res/values-ckb/strings.xml       |  1 -
 app/src/main/res/values-cs/strings.xml        | 14 ---
 app/src/main/res/values-es/strings.xml        | 14 ---
 app/src/main/res/values-fr/strings.xml        | 14 ---
 app/src/main/res/values-id/strings.xml        | 14 ---
 app/src/main/res/values-km/strings.xml        |  8 --
 app/src/main/res/values-lo/strings.xml        | 14 ---
 app/src/main/res/values-nb/strings.xml        | 14 ---
 app/src/main/res/values-nl/strings.xml        | 14 ---
 app/src/main/res/values-prs/strings.xml       |  1 -
 app/src/main/res/values-ps/strings.xml        |  1 -
 app/src/main/res/values-pt/strings.xml        | 14 ---
 app/src/main/res/values-ru/strings.xml        |  1 -
 app/src/main/res/values-sv/strings.xml        |  8 --
 app/src/main/res/values-uk/strings.xml        | 14 ---
 app/src/main/res/values-ur/strings.xml        |  1 -
 app/src/main/res/values-uz/strings.xml        | 14 ---
 app/src/main/res/values-vi/strings.xml        | 14 ---
 app/src/main/res/values-zh-rCN/strings.xml    | 14 ---
 app/src/main/res/values-zh/strings.xml        | 14 ---
 app/src/main/res/values/strings.xml           | 21 -----
 .../dhis2/commons/resources/D2ErrorUtils.kt   |  1 +
 .../commons/resources/ResourceManager.kt      | 34 +++++++
 commons/src/main/res/values-ar/strings.xml    |  2 -
 .../src/main/res/values-b+uz+Cyrl/strings.xml |  1 -
 .../src/main/res/values-b+uz+Latn/strings.xml |  2 -
 commons/src/main/res/values-cs/strings.xml    |  2 -
 commons/src/main/res/values-es/strings.xml    |  2 -
 commons/src/main/res/values-fr/strings.xml    |  2 -
 commons/src/main/res/values-id/strings.xml    |  2 -
 commons/src/main/res/values-lo/strings.xml    |  2 -
 commons/src/main/res/values-nb/strings.xml    |  2 -
 commons/src/main/res/values-nl/strings.xml    |  2 -
 commons/src/main/res/values-pt/strings.xml    |  2 -
 commons/src/main/res/values-uk/strings.xml    |  2 -
 commons/src/main/res/values-uz/strings.xml    |  2 -
 commons/src/main/res/values-vi/strings.xml    |  2 -
 .../src/main/res/values-zh-rCN/strings.xml    |  2 -
 commons/src/main/res/values-zh/strings.xml    |  2 -
 commons/src/main/res/values/strings.xml       | 21 ++++-
 gradle/libs.versions.toml                     |  2 +-
 57 files changed, 187 insertions(+), 429 deletions(-)

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 de6ebdd6855..d9580932ab7 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
@@ -91,6 +91,7 @@ class EventInitialTest {
         on { displayName() } doReturn PROGRAM_STAGE_NAME
         on { executionDateLabel() } doReturn EXECUTION_DATE
         on { generatedByEnrollmentDate() } doReturn true
+        on { uid() } doReturn "programStage"
     }
     private val catCombo: CategoryCombo = mock {
         on { uid() } doReturn CAT_COMBO_UID
@@ -154,7 +155,7 @@ class EventInitialTest {
         enrollmentStatus = enrollmentStatus,
     )
 
-    private fun provideEventResourcesProvider() = EventDetailResourcesProvider(resourceManager)
+    private fun provideEventResourcesProvider() = EventDetailResourcesProvider(resourceManager, programStage.uid())
 
     private fun createOrUpdateEventDetails() = CreateOrUpdateEventDetails(
         repository = eventDetailsRepository,
diff --git a/app/src/main/java/org/dhis2/bindings/Bindings.java b/app/src/main/java/org/dhis2/bindings/Bindings.java
index c500345e52f..c80c620e2b6 100644
--- a/app/src/main/java/org/dhis2/bindings/Bindings.java
+++ b/app/src/main/java/org/dhis2/bindings/Bindings.java
@@ -204,67 +204,6 @@ public static void setEventIcon(ImageView view, Event event, Enrollment enrollme
         }
     }
 
-    @BindingAdapter(value = {"eventStatusText", "enrollmentStatus", "eventProgramStage", "eventProgram"})
-    public static void setEventText(TextView view, Event event, Enrollment enrollment, ProgramStage eventProgramStage, Program program) {
-        if (event != null) {
-            EventStatus status = event.status();
-            EnrollmentStatus enrollmentStatus = enrollment.status();
-            if (status == null)
-                status = EventStatus.ACTIVE;
-            if (enrollmentStatus == null)
-                enrollmentStatus = EnrollmentStatus.ACTIVE;
-
-
-            if (enrollmentStatus == EnrollmentStatus.ACTIVE) {
-                switch (status) {
-                    case ACTIVE:
-                        Date eventDate = event.eventDate();
-                        if (eventProgramStage.periodType() != null && eventProgramStage.periodType().name().contains(PeriodType.Weekly.name()))
-                            eventDate = DateUtils.getInstance().getNextPeriod(eventProgramStage.periodType(), eventDate, 0, true);
-                        if (DateUtils.getInstance().isEventExpired(eventDate, null, event.status(), program.completeEventsExpiryDays(), eventProgramStage.periodType() != null ? eventProgramStage.periodType() : program.expiryPeriodType(), program.expiryDays())) {
-                            view.setText(view.getContext().getString(R.string.event_expired));
-                        } else {
-                            view.setText(view.getContext().getString(R.string.event_open));
-                        }
-                        break;
-                    case COMPLETED:
-                        if (DateUtils.getInstance().isEventExpired(null, event.completedDate(), program.completeEventsExpiryDays())) {
-                            view.setText(view.getContext().getString(R.string.event_expired));
-                        } else {
-                            view.setText(view.getContext().getString(R.string.event_completed));
-                        }
-                        break;
-                    case SCHEDULE:
-                        if (DateUtils.getInstance().isEventExpired(
-                                event.dueDate(),
-                                null,
-                                status,
-                                program.completeEventsExpiryDays(),
-                                eventProgramStage.periodType() != null ? eventProgramStage.periodType() : program.expiryPeriodType(),
-                                program.expiryDays())) {
-                            view.setText(view.getContext().getString(R.string.event_expired));
-                        } else {
-                            view.setText(view.getContext().getString(R.string.event_schedule));
-                        }
-                        break;
-                    case SKIPPED:
-                        view.setText(view.getContext().getString(R.string.event_skipped));
-                        break;
-                    case OVERDUE:
-                        view.setText(R.string.event_overdue);
-                        break;
-                    default:
-                        view.setText(view.getContext().getString(R.string.read_only));
-                        break;
-                }
-            } else if (enrollmentStatus == EnrollmentStatus.COMPLETED) {
-                view.setText(view.getContext().getString(R.string.program_completed));
-            } else { //EnrollmentStatus = CANCELLED
-                view.setText(view.getContext().getString(R.string.program_inactive));
-            }
-        }
-    }
-
     @BindingAdapter(value = {"eventColor", "eventProgramStage", "eventProgram"})
     public static void setEventColor(View view, Event event, ProgramStage programStage, Program program) {
         if (event != null) {
@@ -313,33 +252,6 @@ public static void setEventColor(View view, Event event, ProgramStage programSta
         }
     }
 
-    @BindingAdapter("eventWithoutRegistrationStatusText")
-    public static void setEventWithoutRegistrationStatusText(TextView textView, ProgramEventViewModel event) {
-        switch (event.eventStatus()) {
-            case ACTIVE:
-                if (event.isExpired()) {
-                    textView.setText(textView.getContext().getString(R.string.event_editing_expired));
-                } else {
-                    textView.setText(textView.getContext().getString(R.string.event_open));
-                }
-                break;
-            case COMPLETED:
-                if (event.isExpired()) {
-                    textView.setText(textView.getContext().getString(R.string.event_editing_expired));
-                } else {
-                    textView.setText(textView.getContext().getString(R.string.event_completed));
-                }
-                break;
-            case SKIPPED:
-                textView.setText(textView.getContext().getString(R.string.event_editing_expired));
-                break;
-            default:
-                textView.setText(textView.getContext().getString(R.string.read_only));
-                break;
-        }
-    }
-
-
 
     @BindingAdapter("stateText")
     public static void setStateText(TextView textView, State state) {
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.kt
index f2cdb99aa24..9e1a71aa393 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.kt
@@ -22,6 +22,7 @@ import org.dhis2.commons.dialogs.AlertBottomDialog
 import org.dhis2.commons.dialogs.CustomDialog
 import org.dhis2.commons.dialogs.DialogClickListener
 import org.dhis2.commons.popupmenu.AppMenuHelper
+import org.dhis2.commons.resources.ResourceManager
 import org.dhis2.commons.sync.SyncContext
 import org.dhis2.databinding.ActivityEventCaptureBinding
 import org.dhis2.ui.ErrorFieldList
@@ -58,7 +59,7 @@ class EventCaptureActivity :
     EventCaptureContract.View,
     MapButtonObservable,
     EventDetailsComponentProvider {
-    private var binding: ActivityEventCaptureBinding? = null
+    private lateinit var binding: ActivityEventCaptureBinding
 
     @JvmField
     @Inject
@@ -74,6 +75,9 @@ class EventCaptureActivity :
     private var isEventCompleted = false
     private var eventMode: EventMode? = null
 
+    @Inject
+    lateinit var resourceManager: ResourceManager
+
     @JvmField
     var eventCaptureComponent: EventCaptureComponent? = null
     var programUid: String? = null
@@ -119,6 +123,7 @@ class EventCaptureActivity :
             this,
             intent.getStringExtra(Constants.PROGRAM_UID),
             intent.getStringExtra(Constants.EVENT_UID),
+            presenter?.programStage(),
             pageConfigurator!!.displayAnalytics(),
             pageConfigurator!!.displayRelationships(),
             intent.getBooleanExtra(OPEN_ERROR_LOCATION, false),
@@ -297,9 +302,16 @@ class EventCaptureActivity :
         }
     }
 
-    override fun showSnackBar(messageId: Int) {
+    override fun showSnackBar(messageId: Int, programStage: String) {
         val mySnackbar =
-            Snackbar.make(binding!!.root, messageId, BaseTransientBottomBar.LENGTH_SHORT)
+            Snackbar.make(
+                binding.root,
+                resourceManager.formatWithEventLabel(
+                    messageId,
+                    programStage,
+                ),
+                BaseTransientBottomBar.LENGTH_SHORT,
+            )
         mySnackbar.show()
     }
 
@@ -369,30 +381,43 @@ class EventCaptureActivity :
     }
 
     private fun confirmDeleteEvent() {
-        CustomDialog(
-            this,
-            getString(R.string.delete_event),
-            getString(R.string.confirm_delete_event),
-            getString(R.string.delete),
-            getString(R.string.cancel),
-            0,
-            object : DialogClickListener {
-                override fun onPositive() {
-                    analyticsHelper().setEvent(DELETE_EVENT, CLICK, DELETE_EVENT)
-                    presenter!!.deleteEvent()
-                }
+        presenter?.programStage().let {
+            CustomDialog(
+                this,
+                resourceManager.formatWithEventLabel(
+                    R.string.delete_event_label,
+                    programStageUid = it,
+                ),
+                resourceManager.formatWithEventLabel(
+                    R.string.confirm_delete_event_label,
+                    programStageUid = it,
+                ),
+                getString(R.string.delete),
+                getString(R.string.cancel),
+                0,
+                object : DialogClickListener {
+                    override fun onPositive() {
+                        analyticsHelper().setEvent(DELETE_EVENT, CLICK, DELETE_EVENT)
+                        presenter!!.deleteEvent()
+                    }
 
-                override fun onNegative() {
-                    // dismiss
-                }
-            },
-        ).show()
+                    override fun onNegative() {
+                        // dismiss
+                    }
+                },
+            ).show()
+        }
     }
 
     override fun showEventIntegrityAlert() {
         MaterialAlertDialogBuilder(this, R.style.DhisMaterialDialog)
             .setTitle(R.string.conflict)
-            .setMessage(R.string.event_date_in_future_message)
+            .setMessage(
+                resourceManager.formatWithEventLabel(
+                    R.string.event_label_date_in_future_message,
+                    programStageUid = presenter?.programStage(),
+                ),
+            )
             .setPositiveButton(
                 R.string.change_event_date,
             ) { _, _ -> binding!!.navigationBar.selectItemAt(0) }
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureContract.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureContract.java
index d45ad8e5b3a..7581ab9fdf2 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureContract.java
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureContract.java
@@ -40,7 +40,7 @@ void showCompleteActions(
 
         void SaveAndFinish();
 
-        void showSnackBar(int messageId);
+        void showSnackBar(int messageId, String programStage);
 
         void attemptToSkip();
 
@@ -100,6 +100,8 @@ void attemptFinish(boolean canComplete,
         boolean getCompletionPercentageVisibility();
 
         void emitAction(@NotNull EventCaptureAction onBack);
+
+        String programStage();
     }
 
     public interface EventCaptureRepository {
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePagerAdapter.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePagerAdapter.java
index de871519f30..de78a83a1f0 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePagerAdapter.java
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePagerAdapter.java
@@ -1,5 +1,6 @@
 package org.dhis2.usescases.eventsWithoutRegistration.eventCapture;
 
+import static org.dhis2.commons.Constants.PROGRAM_STAGE_UID;
 import static org.dhis2.usescases.teiDashboard.dashboardfragments.indicators.IndicatorsFragmentKt.VISUALIZATION_TYPE;
 import static org.dhis2.commons.Constants.PROGRAM_UID;
 
@@ -31,6 +32,7 @@ public class EventCapturePagerAdapter extends FragmentStateAdapter {
     private final String programUid;
     private final String eventUid;
     private final List<EventPageType> pages;
+    private final String programStage;
     private EventCaptureFormFragment formFragment;
 
     private final boolean shouldOpenErrorSection;
@@ -46,6 +48,7 @@ private enum EventPageType {
     public EventCapturePagerAdapter(FragmentActivity fragmentActivity,
                                     String programUid,
                                     String eventUid,
+                                    String programStage,
                                     boolean displayAnalyticScreen,
                                     boolean displayRelationshipScreen,
                                     boolean openErrorSection
@@ -54,6 +57,7 @@ public EventCapturePagerAdapter(FragmentActivity fragmentActivity,
         super(fragmentActivity);
         this.programUid = programUid;
         this.eventUid = eventUid;
+        this.programStage = programStage;
         this.shouldOpenErrorSection = openErrorSection;
         pages = new ArrayList<>();
         pages.add(EventPageType.DETAILS);
@@ -93,6 +97,7 @@ public Fragment createFragment(int position) {
                 Bundle bundle = new Bundle();
                 bundle.putString(Constants.EVENT_UID, eventUid);
                 bundle.putString(PROGRAM_UID, programUid);
+                bundle.putString(PROGRAM_STAGE_UID, programStage);
                 EventDetailsFragment eventDetailsFragment = new EventDetailsFragment();
                 eventDetailsFragment.setArguments(bundle);
                 eventDetailsFragment.setOnEventReopened(() -> {
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.kt
index 048c540d06b..53135198fc2 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.kt
@@ -186,7 +186,7 @@ class EventCapturePresenterImpl(
                     schedulerProvider,
                     { result ->
                         if (result) {
-                            view.showSnackBar(R.string.event_was_deleted)
+                            view.showSnackBar(R.string.event_label_was_deleted, programStage())
                         }
                     },
                     Timber::e,
@@ -200,7 +200,7 @@ class EventCapturePresenterImpl(
             eventCaptureRepository.updateEventStatus(EventStatus.SKIPPED)
                 .defaultSubscribe(
                     schedulerProvider,
-                    { view.showSnackBar(R.string.event_was_skipped) },
+                    { view.showSnackBar(R.string.event_label_was_skipped, programStage()) },
                     Timber::e,
                     view::finishDataEntry,
                 ),
@@ -268,4 +268,6 @@ class EventCapturePresenterImpl(
 
     private val eventStatus: EventStatus
         get() = eventCaptureRepository.eventStatus().blockingFirst()
+
+    override fun programStage(): String = eventCaptureRepository.programStage().blockingFirst()
 }
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 c1f6ff7c024..a8d0d42cd83 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(resourceManager, programStageUid)
     }
 
     @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 f1230cd7f20..42165e1254b 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
@@ -6,10 +6,14 @@ import org.hisp.dhis.android.core.event.EventNonEditableReason
 
 class EventDetailResourcesProvider(
     private val resourceManager: ResourceManager,
+    private val programStage: String?,
 ) {
     fun provideDueDate() = resourceManager.getString(R.string.due_date)
 
-    fun provideEventDate() = resourceManager.getString(R.string.event_date)
+    fun provideEventDate() = resourceManager.formatWithEventLabel(
+        R.string.event_label_date,
+        programStage,
+    )
 
     fun provideEditionStatus(reason: EventNonEditableReason): String {
         return when (reason) {
@@ -36,9 +40,15 @@ class EventDetailResourcesProvider(
 
     fun provideButtonCheck() = resourceManager.getString(R.string.check_event)
 
-    fun provideEventCreatedMessage() = resourceManager.getString(R.string.event_updated)
+    fun provideEventCreatedMessage() = resourceManager.formatWithEventLabel(
+        R.string.event_label_updated,
+        programStage,
+    )
 
-    fun provideEventCreationError() = resourceManager.getString(R.string.failed_insert_event)
+    fun provideEventCreationError() = resourceManager.formatWithEventLabel(
+        R.string.failed_insert_event_label,
+        programStage,
+    )
 
     fun provideReOpened() = resourceManager.getString(R.string.re_opened)
 }
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialActivity.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialActivity.java
index 0f3852d7ce8..83b4cc2fe5f 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialActivity.java
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialActivity.java
@@ -29,6 +29,7 @@
 import org.dhis2.commons.dialogs.CustomDialog;
 import org.dhis2.commons.dialogs.DialogClickListener;
 import org.dhis2.commons.popupmenu.AppMenuHelper;
+import org.dhis2.commons.resources.ResourceManager;
 import org.dhis2.databinding.ActivityEventInitialBinding;
 import org.dhis2.usescases.eventsWithoutRegistration.eventCapture.EventCaptureActivity;
 import org.dhis2.usescases.eventsWithoutRegistration.eventDetails.injection.EventDetailsComponent;
@@ -60,6 +61,9 @@ public class EventInitialActivity extends ActivityGlobalAbstract implements Even
     @Inject
     EventInitialPresenter presenter;
 
+    @Inject
+    ResourceManager resourceManager;
+
     private ActivityEventInitialBinding binding;
 
     //Bundle variables
@@ -239,14 +243,22 @@ private void setUpActivityTitle() {
             activityTitle = program.displayName() + " - " + getString(R.string.referral);
         } else {
 
-            activityTitle = eventUid == null ? program.displayName() + " - " + getString(R.string.new_event) : program.displayName();
+            activityTitle = eventUid == null ?
+                    program.displayName() + " - " +
+                    resourceManager.formatWithEventLabel(R.string.new_event_label, programStageUid, 1, false)
+                    : program.displayName();
         }
         binding.setName(activityTitle);
     }
 
     @Override
     public void onEventCreated(String eventUid) {
-        showToast(getString(R.string.event_created));
+        showToast(
+                resourceManager.formatWithEventLabel(
+                        R.string.event_label_created,
+                        programStageUid,
+                1, false
+        ));
         if (eventCreationType != EventCreationType.SCHEDULE && eventCreationType != EventCreationType.REFERAL) {
             startFormActivity(eventUid, true);
         } else {
@@ -340,8 +352,14 @@ public void showMoreOptions(View view) {
     public void confirmDeleteEvent() {
         new CustomDialog(
                 this,
-                getString(R.string.delete_event),
-                getString(R.string.confirm_delete_event),
+                resourceManager.formatWithEventLabel(
+                        R.string.delete_event_label,
+                        programStageUid,
+                        1, false),
+                resourceManager.formatWithEventLabel(
+                        R.string.confirm_delete_event_label,
+                        programStageUid,
+                        1, false),
                 getString(R.string.delete),
                 getString(R.string.cancel),
                 0,
@@ -362,10 +380,23 @@ public void onNegative() {
 
     @Override
     public void showEventWasDeleted() {
-        showToast(getString(R.string.event_was_deleted));
+        showToast(resourceManager.formatWithEventLabel(
+                R.string.event_label_was_deleted,
+                programStageUid,
+                1, false
+        ));
         finish();
     }
 
+    @Override
+    public void showDeleteEventError() {
+        showToast(resourceManager.formatWithEventLabel(
+                R.string.delete_event_label_error,
+                programStageUid,
+                1, false
+        ));
+    }
+
     @Nullable
     @Override
     public EventDetailsComponent provideEventDetailsComponent(@Nullable EventDetailsModule module) {
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialContract.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialContract.java
index 4c190b31f0a..50c0bda4aee 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialContract.java
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialContract.java
@@ -29,5 +29,7 @@ public interface View extends AbstractActivityContracts.View {
         void showQR();
 
         void showEventWasDeleted();
+
+        void showDeleteEventError();
     }
 }
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialPresenter.java b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialPresenter.java
index b1aec976b0b..28a70356175 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialPresenter.java
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialPresenter.java
@@ -144,7 +144,7 @@ public void deleteEvent(String trackedEntityInstance) {
             eventInitialRepository.deleteEvent(eventId, trackedEntityInstance);
             view.showEventWasDeleted();
         } else
-            view.displayMessage(view.getContext().getString(R.string.delete_event_error));
+            view.showDeleteEventError();
     }
 
     public boolean isEnrollmentOpen() {
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt
index 145ef183624..bfe369e296f 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt
@@ -39,6 +39,7 @@ import org.dhis2.commons.filters.FiltersAdapter
 import org.dhis2.commons.orgunitselector.OUTreeFragment
 import org.dhis2.commons.resources.ColorUtils
 import org.dhis2.commons.resources.ObjectStyleUtils.getIconResource
+import org.dhis2.commons.resources.ResourceManager
 import org.dhis2.commons.sync.OnDismissListener
 import org.dhis2.commons.sync.SyncContext.EnrollmentEvent
 import org.dhis2.databinding.FragmentTeiDataBinding
@@ -96,6 +97,9 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
     @Inject
     lateinit var contractHandler: TeiDataContractHandler
 
+    @Inject
+    lateinit var resourceManager: ResourceManager
+
     private var eventAdapter: EventAdapter? = null
     private var dialog: CustomDialog? = null
     private var programStageFromEvent: ProgramStage? = null
@@ -399,7 +403,10 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
     private fun showDialogCloseProgram() {
         dialog = CustomDialog(
             requireContext(),
-            getString(R.string.event_completed),
+            resourceManager.formatWithEventLabel(
+                R.string.event_label_completed,
+                programStageFromEvent?.uid(),
+            ),
             getString(R.string.complete_enrollment_message),
             getString(R.string.button_ok),
             getString(R.string.cancel),
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/teievents/StageViewHolder.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/teievents/StageViewHolder.kt
index 9cd5ea63429..25bc14dd3c0 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/teievents/StageViewHolder.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/teievents/StageViewHolder.kt
@@ -47,7 +47,9 @@ internal class StageViewHolder(
             ),
         )
 
-        val iconResource = ResourceManager(itemView.context, colorUtils)
+        val resourceManager = ResourceManager(itemView.context, colorUtils)
+
+        val iconResource = resourceManager
             .getObjectStyleDrawableResource(
                 stage.style().icon(),
                 R.drawable.ic_default_outline,
@@ -84,8 +86,12 @@ internal class StageViewHolder(
         binding.addStageButton.setOnClickListener {
             stageSelector.onNext(StageSection(stage.uid(), true))
         }
-        binding.programStageCount.text =
-            "${eventItem.eventCount} ${itemView.context.getString(R.string.events)}"
+        val eventCount = "${eventItem.eventCount} " +
+                resourceManager.getEventLabel(
+                    programStageUid = stage.uid(),
+                    quantity = eventItem.eventCount,
+                )
+        binding.programStageCount.text = eventCount
 
         itemView.setOnClickListener { stageSelector.onNext(StageSection(stage.uid(), false)) }
 
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index b9afbe9b74d..fb33b369137 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -126,9 +126,8 @@
     <string name="latitude">خط العرض</string>
     <string name="longitude">خط الطول</string>
     <string name="new_event">حدث جديد</string>
-    <string name="failed_insert_event">فشل إدراج حدث جديد</string>
-    <string name="event_created">تم إنشاء الحدث</string>
-    <string name="event_updated">تم تحديث الحدث</string>
+    <string name="delete_event_error">This event has not been created yet</string>
+
     <string name="one_time">مرة واحدة</string>
     <string name="permanent">دائم</string>
 
@@ -141,15 +140,11 @@
     <string name="datavalue_saved">تم حفظ القيمة!</string>
     <string name="there_is_no_available_period">لا توجد فترات متاحة للاختيار.</string>
     <!--Event Detail-->
-    <string name="event_date">تاريخ الحدث</string>
     <string name="due_date">تاريخ الاستحقاق</string>
     <string name="cat_combo">تجميع فئة</string>
     <string name="date_default">DD/MM/YYYY</string>
     <string name="cancel">إلغاء</string>
     <string name="delete">حذف</string>
-    <string name="delete_event">حذف الحدث</string>
-    <string name="confirm_delete_event">هل أنت متأكد أنك تريد حذف هذا الحدث؟</string>
-    <string name="event_was_deleted">تم حذف الحدث بنجاح</string>
     <string name="total">الإجمالي</string>
     <string name="most_recent_event_date">تاريخ أحدث حدث</string>
 
@@ -260,7 +255,6 @@
     <string name="missing_mandatory_fields_events">تحتاج بعض الحقول إلى إطلاعك.\n هل تريد مراجعة النموذج؟</string>
     <string name="title_delete_go_back">لم يتم حفظ بياناتك</string>
     <string name="delete_go_back">إذا رجعت الآن سيتم حذف جميع المعلومات التي تم إدخالها.</string>
-    <string name="missing_mandatory_fields_events_2.0">بعض الحقول الإلزامية مفقودة:\n%s\n يمكنك الرجوع الآن ، ولكن لن تتمكن من إكمال هذا الحدث.</string>
     <string name="missing_mandatory_fields_go_back">الحذف والرجوع للخلف</string>
     <string name="error_fields">تحتوي بعض الحقول على أخطاء:\n%s\n يرجى التحقق منها.</string>
     <string name="missing_mandatory_fields_finish">بعض الحقول الإلزامية مفقودة. يمكنك إنهاء إدخال البيانات والخروج، لكن لا يمكن تعيين الحدث كمكتمل.</string>
@@ -322,7 +316,6 @@
     <string name="qr_error_id">رمز QR غير صالح</string>
     <string name="qr_error_attr">هذه السمة لايمكن إضافتها</string>
     <string name="qr_error_enrollment">هذا التسجيل لايمكن إضافته</string>
-    <string name="qr_error_event">هذا الحدث لا يمكن إضافته</string>
 
     <string name="jira_report">ابلاغ مشكلة إلى Jira</string>
     <string name="about">حول التطبيق</string>
@@ -469,17 +462,14 @@
     <string name="finish">إنهاء</string>
     <string name="error_fields_title">الحقول التي بها أخطاء</string>
     <string name="error_fields_events">تحتوي بعض الحقول على أخطاء. لم يتم حفظها. يرجى التحقق منها.</string>
-    <string name="event_reopened">بالإمكان الآن تعديل هذا الحدث</string>
     <string name="unique_warning">يجب أن تكون القيمة فريدة، يوجد تعارض تكرار لنفس القيمة. لم يتم الحفظ. يرجى التحقق.</string>
     <string name="unique_coincidence_found">وجد تعارض في حقل ذو قيمة فريدة. لحفظ التسجيل، يرجي التحقق من النموذج.</string>
     <string name="please_wait">الرجاء الانتظار</string>
     <string name="skip">تخطى</string>
     <string name="reschedule">اعادة جدولة</string>
-    <string name="event_was_skipped">تم وضع علامة على الحدث بأنه تم تخطيه</string>
     <string name="no_intructions">لا توجد معلومات عن هذه الشاشة</string>
     <string name="event_overdue">متأخر</string>
     <string name="unsupported_program_rule">هناك قاعدة برنامج واحدة غير معتمدة. يرجى زيارة التوثيق للتحقق</string>
-    <string name="delete_event_error">لم يتم إنشاء هذا الحدث بعد</string>
     <string name="empty_description">لا توجد معلومات عن هذا الحقل</string>
     <string name="biometrics_dialog_title">إعتمادات فارغة</string>
     <string name="biometrics_first_use_text">لتتمكن من تسجيل الدخول باستخدام ماسح بصمة الإصبع، تحتاج أولاً إلى تسجيل الدخول بإستخدام الطريقة الافتراضية</string>
@@ -536,7 +526,6 @@
     <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>
     <string name="adjusting_form">تسوية وضبط النموذج</string>
 
     <string name="sms_receiver_number">رقم المستلم</string>
@@ -638,7 +627,6 @@
     <string name="disable_pin_locked">لا تظهر قفل الشاشة مرة أخرى</string>
     <string name="set_pin">تعيين رمز</string>
     <string name="conflict">تعارض</string>
-    <string name="event_date_in_future_message">لا يمكن أن يكون لهذا الحدث تاريخ في المستقبل. يرجى تغيير التاريخ.</string>
     <string name="change_event_date">غير التاريخ</string>
     <string name="go_back">رجوع</string>
     <string name="data_sets">حزم البيانات</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 837527f10be..8b9a1c39670 100644
--- a/app/src/main/res/values-b+uz+Cyrl/strings.xml
+++ b/app/src/main/res/values-b+uz+Cyrl/strings.xml
@@ -12,8 +12,6 @@
     <string name="error_wrong_credentials">Нотўғри маълумот</string>
     <string name="error_unexpected_error">Кутилмаган хатолик</string>
     <string name="error_internal_server_error">Сервердаги ички хатолик</string>
-    <string name="yes">ҳа</string>
-    <string name="no">йўқ</string>
     <string name="no_value">қиймат йўқ</string>
     <string name="no_reserved_values">Сақланган бошқа қийматлар йўқ. Тизим администраторига мурожаат қилинг.</string>
     <string name="no_reserved_values_connection">Сақланган бошқа қийматлар йўқ. Уларни тўлдириш учун тармоққа уланинг.</string>
@@ -86,13 +84,6 @@
 
     <string name="event_open">Очиш</string>
     <string name="event_completed">Тадбир тугалланди</string>
-    <string name="event_skipped">Тадбир ўтказиб юборилди</string>
-    <string name="event_schedule">Тадбир режаси</string>
-    <string name="event_expired">Тадбир муддати тугаган</string>
-    <string name="event_editing_expired">Таҳрирлаш муддати тугаган</string>
-    <string name="event_accepted">Тадбир қабул қилинган</string>
-    <string name="event_approved">Тадбир тасдиқланди</string>
-    <string name="event_inactive">Тадбир нофаол</string>
     <string name="read_only">Фақат ўқиш учун</string>
     <string name="complete">Тўлиқ</string>
     <string name="finish_and_complete">Тайёр ва тўлиқ</string>
@@ -125,9 +116,6 @@
     <string name="latitude">Кенглик</string>
     <string name="longitude">Узунлик</string>
     <string name="new_event">Янги тадбир</string>
-    <string name="failed_insert_event">Янги тадбирни киритиш амалга ошмади</string>
-    <string name="event_created">Тадбир яратилди</string>
-    <string name="event_updated">Тадбир янгиланди</string>
     <string name="one_time">Бир марта</string>
     <string name="permanent">Доимий</string>
 
@@ -140,15 +128,11 @@
     <string name="datavalue_saved">Қиймат сақланди!</string>
     <string name="there_is_no_available_period">Танлаш учун яроқли давр мавжуд эмас</string>
     <!--Event Detail-->
-    <string name="event_date">Ҳодиса/Тадбир санаси</string>
     <string name="due_date">Муддати</string>
     <string name="cat_combo">Категория комбинацияси</string>
     <string name="date_default">КК/ОО/ЙЙЙЙ</string>
     <string name="cancel">Бекор қилиш</string>
     <string name="delete">Ўчириш</string>
-    <string name="delete_event">Тадбирни ўчиринг</string>
-    <string name="confirm_delete_event">Ҳақиқатдан ҳам ушбу ҳодиса/тадбирни ўчирмоқчимисиз?</string>
-    <string name="event_was_deleted">Тадбир муваффақиятли ўчирилди</string>
     <string name="total">Жами</string>
     <string name="most_recent_event_date">Охирги тадбир санаси</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 6257a77ffee..fc7a77a35f1 100644
--- a/app/src/main/res/values-b+uz+Latn/strings.xml
+++ b/app/src/main/res/values-b+uz+Latn/strings.xml
@@ -110,9 +110,6 @@
     <string name="latitude">Kenglik</string>
     <string name="longitude">Kenglik</string>
     <string name="new_event">Yangi tadbir</string>
-    <string name="failed_insert_event">Yangi tadbirni kiritish amalga oshmadi</string>
-    <string name="event_created">Tadbir yaratildi</string>
-    <string name="event_updated">Tadbir yangilandi</string>
     <string name="one_time">Bir marta</string>
     <string name="permanent">Doimiy</string>
 
@@ -125,15 +122,11 @@
     <string name="datavalue_saved">Qiymat saqlandi!</string>
     <string name="there_is_no_available_period">Tanlash uchun yaroqli davr mavjud emas</string>
     <!--Event Detail-->
-    <string name="event_date">Hodisa/Tadbir sanasi</string>
     <string name="due_date">Muddati</string>
     <string name="cat_combo">Kategoriya kombinatsiyasi</string>
     <string name="date_default">KK/OO/YYYY</string>
     <string name="cancel">Бекор қилиш</string>
     <string name="delete">Oʼchirib tashlash</string>
-    <string name="delete_event">Hodisa/Tadbirni oʼchirib tashlash</string>
-    <string name="confirm_delete_event">Haqiqatdan ham ushbu hodisa/tadbirni oʼchirib tashlamoqchimisiz?</string>
-    <string name="event_was_deleted">Tadbir muvaffaqiyatli oʼchirib tashlandi</string>
     <string name="total">Jami</string>
     <string name="most_recent_event_date">Oxirgi tadbir sanasi</string>
 
@@ -230,7 +223,6 @@
     <string name="missing_mandatory_fields_text_not_delete">Baʼzi majburiy maydonlar qoldirib ketilgan. Аgar orqaga qaytmoqchi boʼlsangiz, Iltimos, ularni toʼldiring.</string>
     <string name="title_delete_go_back">Maʼlumotingiz saqlanmadi</string>
     <string name="delete_go_back">Аgarda hozir orqaga qaytsangiz, barcha kiritilgan maʼlumotlar oʼchiriladi.</string>
-    <string name="missing_mandatory_fields_events_2.0">Baʼzi majburiy maydonlar qoldirib ketilgan: \n %sda\n. Hozir orqaga qayta olasiz, ammo bu holda hodisa/tadbirni yakunlab boʼlmaydi.</string>
     <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>
@@ -292,7 +284,6 @@
     <string name="qr_error_id">QR kod yaroqsiz</string>
     <string name="qr_error_attr">Ushbu atributlarrni qoʼshib boʼlmadi</string>
     <string name="qr_error_enrollment">Ushbu qaydlarni qoʼshib boʼlmadi</string>
-    <string name="qr_error_event">Ushbu hodisa/tadbirni qoʼshib boʼlmadi</string>
 
     <string name="jira_report">Jira nashri uchun xabar berish</string>
     <string name="about">Ҳақида</string>
@@ -433,17 +424,14 @@
     <string name="finish">Tugatish</string>
     <string name="error_fields_title">Xatoliklar mavjud boʼlgan maydonlar</string>
     <string name="error_fields_events">Baʼzi maydonlarda xatoliklar mavjud.Ular saqlanmadi. Iltimos,, ularni tekshirib koʼring.</string>
-    <string name="event_reopened">Ushbu hodisa/tadbirni endi tahrir qilish mumkin</string>
     <string name="unique_warning">Qiymat noyob boʼlishi lozim, bir biriga oʼxshash topildi. U saqlanmadi. Iltimos, tekshirib koʼrish.</string>
     <string name="unique_coincidence_found">Noyob sohada bir biriga oʼxshash qiymat topildi. Roʼyxatdan oʼtishni saqlash uchun formani tekshirish.</string>
     <string name="please_wait">Iltimos, kuting</string>
     <string name="skip">Oʼtkazib yuborish</string>
     <string name="reschedule">Qayta rejalang</string>
-    <string name="event_was_skipped">Hodisa/tadbir oʼtkazib yuborilgan deb belgilandi</string>
     <string name="no_intructions">Ushbu ekrandagi haqida maʼlumot yoʼq</string>
     <string name="event_overdue">Muddat oʼtgan</string>
     <string name="unsupported_program_rule">Bu yerda dasturning qoʼllab quvvatlanmaydigan bir qoidasi mavjud. Iltimos, hujjatlarni tekshiring.</string>
-    <string name="delete_event_error">Ushbu hodisa/dastur hali yaratilmagan</string>
     <string name="empty_description">Ushbu maydon uchun maʼlumot yoʼq</string>
     <string name="biometrics_dialog_title">Ishonch yorliqlari boʼsh</string>
     <string name="biometrics_first_use_text">Barmoq izlari skaneri yordamida tizimga kirish uchun avval standart usuldan foydalanishingiz kerak</string>
@@ -496,7 +484,6 @@
     <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>
     <string name="adjusting_form">Shakl sozlanmoqda...</string>
 
     <string name="sms_receiver_number">Qabul qiluvchining raqami</string>
@@ -598,7 +585,6 @@
     <string name="disable_pin_locked">Bloklangan ekranni qayta koʼrsatmaslik</string>
     <string name="set_pin">PIN kodni oʼrnating</string>
     <string name="conflict">Nomutanosiblik</string>
-    <string name="event_date_in_future_message">Ushbu hodisa/tadbirning sanasi kelajakda boʼlishi mumkin emas. Iltimos, oʼzgartiring</string>
     <string name="change_event_date">Sanani oʼzgartirish</string>
     <string name="go_back">Orqaga qayting</string>
     <string name="data_sets">Maʼlumotlar toʼplami</string>
diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml
index 2054208aa1e..e8ef2ed3bf8 100644
--- a/app/src/main/res/values-ckb/strings.xml
+++ b/app/src/main/res/values-ckb/strings.xml
@@ -5,7 +5,6 @@
     <string name="date">داتا</string>
     <string name="new_event">رووداوي نوي</string>
     <!--Event Detail-->
-    <string name="event_date">بيركاري داتا</string>
     <string name="cancel">لابردن</string>
     <string name="delete">سرينةوة</string>
     <string name="total">كؤي طشتي</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 54cd8a601d4..7eaab4f9e10 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -124,9 +124,6 @@
     <string name="latitude">Zeměpisná šířka</string>
     <string name="longitude">Zeměpisná délka</string>
     <string name="new_event">Nová událost</string>
-    <string name="failed_insert_event">Vložení nové události se nezdařilo</string>
-    <string name="event_created">Událost vytvořena</string>
-    <string name="event_updated">Událost aktualizována</string>
     <string name="one_time">Jednou</string>
     <string name="permanent">Trvale</string>
 
@@ -139,15 +136,11 @@
     <string name="datavalue_saved">Hodnota je uložena!</string>
     <string name="there_is_no_available_period">Nejsou k dispozici žádná období k výběru.</string>
     <!--Event Detail-->
-    <string name="event_date">Datum události</string>
     <string name="due_date">Poslední termín</string>
     <string name="cat_combo">Kombinace kategorií</string>
     <string name="date_default">DD/MM/RRRR</string>
     <string name="cancel">Zrušit</string>
     <string name="delete">Smazat</string>
-    <string name="delete_event">Smazat událost</string>
-    <string name="confirm_delete_event">Opravdu chcete tuto událost smazat?</string>
-    <string name="event_was_deleted">Událost byla úspěšně smazána</string>
     <string name="total">Celkem</string>
     <string name="most_recent_event_date">Datum poslední události</string>
 
@@ -256,7 +249,6 @@
     <string name="missing_mandatory_fields_events">Některá pole vyžadují vaši pozornost.\nChcete formulář zkontrolovat?</string>
     <string name="title_delete_go_back">Vaše data nejsou uložena</string>
     <string name="delete_go_back">Pokud se nyní vrátíte zpět, všechny zadané informace budou smazány.</string>
-    <string name="missing_mandatory_fields_events_2.0">Chybí některá povinná pole:\n%s\nMůžete se nyní vrátit, ale tuto událost nebude možné dokončit.</string>
     <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>
@@ -318,7 +310,6 @@
     <string name="qr_error_id">Neplatný QR kód</string>
     <string name="qr_error_attr">Tento atribut nelze přidat</string>
     <string name="qr_error_enrollment">Tento zápis nelze přidat</string>
-    <string name="qr_error_event">Tuto událost nelze přidat</string>
 
     <string name="jira_report">Nahlásit problém do Jira</string>
     <string name="about">O nás</string>
@@ -465,17 +456,14 @@
     <string name="finish">Dokončit</string>
     <string name="error_fields_title">Pole s chybami</string>
     <string name="error_fields_events">Některá pole obsahují chyby. Nebyla uložena. Prosím, zkontrolujte je.</string>
-    <string name="event_reopened">Tuto událost lze nyní upravit</string>
     <string name="unique_warning">Hodnota by měla být jedinečná, byla nalezena koincidence. Nebylo uloženo. Prosím zkontrolujte to.</string>
     <string name="unique_coincidence_found">Byla nalezena koincidence v jedinečném poli. Pro uložení zápisu prosím zkontrolujte formulář.</string>
     <string name="please_wait">Prosím, čekejte</string>
     <string name="skip">Přeskočit</string>
     <string name="reschedule">Přeplánovat</string>
-    <string name="event_was_skipped">Událost byla označena jako přeskočená</string>
     <string name="no_intructions">O této obrazovce nejsou žádné informace</string>
     <string name="event_overdue">Vypršelo</string>
     <string name="unsupported_program_rule">Existuje jedno programové pravidlo, které není podporováno. Zkontrolujte dokumentaci</string>
-    <string name="delete_event_error">Tato událost ještě nebyla vytvořena</string>
     <string name="empty_description">Žádné informace pro toto pole</string>
     <string name="biometrics_dialog_title">Prázdné pověření</string>
     <string name="biometrics_first_use_text">Abyste se mohli přihlásit pomocí snímače otisků prstů, musíte nejprve použít výchozí způsob</string>
@@ -532,7 +520,6 @@
     <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>
     <string name="adjusting_form">Úprava formuláře…</string>
 
     <string name="sms_receiver_number">Číslo příjemce</string>
@@ -634,7 +621,6 @@
     <string name="disable_pin_locked">Nezobrazovat znovu zamykací obrazovku</string>
     <string name="set_pin">Nastavit PIN</string>
     <string name="conflict">Konflikt</string>
-    <string name="event_date_in_future_message">Tato událost nemůže mít datum v budoucnu. Změňte to prosím.</string>
     <string name="change_event_date">Změnit datum</string>
     <string name="go_back">Zpět</string>
     <string name="data_sets">Datové sady</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d690c50e6fb..97e83fa0d64 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -123,9 +123,6 @@
     <string name="latitude">Latitud</string>
     <string name="longitude">Longitud</string>
     <string name="new_event">Evento nuevo</string>
-    <string name="failed_insert_event">Error/Fallo al crear un nuevo evento</string>
-    <string name="event_created">Evento creado</string>
-    <string name="event_updated">Evento actualizado</string>
     <string name="one_time">Una vez</string>
     <string name="permanent">Permanente</string>
 
@@ -138,15 +135,11 @@
     <string name="datavalue_saved">Guardado!</string>
     <string name="there_is_no_available_period">No hay periodos disponibles.</string>
     <!--Event Detail-->
-    <string name="event_date">Fecha de evento</string>
     <string name="due_date">Fecha de vencimiento</string>
     <string name="cat_combo">Cat Combo</string>
     <string name="date_default">DD/MM/YYYY</string>
     <string name="cancel">Cancelar</string>
     <string name="delete">Borrar</string>
-    <string name="delete_event">Eliminar evento</string>
-    <string name="confirm_delete_event">¿Está seguro de querer eliminar este evento?</string>
-    <string name="event_was_deleted">Evento eliminado</string>
     <string name="total">Total</string>
     <string name="most_recent_event_date">Fecha de evento más reciente</string>
 
@@ -254,7 +247,6 @@
     <string name="missing_mandatory_fields_events">Algunos campos necesitan su atención.\n¿Desea revisar el formulario?</string>
     <string name="title_delete_go_back">Los datos no se han guardado</string>
     <string name="delete_go_back">Si vuelve ahora la información registrada se perderá </string>
-    <string name="missing_mandatory_fields_events_2.0">Faltan campos obligatorios:+n%s\nPuede ir atrás, pero el evento no se puede completar.</string>
     <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>
@@ -316,7 +308,6 @@
     <string name="qr_error_id">Código QR no válido</string>
     <string name="qr_error_attr">Este atributo no puede ser añadido</string>
     <string name="qr_error_enrollment">Esta admisión no puede ser añadida</string>
-    <string name="qr_error_event">Este evento no puede ser añadido</string>
 
     <string name="jira_report">Reportar problema en Jira</string>
     <string name="about">Acerca de</string>
@@ -463,17 +454,14 @@
     <string name="finish">Acabar</string>
     <string name="error_fields_title">Campos con errores</string>
     <string name="error_fields_events">Algunos campos presentan errores. No se han guardado. Revíselos por favor.</string>
-    <string name="event_reopened">Ahora puede editar este evento</string>
     <string name="unique_warning">El valor debe ser único, se ha encontrado una coincidencia. El campo no se ha guardado, revíselo.</string>
     <string name="unique_coincidence_found">Se ha encontrado una coincidencia en un campo único. Por favor compruebe el formulario para guardar el registro.</string>
     <string name="please_wait">Por favor, espere</string>
     <string name="skip">Omitir</string>
     <string name="reschedule">Reprogramar</string>
-    <string name="event_was_skipped">El evento se ha marcado como omitido</string>
     <string name="no_intructions">No hay información sobre esta pantalla</string>
     <string name="event_overdue">Atrasado</string>
     <string name="unsupported_program_rule">Hay alguna program rule no soportada. Revise la documentación.</string>
-    <string name="delete_event_error">Este evento aun no se ha creado</string>
     <string name="empty_description">No hay información para este campo</string>
     <string name="biometrics_dialog_title">Vaciar credenciales</string>
     <string name="biometrics_first_use_text">Para poder iniciar sesión por huella dactilar debe entrar primero por el modo normal</string>
@@ -530,7 +518,6 @@
     <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>
     <string name="adjusting_form">Adaptando el formulario...</string>
 
     <string name="sms_receiver_number">Numero receptor</string>
@@ -632,7 +619,6 @@
     <string name="disable_pin_locked">No volver a mostrar la pantalla de bloqueo</string>
     <string name="set_pin">Establecer pin</string>
     <string name="conflict">Conflicto</string>
-    <string name="event_date_in_future_message">Este evento no puede tener una fecha en el futuro. Por favor cámbiela.</string>
     <string name="change_event_date">Cambiar fecha</string>
     <string name="go_back">Ir atrás</string>
     <string name="data_sets">Sets de datos</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f1431b0179a..c8f41b60b4f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -121,9 +121,6 @@
     <string name="latitude">Latitude</string>
     <string name="longitude">Longitude</string>
     <string name="new_event">Nouvel événement</string>
-    <string name="failed_insert_event">échoué l´insérer nouvel événement</string>
-    <string name="event_created">événement créé</string>
-    <string name="event_updated">événement mis à jour</string>
     <string name="one_time">Une fois</string>
     <string name="permanent">Définitif</string>
 
@@ -136,15 +133,11 @@
     <string name="datavalue_saved">La valeur a été enregistrée</string>
     <string name="there_is_no_available_period">Aucune période disponible pour sélectionner</string>
     <!--Event Detail-->
-    <string name="event_date">Datee d´événement</string>
     <string name="due_date">Date d\'échéance</string>
     <string name="cat_combo">Combinaison de catégories</string>
     <string name="date_default">JJ/MM/AAAA</string>
     <string name="cancel">Annuler</string>
     <string name="delete">Supprimer</string>
-    <string name="delete_event">Effacer l´événement</string>
-    <string name="confirm_delete_event">Êtes-vous sûr vouloir effacer l´événement?</string>
-    <string name="event_was_deleted">événement supprimé avec succès</string>
     <string name="total">Total</string>
     <string name="most_recent_event_date">Date de l\'événement le plus récent</string>
 
@@ -252,7 +245,6 @@
     <string name="missing_mandatory_fields_events">Certains champs nécessitent votre attention. \n Voulez-vous revoir le formulaire ?</string>
     <string name="title_delete_go_back">Vos données n\'ont pas été sauvegardées</string>
     <string name="delete_go_back">Si vous retournez maintenant, toute information saisie sera supprimée.</string>
-    <string name="missing_mandatory_fields_events_2.0">Certains champs obligatoires sont vides:\n%s\nVous pouvez retourner maintenant, mais cet évènement ne pourra etre complété.</string>
     <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>
@@ -314,7 +306,6 @@
     <string name="qr_error_id">Code QR invalide</string>
     <string name="qr_error_attr">Cet attribut ne peut pas être ajouté</string>
     <string name="qr_error_enrollment">Cette inscription ne peu pas être ajoutée</string>
-    <string name="qr_error_event">Cet événement ne peut pas être ajouté</string>
 
     <string name="jira_report">Signaler les problèmes à Jira</string>
     <string name="about">À propos</string>
@@ -460,17 +451,14 @@
     <string name="finish">Terminer</string>
     <string name="error_fields_title">Champs avec erreurs</string>
     <string name="error_fields_events">Certains champs ont des erreurs. Les valeurs n\'ont pas été enregistrées. Veuillez les vérifier. </string>
-    <string name="event_reopened">Cet evènement peut maintenant etre édité</string>
     <string name="unique_warning">La valeur doit être unique, une coincidence a été trouvée. Elle n\'a pas été sauvegardée. Veuillez vérifier. </string>
     <string name="unique_coincidence_found">Une coïncidence dans un domaine unique a été trouvée. Veuillez vérifier le formulaire pour enregistrer l\'inscription.</string>
     <string name="please_wait">Veuillez patienter</string>
     <string name="skip">Ignorer</string>
     <string name="reschedule">Re-agender</string>
-    <string name="event_was_skipped">L\'évènement a été marqué comme ignoré.</string>
     <string name="no_intructions">Il n\'y a pas d\'information pour cet écran</string>
     <string name="event_overdue">En retard</string>
     <string name="unsupported_program_rule">Il y a une règle de programme dont le fonctionnement n\'est pas encore actif. Veuillez vérifiez la documentation</string>
-    <string name="delete_event_error">Cet évènement n\'a pas encore été créé</string>
     <string name="empty_description">Pas d\'information pour ce champ</string>
     <string name="biometrics_dialog_title">Références vides</string>
     <string name="biometrics_first_use_text">Afin d\'utiliser la connexion par le scanner d\'empreinte digitale vous devez d\'abord vous connecter normalement</string>
@@ -527,7 +515,6 @@
     <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>
     <string name="adjusting_form">Adapter le formulaire...</string>
 
     <string name="sms_receiver_number">Numéro du destinataire</string>
@@ -629,7 +616,6 @@
     <string name="disable_pin_locked">Ne plus afficher l\'écran de verrouillage</string>
     <string name="set_pin">Définir la broche</string>
     <string name="conflict">Conflit</string>
-    <string name="event_date_in_future_message">Cet événement ne peut pas avoir de date dans le futur. Veuillez le changer.</string>
     <string name="change_event_date">Date de modification</string>
     <string name="go_back">Précédent</string>
     <string name="data_sets">Ensembles de données</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 534ef51df3e..87e9818b844 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -118,9 +118,6 @@
     <string name="latitude">Lintang</string>
     <string name="longitude">Bujur</string>
     <string name="new_event">Event baru</string>
-    <string name="failed_insert_event">Gagal menambahkan even baru</string>
-    <string name="event_created">Even dibuat</string>
-    <string name="event_updated">Even diperbarui</string>
     <string name="one_time">Satu kali</string>
     <string name="permanent">Permanen</string>
 
@@ -133,15 +130,11 @@
     <string name="datavalue_saved">Data tersimpan!</string>
     <string name="there_is_no_available_period">Tidak ada periode yang dapat dipilih.</string>
     <!--Event Detail-->
-    <string name="event_date">Tanggal Event</string>
     <string name="due_date">Tanggal jatuh tempo</string>
     <string name="cat_combo">Cat Combo</string>
     <string name="date_default">DD/MM/YYYY</string>
     <string name="cancel">batal</string>
     <string name="delete">hapus</string>
-    <string name="delete_event">Hapus even</string>
-    <string name="confirm_delete_event">Apakah Anda yakin akan menghapus even ini?</string>
-    <string name="event_was_deleted">Even terhapus</string>
     <string name="total">Total</string>
     <string name="most_recent_event_date">hal yang paling terbaru</string>
 
@@ -246,7 +239,6 @@
     <string name="missing_mandatory_fields_text_not_delete">Beberapa bidang wajib tidak ada. Jika Anda ingin kembali, silakan isi.</string>
     <string name="title_delete_go_back">Data Anda tidak disimpan</string>
     <string name="delete_go_back">Jika Anda kembali sekarang, semua informasi yang dimasukkan akan dihapus.</string>
-    <string name="missing_mandatory_fields_events_2.0">Beberapa bidang wajib tidak ada:\n%s\nAnda dapat kembali sekarang, tetapi even ini tidak akan dapat diselesaikan.</string>
     <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>
@@ -308,7 +300,6 @@
     <string name="qr_error_id">Kode QR tidak valid</string>
     <string name="qr_error_attr">Atribut ini tidak dapat ditambahkan</string>
     <string name="qr_error_enrollment">Pendaftaran ini tidak dapat ditambahkan</string>
-    <string name="qr_error_event">Even ini tidak dapat ditambahkan</string>
 
     <string name="jira_report">Laporkan Masalah Jira</string>
     <string name="about">Tentang</string>
@@ -451,17 +442,14 @@
     <string name="finish">Selesai</string>
     <string name="error_fields_title">Parameter dengan kesalahan</string>
     <string name="error_fields_events">Beberapa parameter terdapat kesalahan. Parameter ini belum disimpan. Mohon periksa kembali</string>
-    <string name="event_reopened">Even ini sekarang dapat diedit</string>
     <string name="unique_warning">Nilai harus unik, kebetulan telah ditemukan. Itu belum disimpan. Tolong diperiksa.</string>
     <string name="unique_coincidence_found">Sebuah kebetulan di bidang yang unik telah ditemukan. Silakan periksa formulir untuk menyimpan Pendaftaran.</string>
     <string name="please_wait">Mohon tunggu</string>
     <string name="skip">Lewati</string>
     <string name="reschedule">Jadwal ulang</string>
-    <string name="event_was_skipped">Even ditandai sebagai dilewati</string>
     <string name="no_intructions">Tidak ada informasi untuk layar ini</string>
     <string name="event_overdue">Lewat waktu</string>
     <string name="unsupported_program_rule">Terdapat satu aturan program yang tidak didukung. Silakan periksa dokumentasi</string>
-    <string name="delete_event_error">Even ini belum dibuat</string>
     <string name="empty_description">Tidak ada info untuk bidang ini</string>
     <string name="biometrics_dialog_title">Kredensial Kosong</string>
     <string name="biometrics_first_use_text">Untuk dapat login menggunakan pemindai sidik jari, Anda terlebih dahulu harus menggunakan cara default</string>
@@ -517,7 +505,6 @@
     <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>
     <string name="adjusting_form">Menyesuaikan formulir…</string>
 
     <string name="sms_receiver_number">Nomor penerima</string>
@@ -729,7 +716,6 @@
     <string name="disable_pin_locked">Jangan tampilkan layar kunci lagi</string>
     <string name="set_pin">Setel pin</string>
     <string name="conflict">Konflik</string>
-    <string name="event_date_in_future_message">Even ini tidak dapat memiliki tanggal di masa mendatang. Silakan ubah.</string>
     <string name="change_event_date">Ganti tanggal</string>
     <string name="go_back">Kembali</string>
     <string name="data_sets">Data set</string>
diff --git a/app/src/main/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml
index def272d7ef1..4aa68b5ac8e 100644
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@@ -90,22 +90,15 @@
     <string name="latitude">រយៈទទឹង</string>
     <string name="longitude">រយៈបណ្តោយ</string>
     <string name="new_event">ព្រឹត្តិការណ៏ថ្មី</string>
-    <string name="failed_insert_event">បរាជ័យក្នុងការបន្ថែមព្រឹត្តិការណ៏ថ្មី</string>
-    <string name="event_created">ព្រឹត្តិការណ៏ត្រូវបានបង្កើត</string>
-    <string name="event_updated">ព្រឹត្តិការណ៏ត្រូវបានធ្វើបច្ចុប្បន្នភាព</string>
     <string name="one_time">មួយពេល</string>
     <string name="permanent">អចិន្ត្រៃយ៍</string>
 
     <!--Event Detail-->
-    <string name="event_date">ថ្ងៃខែឆ្នាំរបស់ព្រឹត្តិការណ៏</string>
     <string name="due_date">កាលបរិច្ឆេទកំណត់</string>
     <string name="cat_combo">ប្រភេទបន្សំចូលគ្នា</string>
     <string name="date_default">ថ្ងៃថ្ងៃ/ខែខែ/ឆ្នាំឆ្នាំឆ្នាំឆ្នាំ</string>
     <string name="cancel">បោះបង់</string>
     <string name="delete">​លុប​</string>
-    <string name="delete_event">លុបចោលព្រឹត្តិការណ៏</string>
-    <string name="confirm_delete_event">តើអ្នកច្បាស់ទេថាចង់លុបចោលព្រឹត្តិការណ៏នេះ?</string>
-    <string name="event_was_deleted">ព្រឹត្តិការណ៏បានលុបជោគជ័យ</string>
     <!--TEI Enrollment list-->
     <string name="enrollment_list">បញ្ជីចុះឈ្មោះ</string>
     <string name="active_programs">កម្មវិធីដំណើរការ</string>
@@ -221,7 +214,6 @@
     <string name="qr_error_id">លេខកូដ QR មិនត្រឹមត្រូវ</string>
     <string name="qr_error_attr">Attribute (លក្ខណៈនេះ) មិនអាចត្រូវបានបន្ថែមទេ</string>
     <string name="qr_error_enrollment">ការចុះឈ្មោះនេះមិនអាចបន្ថែមបានឡើយ</string>
-    <string name="qr_error_event">ព្រឹត្តិការណ៏នេះមិនអាចបន្ថែមបានឡើយ</string>
 
     <string name="jira_report">រាយការណ៏បញ្ហា Jira</string>
     <string name="about">អំពី</string>
diff --git a/app/src/main/res/values-lo/strings.xml b/app/src/main/res/values-lo/strings.xml
index cf913256072..1d4863713e1 100644
--- a/app/src/main/res/values-lo/strings.xml
+++ b/app/src/main/res/values-lo/strings.xml
@@ -116,9 +116,6 @@
     <string name="latitude">ເສັ້ນຂະໜານ</string>
     <string name="longitude">ເສັ້ນແວງ</string>
     <string name="new_event">ກໍລະນີໃໝ່</string>
-    <string name="failed_insert_event">ການເພີ່ມກໍລະນີໃໝ່ເຂົ້າຫຼົມເຫວ</string>
-    <string name="event_created">ກໍລະນີທີ່ໄດ້ຖືກສ້າງຂື້ນ</string>
-    <string name="event_updated">ກໍລະນີທີ່ໄດ້ຖືກປັບປຸງ</string>
     <string name="one_time">ເທື່ອດຽວ</string>
     <string name="permanent">ຖາວອນ</string>
 
@@ -129,15 +126,11 @@
     <string name="datavalue_saved">ປະຫຍັດຄ່າ!</string>
     <string name="there_is_no_available_period">ບໍ່ມີໄລຍະເວລາທີຈະເລືອກ</string>
     <!--Event Detail-->
-    <string name="event_date">ວັນທີເຫດການ</string>
     <string name="due_date">ວັນທີຕ້ອງແລ້ວ</string>
     <string name="cat_combo">ລາຍການທີ່ໃຫ້ເລືອກ</string>
     <string name="date_default">ວ/ດ/ປ</string>
     <string name="cancel">ຍົກເລີກ</string>
     <string name="delete">ລົບ</string>
-    <string name="delete_event">ລືບກໍລະນີອອກ</string>
-    <string name="confirm_delete_event">ທ່ານໝັ້ນໃຈບໍ ວ່າທ່ານຕ້ອງການລືບກໍລະນີນີ້ອອກ?</string>
-    <string name="event_was_deleted">ກໍລະນີນີ້ໄດ້ຖືກລືບອອກຮຽບຮ້ອຍແລ້ວ</string>
     <string name="total">ລວມ</string>
     <string name="most_recent_event_date">ວັນທີເຫດການຄັ້ງຫຼ້າສຸດ</string>
 
@@ -241,7 +234,6 @@
     <string name="missing_mandatory_fields_events">ບາງຊ່ອງຂໍ້ມູນຈຳເປັນຕ້ອງດຳເນີນການຂອງທ່ານ.\n ທ່ານຕ້ອງການກວດສອບແບບຟອມຫຼືບໍ?</string>
     <string name="title_delete_go_back">ຂໍ້ມູນຂອງທ່ານບໍ່ໄດ້ບັນທຶກ</string>
     <string name="delete_go_back">ຖ້າທ່ານກັບຄືນຕອນນີ້ ຂໍ້ມູນທີ່ປ້ອນທັ້ງໝົດຈະຖຶກລົບ</string>
-    <string name="missing_mandatory_fields_events_2.0">ຫ້ອງປ້ອນຂໍ້ມູນຈໍານວນໜື່ງບໍ່ເຫັນ. \n %s ດຽວນີ້ ທ່ານສາມາດກັບຄືນ, ແຕ່ຂໍ່ມູນຂອງເຫດການນີ້ຈະຍັງບໍ່ສາມາດບັນທຶກໄດ້</string>
     <string name="missing_mandatory_fields_go_back">ລືບຂໍ້ມູນ ແລະ ກັບຄືນ</string>
     <string name="error_fields">ບາງຊ່ອງມີຂໍ້ຜິດພາດ, %s ກະລຸນາກວດສອບ</string>
     <string name="missing_mandatory_fields_finish">ຊ່ອງປ້ອນຂໍ້ມູນຈໍານວນໜື່ງບໍ່ເຫັນ. ທ່ານສາມາດປ້ອນຂໍ້ມູນ ແລະ ອອກໄດ້, ແຕ່ເຫດການຈະບໍ່ສາມາດເຮັດໃຫ້ສຳເລັດໄດ້</string>
@@ -303,7 +295,6 @@
     <string name="qr_error_id">ລະຫັດ QR ບໍ່ຖືກ</string>
     <string name="qr_error_attr">ຄຸນລັກສະນະອັນນີ້ບໍ່ສາມາດປ້ອນເຂົ້າໄດ້</string>
     <string name="qr_error_enrollment">ການຂື້ນທະບຽນນີ້ບໍ່ສາມາດປ້ອນເຂົ້າໄດ້</string>
-    <string name="qr_error_event">ກໍລະນີນີ້ບໍ່ສາມາດປ້ອນເຂົ້າໄດ້</string>
 
     <string name="jira_report">ລາຍງານບັນຫາໃຫ້ Jira</string>
     <string name="about">ກ່ຽວກັບ</string>
@@ -447,17 +438,14 @@
     <string name="finish">ສີ້ນສຸດ</string>
     <string name="error_fields_title">ຂໍ້ມູນມີຂໍ້ຜິດພາດ</string>
     <string name="error_fields_events">ບາງຊ່ອງຂໍ້ມູນມີຂໍ້ຜິດພາດ. ຍັງບໍໄດ້ບັນທຶກ ກະລຸນາກວດສອບ</string>
-    <string name="event_reopened">ເຫດການນີ້ບໍ່ສາມາດແກ້ໄຂໄດ້</string>
     <string name="unique_warning">ຄ່າບໍໍຄວນຊ້ຳກັນ ບັງເອີນໄດ້ຖຶກພົບເຫັນ. ມັນບໍໄດ້ບັນທຶກ. ກະລຸນາກວດສອບ</string>
     <string name="unique_coincidence_found">ໄດ້ພົບເຫັນຊ່ອງປ້ອນຂໍ້ມູນທີ່ເປັນເອກະລັກ. ກະລຸນາກວດສອບແບບຟອມເພື່ອບັນທຶກການລົງທະບຽນ</string>
     <string name="please_wait">ກະລຸນາລໍຖ້າ</string>
     <string name="skip">ຂ້າມ</string>
     <string name="reschedule">ກຳນົດເວລາໃໝ່</string>
-    <string name="event_was_skipped">ເຫດການຖຶກໝາຍວ່າໄດ້ຂ້າມແລ້ວ</string>
     <string name="no_intructions">ບໍ່ມີຂໍ້ມູນສຳລັບໜ້າຈໍນີ້</string>
     <string name="event_overdue">ກາຍເວລາທີ່ກໍານົດ</string>
     <string name="unsupported_program_rule">ມີກົດລະບຽບຂອງສາຍງານໜື່ງຂໍ້ທີບໍໄດ້ຮອງຮັບ. ກະລຸນາກວດສອບເອກະສານ</string>
-    <string name="delete_event_error">ເຫດການນີ້ຍັງບໍ່ໄດ້ສ້າງ</string>
     <string name="empty_description">ບໍ່ມີຂໍ້ມູນສຳລັບຫ້ອງຂໍ້ມູນນີ້</string>
     <string name="biometrics_dialog_title">ຂໍ້ມູນປະຈຳຕົວຫວ່າງເປົ່າ</string>
     <string name="biometrics_first_use_text">ເພື່ອໃຫ້ສາມາດເຂົ້າສູ່ລະບົບໂດຍໃຊ້ເຄື່ອງສະແກນລາຍນິ້ວມື້ ທ່ານຕ້ອງໃຊ້ວິທີເລີ່ມຕົ້ນກ່ອນ</string>
@@ -512,7 +500,6 @@
     <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>
     <string name="adjusting_form">ກຳລັງປັບຟອມ...</string>
 
     <string name="sms_receiver_number">ຕົວເລກຜູ້ຮັບ</string>
@@ -610,7 +597,6 @@
     <string name="disable_pin_locked">ບໍ່ຕ້ອງສະແດງລັອກໜ້າຈໍອີກ</string>
     <string name="set_pin">ຕັ້ງລະຫັດຜ່ານ</string>
     <string name="conflict">ຂັດແຍ້ງ</string>
-    <string name="event_date_in_future_message">ເຫດການນີ້ບໍ່ສາມາດມີວັນທີໃນອະນາຄົດໄດ້. ກະລຸນາປ່ຽນ.</string>
     <string name="change_event_date">ປ່ຽນວັນທີ</string>
     <string name="go_back">ກັບຄືນ</string>
     <string name="data_sets">ແບບຟອມ</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index e389731bb8b..28ed756261d 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -117,9 +117,6 @@
     <string name="latitude">Breddegrad</string>
     <string name="longitude">Lengdegrad</string>
     <string name="new_event">Ny hendelse</string>
-    <string name="failed_insert_event">Kunne ikke sette inn ny hendelse</string>
-    <string name="event_created">Hendelse opprettet</string>
-    <string name="event_updated">Hendelse oppdatert</string>
     <string name="one_time">En gang</string>
     <string name="permanent">Permanent</string>
 
@@ -132,15 +129,11 @@
     <string name="datavalue_saved">Verdien er lagret!</string>
     <string name="there_is_no_available_period">Det er ingen tilgjengelige perioder å velge.</string>
     <!--Event Detail-->
-    <string name="event_date">Hendelsesdato</string>
     <string name="due_date">Forfallsdato</string>
     <string name="cat_combo">Kat kombo</string>
     <string name="date_default">DD/MM/ÅÅÅÅ</string>
     <string name="cancel">Avbryt</string>
     <string name="delete">Slett</string>
-    <string name="delete_event">Slett hendelse</string>
-    <string name="confirm_delete_event">Er du sikker på at du vil slette denne hendelsen?</string>
-    <string name="event_was_deleted">Hendelsen ble slettet.</string>
     <string name="total">Totalt</string>
     <string name="most_recent_event_date">Siste hendelsesdato</string>
 
@@ -246,7 +239,6 @@
     <string name="missing_mandatory_fields_text_not_delete">Noen obligatoriske felt mangler. Hvis du vil gå tilbake, vennligst fyll inn dem.</string>
     <string name="title_delete_go_back">Dine data er ikke lagret</string>
     <string name="delete_go_back">Hvis du går tilbake nå, vil all informasjon som har blitt lagt inn bli slettet.</string>
-    <string name="missing_mandatory_fields_events_2.0">Noen obligatoriske felt mangler:\n%s\nDu kan gå tilbake nå, men denne hendelsel vil ikke bli fullført.</string>
     <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>
@@ -308,7 +300,6 @@
     <string name="qr_error_id">Ugyldig QR kode</string>
     <string name="qr_error_attr">Denne attributten kan ikke legges til</string>
     <string name="qr_error_enrollment">Denne registreringen kan ikke legges til</string>
-    <string name="qr_error_event">Denne hendelsen kan ikke legges til</string>
 
     <string name="jira_report">Rapporter et Jira problem</string>
     <string name="about">Om</string>
@@ -452,17 +443,14 @@
     <string name="finish">Fullfør</string>
     <string name="error_fields_title">Felt som inneholder feil</string>
     <string name="error_fields_events">Noen felter inneholder feil. De har ikke blitt lagret. Vennligt, sjekk dem.</string>
-    <string name="event_reopened">Denne hendelsen kan nå bli endret</string>
     <string name="unique_warning">Verdien skal være unik, et sammentreff ble funnet. Det har ikke blitt lagret. Vennligst sjekk det.</string>
     <string name="unique_coincidence_found">Et sammentreff i et unikt felt ble funnet. Vennligst sjekk skjema for å lagre registrering.</string>
     <string name="please_wait">Vennligst vent</string>
     <string name="skip">Hopp over</string>
     <string name="reschedule">Planlegg på nytt</string>
-    <string name="event_was_skipped">Denne hendelsen var merket som hoppet over.</string>
     <string name="no_intructions">Det er ingen informasjon for denne skjermen</string>
     <string name="event_overdue">Forfalt</string>
     <string name="unsupported_program_rule">Det er ingen programregel som ikke er støttet. Vennligst sjekk dokumentasjonen</string>
-    <string name="delete_event_error">Denne hendelsen har ikke blitt opprettet enda</string>
     <string name="empty_description">Ingen info for dette feltet</string>
     <string name="biometrics_dialog_title">Tomme opplysninger</string>
     <string name="biometrics_first_use_text">For å kunne logge inn ved bruk av fingerskanner må du først logge inn på standard måte</string>
@@ -516,7 +504,6 @@
     <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>
     <string name="adjusting_form">Justerer fra...</string>
 
     <string name="sms_receiver_number">Mottakernummer</string>
@@ -618,7 +605,6 @@
     <string name="disable_pin_locked">Ikke vis igjen, lås skjerm</string>
     <string name="set_pin">Sett pin</string>
     <string name="conflict">Konflikt</string>
-    <string name="event_date_in_future_message">Denne hendelsen kan ikke ha en dato i fremtiden. Vennligst endre det.</string>
     <string name="change_event_date">Endre dato</string>
     <string name="go_back">Gå tilbake</string>
     <string name="data_sets">Datasett</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 6d2e531c19f..d4c4f8a4deb 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -122,9 +122,6 @@
     <string name="latitude">Breedtegraad</string>
     <string name="longitude">Lengtegraad</string>
     <string name="new_event">Nieuw evenement</string>
-    <string name="failed_insert_event">Kan geen nieuwe gebeurtenis invoegen</string>
-    <string name="event_created">Evenement gemaakt</string>
-    <string name="event_updated">Evenement bijgewerkt</string>
     <string name="one_time">Een keer</string>
     <string name="permanent">permanent</string>
 
@@ -137,15 +134,11 @@
     <string name="datavalue_saved">Waarde is opgeslagen!</string>
     <string name="there_is_no_available_period">Er zijn geen beschikbare periodes om te selecteren.</string>
     <!--Event Detail-->
-    <string name="event_date">Evenement datum</string>
     <string name="due_date">Deadline</string>
     <string name="cat_combo">Katten combinatie</string>
     <string name="date_default">DD/MM/JJJJ</string>
     <string name="cancel">Annuleren</string>
     <string name="delete">Verwijder</string>
-    <string name="delete_event">evenement verwijderen</string>
-    <string name="confirm_delete_event">Weet je zeker dat je dit evenement wilt verwijderen?</string>
-    <string name="event_was_deleted">Evenement succesvol verwijderd</string>
     <string name="total">Totaal</string>
     <string name="most_recent_event_date">Datum meest recente evenement</string>
 
@@ -255,7 +248,6 @@
     <string name="missing_mandatory_fields_events">Sommige velden hebben uw aandacht nodig.\Wilt u het formulier bekijken?</string>
     <string name="title_delete_go_back">Uw gegevens worden niet bewaard</string>
     <string name="delete_go_back">Als u nu teruggaat, wordt alle ingevoerde informatie verwijderd.</string>
-    <string name="missing_mandatory_fields_events_2.0">Er ontbreken enkele verplichte velden:\n%s\nJe kunt nu teruggaan, maar dit evenement kan niet worden voltooid.</string>
     <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>
@@ -317,7 +309,6 @@
     <string name="qr_error_id">Ongeldige QR-code</string>
     <string name="qr_error_attr">Dit kenmerk kan niet worden toegevoegd</string>
     <string name="qr_error_enrollment">Deze inschrijving kan niet worden toegevoegd</string>
-    <string name="qr_error_event">Dit evenement kan niet worden toegevoegd</string>
 
     <string name="jira_report">Rapporteer Jira-probleem</string>
     <string name="about">Over</string>
@@ -464,17 +455,14 @@
     <string name="finish">Finish</string>
     <string name="error_fields_title">Velden met fouten</string>
     <string name="error_fields_events">Sommige velden bevatten fouten. Ze zijn niet opgeslagen. Controleer ze alsjeblieft.</string>
-    <string name="event_reopened">Dit evenement kan nu worden bewerkt</string>
     <string name="unique_warning">De waarde moet uniek zijn, er is een toeval gevonden. Het is niet opgeslagen. Controleer het alstublieft.</string>
     <string name="unique_coincidence_found">Er is een toeval gevonden in een uniek veld. Controleer het formulier om de inschrijving op te slaan.</string>
     <string name="please_wait">Even geduld alstublieft</string>
     <string name="skip">Overslaan</string>
     <string name="reschedule">Opnieuw plannen</string>
-    <string name="event_was_skipped">Het evenement is gemarkeerd als overgeslagen</string>
     <string name="no_intructions">Er is geen informatie voor dit scherm</string>
     <string name="event_overdue">Verlopen</string>
     <string name="unsupported_program_rule">Er is één programmaregel die niet wordt ondersteund. Controleer de documentatie</string>
-    <string name="delete_event_error">Dit evenement is nog niet aangemaakt</string>
     <string name="empty_description">Geen info voor dit veld</string>
     <string name="biometrics_dialog_title">Lege inloggegevens</string>
     <string name="biometrics_first_use_text">Om in te kunnen loggen met de vingerafdrukscanner moet je eerst de standaardmanier gebruiken</string>
@@ -534,7 +522,6 @@
     <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>
     <string name="adjusting_form">Formulier aanpassen…</string>
 
     <string name="sms_receiver_number">Ontvanger nummer</string>
@@ -635,7 +622,6 @@
     <string name="disable_pin_locked">Vergrendelscherm niet meer weergeven</string>
     <string name="set_pin">Speld instellen</string>
     <string name="conflict">Conflict</string>
-    <string name="event_date_in_future_message">Dit evenement kan geen datum in de toekomst hebben. Wijzig het alstublieft.</string>
     <string name="change_event_date">Verander de datum</string>
     <string name="go_back">Ga terug</string>
     <string name="data_sets">Gegevensreeksen</string>
diff --git a/app/src/main/res/values-prs/strings.xml b/app/src/main/res/values-prs/strings.xml
index 40fa98d5bb4..8f785365cbb 100644
--- a/app/src/main/res/values-prs/strings.xml
+++ b/app/src/main/res/values-prs/strings.xml
@@ -34,7 +34,6 @@
     <!--DataSet initial-->
     <string name="report_period">معیاد گزارش</string>
     <!--Event Detail-->
-    <string name="event_date">تاریخ واقعه</string>
     <string name="due_date">موعد مقرر</string>
     <string name="cancel">انصراف</string>
     <string name="delete">حذف</string>
diff --git a/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml
index 0311e51f761..13efdebeb14 100644
--- a/app/src/main/res/values-ps/strings.xml
+++ b/app/src/main/res/values-ps/strings.xml
@@ -35,7 +35,6 @@
     <!--DataSet initial-->
     <string name="report_period">د راپور ورکولو موده</string>
     <!--Event Detail-->
-    <string name="event_date">د پېښې نېټه</string>
     <string name="due_date">ټاکلې نېټه</string>
     <string name="cancel">رد یې کړئ [ ژباړه ـ ردول ]</string>
     <string name="delete">خذف یې کړئ</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 9b9773f1ba8..554206fb56f 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -118,9 +118,6 @@
     <string name="latitude">Latitude</string>
     <string name="longitude">Longitude</string>
     <string name="new_event">Novo evento</string>
-    <string name="failed_insert_event">Falha ao inserir novo Evento</string>
-    <string name="event_created">Evento criado</string>
-    <string name="event_updated">Evento atualizado</string>
     <string name="one_time">Um tempo</string>
     <string name="permanent">Permanente</string>
 
@@ -133,15 +130,11 @@
     <string name="datavalue_saved">O valor é salvo!</string>
     <string name="there_is_no_available_period">Não há períodos disponíveis para seleção.</string>
     <!--Event Detail-->
-    <string name="event_date">Data de incidente</string>
     <string name="due_date">Data de vencimento</string>
     <string name="cat_combo">Combinação de categoria</string>
     <string name="date_default">DD/MM/AAAA</string>
     <string name="cancel">Cancelar</string>
     <string name="delete">Apagar</string>
-    <string name="delete_event">Suprimir evento</string>
-    <string name="confirm_delete_event">Tem certeza de que deseja excluir este evento?</string>
-    <string name="event_was_deleted">Evento excluído com sucesso</string>
     <string name="total">Total</string>
     <string name="most_recent_event_date">Data do evento mais recente</string>
 
@@ -248,7 +241,6 @@
     <string name="missing_mandatory_fields_text_not_delete">Alguns campos obrigatórios estão ausentes. Se você quiser voltar, por favor preencha-os. </string>
     <string name="title_delete_go_back">Seus dados não são salvos</string>
     <string name="delete_go_back">Se você voltar agora, todas as informações inseridas serão excluídas.</string>
-    <string name="missing_mandatory_fields_events_2.0">Alguns campos obrigatórios estão ausentes:/n%s/nVocê pode voltar agora, mas este evento não poderá ser concluído.</string>
     <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>
@@ -310,7 +302,6 @@
     <string name="qr_error_id">Código QR inválido</string>
     <string name="qr_error_attr">Este atributo não pode ser adicionado</string>
     <string name="qr_error_enrollment">Esta inscrição não pode ser adicionada</string>
-    <string name="qr_error_event">Este evento não pode ser adicionado</string>
 
     <string name="jira_report">Relatar problema de Jira</string>
     <string name="about">Acerca</string>
@@ -454,17 +445,14 @@
     <string name="finish">Terminar</string>
     <string name="error_fields_title">Campos com erros</string>
     <string name="error_fields_events">Alguns campos possuem erros. Eles não foram salvos. Por favor, verifique-os.</string>
-    <string name="event_reopened">Este evento agora pode ser editado</string>
     <string name="unique_warning">O valor deve ser único, uma coincidência foi encontrada. Não foi salvo. Por favor verifique isto.</string>
     <string name="unique_coincidence_found">Foi encontrada uma coincidência em um campo único. Verifique o formulário para salvar a Inscrição.</string>
     <string name="please_wait">Por favor aguarde...</string>
     <string name="skip">Saltar</string>
     <string name="reschedule">Reprogramar</string>
-    <string name="event_was_skipped">O evento foi marcado como ignorado</string>
     <string name="no_intructions">Não há informações para esta tela</string>
     <string name="event_overdue">Atrasado</string>
     <string name="unsupported_program_rule">There is one program rule which is not supported. Por favor verifique a documentação</string>
-    <string name="delete_event_error">Este evento ainda não foi criado</string>
     <string name="empty_description">Nenhuma informação para este campo</string>
     <string name="biometrics_dialog_title">Credenciais Vazias</string>
     <string name="biometrics_first_use_text">Para poder fazer login usando o scanner de impressão digital você precisa primeiro usar a maneira padrão</string>
@@ -518,7 +506,6 @@
     <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>
     <string name="adjusting_form">Ajustando formulário...</string>
 
     <string name="sms_receiver_number">Número do receptor</string>
@@ -620,7 +607,6 @@
     <string name="disable_pin_locked">Não mostrar novamente a tela de bloqueio</string>
     <string name="set_pin">Definir pino</string>
     <string name="conflict">Conflito</string>
-    <string name="event_date_in_future_message">Este evento não pode ter uma data no futuro. Por favor mude.</string>
     <string name="change_event_date">Mudar data</string>
     <string name="go_back">Voltar</string>
     <string name="data_sets">Agregação de Dados</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 773fb58e96a..35154215422 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -39,7 +39,6 @@
     <!--DataSet initial-->
     <string name="report_period">Отчет за период</string>
     <!--Event Detail-->
-    <string name="event_date">Дата события</string>
     <string name="due_date">Дата выполнения</string>
     <string name="cancel">Отмена</string>
     <string name="delete">Удалить</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 740daf29699..dff2b914934 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -88,20 +88,13 @@
     <string name="latitude">Latitud</string>
     <string name="longitude">Longitud</string>
     <string name="new_event">Ny händelse</string>
-    <string name="failed_insert_event">Det gick inte att spara ny händelse</string>
-    <string name="event_created">Händelse skapad</string>
-    <string name="event_updated">Händelse uppdaterad</string>
     <string name="one_time">En gång</string>
     <!--Event Detail-->
-    <string name="event_date">Händelse datum</string>
     <string name="due_date">Förfallodatum</string>
     <string name="cat_combo">Kategori kombination</string>
     <string name="date_default">DD/MM/ÅÅÅÅ</string>
     <string name="cancel">Avbryt</string>
     <string name="delete">Radera</string>
-    <string name="delete_event">Ta bort händelse</string>
-    <string name="confirm_delete_event">Är du säker på att du vill radera den här händelsen?</string>
-    <string name="event_was_deleted">Händelse raderats</string>
     <string name="total">Totalt</string>
     <!--TEI Enrollment list-->
     <string name="enrollment_list">Inskrivningslista</string>
@@ -218,7 +211,6 @@
     <string name="qr_error_id">Ogiltig QR-kod</string>
     <string name="qr_error_attr">Det här attributet kan inte läggas till</string>
     <string name="qr_error_enrollment">Denna inskrivning kan inte läggas till</string>
-    <string name="qr_error_event">Den här händelsen kan inte läggas till</string>
 
     <string name="jira_report">Rapportera ett problem i JIRA</string>
     <string name="about">Handla om</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 3d5dacdfac7..95d93db854b 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -124,9 +124,6 @@
     <string name="latitude">Широта</string>
     <string name="longitude">Довгота</string>
     <string name="new_event">Нова подія</string>
-    <string name="failed_insert_event">Не вдалося додати новий випадок</string>
-    <string name="event_created">Випадок створено</string>
-    <string name="event_updated">Випадок оновлено</string>
     <string name="one_time">Одноразово</string>
     <string name="permanent">Постійно</string>
 
@@ -139,15 +136,11 @@
     <string name="datavalue_saved">Значення збережено!</string>
     <string name="there_is_no_available_period">Немає доступних періодів для вибору.</string>
     <!--Event Detail-->
-    <string name="event_date">Дата події</string>
     <string name="due_date">Дата виконання</string>
     <string name="cat_combo">Комбінація категорій</string>
     <string name="date_default">ДД/ММ/РРРР</string>
     <string name="cancel">Скасувати</string>
     <string name="delete">Видалити</string>
-    <string name="delete_event">Видалити випадок</string>
-    <string name="confirm_delete_event">Ви впевнені, що хочете видалити цей випадок?</string>
-    <string name="event_was_deleted">Випадок успішно видалено</string>
     <string name="total">Підсумок</string>
     <string name="most_recent_event_date">Дата останнього випадку</string>
 
@@ -256,7 +249,6 @@
     <string name="missing_mandatory_fields_events">Деякі поля потребують Вашої уваги. Бажаєте переглянути форму?</string>
     <string name="title_delete_go_back">Ваші дані не збережено</string>
     <string name="delete_go_back">Якщо Ви зараз повернетеся назад, уся введена інформація буде видалена.</string>
-    <string name="missing_mandatory_fields_events_2.0">Деякі обов’язкові поля не заповнено:%s Ви можете повернутися назад зараз, але цей випадок не можна буде завершити.</string>
     <string name="missing_mandatory_fields_go_back">Видалити та повернутися назад</string>
     <string name="error_fields">У деяких полях є помилки:%s Будь ласка, перевірте їх.</string>
     <string name="missing_mandatory_fields_finish">Деякі обов’язкові поля не заповнено. Ви можете завершити введення даних і вийти, але випадок не може бути завершений.</string>
@@ -318,7 +310,6 @@
     <string name="qr_error_id">Невірний QR-код</string>
     <string name="qr_error_attr">Цей атрибут не можна додати</string>
     <string name="qr_error_enrollment">Цю реєстрацію не можна додати</string>
-    <string name="qr_error_event">Цей випадок неможливо додати</string>
 
     <string name="jira_report">Повідомити про проблему Jira</string>
     <string name="about">Про</string>
@@ -465,17 +456,14 @@
     <string name="finish">Закінчити</string>
     <string name="error_fields_title">Поля з помилками</string>
     <string name="error_fields_events">У деяких полях є помилки. Вони не збереглися. Будь ласка, перевірте їх.</string>
-    <string name="event_reopened">Цей випадок тепер можна редагувати</string>
     <string name="unique_warning">Значення має бути унікальним, знайдено збіг. Значення не збереглось. Будь ласка, перевірте це.</string>
     <string name="unique_coincidence_found">Виявлено збіг в унікальному полі. Будь ласка, перевірте форму, щоб зберегти реєстрацію.</string>
     <string name="please_wait">Будь ласка, почекайте</string>
     <string name="skip">Пропустити</string>
     <string name="reschedule">Перепланувати</string>
-    <string name="event_was_skipped">Випадок позначено як пропущений</string>
     <string name="no_intructions">Для цієї частини немає інформації</string>
     <string name="event_overdue">Прострочене</string>
     <string name="unsupported_program_rule">Є одне правило програми, яке не підтримується. Будь ласка, зверніться до інструкції</string>
-    <string name="delete_event_error">Цей випадок ще не зареєстровано</string>
     <string name="empty_description">Немає інформації для цього поля</string>
     <string name="biometrics_dialog_title">Порожні облікові дані</string>
     <string name="biometrics_first_use_text">Щоб мати можливість увійти за допомогою сканера відбитків пальців, спочатку потрібно використовувати спосіб за замовчуванням</string>
@@ -532,7 +520,6 @@
     <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>
     <string name="adjusting_form">Коригування форми…</string>
 
     <string name="sms_receiver_number">Номер одержувача</string>
@@ -634,7 +621,6 @@
     <string name="disable_pin_locked">Більше не показувати екран блокування</string>
     <string name="set_pin">Встановити PIN</string>
     <string name="conflict">Помилка</string>
-    <string name="event_date_in_future_message">Цей випадок не може мати дату в майбутньому. Будь ласка, виправте це.</string>
     <string name="change_event_date">Змінити дату</string>
     <string name="go_back">Повернутися</string>
     <string name="data_sets">Набори даних</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 25f265397a5..b282373b810 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -36,7 +36,6 @@
     <string name="longitude">لمبائی</string>
     <string name="new_event">نئی تقریب</string>
     <!--Event Detail-->
-    <string name="event_date">واقعہ کی تاریخ</string>
     <string name="due_date">اخری تاریخ</string>
     <string name="cancel">منسوخ</string>
     <string name="delete">حذف</string>
diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
index f6fae6ecd4b..8733dee9f39 100644
--- a/app/src/main/res/values-uz/strings.xml
+++ b/app/src/main/res/values-uz/strings.xml
@@ -118,9 +118,6 @@
     <string name="latitude">Кенглик</string>
     <string name="longitude">Узунлик</string>
     <string name="new_event">Янги тадбир</string>
-    <string name="failed_insert_event">Янги тадбирни киритиш амалга ошмади</string>
-    <string name="event_created">Тадбир яратилди</string>
-    <string name="event_updated">Тадбир янгиланди</string>
     <string name="one_time">Бир марта</string>
     <string name="permanent">Доимий</string>
 
@@ -133,15 +130,11 @@
     <string name="datavalue_saved">Қиймат сақланди!</string>
     <string name="there_is_no_available_period">Танлаш учун яроқли давр мавжуд эмас</string>
     <!--Event Detail-->
-    <string name="event_date">Ҳодиса/Тадбир санаси</string>
     <string name="due_date">Муддати</string>
     <string name="cat_combo">Категория комбинацияси</string>
     <string name="date_default">КК/ОО/ЙЙЙЙ</string>
     <string name="cancel">Бекор қилиш</string>
     <string name="delete">Ўчириб ташлаш</string>
-    <string name="delete_event">Ҳодиса/Тадбирни ўчириб ташлаш</string>
-    <string name="confirm_delete_event">Ҳақиқатдан ҳам ушбу ҳодиса/тадбирни ўчириб ташламоқчимисиз?</string>
-    <string name="event_was_deleted">Тадбир муваффақиятли ўчириб ташланди</string>
     <string name="total">Жами</string>
     <string name="most_recent_event_date">Охирги тадбир санаси</string>
 
@@ -246,7 +239,6 @@
     <string name="missing_mandatory_fields_text_not_delete">Баъзи мажбурий майдонлар қолдириб кетилган. Агар орқага қайтмоқчи бўлсангиз, Илтимос, уларни тўлдиринг.</string>
     <string name="title_delete_go_back">Маълумотингиз сақланмади</string>
     <string name="delete_go_back">Агарда ҳозир орқага қайтсангиз, барча киритилган маълумотлар ўчирилади.</string>
-    <string name="missing_mandatory_fields_events_2.0">Баъзи мажбурий майдонлар қолдириб кетилган: \n   %sда\n. Ҳозир орқага қайта оласиз, аммо бу ҳолда ҳодиса/тадбирни якунлаб бўлмайди.</string>
     <string name="missing_mandatory_fields_go_back">Ўчириб ташлаш ва орқага қайтиш</string>
     <string name="error_fields">Баъзи маълумотларда хатоликлар мавжуд: \n%s\. Илтимос, уларни текширинг.</string>
     <string name="missing_mandatory_fields_finish">Баъзи мажбурий майдонлар қолдириб кетилган. Сиз маълумотларни киритишни якунлаб чиқишингиз мумкин. Аммо бу ҳолда ҳодиса/тадбирни якунлаб бўлмайди.</string>
@@ -308,7 +300,6 @@
     <string name="qr_error_id">QR код яроқсиз</string>
     <string name="qr_error_attr">Ушбу атрибутларрни қўшиб бўлмади</string>
     <string name="qr_error_enrollment">Ушбу қайдларни қўшиб бўлмади</string>
-    <string name="qr_error_event">Ушбу ҳодиса/тадбирни қўшиб бўлмади</string>
 
     <string name="jira_report">Jira нашри учун хабар бериш</string>
     <string name="about">Ҳақида</string>
@@ -452,17 +443,14 @@
     <string name="finish">Тугатиш</string>
     <string name="error_fields_title">Хатоликлар мавжуд бўлган майдонлар</string>
     <string name="error_fields_events">Баъзи майдонларда хатоликлар мавжуд.Улар сақланмади. Илтимос,, уларни текшириб кўринг.</string>
-    <string name="event_reopened">Ушбу ҳодиса/тадбирни энди таҳрир қилиш мумкин</string>
     <string name="unique_warning">Қиймат ноёб бўлиши лозим, бир бирига ўхшаш топилди. У сақланмади. Илтимос, текшириб кўриш.</string>
     <string name="unique_coincidence_found">Ноёб соҳада бир бирига ўхшаш қиймат топилди. Рўйхатдан ўтишни сақлаш учун формани текшириш.</string>
     <string name="please_wait">Илтимос, кутинг</string>
     <string name="skip">Ўтказиб юбориш</string>
     <string name="reschedule">Қайта режаланг</string>
-    <string name="event_was_skipped">Ҳодиса/тадбир ўтказиб юборилган деб белгиланди</string>
     <string name="no_intructions">Ушбу экрандаги ҳақида маълумот йўқ</string>
     <string name="event_overdue">Муддат ўтган</string>
     <string name="unsupported_program_rule">Бу ерда дастурнинг қўллаб қувватланмайдиган бир қоидаси мавжуд. Илтимос, ҳужжатларни текширинг.</string>
-    <string name="delete_event_error">Ушбу ҳодиса/дастур ҳали яратилмаган</string>
     <string name="empty_description">Ушбу майдон учун маълумот йўқ</string>
     <string name="biometrics_dialog_title">Ишонч ёрлиқлари бўш</string>
     <string name="biometrics_first_use_text">Бармоқ излари сканери ёрдамида  тизимга кириш учун аввал стандарт усулдан фойдаланишингиз керак</string>
@@ -518,7 +506,6 @@
     <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>
     <string name="adjusting_form">Шакл созланмоқда...</string>
 
     <string name="sms_receiver_number">Қабул қилувчининг рақами</string>
@@ -620,7 +607,6 @@
     <string name="disable_pin_locked">Блокланган экранни қайта кўрсатмаслик</string>
     <string name="set_pin">ПИН кодни ўрнатинг</string>
     <string name="conflict">Номутаносиблик</string>
-    <string name="event_date_in_future_message">Ушбу ҳодиса/тадбирнинг санаси келажакда бўлиши мумкин эмас. Илтимос, ўзгартиринг</string>
     <string name="change_event_date">Санани ўзгартириш</string>
     <string name="go_back">Орқага қайтинг</string>
     <string name="data_sets">Маълумотлар тўплами</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 83c4c331b65..8c8d1c11e84 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -119,9 +119,6 @@
     <string name="latitude">Vĩ độ</string>
     <string name="longitude">Kinh độ</string>
     <string name="new_event">Sự kiện mới</string>
-    <string name="failed_insert_event">Lỗi khi thêm Sự Kiện mới</string>
-    <string name="event_created">Sự kiện đã tạo</string>
-    <string name="event_updated">Sự kiện đã cập nhật</string>
     <string name="one_time">Một lần</string>
     <string name="permanent">Cố định</string>
 
@@ -134,15 +131,11 @@
     <string name="datavalue_saved">Giá trị đã được lưu!</string>
     <string name="there_is_no_available_period">Không có thời điểm để chọn.</string>
     <!--Event Detail-->
-    <string name="event_date">Ngày sự kiện</string>
     <string name="due_date">Ngày đến hạn</string>
     <string name="cat_combo">Tổ hợp Phân Loại</string>
     <string name="date_default">DD/MM/YYYY</string>
     <string name="cancel">Hủy</string>
     <string name="delete">Xóa</string>
-    <string name="delete_event">Xóa sự kiện</string>
-    <string name="confirm_delete_event">Bạn có chắc chắn muốn xóa sự kiện này?</string>
-    <string name="event_was_deleted">Sự kiện đã được xóa</string>
     <string name="total">Tổng số</string>
     <string name="most_recent_event_date">Ngày sự kiện gần nhất</string>
 
@@ -248,7 +241,6 @@
     <string name="missing_mandatory_fields_events">Một số trường dữ liệu cần bạn chú ý.\n Bạn có muốn xem xét biểu nhập không?</string>
     <string name="title_delete_go_back">Dữ liệu của bạn chưa được lưu</string>
     <string name="delete_go_back">Nếu bạn quay lại bây giờ, tất cả thông tin đã nhập sẽ bị xóa.</string>
-    <string name="missing_mandatory_fields_events_2.0">Một số trường bắt buộc nhập bị thiếu:\n %s\n Bạn có thể quay trở lại bây giờ, nhưng sự kiện này sẽ không thể hoàn tất.</string>
     <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>
@@ -310,7 +302,6 @@
     <string name="qr_error_id">Mã QR không hợp lệ</string>
     <string name="qr_error_attr">Không thể thêm thuộc tính này</string>
     <string name="qr_error_enrollment">Không thể đăng ký</string>
-    <string name="qr_error_event">Không thể thêm sự kiện này</string>
 
     <string name="jira_report">Báo cáo vấn đề lên Jira</string>
     <string name="about">Giới thiệu</string>
@@ -457,17 +448,14 @@
     <string name="finish">Lưu</string>
     <string name="error_fields_title">Các trường dữ liệu có lỗi</string>
     <string name="error_fields_events">Một số trường dữ liệu có lỗi. Chúng chưa được lưu. Xin vui lòng kiểm tra lại.</string>
-    <string name="event_reopened">Bây giờ sự kiện này có thể chỉnh sửa</string>
     <string name="unique_warning">Giá trị phải là duy nhất, có một giá trị bị trùng. Nó chưa được lưu lại. Xin vui lòng kiểm tra. </string>
     <string name="unique_coincidence_found">Có một sự trùng lặp trong trường duy nhất. Xin vui lòng kiểm tra lại biểu nhập để lưu Đăng ký này. </string>
     <string name="please_wait">Xin vui lòng đợi</string>
     <string name="skip">Bỏ qua</string>
     <string name="reschedule">Sửa lịch hẹn</string>
-    <string name="event_was_skipped">Sự kiện đã được đánh dấu là đã bỏ qua</string>
     <string name="no_intructions">Không có thông tin cho màn hình này</string>
     <string name="event_overdue">Quá hạn</string>
     <string name="unsupported_program_rule">Có một quy tắc chương trình không được hỗ trợ. Vui lòng kiểm tra tài liệu.</string>
-    <string name="delete_event_error">Sự kiện này chưa được tạo.</string>
     <string name="empty_description">Không có thông tin cho trường dữ liệu này</string>
     <string name="biometrics_dialog_title">Xóa hết thông tin đăng nhập</string>
     <string name="biometrics_first_use_text">Để có thể đăng nhập bằng cách sử dụng máy quét dấu vân tay, trước tiên bạn cần phải sử dụng cách mặc định.</string>
@@ -524,7 +512,6 @@
     <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>
     <string name="adjusting_form">Đang điều chỉnh biểu nhập...</string>
 
     <string name="sms_receiver_number">Số người nhận</string>
@@ -626,7 +613,6 @@
     <string name="disable_pin_locked">Không hiển thị lại màn hình khóa</string>
     <string name="set_pin">Cài đặt mã pin</string>
     <string name="conflict">Xung đột</string>
-    <string name="event_date_in_future_message">Sự kiện này không thể có ngày trong tương lai. Vui lòng thay đổi nó.</string>
     <string name="change_event_date">Thay đổi ngày</string>
     <string name="go_back">Trở lại</string>
     <string name="data_sets">Biểu nhập</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index c5300ba88ad..06dff43ec73 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -116,9 +116,6 @@
     <string name="latitude">维度</string>
     <string name="longitude">经度</string>
     <string name="new_event">新事件</string>
-    <string name="failed_insert_event">插入新事件失败</string>
-    <string name="event_created">事件已经创建</string>
-    <string name="event_updated">事件已经更新</string>
     <string name="one_time">一次</string>
     <string name="permanent">永远</string>
 
@@ -131,15 +128,11 @@
     <string name="datavalue_saved">值已被保存</string>
     <string name="there_is_no_available_period">没有可用期间可选</string>
     <!--Event Detail-->
-    <string name="event_date">事件日期</string>
     <string name="due_date">到期日期</string>
     <string name="cat_combo">分类选择框</string>
     <string name="date_default">DD/MM/YYYY</string>
     <string name="cancel">取消</string>
     <string name="delete">删除</string>
-    <string name="delete_event">删除事件</string>
-    <string name="confirm_delete_event">你确定删除事件</string>
-    <string name="event_was_deleted">事件删除成功</string>
     <string name="total">总共</string>
     <string name="most_recent_event_date">最近事件日期</string>
 
@@ -245,7 +238,6 @@
     <string name="missing_mandatory_fields_text_not_delete">有些强制字段缺失，如果你后退，请填充他们</string>
     <string name="title_delete_go_back">你的数据已经被保存</string>
     <string name="delete_go_back">如果退回，所有输入信息将被删除</string>
-    <string name="missing_mandatory_fields_events_2.0">有些强制字段缺少值：%s。 你现在可以退回，但该事件不能被完成。</string>
     <string name="missing_mandatory_fields_go_back">删除并后退</string>
     <string name="error_fields">有些字段有错误：%s。 \n 请检查。</string>
     <string name="missing_mandatory_fields_finish">有些强制字段缺失。你可以完成数据录入并退出，但不能完成该事件。</string>
@@ -307,7 +299,6 @@
     <string name="qr_error_id">无效的二维码</string>
     <string name="qr_error_attr">该属性不能被添加</string>
     <string name="qr_error_enrollment">该注册不能添加</string>
-    <string name="qr_error_event">该事件不能添加</string>
 
     <string name="jira_report">报告Jira问题</string>
     <string name="about">关于</string>
@@ -451,17 +442,14 @@
     <string name="finish">保存</string>
     <string name="error_fields_title">有错误的字段</string>
     <string name="error_fields_events">有些字段有错误，他们已经保存，请检查。</string>
-    <string name="event_reopened">该事件可以编辑了。</string>
     <string name="unique_warning">值应该唯一，发现相同的。还没有保存，请检查。</string>
     <string name="unique_coincidence_found">唯一字段发现相同的，请检查表单 以便保存注册</string>
     <string name="please_wait">请等待</string>
     <string name="skip">跳过</string>
     <string name="reschedule">重新调度</string>
-    <string name="event_was_skipped">事件被标记为跳过</string>
     <string name="no_intructions">该屏没有信息</string>
     <string name="event_overdue">逾期</string>
     <string name="unsupported_program_rule">存在不支持的项目规则，请检查文档。</string>
-    <string name="delete_event_error">事件还没有创建</string>
     <string name="empty_description">该字段没有相关信息</string>
     <string name="biometrics_dialog_title">空证书</string>
     <string name="biometrics_first_use_text">为了能够使用指纹扫描器，你需要先使用缺省的方法</string>
@@ -515,7 +503,6 @@
     <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>
     <string name="adjusting_form">调整表单。。。</string>
 
     <string name="sms_receiver_number">接收号码</string>
@@ -617,7 +604,6 @@
     <string name="disable_pin_locked">不再显示锁屏</string>
     <string name="set_pin">设置PIN</string>
     <string name="conflict">冲突</string>
-    <string name="event_date_in_future_message">事件不能有将来的时间，请修改</string>
     <string name="change_event_date">改变日期</string>
     <string name="go_back">后退</string>
     <string name="data_sets">数据集</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 724625f3807..fc95716eb2b 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -121,9 +121,6 @@
     <string name="latitude">纬度</string>
     <string name="longitude">经度</string>
     <string name="new_event">新事件</string>
-    <string name="failed_insert_event">插入新事件失败</string>
-    <string name="event_created">事件已经创建</string>
-    <string name="event_updated">事件已经更新</string>
     <string name="one_time">一次</string>
     <string name="permanent">永远</string>
 
@@ -136,15 +133,11 @@
     <string name="datavalue_saved">值已被保存</string>
     <string name="there_is_no_available_period">没有可用期间可选</string>
     <!--Event Detail-->
-    <string name="event_date">事故日期</string>
     <string name="due_date">到期日期</string>
     <string name="cat_combo">分类选择框</string>
     <string name="date_default">DD/MM/YYYY</string>
     <string name="cancel">取消</string>
     <string name="delete">删除</string>
-    <string name="delete_event">删除事件</string>
-    <string name="confirm_delete_event">你确定删除事件</string>
-    <string name="event_was_deleted">事件删除成功</string>
     <string name="total">总共</string>
     <string name="most_recent_event_date">最近事件日期</string>
 
@@ -250,7 +243,6 @@
     <string name="missing_mandatory_fields_events">某些字段需要您注意。\n您要查看表单吗？</string>
     <string name="title_delete_go_back">你的数据已经被保存</string>
     <string name="delete_go_back">如果退回，所有输入信息将被删除</string>
-    <string name="missing_mandatory_fields_events_2.0">有些强制字段缺少值：%s。 你现在可以退回，但该事件不能被完成。</string>
     <string name="missing_mandatory_fields_go_back">删除并后退</string>
     <string name="error_fields">有些字段有错误：%s。 \n 请检查。</string>
     <string name="missing_mandatory_fields_finish">有些强制字段缺失。你可以完成数据录入并退出，但不能完成该事件。</string>
@@ -312,7 +304,6 @@
     <string name="qr_error_id">无效的二维码</string>
     <string name="qr_error_attr">该属性不能被添加</string>
     <string name="qr_error_enrollment">该注册不能添加</string>
-    <string name="qr_error_event">该事件不能添加</string>
 
     <string name="jira_report">报告Jira问题</string>
     <string name="about">关于</string>
@@ -459,17 +450,14 @@
     <string name="finish">保存</string>
     <string name="error_fields_title">有错误的字段</string>
     <string name="error_fields_events">有些字段有错误，他们已经保存，请检查。</string>
-    <string name="event_reopened">该事件可以编辑了。</string>
     <string name="unique_warning">值应该唯一，发现相同的。还没有保存，请检查。</string>
     <string name="unique_coincidence_found">唯一字段发现相同的，请检查表单 以便保存注册</string>
     <string name="please_wait">请等待.....</string>
     <string name="skip">跳过</string>
     <string name="reschedule">重新调度</string>
-    <string name="event_was_skipped">事件被标记为跳过</string>
     <string name="no_intructions">该屏没有信息</string>
     <string name="event_overdue">逾期</string>
     <string name="unsupported_program_rule">存在不支持的项目规则，请检查文档。</string>
-    <string name="delete_event_error">事件还没有创建</string>
     <string name="empty_description">该字段没有相关信息</string>
     <string name="biometrics_dialog_title">空证书</string>
     <string name="biometrics_first_use_text">为了能够使用指纹扫描器，你需要先使用缺省的方法</string>
@@ -526,7 +514,6 @@
     <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>
     <string name="adjusting_form">调整表单。。。</string>
 
     <string name="sms_receiver_number">接收号码</string>
@@ -628,7 +615,6 @@
     <string name="disable_pin_locked">不再显示锁屏</string>
     <string name="set_pin">设置PIN</string>
     <string name="conflict">冲突</string>
-    <string name="event_date_in_future_message">事件不能有将来的时间，请修改</string>
     <string name="change_event_date">改变日期</string>
     <string name="go_back">后退</string>
     <string name="data_sets">数据集</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a6240e2fb7d..e42dec17748 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -95,13 +95,6 @@
 
     <string name="event_open">Open</string>
     <string name="event_completed">Event completed</string>
-    <string name="event_skipped">Event skipped</string>
-    <string name="event_schedule">Event schedule</string>
-    <string name="event_expired">Event expired</string>
-    <string name="event_editing_expired">Editing expired</string>
-    <string name="event_accepted">Event accepted</string>
-    <string name="event_approved">Event approved</string>
-    <string name="event_inactive">Event inactive</string>
     <string name="read_only">Read only</string>
     <string name="finish_and_complete">Finish and complete</string>
     <string name="completed">Completed</string>
@@ -133,9 +126,6 @@
     <string name="latitude">Latitude</string>
     <string name="longitude">Longitude</string>
     <string name="new_event">New event</string>
-    <string name="failed_insert_event">Failed to insert new Event</string>
-    <string name="event_created">Event created</string>
-    <string name="event_updated">Event updated</string>
     <string name="fake_program_stage_description" translatable="false">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.</string>
     <string name="one_time">One time</string>
     <string name="permanent">Permanent</string>
@@ -149,15 +139,11 @@
     <string name="datavalue_saved">Value is saved!</string>
     <string name="there_is_no_available_period">There is no available periods to select.</string>
     <!--Event Detail-->
-    <string name="event_date">Event date</string>
     <string name="due_date">Due date</string>
     <string name="cat_combo">Cat combo</string>
     <string name="date_default">DD/MM/YYYY</string>
     <string name="cancel">Cancel</string>
     <string name="delete">Delete</string>
-    <string name="delete_event">Delete event</string>
-    <string name="confirm_delete_event">Are you sure that you want to delete this event?</string>
-    <string name="event_was_deleted">Event deleted successfully</string>
     <string name="total">Total</string>
     <string name="most_recent_event_date">Most recent event date</string>
     <string name="no_options">No options available</string>
@@ -269,7 +255,6 @@
     <string name="missing_mandatory_fields_events">Some fields need your attention.\nDo you want to review the form?</string>
     <string name="title_delete_go_back">Your data is not saved</string>
     <string name="delete_go_back">If you go back now all information entered will be deleted.</string>
-    <string name="missing_mandatory_fields_events_2.0">Some mandatory fields are missing:\n%s\nYou can go back now, but this event won\'t be able to be completed.</string>
     <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>
@@ -331,7 +316,6 @@
     <string name="qr_error_id">Invalid QR code</string>
     <string name="qr_error_attr">This attribute can\'t be added</string>
     <string name="qr_error_enrollment">This enrollment can\'t be added</string>
-    <string name="qr_error_event">This event can\'t be added</string>
 
     <string name="jira_report">Report Jira Issue</string>
     <string name="about">About</string>
@@ -478,17 +462,14 @@
     <string name="finish">Finish</string>
     <string name="error_fields_title">Fields with errors</string>
     <string name="error_fields_events">Some fields have errors. They have not been saved. Please, check them.</string>
-    <string name="event_reopened">This event can now be edited</string>
     <string name="unique_warning">The value should be unique, a coincidence has been found. It has not been saved. Please check it.</string>
     <string name="unique_coincidence_found">A coincidence in a unique field has been found. Please check form to save Enrollment.</string>
     <string name="please_wait">Please wait</string>
     <string name="skip">Skip</string>
     <string name="reschedule">Reschedule</string>
-    <string name="event_was_skipped">The event was marked as skipped</string>
     <string name="no_intructions">There is no information for this screen</string>
     <string name="event_overdue">Overdue</string>
     <string name="unsupported_program_rule">There is one program rule which is not supported. Please check the documentation</string>
-    <string name="delete_event_error">This event has not been created yet</string>
     <string name="empty_description">No info for this field</string>
     <string name="biometrics_dialog_title">Empty Credentials</string>
     <string name="biometrics_first_use_text">To be able to log in using the fingerprint scanner you first need to use the default way</string>
@@ -548,7 +529,6 @@
     <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>
     <string name="adjusting_form">Adjusting form…</string>
 
     <string name="sms_receiver_number">Receiver number</string>
@@ -650,7 +630,6 @@
     <string name="disable_pin_locked">Don´t show again lock screen</string>
     <string name="set_pin">Set pin</string>
     <string name="conflict">Conflict</string>
-    <string name="event_date_in_future_message">This event can\'t have a date in the future. Please change it.</string>
     <string name="change_event_date">Change date</string>
     <string name="go_back">Go back</string>
     <string name="data_sets">Data sets</string>
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 aa6332b5bac..53bdeced3ec 100644
--- a/commons/src/main/java/org/dhis2/commons/resources/D2ErrorUtils.kt
+++ b/commons/src/main/java/org/dhis2/commons/resources/D2ErrorUtils.kt
@@ -152,6 +152,7 @@ class D2ErrorUtils(
                 } else {
                     context.getString(R.string.error_no_internet_connection)
                 }
+            else -> ""
         }
     }
 }
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 7b19d4ec53b..4409775a5e2 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
@@ -70,6 +72,38 @@ class ResourceManager(
             .getErrorMessage(throwable)
 
     fun defaultEventLabel(): String = getWrapperContext().getString(R.string.events)
+    fun getEventLabel(
+        programStageUid: String? = null,
+        quantity: Int = 1,
+    ) = try {
+        D2Manager.getD2().programModule()
+            .programStages().uid(programStageUid)
+            .blockingGet()?.eventLabel()
+    } catch (e: Exception) {
+        null
+    } ?: getPlural(R.plurals.event_label, quantity)
+
+    fun formatWithEventLabel(
+        @StringRes stringResource: Int,
+        programStageUid: String? = null,
+        quantity: Int = 1,
+        formatWithQuantity: Boolean = false,
+    ): String {
+        val eventLabel = getEventLabel(programStageUid, quantity)
+        return with(getString(stringResource)) {
+            val finalLabel = if (this@with.startsWith("%s")) {
+                eventLabel.capitalize(Locale.current)
+            } else {
+                eventLabel
+            }
+            if (formatWithQuantity) {
+                format(quantity, finalLabel)
+            } else {
+                format(finalLabel)
+            }
+        }
+    }
+
     fun defaultDataSetLabel(): String = getWrapperContext().getString(R.string.data_sets)
     fun defaultTeiLabel(): String = getWrapperContext().getString(R.string.tei)
     fun jiraIssueSentMessage(): String = getWrapperContext().getString(R.string.jira_issue_sent)
diff --git a/commons/src/main/res/values-ar/strings.xml b/commons/src/main/res/values-ar/strings.xml
index 5e0df2dc8b9..da62ba27df3 100644
--- a/commons/src/main/res/values-ar/strings.xml
+++ b/commons/src/main/res/values-ar/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">حدث</string>
     <string name="no_data">لا توجد بيانات</string>
     <string name="change_calendar_view">تغيير طريقة عرض التقويم</string>
     <string name="clear">تصفية</string>
@@ -16,7 +15,6 @@
     <string name="navigation_analytics">التحليلات</string>
     <string name="navigation_tasks">المهام</string>
     <string name="navigation_programs">البرامج</string>
-    <string name="navigation_events">الأحداث</string>
     <string name="navigation_relationships">العلاقات</string>
     <string name="navigation_notes">الملاحظات</string>
     <string name="navigation_data_entry">إدخال البيانات</string>
diff --git a/commons/src/main/res/values-b+uz+Cyrl/strings.xml b/commons/src/main/res/values-b+uz+Cyrl/strings.xml
index a11a57e7247..27515433354 100644
--- a/commons/src/main/res/values-b+uz+Cyrl/strings.xml
+++ b/commons/src/main/res/values-b+uz+Cyrl/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">Ҳодиса/Тадбир</string>
     <string name="no_data">Маълумот йўқ</string>
     <string name="default_empty_dataset_section_label">Маълумот</string>
 </resources>
\ No newline at end of file
diff --git a/commons/src/main/res/values-b+uz+Latn/strings.xml b/commons/src/main/res/values-b+uz+Latn/strings.xml
index d3b6621e438..03ea4e2e17b 100644
--- a/commons/src/main/res/values-b+uz+Latn/strings.xml
+++ b/commons/src/main/res/values-b+uz+Latn/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">Hodisa/Tadbir</string>
     <string name="no_data">Maʼlumot yoʼq</string>
     <string name="change_calendar_view">Taqvim koʼrinishini oʼzgartirish</string>
     <string name="clear">aniq</string>
@@ -16,7 +15,6 @@
     <string name="navigation_analytics">Аnalitika</string>
     <string name="navigation_tasks">Vazifalar</string>
     <string name="navigation_programs">Dasturlar</string>
-    <string name="navigation_events">Hodisa/tadbirlar</string>
     <string name="navigation_relationships">Oʼzaro aloqalar</string>
     <string name="navigation_notes">Izohlar</string>
     <string name="navigation_data_entry">Maʼlumot kiritish</string>
diff --git a/commons/src/main/res/values-cs/strings.xml b/commons/src/main/res/values-cs/strings.xml
index 85f7b694b3e..e2bd85edbc7 100644
--- a/commons/src/main/res/values-cs/strings.xml
+++ b/commons/src/main/res/values-cs/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">Událost</string>
     <string name="no_data">Nejsou data</string>
     <string name="feature_configuration">Konfigurace funkcí</string>
     <string name="change_calendar_view">Změnit zobrazení kalendáře</string>
@@ -17,7 +16,6 @@
     <string name="navigation_analytics">Analytika</string>
     <string name="navigation_tasks">Úkoly</string>
     <string name="navigation_programs">Programy</string>
-    <string name="navigation_events">Události</string>
     <string name="navigation_relationships">Vztahy</string>
     <string name="navigation_notes">Poznámky</string>
     <string name="navigation_data_entry">Vstup dat</string>
diff --git a/commons/src/main/res/values-es/strings.xml b/commons/src/main/res/values-es/strings.xml
index ff4807d5748..5f60ed38e4c 100644
--- a/commons/src/main/res/values-es/strings.xml
+++ b/commons/src/main/res/values-es/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">Evento</string>
     <string name="no_data">No hay datos</string>
     <string name="feature_configuration">Configuración de funciones</string>
     <string name="change_calendar_view">Cambiar vista</string>
@@ -17,7 +16,6 @@
     <string name="navigation_analytics">Analíticas</string>
     <string name="navigation_tasks">Tareas</string>
     <string name="navigation_programs">Programas</string>
-    <string name="navigation_events">Eventos</string>
     <string name="navigation_relationships">Relaciones</string>
     <string name="navigation_notes">Notas</string>
     <string name="navigation_data_entry">Introducción de datos</string>
diff --git a/commons/src/main/res/values-fr/strings.xml b/commons/src/main/res/values-fr/strings.xml
index bd071215086..547ed1ba25d 100644
--- a/commons/src/main/res/values-fr/strings.xml
+++ b/commons/src/main/res/values-fr/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">Évènement</string>
     <string name="no_data">Aucune donnée</string>
     <string name="change_calendar_view">Changer de vue calendrier</string>
     <string name="clear">Effacer</string>
@@ -16,7 +15,6 @@
     <string name="navigation_analytics">Analytiques</string>
     <string name="navigation_tasks">Tâches</string>
     <string name="navigation_programs">Programmes</string>
-    <string name="navigation_events">Événements</string>
     <string name="navigation_relationships">Relations</string>
     <string name="navigation_notes">Notes</string>
     <string name="navigation_data_entry">Saisie de données</string>
diff --git a/commons/src/main/res/values-id/strings.xml b/commons/src/main/res/values-id/strings.xml
index 02f533d8603..68affb8eb97 100644
--- a/commons/src/main/res/values-id/strings.xml
+++ b/commons/src/main/res/values-id/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">Even</string>
     <string name="no_data">Tidak ada data</string>
     <string name="change_calendar_view">Ubah tampilan kalender</string>
     <string name="clear">Kosongkan</string>
@@ -16,7 +15,6 @@
     <string name="navigation_analytics">Analitik</string>
     <string name="navigation_tasks">Tugas</string>
     <string name="navigation_programs">Program-program</string>
-    <string name="navigation_events">Even</string>
     <string name="navigation_relationships">Hubungan</string>
     <string name="navigation_notes">Catatan</string>
     <string name="navigation_data_entry">Data entri</string>
diff --git a/commons/src/main/res/values-lo/strings.xml b/commons/src/main/res/values-lo/strings.xml
index 408f6ab0882..aabc6080f60 100644
--- a/commons/src/main/res/values-lo/strings.xml
+++ b/commons/src/main/res/values-lo/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">ເຫດການ</string>
     <string name="no_data">ບໍ່ມີຂໍ້ມູນ</string>
     <string name="change_calendar_view">ປ່ຽນຮູບແບບປະຕິທິນ</string>
     <string name="clear">ຈັດມ້ຽນ</string>
@@ -14,7 +13,6 @@
     <string name="navigation_table_view">ເບີ່ງຕາຕະລາງ</string>
     <string name="navigation_analytics">ການວິເຄາະ</string>
     <string name="navigation_programs">ສາຍງານ</string>
-    <string name="navigation_events">ເຫດການ</string>
     <string name="navigation_relationships">ສາຍພົວພັນ</string>
     <string name="navigation_notes">ຂໍ້ຄວາມ</string>
     <string name="navigation_data_entry">ປ້ອນຂໍ້ມູນ</string>
diff --git a/commons/src/main/res/values-nb/strings.xml b/commons/src/main/res/values-nb/strings.xml
index 1f7b9233123..7829802417b 100644
--- a/commons/src/main/res/values-nb/strings.xml
+++ b/commons/src/main/res/values-nb/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">Hendelse</string>
     <string name="no_data">Ingen data</string>
     <string name="change_calendar_view">Endre kalendervisning</string>
     <string name="clear">tøm</string>
@@ -16,7 +15,6 @@
     <string name="navigation_analytics">Analyser</string>
     <string name="navigation_tasks">Oppgaver</string>
     <string name="navigation_programs">Programmer</string>
-    <string name="navigation_events">Hendelser</string>
     <string name="navigation_relationships">Relasjoner</string>
     <string name="navigation_notes">Notater</string>
     <string name="navigation_data_entry">Dataregistrering</string>
diff --git a/commons/src/main/res/values-nl/strings.xml b/commons/src/main/res/values-nl/strings.xml
index 669d5d46ddb..1116ef15efb 100644
--- a/commons/src/main/res/values-nl/strings.xml
+++ b/commons/src/main/res/values-nl/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">Gebeurtenis</string>
     <string name="no_data">Geen gegevens</string>
     <string name="feature_configuration">Functieconfiguratie</string>
     <string name="change_calendar_view">Agendaweergave wijzigen</string>
@@ -17,7 +16,6 @@
     <string name="navigation_analytics">Analyse</string>
     <string name="navigation_tasks">Taken</string>
     <string name="navigation_programs">Programma\'s</string>
-    <string name="navigation_events">Gebeurtenissen</string>
     <string name="navigation_relationships">Relaties</string>
     <string name="navigation_notes">Notities</string>
     <string name="navigation_data_entry">Gegevensinvoer</string>
diff --git a/commons/src/main/res/values-pt/strings.xml b/commons/src/main/res/values-pt/strings.xml
index bec576b277d..dd916672b7f 100644
--- a/commons/src/main/res/values-pt/strings.xml
+++ b/commons/src/main/res/values-pt/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">Evento</string>
     <string name="no_data">Não ha dados</string>
     <string name="change_calendar_view">Alterar visualização da agenda</string>
     <string name="clear">claro</string>
@@ -16,7 +15,6 @@
     <string name="navigation_analytics">Google Analytics</string>
     <string name="navigation_tasks">Tarefas</string>
     <string name="navigation_programs">Programas</string>
-    <string name="navigation_events">Eventos</string>
     <string name="navigation_relationships">Relacionamentos</string>
     <string name="navigation_notes">Notas</string>
     <string name="navigation_data_entry">Entrada de dados</string>
diff --git a/commons/src/main/res/values-uk/strings.xml b/commons/src/main/res/values-uk/strings.xml
index 64a8c768aa9..fbfbe1e7576 100644
--- a/commons/src/main/res/values-uk/strings.xml
+++ b/commons/src/main/res/values-uk/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">Випадок</string>
     <string name="no_data">Немає даних</string>
     <string name="feature_configuration">Конфігурація функції</string>
     <string name="change_calendar_view">Змінити вид календаря</string>
@@ -17,7 +16,6 @@
     <string name="navigation_analytics">Аналітика</string>
     <string name="navigation_tasks">Завдання</string>
     <string name="navigation_programs">Програми</string>
-    <string name="navigation_events">Випадки</string>
     <string name="navigation_relationships">Зв\'язки</string>
     <string name="navigation_notes">Примітки</string>
     <string name="navigation_data_entry">Введення даних</string>
diff --git a/commons/src/main/res/values-uz/strings.xml b/commons/src/main/res/values-uz/strings.xml
index ae187612534..e879d87b4bd 100644
--- a/commons/src/main/res/values-uz/strings.xml
+++ b/commons/src/main/res/values-uz/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">Ҳодиса/Тадбир</string>
     <string name="no_data">Маълумот йўқ</string>
     <string name="change_calendar_view">Тақвим кўринишини ўзгартириш</string>
     <string name="clear">аниқ</string>
@@ -16,7 +15,6 @@
     <string name="navigation_analytics">Аналитика</string>
     <string name="navigation_tasks">Вазифалар</string>
     <string name="navigation_programs">Дастурлар</string>
-    <string name="navigation_events">Ҳодиса/Тадбирлар</string>
     <string name="navigation_relationships">Ўзаро алоқалар</string>
     <string name="navigation_notes">Изоҳлар</string>
     <string name="navigation_data_entry">Маълумот киритиш</string>
diff --git a/commons/src/main/res/values-vi/strings.xml b/commons/src/main/res/values-vi/strings.xml
index b20700f7425..9c241ed62da 100644
--- a/commons/src/main/res/values-vi/strings.xml
+++ b/commons/src/main/res/values-vi/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">Sự Kiện</string>
     <string name="no_data">Không có dữ liệu</string>
     <string name="feature_configuration">Cấu hình chức năng</string>
     <string name="change_calendar_view">Thay đổi xem lịch</string>
@@ -17,7 +16,6 @@
     <string name="navigation_analytics">Phân tích</string>
     <string name="navigation_tasks">Nhiệm vụ</string>
     <string name="navigation_programs">Chương trình</string>
-    <string name="navigation_events">Sự kiện</string>
     <string name="navigation_relationships">Mối quan hệ</string>
     <string name="navigation_notes">Ghi Chú</string>
     <string name="navigation_data_entry">Nhập dữ liệu</string>
diff --git a/commons/src/main/res/values-zh-rCN/strings.xml b/commons/src/main/res/values-zh-rCN/strings.xml
index 6faa1d56709..1f17017bd8b 100644
--- a/commons/src/main/res/values-zh-rCN/strings.xml
+++ b/commons/src/main/res/values-zh-rCN/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">事件</string>
     <string name="no_data">无数据</string>
     <string name="change_calendar_view">改变日历视图。</string>
     <string name="clear">清除</string>
@@ -16,7 +15,6 @@
     <string name="navigation_analytics">分析</string>
     <string name="navigation_tasks">任务</string>
     <string name="navigation_programs">项目</string>
-    <string name="navigation_events">事件</string>
     <string name="navigation_relationships">关系</string>
     <string name="navigation_notes">笔记</string>
     <string name="navigation_data_entry">数据输入</string>
diff --git a/commons/src/main/res/values-zh/strings.xml b/commons/src/main/res/values-zh/strings.xml
index e2990b7c2fb..47f0d70e82d 100644
--- a/commons/src/main/res/values-zh/strings.xml
+++ b/commons/src/main/res/values-zh/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">事件</string>
     <string name="no_data">无数据</string>
     <string name="feature_configuration">特征配置</string>
     <string name="change_calendar_view">改变日历视图。</string>
@@ -17,7 +16,6 @@
     <string name="navigation_analytics">分析工具</string>
     <string name="navigation_tasks">任务</string>
     <string name="navigation_programs">项目</string>
-    <string name="navigation_events">事件</string>
     <string name="navigation_relationships">关系</string>
     <string name="navigation_notes">笔记</string>
     <string name="navigation_data_entry">数据输入</string>
diff --git a/commons/src/main/res/values/strings.xml b/commons/src/main/res/values/strings.xml
index 537fd500d8a..bed79327176 100644
--- a/commons/src/main/res/values/strings.xml
+++ b/commons/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_event">Event</string>
     <string name="no_data">No data</string>
     <string name="feature_configuration">Feature Configuration</string>
     <string name="app_name" translatable="false">Commons</string>
@@ -18,7 +17,6 @@
     <string name="navigation_analytics">Analytics</string>
     <string name="navigation_tasks">Tasks</string>
     <string name="navigation_programs">Programs</string>
-    <string name="navigation_events">Events</string>
     <string name="navigation_relationships">Relationships</string>
     <string name="navigation_notes">Notes</string>
     <string name="navigation_data_entry">Data entry</string>
@@ -240,4 +238,23 @@
         <item quantity="other">%d years overdue</item>
     </plurals>
     <string name="open_with">Open with</string>
+
+    <!-- Event -->
+    <plurals name="event_label">
+        <item quantity="one">event</item>
+        <item quantity="other">events</item>
+    </plurals>
+    <string name="event_label_completed">%s completed</string>
+    <string name="event_label_created">%s created</string>
+    <string name="new_event_label">New %s</string>
+    <string name="event_label_date">%s date</string>
+    <string name="delete_event_label">Delete %s</string>
+    <string name="event_label_was_deleted">%s deleted successfully</string>
+    <string name="delete_event_label_error">This %s has not been created yet</string>
+    <string name="event_label_was_skipped">The %s was marked as skipped</string>
+    <string name="confirm_delete_event_label">Are you sure that you want to delete this %s?</string>
+    <string name="event_label_updated">%s updated</string>
+    <string name="event_label_date_in_future_message">This %s can\'t have a date in the future. Please change it.</string>
+    <string name="failed_insert_event_label">Failed to insert new %s</string>
+
 </resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 06b1bb0691a..aaf671a640d 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-20240208.120831-12"
 ruleEngine = "2.1.9"
 appcompat = "1.6.1"
 annotation = "1.6.0"