diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CreateEditCaseScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CreateEditCaseScreen.kt
index 72234989..b7e74f1d 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CreateEditCaseScreen.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CreateEditCaseScreen.kt
@@ -440,12 +440,12 @@ private fun ConfirmOldIncidentDialog(
 ) {
     val t = LocalAppTranslator.current
     val confirmContinueKey = if (isCreateWorksite) {
-        "~~{incident_name} was created {relative_time}. Continue creating a Case for {incident_name}?"
+        "caseForm.old_incident_case_create_confirm"
     } else {
-        "~~{incident_name} was created {relative_time}. Continue editing this Case for {incident_name}?"
+        "caseForm.old_incident_case_edit_confirm"
     }
     CrisisCleanupAlertDialog(
-        title = t("~~Old Incident"),
+        title = t("caseForm.old_incident"),
         confirmButton = {
             CrisisCleanupTextButton(
                 text = t("actions.yes"),
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesFilterScreen.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesFilterScreen.kt
index d60737c9..3a238b6b 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesFilterScreen.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesFilterScreen.kt
@@ -166,7 +166,7 @@ internal fun CasesFilterRoute(
         val closeDialog = { confirmAbandonFilterChange = false }
         CrisisCleanupAlertDialog(
             onDismissRequest = closeDialog,
-            title = t("~~Filter changes"),
+            title = t("worksiteFilters.filter_changes"),
             confirmButton = {
                 CrisisCleanupTextButton(
                     text = t("actions.apply_filters"),
@@ -178,11 +178,11 @@ internal fun CasesFilterRoute(
             },
             dismissButton = {
                 CrisisCleanupTextButton(
-                    text = t("~~Abandon"),
+                    text = t("actions.abandon"),
                     onClick = onBack,
                 )
             },
-            text = t("~~Filters have changed. Would you like to apply or abandon the changes?"),
+            text = t("worksiteFilters.filter_changes_confirmation"),
         )
     }
 }
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesScreen.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesScreen.kt
index 96d8512a..f6616645 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesScreen.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesScreen.kt
@@ -824,7 +824,7 @@ private fun MapLayersView(
                 verticalArrangement = listItemSpacedByHalf,
             ) {
                 Text(
-                    t("~~Map type"),
+                    t("worksiteMap.toggle_map_type"),
                     style = LocalFontStyles.current.header3,
                 )
 
@@ -843,7 +843,7 @@ private fun MapLayersView(
                             imageVector = CrisisCleanupIcons.NormalMap,
                             onClick = { onToggleSatelliteType(false) },
                         )
-                        Text(t("~~Default"))
+                        Text(t("worksiteMap.street_map"))
                     }
                     Column(
                         horizontalAlignment = Alignment.CenterHorizontally,
@@ -854,7 +854,7 @@ private fun MapLayersView(
                             imageVector = CrisisCleanupIcons.SatelliteMap,
                             onClick = { onToggleSatelliteType(true) },
                         )
-                        Text(t("~~Satellite"))
+                        Text(t("worksiteMap.satellite_map"))
                     }
                 }
             }
diff --git a/feature/incidentcache/src/main/kotlin/com/crisiscleanup/feature/incidentcache/ui/IncidentWorksitesCacheScreen.kt b/feature/incidentcache/src/main/kotlin/com/crisiscleanup/feature/incidentcache/ui/IncidentWorksitesCacheScreen.kt
index c13a4487..3a64d580 100644
--- a/feature/incidentcache/src/main/kotlin/com/crisiscleanup/feature/incidentcache/ui/IncidentWorksitesCacheScreen.kt
+++ b/feature/incidentcache/src/main/kotlin/com/crisiscleanup/feature/incidentcache/ui/IncidentWorksitesCacheScreen.kt
@@ -162,7 +162,7 @@ private fun IncidentWorksitesCacheScreen(
                 ) {
                     val syncStageMessage = when (syncStage) {
                         IncidentCacheStage.Inactive -> t("appCache.ready_to_sync")
-                        IncidentCacheStage.Start -> t("~~Starting sync...")
+                        IncidentCacheStage.Start -> t("appCache.starting_sync")
                         IncidentCacheStage.Incidents -> t("appCache.syncing_incidents")
                         IncidentCacheStage.WorksitesBounded -> t("appCache.syncing_cases_in_designated_area")
                         IncidentCacheStage.WorksitesPreload -> t("appCache.syncing_nearby_cases")