diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt
index ff3a89f3..c7a237f9 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/MainScreen.kt
@@ -23,11 +23,11 @@ import com.rtbishop.look4sat.presentation.satellites.satellitesDestination
 import com.rtbishop.look4sat.presentation.settings.settingsDestination
 
 sealed class Screen(val route: String, val iconResId: Int, val titleResId: Int) {
-    data object Satellites : Screen("satellites", R.drawable.ic_satellites, R.string.nav_satellites)
-    data object Passes : Screen("passes", R.drawable.ic_passes, R.string.nav_passes)
+    data object Satellites : Screen("satellites", R.drawable.ic_satellites, R.string.nav_sat)
+    data object Passes : Screen("passes", R.drawable.ic_passes, R.string.nav_pass)
     data object Radar : Screen("radar", R.drawable.ic_radar, R.string.nav_radar)
     data object Map : Screen("map", R.drawable.ic_map, R.string.nav_map)
-    data object Settings : Screen("settings", R.drawable.ic_settings, R.string.nav_settings)
+    data object Settings : Screen("settings", R.drawable.ic_settings, R.string.nav_prefs)
 }
 
 @Composable
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/common/Components.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/common/Components.kt
index 81d4300f..ee0f66ac 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/common/Components.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/common/Components.kt
@@ -108,7 +108,7 @@ fun RowScope.NextPassRow(pass: OrbitalPass, modifier: Modifier = Modifier) {
 //                .background(color = MaterialTheme.colorScheme.background)
                 .padding(start = 6.dp, top = 1.dp, end = 6.dp, bottom = 0.dp)
         ) {
-            val passSatId = stringResource(id = R.string.passes_satId, pass.catNum)
+            val passSatId = stringResource(id = R.string.pass_satId, pass.catNum)
             Row(verticalAlignment = Alignment.CenterVertically) {
                 Text(
                     text = "$passSatId - ",
@@ -175,7 +175,7 @@ fun RowScope.NextPassRow(pass: OrbitalPass, modifier: Modifier = Modifier) {
                 ) {
                     Text(
                         text = stringResource(
-                            id = R.string.passes_aosLos,
+                            id = R.string.pass_aosLos,
                             pass.aosAzimuth.toInt(),
                             pass.losAzimuth.toInt()
                         ),
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesDialog.kt
index 02a28322..32a7a4bf 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesDialog.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesDialog.kt
@@ -74,16 +74,16 @@ fun PassesDialog(hours: Int, elevation: Double, cancel: () -> Unit, accept: (Int
     val onAccept = {
         accept(hoursValue.intValue, elevationValueNew.doubleValue).also { cancel() }
     }
-    SharedDialog(title = stringResource(R.string.passes_filter_passes), onCancel = cancel, onAccept = onAccept) {
+    SharedDialog(title = stringResource(R.string.pass_filter_title), onCancel = cancel, onAccept = onAccept) {
         SliderRow(
-            title = stringResource(R.string.passes_filter_above),
+            title = stringResource(R.string.pass_filter_elev),
             value = elevationValueNew.doubleValue,
             valuePostfix = "°",
             valueResId = R.drawable.ic_elevation,
             valueRange = 0f..60f
         ) { elevationValueNew.doubleValue = it.toDouble() }
         SliderRow(
-            title = stringResource(R.string.passes_filter_within),
+            title = stringResource(R.string.pass_filter_hours),
             value = hoursValue.intValue.toDouble(),
             valuePostfix = "h",
             valueResId = R.drawable.ic_clock,
@@ -146,7 +146,7 @@ fun RadiosDialog(modes: List<String>, cancel: () -> Unit, accept: (List<String>)
         if (selected.contains(mode)) selected.remove(mode) else selected.add(mode)
     }
     val onAccept = { accept(selected.toList()).also { cancel() } }
-    SharedDialog(title = stringResource(R.string.passes_filter_modes), onCancel = cancel, onAccept = onAccept) {
+    SharedDialog(title = stringResource(R.string.pass_modes_title), onCancel = cancel, onAccept = onAccept) {
         LazyVerticalGrid(
             columns = GridCells.Adaptive(240.dp),
             modifier = Modifier
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt
index a27d9003..014f5271 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt
@@ -95,8 +95,8 @@ private fun PassesScreen(uiState: PassesState, navigateToRadar: (Int, Long) -> U
     }
     if (uiState.shouldSeeWelcome) {
         InfoDialog(
-            title = stringResource(R.string.passes_welcome_title),
-            text = stringResource(R.string.passes_welcome_message)
+            title = stringResource(R.string.pass_welcome_title),
+            text = stringResource(R.string.pass_welcome_message)
         ) {
             uiState.takeAction(PassesAction.DismissWelcome)
         }
@@ -158,7 +158,7 @@ private fun PassesList(
             }
         ) {
             if (passes.isEmpty()) {
-                EmptyListCard(message = stringResource(R.string.passes_empty_list_message))
+                EmptyListCard(message = stringResource(R.string.pass_empty_list_message))
             } else {
                 LazyVerticalGrid(
                     state = gridState,
@@ -204,7 +204,7 @@ private fun NearEarthPass(
     modifier: Modifier = Modifier,
     isVerticalLayout: Boolean = true
 ) {
-    val passSatId = stringResource(id = R.string.passes_satId, pass.catNum)
+    val passSatId = stringResource(id = R.string.pass_satId, pass.catNum)
     val horizontalPadding = if (isVerticalLayout) 6.dp else 10.dp
     Surface(color = MaterialTheme.colorScheme.background, modifier = modifier) {
         Surface(modifier = Modifier
@@ -254,7 +254,7 @@ private fun NearEarthPass(
                         verticalAlignment = Alignment.CenterVertically
                     ) {
                         if (pass.isDeepSpace) {
-                            Text(text = stringResource(R.string.passes_deep_space), fontSize = 15.sp)
+                            Text(text = stringResource(R.string.pass_deep_space), fontSize = 15.sp)
                         } else {
                             Text(
                                 text = sdfDate.format(Date(pass.aosTime)),
@@ -285,7 +285,7 @@ private fun NearEarthPass(
                     ) {
                         Text(
                             text = stringResource(
-                                id = R.string.passes_aosLos,
+                                id = R.string.pass_aosLos,
                                 pass.aosAzimuth.toInt(),
                                 pass.losAzimuth.toInt()
                             ),
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesDialog.kt
index 9a855eda..db95f86b 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesDialog.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesDialog.kt
@@ -42,7 +42,7 @@ fun MultiTypesDialog(
         if (selected.contains(type)) selected.remove(type) else selected.add(type)
     }
     val onAccept = { accept(selected.toList()) }
-    SharedDialog(title = stringResource(R.string.satellites_select_type), onCancel = cancel, onAccept = onAccept) {
+    SharedDialog(title = stringResource(R.string.sat_type_title), onCancel = cancel, onAccept = onAccept) {
         LazyVerticalGrid(
             columns = GridCells.Adaptive(240.dp),
             modifier = Modifier
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesScreen.kt
index 763bbecf..70e46bc2 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesScreen.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/satellites/SatellitesScreen.kt
@@ -28,6 +28,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
@@ -72,8 +74,8 @@ private fun SatellitesScreen(uiState: SatellitesState, navigateUp: () -> Unit) {
     }
     if (uiState.shouldSeeWarning) {
         InfoDialog(
-            stringResource(R.string.satellites_warning_title),
-            stringResource(R.string.satellites_warning_message)
+            stringResource(R.string.sat_warning_title),
+            stringResource(R.string.sat_warning_message)
         ) {
             uiState.takeAction(SatellitesAction.DismissWarning)
         }
@@ -82,28 +84,34 @@ private fun SatellitesScreen(uiState: SatellitesState, navigateUp: () -> Unit) {
     val selectAll = { uiState.takeAction(SatellitesAction.SelectAll) }
     val setQuery = { newQuery: String -> uiState.takeAction(SatellitesAction.SearchFor(newQuery)) }
     val saveSelection = { uiState.takeAction(SatellitesAction.SaveSelection).also { navigateUp() } }
+    val primCardCd = stringResource(R.string.btn_accept)
+    val primCardMod = Modifier.semantics { contentDescription = primCardCd }
+    val clearAllCd = stringResource(R.string.sat_clear_all)
+    val clearAllMod = Modifier.semantics { contentDescription = clearAllCd }
+    val selectAllCd = stringResource(R.string.sat_select_all)
+    val selectAllMod = Modifier.semantics { contentDescription = selectAllCd }
     Column(modifier = Modifier.layoutPadding(), verticalArrangement = Arrangement.spacedBy(6.dp)) {
         if (isVerticalLayout()) {
             TopBar {
                 TypeCard(types = uiState.currentTypes, toggleDialog, modifier = Modifier.weight(1f))
-                PrimaryIconCard(onClick = saveSelection, resId = R.drawable.ic_done)
+                PrimaryIconCard(onClick = saveSelection, resId = R.drawable.ic_done, modifier = primCardMod)
             }
             TopBar {
                 SearchBar(setQuery = { setQuery(it) }, modifier = Modifier.weight(1f))
-                IconCard(action = unselectAll, resId = R.drawable.ic_check_off)
-                IconCard(action = selectAll, resId = R.drawable.ic_check_on)
+                IconCard(action = unselectAll, resId = R.drawable.ic_check_off, modifier = clearAllMod)
+                IconCard(action = selectAll, resId = R.drawable.ic_check_on, modifier = selectAllMod)
             }
         } else {
             TopBar {
-                PrimaryIconCard(onClick = saveSelection, resId = R.drawable.ic_done)
+                PrimaryIconCard(onClick = saveSelection, resId = R.drawable.ic_done, modifier = primCardMod)
                 TypeCard(types = uiState.currentTypes, toggleDialog, modifier = Modifier.weight(1f))
                 SearchBar(setQuery = { setQuery(it) }, modifier = Modifier.weight(1f))
-                IconCard(action = unselectAll, resId = R.drawable.ic_check_off)
-                IconCard(action = selectAll, resId = R.drawable.ic_check_on)
+                IconCard(action = unselectAll, resId = R.drawable.ic_check_off, modifier = clearAllMod)
+                IconCard(action = selectAll, resId = R.drawable.ic_check_on, modifier = selectAllMod)
             }
         }
         ElevatedCard(modifier = Modifier.fillMaxSize()) {
-            val emptyMessage = stringResource(R.string.satellites_empty_list_message)
+            val emptyMessage = stringResource(R.string.sat_empty_list_message)
             when {
                 uiState.isLoading -> CardLoadingIndicator()
                 uiState.itemsList.isEmpty() -> EmptyListCard(message = emptyMessage)
@@ -143,7 +151,7 @@ private fun SearchBar(setQuery: (String) -> Unit, modifier: Modifier = Modifier)
                 decorationBox = { innerTextField ->
                     if (currentQuery.value.isEmpty()) {
                         Text(
-                            text = stringResource(id = R.string.satellites_search_hint),
+                            text = stringResource(id = R.string.sat_search_hint),
                             fontSize = 16.sp,
                             lineHeight = 20.sp,
                             fontWeight = FontWeight.Medium,
@@ -155,7 +163,8 @@ private fun SearchBar(setQuery: (String) -> Unit, modifier: Modifier = Modifier)
                 cursorBrush = SolidColor(MaterialTheme.colorScheme.onSurface)
             )
             IconButton(onClick = { setNewQuery("") }) {
-                Icon(painter = painterResource(id = R.drawable.ic_close), contentDescription = null)
+                val clearCd = stringResource(R.string.sat_search_clear)
+                Icon(painter = painterResource(id = R.drawable.ic_close), contentDescription = clearCd)
             }
         }
     }
@@ -178,7 +187,7 @@ private fun TypeCard(types: List<String>, onClick: () -> Unit, modifier: Modifie
                 tint = MaterialTheme.colorScheme.primary
             )
             Text(
-                text = stringResource(R.string.satellites_type, typesText),
+                text = stringResource(R.string.sat_type_hint, typesText),
                 fontSize = 16.sp,
                 fontWeight = FontWeight.Medium,
                 modifier = Modifier
@@ -199,7 +208,7 @@ private fun SatellitePreview() {
 
 @Composable
 private fun Satellite(item: SatItem, onSelected: (Int, Boolean) -> Unit, modifier: Modifier) {
-    val passSatId = stringResource(id = R.string.passes_satId, item.catnum)
+    val passSatId = stringResource(id = R.string.pass_satId, item.catnum)
     Surface(
         color = MaterialTheme.colorScheme.background,
         modifier = modifier.clickable { onSelected(item.catnum, item.isSelected) }) {
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsDialog.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsDialog.kt
index 7f7d0fc2..b59baadd 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsDialog.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsDialog.kt
@@ -21,12 +21,12 @@ private fun PositionDialogPreview() {
 fun PositionDialog(lat: Double, lon: Double, dismiss: () -> Unit, save: (Double, Double) -> Unit) {
     val latValue = rememberSaveable { mutableStateOf(lat.toString()) }
     val lonValue = rememberSaveable { mutableStateOf(lon.toString()) }
-    val titleText = stringResource(id = R.string.settings_position_title)
+    val titleText = stringResource(id = R.string.prefs_station_title)
     val onAccept = { saveValues(latValue.value, lonValue.value, save).also { dismiss() } }
     SharedDialog(title = titleText, onCancel = dismiss, onAccept = onAccept) {
-        Text(text = stringResource(id = R.string.settings_position_lat_text))
+        Text(text = stringResource(id = R.string.prefs_station_lat_text))
         OutlinedTextField(value = latValue.value, onValueChange = { latValue.value = it })
-        Text(text = stringResource(id = R.string.settings_position_lon_text))
+        Text(text = stringResource(id = R.string.prefs_station_lon_text))
         OutlinedTextField(value = lonValue.value, onValueChange = { lonValue.value = it })
     }
 }
@@ -49,8 +49,8 @@ private fun LocatorDialogPreview() {
 fun LocatorDialog(qthLocator: String, dismiss: () -> Unit, save: (String) -> Unit) {
     val locator = rememberSaveable { mutableStateOf(qthLocator) }
     val onAccept = { save(locator.value).also { dismiss() } }
-    SharedDialog(title = stringResource(R.string.settings_locator_title), onCancel = dismiss, onAccept = onAccept) {
-        Text(text = stringResource(id = R.string.settings_locator_text))
+    SharedDialog(title = stringResource(R.string.prefs_locator_title), onCancel = dismiss, onAccept = onAccept) {
+        Text(text = stringResource(id = R.string.prefs_locator_text))
         OutlinedTextField(value = locator.value, onValueChange = { locator.value = it })
     }
 }
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt
index 4ca73ca7..5ea6e365 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsScreen.kt
@@ -72,7 +72,7 @@ fun NavGraphBuilder.settingsDestination() {
 private fun SettingsScreen(uiState: SettingsState) {
     // Permissions setup
     val bluetoothContract = ActivityResultContracts.RequestPermission()
-    val bluetoothError = stringResource(R.string.settings_BTremote_perm_error)
+    val bluetoothError = stringResource(R.string.prefs_BTremote_perm_error)
     val bluetoothPerm = when {
         Build.VERSION.SDK_INT < Build.VERSION_CODES.S -> Manifest.permission.BLUETOOTH
         else -> Manifest.permission.BLUETOOTH_CONNECT
@@ -84,7 +84,7 @@ private fun SettingsScreen(uiState: SettingsState) {
         }
     }
     val locationContract = ActivityResultContracts.RequestMultiplePermissions()
-    val locationError = stringResource(R.string.settings_location_gps_error)
+    val locationError = stringResource(R.string.prefs_loc_gps_error)
     val locationPermCoarse = Manifest.permission.ACCESS_COARSE_LOCATION
     val locationPermFine = Manifest.permission.ACCESS_FINE_LOCATION
     val locationRequest = rememberLauncherForActivityResult(locationContract) { permissions ->
@@ -233,7 +233,7 @@ private fun LocationCard(
         ) {
             Row(verticalAlignment = Alignment.CenterVertically) {
                 Text(
-                    text = stringResource(id = R.string.settings_location_title),
+                    text = stringResource(id = R.string.prefs_loc_title),
                     color = MaterialTheme.colorScheme.primary
                 )
                 UpdateIndicator(isUpdating = settings.isUpdating, Modifier.weight(1f))
@@ -262,19 +262,19 @@ private fun LocationCard(
             Row(horizontalArrangement = Arrangement.SpaceEvenly) {
                 CardButton(
                     onClick = setGpsPos,
-                    text = stringResource(id = R.string.settings_station_gps),
+                    text = stringResource(id = R.string.prefs_loc_gps_title),
                     modifier = Modifier.weight(1f)
                 )
                 Spacer(modifier = Modifier.width(6.dp))
                 CardButton(
                     onClick = showPosDialog,
-                    text = stringResource(id = R.string.settings_station_manual),
+                    text = stringResource(id = R.string.prefs_loc_manual_title),
                     modifier = Modifier.weight(1f)
                 )
                 Spacer(modifier = Modifier.width(6.dp))
                 CardButton(
                     onClick = showLocDialog,
-                    text = stringResource(id = R.string.settings_station_qth),
+                    text = stringResource(id = R.string.prefs_loc_qth_title),
                     modifier = Modifier.weight(1f)
                 )
             }
@@ -310,7 +310,7 @@ private fun DataCard(
         ) {
             Row(verticalAlignment = Alignment.CenterVertically) {
                 Text(
-                    text = stringResource(id = R.string.settings_data_title),
+                    text = stringResource(id = R.string.prefs_data_title),
                     color = MaterialTheme.colorScheme.primary
                 )
                 UpdateIndicator(isUpdating = settings.isUpdating, Modifier.weight(1f))
@@ -327,19 +327,19 @@ private fun DataCard(
             Row(horizontalArrangement = Arrangement.SpaceEvenly) {
                 CardButton(
                     onClick = { updateFromWeb() },
-                    text = stringResource(id = R.string.settings_data_online),
+                    text = stringResource(id = R.string.prefs_data_online),
                     modifier = Modifier.weight(1f)
                 )
                 Spacer(modifier = Modifier.width(6.dp))
                 CardButton(
                     onClick = { updateFromFile() },
-                    text = stringResource(id = R.string.settings_data_import),
+                    text = stringResource(id = R.string.prefs_data_import),
                     modifier = Modifier.weight(1f)
                 )
                 Spacer(modifier = Modifier.width(6.dp))
                 CardButton(
                     onClick = { clearAllData() },
-                    text = stringResource(id = R.string.settings_data_clear),
+                    text = stringResource(id = R.string.prefs_data_clear),
                     modifier = Modifier.weight(1f)
                 )
             }
@@ -372,7 +372,7 @@ private fun NetworkOutputCard(
     ElevatedCard(modifier = Modifier.fillMaxWidth()) {
         Column(modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp)) {
             Text(
-                text = stringResource(id = R.string.settings_remote_title),
+                text = stringResource(id = R.string.prefs_remote_title),
                 color = MaterialTheme.colorScheme.primary
             )
             Row(
@@ -380,7 +380,7 @@ private fun NetworkOutputCard(
                 verticalAlignment = Alignment.CenterVertically,
                 modifier = Modifier.fillMaxWidth()
             ) {
-                Text(text = stringResource(R.string.settings_remote_switch))
+                Text(text = stringResource(R.string.prefs_remote_switch))
                 Switch(checked = settings.rotatorState, onCheckedChange = { setRotatorState(it) })
             }
             Row(
@@ -391,7 +391,7 @@ private fun NetworkOutputCard(
                 OutlinedTextField(
                     value = settings.rotatorAddress,
                     singleLine = true,
-                    label = { Text(text = stringResource(R.string.settings_remote_ip_hint)) },
+                    label = { Text(text = stringResource(R.string.prefs_remote_ip_hint)) },
                     onValueChange = { setRotatorAddress(it) },
                     modifier = Modifier.weight(1.5f),
                     enabled = settings.rotatorState
@@ -399,7 +399,7 @@ private fun NetworkOutputCard(
                 OutlinedTextField(
                     value = settings.rotatorPort,
                     onValueChange = { setRotatorPort(it) },
-                    label = { Text(text = stringResource(R.string.settings_remote_port_hint)) },
+                    label = { Text(text = stringResource(R.string.prefs_remote_port_hint)) },
                     singleLine = true,
                     modifier = Modifier.weight(1f),
                     enabled = settings.rotatorState
@@ -435,7 +435,7 @@ private fun BluetoothOutputCard(
     ElevatedCard(modifier = Modifier.fillMaxWidth()) {
         Column(modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp)) {
             Text(
-                text = stringResource(id = R.string.settings_BTremote_title),
+                text = stringResource(id = R.string.prefs_BTremote_title),
                 color = MaterialTheme.colorScheme.primary
             )
             Row(
@@ -443,7 +443,7 @@ private fun BluetoothOutputCard(
                 verticalAlignment = Alignment.CenterVertically,
                 modifier = Modifier.fillMaxWidth()
             ) {
-                Text(text = stringResource(R.string.settings_BTremote_switch))
+                Text(text = stringResource(R.string.prefs_BTremote_switch))
                 Switch(checked = settings.bluetoothState, onCheckedChange = { setBluetoothState(it) })
             }
             Row(
@@ -454,7 +454,7 @@ private fun BluetoothOutputCard(
                 OutlinedTextField(
                     value = settings.bluetoothAddress,
                     singleLine = true,
-                    label = { Text(text = stringResource(R.string.settings_BTremote_device_hint)) },
+                    label = { Text(text = stringResource(R.string.prefs_BTremote_device_hint)) },
                     onValueChange = { setBluetoothAddress(it) },
                     modifier = Modifier.weight(1.5f),
                     enabled = settings.bluetoothState
@@ -462,7 +462,7 @@ private fun BluetoothOutputCard(
                 OutlinedTextField(
                     value = settings.bluetoothFormat,
                     onValueChange = { setBluetoothFormat(it) },
-                    label = { Text(text = stringResource(R.string.settings_BTremote_output_hint)) },
+                    label = { Text(text = stringResource(R.string.prefs_BTremote_output_hint)) },
                     singleLine = true,
                     modifier = Modifier.weight(1f),
                     enabled = settings.bluetoothState
@@ -503,7 +503,7 @@ private fun OtherCard(
                 verticalAlignment = Alignment.CenterVertically,
                 modifier = Modifier.fillMaxWidth()
             ) {
-                Text(text = stringResource(id = R.string.settings_other_switch_utc))
+                Text(text = stringResource(id = R.string.prefs_other_switch_utc))
                 Switch(checked = settings.stateOfUtc, onCheckedChange = { toggleUtc(it) })
             }
             Row(
@@ -511,7 +511,7 @@ private fun OtherCard(
                 verticalAlignment = Alignment.CenterVertically,
                 modifier = Modifier.fillMaxWidth()
             ) {
-                Text(text = stringResource(id = R.string.settings_other_switch_update))
+                Text(text = stringResource(id = R.string.prefs_other_switch_update))
                 Switch(checked = settings.stateOfAutoUpdate, onCheckedChange = { toggleUpdate(it) })
             }
             Row(
@@ -519,7 +519,7 @@ private fun OtherCard(
                 verticalAlignment = Alignment.CenterVertically,
                 modifier = Modifier.fillMaxWidth()
             ) {
-                Text(text = stringResource(id = R.string.settings_other_switch_sweep))
+                Text(text = stringResource(id = R.string.prefs_other_switch_sweep))
                 Switch(checked = settings.stateOfSweep, onCheckedChange = { toggleSweep(it) })
             }
             Row(
@@ -527,7 +527,7 @@ private fun OtherCard(
                 verticalAlignment = Alignment.CenterVertically,
                 modifier = Modifier.fillMaxWidth()
             ) {
-                Text(text = stringResource(id = R.string.settings_other_switch_sensors))
+                Text(text = stringResource(id = R.string.prefs_other_switch_sensors))
                 Switch(checked = settings.stateOfSensors, onCheckedChange = { toggleSensor(it) })
             }
         }
@@ -537,12 +537,12 @@ private fun OtherCard(
 @Composable
 private fun setUpdateTime(updateTime: Long): String {
     val updateDate = if (updateTime != 0L) {
-        val timePattern = stringResource(id = R.string.settings_last_updated_pattern)
+        val timePattern = stringResource(id = R.string.prefs_updated_time)
         SimpleDateFormat(timePattern, Locale.getDefault()).format(Date(updateTime))
     } else {
-        stringResource(id = R.string.passes_placeholder)
+        stringResource(id = R.string.pass_time_placeholder)
     }
-    return stringResource(id = R.string.settings_data_update, updateDate)
+    return stringResource(id = R.string.prefs_updated_title, updateDate)
 }
 
 @Composable
@@ -568,7 +568,7 @@ private fun CardCredits(modifier: Modifier = Modifier) {
             modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp)
         ) {
             Text(
-                text = stringResource(id = R.string.settings_outro_title),
+                text = stringResource(id = R.string.prefs_outro_title),
                 fontSize = 18.sp,
                 fontWeight = FontWeight.Medium,
                 color = MaterialTheme.colorScheme.primary,
@@ -576,11 +576,11 @@ private fun CardCredits(modifier: Modifier = Modifier) {
             )
             Text(
                 text = stringResource(
-                    id = R.string.settings_outro_thanks
+                    id = R.string.prefs_outro_thanks
                 ), fontSize = 16.sp, textAlign = TextAlign.Center
             )
             Text(
-                text = stringResource(id = R.string.settings_outro_license),
+                text = stringResource(id = R.string.prefs_outro_license),
                 fontSize = 18.sp,
                 fontWeight = FontWeight.Medium,
                 color = MaterialTheme.colorScheme.primary,
diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.kt
index 3344adbd..1bb89cf0 100644
--- a/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/presentation/settings/SettingsViewModel.kt
@@ -152,13 +152,13 @@ class SettingsViewModel(
 
     private fun setGpsPosition() {
         if (settingsRepo.setStationPosition()) {
-            val messageResId = R.string.settings_location_success
+            val messageResId = R.string.prefs_loc_success
             val newPosSettings = _uiState.value.positionSettings.copy(
                 isUpdating = true, messageResId = messageResId
             )
             _uiState.update { it.copy(positionSettings = newPosSettings) }
         } else {
-            val errorResId = R.string.settings_location_gps_error
+            val errorResId = R.string.prefs_loc_gps_error
             val newPosSettings = _uiState.value.positionSettings.copy(
                 isUpdating = false, messageResId = errorResId
             )
@@ -168,13 +168,13 @@ class SettingsViewModel(
 
     private fun setGeoPosition(latitude: Double, longitude: Double) {
         if (settingsRepo.setStationPosition(latitude, longitude, 0.0)) {
-            val messageResId = R.string.settings_location_success
+            val messageResId = R.string.prefs_loc_success
             val newPosSettings = _uiState.value.positionSettings.copy(
                 isUpdating = false, messageResId = messageResId
             )
             _uiState.update { it.copy(positionSettings = newPosSettings) }
         } else {
-            val errorResId = R.string.settings_location_manual_error
+            val errorResId = R.string.prefs_loc_manual_error
             val newPosSettings = _uiState.value.positionSettings.copy(
                 isUpdating = false, messageResId = errorResId
             )
@@ -184,13 +184,13 @@ class SettingsViewModel(
 
     private fun setQthPosition(locator: String) {
         if (settingsRepo.setStationPosition(locator)) {
-            val messageResId = R.string.settings_location_success
+            val messageResId = R.string.prefs_loc_success
             val newPosSettings = _uiState.value.positionSettings.copy(
                 isUpdating = false, messageResId = messageResId
             )
             _uiState.update { it.copy(positionSettings = newPosSettings) }
         } else {
-            val errorResId = R.string.settings_location_qth_error
+            val errorResId = R.string.prefs_loc_qth_error
             val newPosSettings = _uiState.value.positionSettings.copy(
                 isUpdating = false, messageResId = errorResId
             )
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5f6128c9..5b51af22 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -6,143 +6,130 @@
     <string name="empty_list_message">No items to display</string>
 
     <!-- Navigation -->
-    <string name="nav_satellites">Satélites</string>
-    <string name="nav_passes">Passes</string>
+    <string name="nav_sat">Satélites</string>
+    <string name="nav_pass">Passes</string>
     <string name="nav_radar">Radar</string>
     <string name="nav_map">Mapa</string>
-    <string name="nav_settings">Ajustes</string>
+    <string name="nav_prefs">Ajustes</string>
 
     <!-- Satellites screen -->
-    <string name="satellites_select_all">Seleccionar todo</string>
-    <string name="satellites_clear_all">Vaciar todo</string>
-    <string name="satellites_select_type">Seleccionar tipo de satélite</string>
-    <string name="satellites_type">Tipo: %s</string>
-    <string name="satellites_search_hint">Buscar por Nombre / Id</string>
-    <string name="satellites_empty_list_message">
+    <string name="sat_type_hint">Tipo: %s</string>
+    <string name="sat_type_title">Seleccionar tipo de satélite</string>
+    <string name="sat_search_hint">Id - Name</string>
+    <string name="sat_search_clear">Vaciar</string>
+    <string name="sat_clear_all">Vaciar todo</string>
+    <string name="sat_select_all">Seleccionar todo</string>
+    <string name="sat_empty_list_message">
         Make sure your search query is correct and the DB is updated</string>
-    <string name="satellites_warning_title">Warning\!</string>
-    <string name="satellites_warning_message">
+    <string name="sat_warning_title">Warning\!</string>
+    <string name="sat_warning_message">
         There are over 9000 satellites listed in this app.
         It makes no sense to track them all at the same time.
         \n\nAlways try to narrow down the list to only the ones
         you\'re interested in vía search and types selector.</string>
 
     <!-- Passes screen -->
-    <string name="passes_error">No hay pases de satélite próximos para mostrar</string>
-    <string name="passes_empty_db">No hay datos para mostrar. Por favor, actualiza la base de datos a través del menú Ajustes.</string>
-    <string name="passes_deep_space">DeepSpace</string>
-    <string name="passes_filter_passes">Filtrar pases</string>
-    <string name="passes_filter_within">Horas por delante</string>
-    <string name="passes_filter_above">Elevación mínima</string>
-    <string name="passes_filter_modes">Tipo de modulación</string>
-    <string name="passes_elevation">ELEV: %.1f°</string>
-    <string name="passes_altitude">ALT: %.0f km</string>
-    <string name="passes_placeholder"> - - : - - </string>
-    <string name="passes_empty_list_message">
+    <string name="pass_filter_title">Filtrar pases</string>
+    <string name="pass_filter_elev">Elevación mínima</string>
+    <string name="pass_filter_hours">Horas por delante</string>
+    <string name="pass_modes_title">Tipo de modulación</string>
+    <string name="pass_elevation">ELEV: %.1f°</string>
+    <string name="pass_altitude">ALT: %.0f km</string>
+    <string name="pass_empty_db_message">No hay datos para mostrar. Por favor, actualiza la base de datos a través del menú Ajustes.</string>
+    <string name="pass_empty_list_message">
         Make sure your filters are correct and you have selected satellites</string>
-    <string name="passes_welcome_title">Welcome to Look4Sat\!</string>
-    <string name="passes_welcome_message">
+    <string name="pass_error_message">No hay pases de satélite próximos para mostrar</string>
+    <string name="pass_welcome_title">Welcome to Look4Sat\!</string>
+    <string name="pass_welcome_message">
         Make sure to set your position vía GPS, Lat/Lon or QTH in Settings.
         \n\nPlease update the database at least weekly to get accurate predictions.</string>
 
     <!-- Radar screen -->
+    <string name="radar_back">Atrás</string>
+    <string name="radar_notify">Notificar</string>
     <string name="radar_az_text">Ácimut</string>
     <string name="radar_el_text">Elevación</string>
     <string name="radar_alt_text">Altitud</string>
     <string name="radar_dist_text">Distancia</string>
-    <string name="radar_visible">Visible</string>
     <string name="radar_eclipsed">Eclipsado</string>
-    <string name="radar_mode">Modo: %s</string>
-    <string name="radar_inverted">Invertido: %s</string>
-    <string name="radar_info">%s</string>
-    <string name="radar_no_link">- - . - -</string>
-    <string name="radar_link_low">%.4f</string>
-    <string name="radar_link_lowHigh">%.4f - %.4f</string>
-    <string name="radar_data">Transmisores satélite:</string>
-    <string name="radar_no_data">Este satélite no lleva transmisores</string>
-    <string name="radar_string_yes">Si</string>
-    <string name="radar_string_no">No</string>
     <string name="radar_downlink">Downlink</string>
     <string name="radar_uplink">Uplink</string>
     <string name="radar_add">Añadir</string>
-    <string name="radar_back">Atrás</string>
-    <string name="radar_notify">Notificar</string>
+    <string name="radar_data">Transmisores satélite:</string>
+    <string name="radar_inverted">Invertido: %s</string>
+    <string name="radar_mode">Modo: %s</string>
+    <string name="radar_no_data">Este satélite no lleva transmisores</string>
+    <string name="radar_string_no">No</string>
+    <string name="radar_string_yes">Si</string>
+    <string name="radar_visible">Visible</string>
 
     <!-- Map screen -->
-    <string name="map_title">Mapa mundo</string>
-    <string name="map_sat_name">%s</string>
-    <string name="map_sat_id">Id:%d</string>
-    <string name="map_azimuth">Ácimut: %.1f°</string>
-    <string name="map_elevation">Elevación: %.1f°</string>
-    <string name="map_latitude">Latitud: %.1f°</string>
-    <string name="map_longitude">Longitud: %.1f°</string>
-    <string name="map_visible">Visible</string>
-    <string name="map_eclipsed">Eclipsado</string>
-    <string name="map_visibility">Visibilidad: %s</string>
-    <string name="map_period">Período: %.0f min</string>
-    <string name="map_phase">Fase: %.1f°</string>
-    <string name="map_altitude">Altitud: %.0f km</string>
-    <string name="map_distance">Distancia: %.0f km</string>
-    <string name="map_velocity">Velocidad: %.2f km/s</string>
-    <string name="map_copyright">Wikimedia maps | Map data © OpenStreetMap contributors</string>
     <string name="map_prev">Anterior</string>
     <string name="map_next">Siguiente</string>
+    <string name="map_azimuth">Ácimut: %.1f°</string>
+    <string name="map_elevation">Elevación: %.1f°</string>
+    <string name="map_altitude">Altitud: %.0f km</string>
+    <string name="map_distance">Distancia: %.0f km</string>
+    <string name="map_latitude">Latitud: %.1f°</string>
+    <string name="map_longitude">Longitud: %.1f°</string>
+    <string name="map_phase">Fase: %.1f°</string>
+    <string name="map_eclipsed">Eclipsado</string>
+    <string name="map_period">Período: %.0f min</string>
+    <string name="map_velocity">Velocidad: %.2f km/s</string>
+    <string name="map_visibility">Visibilidad: %s</string>
+    <string name="map_visible">Visible</string>
 
     <!-- Settings screen -->
-    <string name="settings_location_title">Ubicación estación</string>
-    <string name="settings_location_lat">Latitud: %.4f°</string>
-    <string name="settings_location_lon">Longitud: %.4f°</string>
-    <string name="settings_location_null">Sin datos de geolocalización</string>
-    <string name="settings_location_gps_error">Revisa los permisos de ubicación</string>
-    <string name="settings_location_manual_error">Ubicación no válida</string>
-    <string name="settings_location_qth_error">Ubicación QTH no válida</string>
-    <string name="settings_location_success">Ubicación actualizada con éxito</string>
+    <string name="prefs_donate">Soporte</string>
+    <string name="prefs_license">GPLv3 Licence</string>
+    <string name="prefs_privacy">Privacy Policy</string>
+    <string name="prefs_fdroid">F-Droid</string>
+    <string name="prefs_github">GitHub</string>
 
-    <string name="settings_data_title">Actualizar datos de satélites</string>
-    <string name="settings_data_error">Actualización completada con errores</string>
-    <string name="settings_data_update">Última actualización: %s</string>
-    <string name="settings_data_entries">Satélites: %s</string>
-    <string name="settings_data_radios">Transmisores: %s</string>
-    <string name="settings_data_success">Actualización completada con éxito</string>
-    <string name="settings_data_clear_success">Datos eliminados con éxito</string>
+    <string name="prefs_updated_title">Última actualización: %s</string>
+    <string name="prefs_updated_time">d MMM yyyy - HH:mm:ss</string>
 
-    <string name="settings_remote_title">Preferencias Rotator</string>
-    <string name="settings_remote_switch">Habilitar control remoto</string>
-    <string name="settings_remote_ip_hint">Dirección IP</string>
-    <string name="settings_remote_port_hint">Puerto</string>
+    <string name="prefs_loc_title">Ubicación estación</string>
+    <string name="prefs_loc_gps_title">GPS</string>
+    <string name="prefs_loc_gps_error">Revisa los permisos de ubicación</string>
+    <string name="prefs_loc_manual_title">Manual</string>
+    <string name="prefs_loc_manual_error">Ubicación no válida</string>
+    <string name="prefs_loc_qth_title">QTH</string>
+    <string name="prefs_loc_qth_error">Ubicación QTH no válida</string>
+    <string name="prefs_loc_success">Ubicación actualizada con éxito</string>
+    <string name="prefs_station_title">Ajustar ubicaicón de la estación</string>
+    <string name="prefs_station_lat_text">Latitud de tu estación terrestre</string>
+    <string name="prefs_station_lon_text">Longitud de tu estación terrestre</string>
+    <string name="prefs_locator_title">Ajustes ubicación QTH</string>
+    <string name="prefs_locator_text">Ajustar posición de la estación con tu ubicación</string>
 
-    <string name="settings_BTremote_title">Salida por Bluetooth</string>
-    <string name="settings_BTremote_switch">Habilitar salida</string>
-    <string name="settings_BTremote_device_hint">Id dispositivo</string>
-    <string name="settings_BTremote_output_hint">Formato de datos</string>
-    <string name="settings_BTremote_perm_error">Revisa los permisos de Bluetooth</string>
+    <string name="prefs_data_title">Actualizar datos de satélites</string>
+    <string name="prefs_data_entries">Satélites: %s</string>
+    <string name="prefs_data_radios">Transmisores: %s</string>
+    <string name="prefs_data_online">Online</string>
+    <string name="prefs_data_import">Importar</string>
+    <string name="prefs_data_clear">Vaciar</string>
+    <string name="prefs_data_clear_success">Datos eliminados con éxito</string>
+    <string name="prefs_data_update_success">Actualización completada con éxito</string>
 
-    <string name="settings_other_switch_utc">Mostrar tiempos de pase en UTC</string>
-    <string name="settings_other_switch_update">Habilitar auto actualización de datos</string>
-    <string name="settings_other_switch_sweep">Habilitar animaciones radar</string>
-    <string name="settings_other_switch_sensors">Usar sensores para rotar vista de radar</string>
+    <string name="prefs_remote_title">Preferencias Rotator</string>
+    <string name="prefs_remote_switch">Habilitar control remoto</string>
+    <string name="prefs_remote_ip_hint">Dirección IP</string>
+    <string name="prefs_remote_port_hint">Puerto</string>
 
-    <string name="settings_station_gps">GPS</string>
-    <string name="settings_station_manual">Manual</string>
-    <string name="settings_station_qth">QTH</string>
-    <string name="settings_data_online">Online</string>
-    <string name="settings_data_import">Importar</string>
-    <string name="settings_github">GitHub</string>
-    <string name="settings_donate">Soporte</string>
-    <string name="settings_fdroid">F-Droid</string>
-    <string name="settings_license">GPLv3 Licence</string>
-    <string name="settings_privacy">Privacy Policy</string>
-    <string name="settings_locator_title">Ajustes ubicación QTH</string>
-    <string name="settings_locator_text">Ajustar posición de la estación con tu ubicación</string>
-    <string name="settings_data_clear">Vaciar</string>
-    <string name="settings_position_title">Ajustar ubicaicón de la estación</string>
-    <string name="settings_position_lat_text">Latitud de tu estación terrestre</string>
-    <string name="settings_position_lon_text">Longitud de tu estación terrestre</string>
+    <string name="prefs_BTremote_title">Salida por Bluetooth</string>
+    <string name="prefs_BTremote_switch">Habilitar salida</string>
+    <string name="prefs_BTremote_device_hint">Id dispositivo</string>
+    <string name="prefs_BTremote_output_hint">Formato de datos</string>
+    <string name="prefs_BTremote_perm_error">Revisa los permisos de Bluetooth</string>
 
-    <string name="settings_last_updated_pattern">d MMM yyyy - HH:mm:ss</string>
+    <string name="prefs_other_switch_utc">Mostrar tiempos de pase en UTC</string>
+    <string name="prefs_other_switch_update">Habilitar auto actualización de datos</string>
+    <string name="prefs_other_switch_sweep">Habilitar animaciones radar</string>
+    <string name="prefs_other_switch_sensors">Usar sensores para rotar vista de radar</string>
 
-    <string name="settings_outro_title">Me gustaría dar las gracias a:</string>
-    <string name="settings_outro_thanks"> • ti por descargar y usar Look4Sat! \nQue tengas cielos despejados!
+    <string name="prefs_outro_title">Me gustaría dar las gracias a:</string>
+    <string name="prefs_outro_thanks"> • ti por descargar y usar Look4Sat! \nQue tengas cielos despejados!
         \n • <a href="https://github.com/g4dpz">David A. B. Johnson</a>
         y <a href="https://github.com/davidmoten">Dave Moten</a> por crear predict4java lib
         bajo <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a>.
@@ -155,7 +142,7 @@
         \n • <a href="https://appoftheday.downloadastro.com/app/look4sat-satellite-tracker/">DownloadAstro</a>
         por su interés en la app y la entrevista publicada.
     </string>
-    <string name="settings_outro_license"><a href="https://sites.google.com/view/look4sat-privacy-policy/home">Política de privacidad.</a>
+    <string name="prefs_outro_license"><a href="https://sites.google.com/view/look4sat-privacy-policy/home">Política de privacidad.</a>
         La app viene sin garantías de ningún tipo. \nPara más información revisa la licencia <a href="https://www.gnu.org/licenses/gpl-3.0.html">GNU GPLv3</a>.
     </string>
 
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6c4875a0..3056ce06 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -6,144 +6,130 @@
     <string name="empty_list_message">No items to display</string>
 
     <!-- Navigation -->
-    <string name="nav_satellites">Спутники</string>
-    <string name="nav_passes">Пролеты</string>
+    <string name="nav_sat">Спутники</string>
+    <string name="nav_pass">Пролеты</string>
     <string name="nav_radar">Radar</string>
     <string name="nav_map">Карта</string>
-    <string name="nav_settings">Настройки</string>
+    <string name="nav_prefs">Настройки</string>
 
     <!-- Satellites screen -->
-    <string name="satellites_select_all">Выбрать</string>
-    <string name="satellites_clear_all">Очистить</string>
-    <string name="satellites_select_type">Выберите тип спутника</string>
-    <string name="satellites_type">Выбран тип: %s</string>
-    <string name="satellites_search_hint">Имя / Id</string>
-    <string name="satellites_empty_list_message">
+    <string name="sat_type_hint">Выбран тип: %s</string>
+    <string name="sat_type_title">Выберите тип спутника</string>
+    <string name="sat_search_hint">Id - Название</string>
+    <string name="sat_search_clear">Очистить</string>
+    <string name="sat_clear_all">Очистить</string>
+    <string name="sat_select_all">Выбрать</string>
+    <string name="sat_empty_list_message">
         Make sure your search query is correct and the DB is updated</string>
-    <string name="satellites_warning_title">Warning\!</string>
-    <string name="satellites_warning_message">
+    <string name="sat_warning_title">Warning\!</string>
+    <string name="sat_warning_message">
         There are over 9000 satellites listed in this app.
         It makes no sense to track them all at the same time.
         \n\nAlways try to narrow down the list to only the ones
         you\'re interested in via search and types selector.</string>
 
     <!-- Passes screen -->
-    <string name="passes_filter_modes">Выберите тип модуляции</string>
-    <string name="passes_filter_passes">Фильтровать пролеты</string>
-    <string name="passes_filter_within">Количество часов</string>
-    <string name="passes_filter_above">Минимальная элевация</string>
-    <string name="passes_deep_space">DeepSpace</string>
-    <string name="passes_error">Нет предстоящих пролётов спутников</string>
-    <string name="passes_empty_db">Пожалуйста, обновите базу данных спутников через меню Настроек</string>
-    <string name="passes_elevation">Элевация: %.1f°</string>
-    <string name="passes_altitude">Высота: %d км</string>
-    <string name="passes_placeholder"> -- : -- : -- </string>
-    <string name="passes_empty_list_message">
+    <string name="pass_filter_title">Фильтровать пролеты</string>
+    <string name="pass_filter_elev">Минимальная элевация</string>
+    <string name="pass_filter_hours">Количество часов</string>
+    <string name="pass_modes_title">Выберите тип модуляции</string>
+    <string name="pass_elevation">Элевация: %.1f°</string>
+    <string name="pass_altitude">Высота: %d км</string>
+    <string name="pass_empty_db_message">Пожалуйста, обновите базу данных спутников через меню Настроек</string>
+    <string name="pass_empty_list_message">
         Make sure your filters are correct and you have selected satellites</string>
-    <string name="passes_welcome_title">Welcome to Look4Sat\!</string>
-    <string name="passes_welcome_message">
+    <string name="pass_error_message">Нет предстоящих пролётов спутников</string>
+    <string name="pass_welcome_title">Welcome to Look4Sat\!</string>
+    <string name="pass_welcome_message">
         Make sure to set your position via GPS, Lat/Lon or QTH in Settings.
         \n\nPlease update the database at least weekly to get accurate predictions.</string>
 
     <!-- Radar screen -->
+    <string name="radar_back">Назад</string>
+    <string name="radar_notify">Уведомить</string>
     <string name="radar_az_text">Азим.</string>
     <string name="radar_el_text">Элев.</string>
     <string name="radar_alt_text">Выс.</string>
     <string name="radar_dist_text">Дальн.</string>
-    <string name="radar_visible">Видимый</string>
     <string name="radar_eclipsed">В тени</string>
-    <string name="radar_mode">Модуляция: %s</string>
-    <string name="radar_inverted">Инверсия: %s</string>
-    <string name="radar_info">%s</string>
-    <string name="radar_no_link">- - . - -</string>
-    <string name="radar_link_low">%.4f</string>
-    <string name="radar_link_lowHigh">%.4f - %.4f</string>
-    <string name="radar_data">Трансиверы спутника:</string>
-    <string name="radar_no_data">У этого спутника нет трансиверов</string>
-    <string name="radar_string_yes">Да</string>
-    <string name="radar_string_no">Нет</string>
     <string name="radar_downlink">Даунлинк</string>
     <string name="radar_uplink">Аплинк</string>
     <string name="radar_add">Добавить</string>
-    <string name="radar_back">Назад</string>
-    <string name="radar_notify">Уведомить</string>
+    <string name="radar_data">Трансиверы спутника:</string>
+    <string name="radar_inverted">Инверсия: %s</string>
+    <string name="radar_mode">Модуляция: %s</string>
+    <string name="radar_no_data">У этого спутника нет трансиверов</string>
+    <string name="radar_string_no">Нет</string>
+    <string name="radar_string_yes">Да</string>
+    <string name="radar_visible">Видимый</string>
 
     <!-- Map screen -->
-    <string name="map_title">Карта Мира</string>
-    <string name="map_sat_name">%s</string>
-    <string name="map_sat_id">Id:%d</string>
-    <string name="map_azimuth">Азимут: %.1f°</string>
-    <string name="map_elevation">Элевация: %.1f°</string>
-    <string name="map_latitude">Широта: %.1f°</string>
-    <string name="map_longitude">Долгота: %.1f°</string>
-    <string name="map_visible">Видимый</string>
-    <string name="map_eclipsed">В тени</string>
-    <string name="map_visibility">Видимость: %s</string>
-    <string name="map_period">Период: %.0fмин</string>
-    <string name="map_phase">Фаза: %.1f°</string>
-    <string name="map_altitude">Высота: %.0fкм</string>
-    <string name="map_distance">Дистанция: %.0fкм</string>
-    <string name="map_velocity">Скорость: %.2fкм/с</string>
-    <string name="map_copyright">Wikimedia maps | Map data © OpenStreetMap contributors</string>
     <string name="map_prev">Пред</string>
     <string name="map_next">След</string>
+    <string name="map_azimuth">Азимут: %.1f°</string>
+    <string name="map_elevation">Элевация: %.1f°</string>
+    <string name="map_altitude">Высота: %.0fкм</string>
+    <string name="map_distance">Дистанция: %.0fкм</string>
+    <string name="map_latitude">Широта: %.1f°</string>
+    <string name="map_longitude">Долгота: %.1f°</string>
+    <string name="map_phase">Фаза: %.1f°</string>
+    <string name="map_eclipsed">В тени</string>
+    <string name="map_period">Период: %.0fмин</string>
+    <string name="map_velocity">Скорость: %.2fкм/с</string>
+    <string name="map_visibility">Видимость: %s</string>
+    <string name="map_visible">Видимый</string>
 
     <!-- Settings screen -->
-    <string name="settings_location_title">Местоположение</string>
-    <string name="settings_location_lat">Широта: %.4f°</string>
-    <string name="settings_location_lon">Долгота: %.4f°</string>
-    <string name="settings_location_null">Нет данных геолокации</string>
-    <string name="settings_location_gps_error">Нет разрешения использовать геоданные</string>
-    <string name="settings_location_manual_error">Введены неверные данные</string>
-    <string name="settings_location_qth_error">Неправильный локатор QTH</string>
-    <string name="settings_location_success">Позиция успешно обновлена</string>
+    <string name="prefs_donate">Поддержать</string>
+    <string name="prefs_license">Лицензия</string>
+    <string name="prefs_privacy">Конфиденц.</string>
+    <string name="prefs_fdroid">F-Droid</string>
+    <string name="prefs_github">GitHub</string>
 
-    <string name="settings_data_title">Обновление данных</string>
-    <string name="settings_data_error">При обновлении возникли ошибки</string>
-    <string name="settings_data_update">Обновлено: %s</string>
-    <string name="settings_data_entries">Спутников: %s</string>
-    <string name="settings_data_radios">Трансиверов: %s</string>
-    <string name="settings_data_success">Обновление прошло успешно</string>
-    <string name="settings_data_clear_success">Очистка прошла успешно</string>
+    <string name="prefs_updated_title">Обновлено: %s</string>
+    <string name="prefs_updated_time">d MMM yyyy - HH:mm:ss</string>
 
-    <string name="settings_remote_title">Настройки ротатора</string>
-    <string name="settings_remote_switch">Удаленное управление</string>
-    <string name="settings_remote_ip_hint">IP адрес</string>
-    <string name="settings_remote_port_hint">Порт</string>
+    <string name="prefs_loc_title">Местоположение</string>
+    <string name="prefs_loc_gps_title">GPS</string>
+    <string name="prefs_loc_gps_error">Нет разрешения использовать геоданные</string>
+    <string name="prefs_loc_manual_title">Ввести</string>
+    <string name="prefs_loc_manual_error">Введены неверные данные</string>
+    <string name="prefs_loc_qth_title">QTH</string>
+    <string name="prefs_loc_qth_error">Неправильный локатор QTH</string>
+    <string name="prefs_loc_success">Позиция успешно обновлена</string>
+    <string name="prefs_station_title">Настройки местоположения</string>
+    <string name="prefs_station_lat_text">Установите широту наземной станции</string>
+    <string name="prefs_station_lon_text">Установите долготу наземной станции</string>
+    <string name="prefs_locator_title">Настройки локатора QTH</string>
+    <string name="prefs_locator_text">Установить позицию используя локатор</string>
 
-    <string name="settings_BTremote_title">Передача данных по Bluetooth</string>
-    <string name="settings_BTremote_switch">Включить передачу</string>
-    <string name="settings_BTremote_device_hint">Id устройства</string>
-    <string name="settings_BTremote_output_hint">Формат данных</string>
-    <string name="settings_BTremote_perm_error">Нет разрешения использовать bluetooth</string>
+    <string name="prefs_data_title">Обновление данных</string>
+    <string name="prefs_data_entries">Спутников: %s</string>
+    <string name="prefs_data_radios">Трансиверов: %s</string>
+    <string name="prefs_data_online">Онлайн</string>
+    <string name="prefs_data_import">Импорт</string>
+    <string name="prefs_data_clear">Очистить</string>
+    <string name="prefs_data_clear_success">Очистка прошла успешно</string>
+    <string name="prefs_data_update_success">Обновление прошло успешно</string>
 
-    <string name="settings_other_switch_utc">Показывать время по UTC</string>
-    <string name="settings_other_switch_update">Обновлять данные автоматически</string>
-    <string name="settings_other_switch_sweep">Показывать анимацию радара</string>
-    <string name="settings_other_switch_sensors">Использовать сенсоры устройства</string>
+    <string name="prefs_remote_title">Настройки ротатора</string>
+    <string name="prefs_remote_switch">Удаленное управление</string>
+    <string name="prefs_remote_ip_hint">IP адрес</string>
+    <string name="prefs_remote_port_hint">Порт</string>
 
-    <string name="settings_station_gps">GPS</string>
-    <string name="settings_station_manual">Ввести</string>
-    <string name="settings_station_qth">QTH</string>
-    <string name="settings_data_online">Онлайн</string>
-    <string name="settings_data_import">Импорт</string>
-    <string name="settings_github">GitHub</string>
-    <string name="settings_donate">Поддержать</string>
-    <string name="settings_fdroid">F-Droid</string>
-    <string name="settings_license">Лицензия</string>
-    <string name="settings_privacy">Конфиденц.</string>
+    <string name="prefs_BTremote_title">Передача данных по Bluetooth</string>
+    <string name="prefs_BTremote_switch">Включить передачу</string>
+    <string name="prefs_BTremote_device_hint">Id устройства</string>
+    <string name="prefs_BTremote_output_hint">Формат данных</string>
+    <string name="prefs_BTremote_perm_error">Нет разрешения использовать bluetooth</string>
 
-    <string name="settings_last_updated_pattern">d MMM yyyy - HH:mm:ss</string>
+    <string name="prefs_other_switch_utc">Показывать время по UTC</string>
+    <string name="prefs_other_switch_update">Обновлять данные автоматически</string>
+    <string name="prefs_other_switch_sweep">Показывать анимацию радара</string>
+    <string name="prefs_other_switch_sensors">Использовать сенсоры устройства</string>
 
-    <string name="settings_data_clear">Очистить</string>
-    <string name="settings_locator_title">Настройки локатора QTH</string>
-    <string name="settings_locator_text">Установить позицию используя локатор</string>
-    <string name="settings_position_title">Настройки местоположения</string>
-    <string name="settings_position_lat_text">Установите широту наземной станции</string>
-    <string name="settings_position_lon_text">Установите долготу наземной станции</string>
-
-    <string name="settings_outro_title">Я хотел бы сказать спасибо:</string>
-    <string name="settings_outro_thanks">Вам за использование этого приложения! \nЖелаю всегда чистого неба над головой!
+    <string name="prefs_outro_title">Я хотел бы сказать спасибо:</string>
+    <string name="prefs_outro_thanks">Вам за использование этого приложения! \nЖелаю всегда чистого неба над головой!
         \n<a href="https://github.com/g4dpz">David A. B. Johnson</a> и
         <a href="https://github.com/davidmoten">Dave Moten</a> за работу над predict4java и доступ
         к ней по <a href="https://gnu.org/licenses/old-licenses/gpl-2.0.en.html">GNU GPLv2</a>
@@ -156,6 +142,6 @@
         \n<a href="https://appoftheday.downloadastro.com/app/look4sat-satellite-tracker/">DownloadAstro</a>
         за интерес к приложению и публикацию интервью на сайте.
     </string>
-    <string name="settings_outro_license">Это ПО поставляется без гарантий.</string>
+    <string name="prefs_outro_license">Это ПО поставляется без гарантий.</string>
 
 </resources>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 62185564..e5462825 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -6,144 +6,130 @@
     <string name="empty_list_message">No items to display</string>
 
     <!-- Navigation -->
-    <string name="nav_satellites">චන්ද්‍රිකා</string>
-    <string name="nav_passes">පසුකර යෑම්</string>
+    <string name="nav_sat">චන්ද්‍රිකා</string>
+    <string name="nav_pass">පසුකර යෑම්</string>
     <string name="nav_radar">Radar</string>
     <string name="nav_map">සිතියම</string>
-    <string name="nav_settings">පසුතල</string>
+    <string name="nav_prefs">පසුතල</string>
 
     <!-- Satellites screen -->
-    <string name="satellites_select_type">චන්ද්‍රිකා ආකාරය තෝරන්න</string>
-    <string name="satellites_type">තේරූ ආකාර: %s</string>
-    <string name="satellites_select_all">සියල්ල තෝරන්න</string>
-    <string name="satellites_clear_all">සියල්ල පිරිසිදු ක°</string>
-    <string name="satellites_search_hint">Name / Id</string>
-    <string name="satellites_empty_list_message">
+    <string name="sat_type_hint">තේරූ ආකාර: %s</string>
+    <string name="sat_type_title">චන්ද්‍රිකා ආකාරය තෝරන්න</string>
+    <string name="sat_search_hint">Id - Name</string>
+    <string name="sat_search_clear">පිරිසිදු ක°</string>
+    <string name="sat_clear_all">සියල්ල පිරිසිදු ක°</string>
+    <string name="sat_select_all">සියල්ල තෝරන්න</string>
+    <string name="sat_empty_list_message">
         Make sure your search query is correct and the DB is updated</string>
-    <string name="satellites_warning_title">Warning\!</string>
-    <string name="satellites_warning_message">
+    <string name="sat_warning_title">Warning\!</string>
+    <string name="sat_warning_message">
         There are over 9000 satellites listed in this app.
         It makes no sense to track them all at the same time.
         \n\nAlways try to narrow down the list to only the ones
         you\'re interested in via search and types selector.</string>
 
     <!-- Passes screen -->
-    <string name="passes_filter_passes">පසුකිරිම් පිරිපහදුව</string>
-    <string name="passes_filter_within">ඉදිරි පැය</string>
-    <string name="passes_filter_above">අවම උත්තෝලනය</string>
-    <string name="passes_filter_modes">මූර්ජන ආකාරය තෝරන්න</string>
-    <string name="passes_deep_space">DeepSpace</string>
-    <string name="passes_error">ප්‍රදර්ශනය කිරීමට ඉදිරියට එන චන්ද්‍රිකා පසුකර යෑම් නැත.</string>
-    <string name="passes_empty_db">පෙන්වීමට දත්ත නැත. කරුණාකර දත්ත සමුදාය යාවත්කාලීන කරන්න.</string>
-    <string name="passes_elevation">උත්තෝලනය: %.1f°</string>
-    <string name="passes_altitude">උන්නතාශය: %d km</string>
-    <string name="passes_placeholder"> -- : -- : -- </string>
-    <string name="passes_empty_list_message">
+    <string name="pass_filter_title">පසුකිරිම් පිරිපහදුව</string>
+    <string name="pass_filter_elev">අවම උත්තෝලනය</string>
+    <string name="pass_filter_hours">ඉදිරි පැය</string>
+    <string name="pass_modes_title">මූර්ජන ආකාරය තෝරන්න</string>
+    <string name="pass_elevation">උත්තෝලනය: %.1f°</string>
+    <string name="pass_altitude">උන්නතාශය: %d km</string>
+    <string name="pass_empty_db_message">පෙන්වීමට දත්ත නැත. කරුණාකර දත්ත සමුදාය යාවත්කාලීන කරන්න.</string>
+    <string name="pass_empty_list_message">
         Make sure your filters are correct and you have selected satellites</string>
-    <string name="passes_welcome_title">Welcome to Look4Sat\!</string>
-    <string name="passes_welcome_message">
+    <string name="pass_error_message">ප්‍රදර්ශනය කිරීමට ඉදිරියට එන චන්ද්‍රිකා පසුකර යෑම් නැත.</string>
+    <string name="pass_welcome_title">Welcome to Look4Sat\!</string>
+    <string name="pass_welcome_message">
         Make sure to set your position via GPS, Lat/Lon or QTH in Settings.
         \n\nPlease update the database at least weekly to get accurate predictions.</string>
 
     <!-- Radar screen -->
+    <string name="radar_back">ආපසු</string>
+    <string name="radar_notify">දන්වනවා</string>
     <string name="radar_az_text">දිගංශය</string>
     <string name="radar_el_text">උත්තෝලනය</string>
     <string name="radar_alt_text">උන්නතාශය</string>
     <string name="radar_dist_text">පරතරය</string>
-    <string name="radar_visible">දෘශ්‍යමාන</string>
     <string name="radar_eclipsed">අදෘශ්‍ය</string>
-    <string name="radar_mode">ප්‍රාකාරය: %s</string>
-    <string name="radar_inverted">Inverted: %s</string>
-    <string name="radar_info">%s</string>
-    <string name="radar_no_link">- - . - -</string>
-    <string name="radar_link_low">%.4f</string>
-    <string name="radar_link_lowHigh">%.4f - %.4f</string>
-    <string name="radar_data">චන්ද්‍රිකා සම්ප්‍රේෂණයන්:</string>
-    <string name="radar_no_data">මෙම චන්ද්‍රිකාව සම්ප්‍රෙෂණය නොකරයි</string>
-    <string name="radar_string_yes">ඔව්</string>
-    <string name="radar_string_no">නෑ</string>
     <string name="radar_downlink">Downlink</string>
     <string name="radar_uplink">Uplink</string>
     <string name="radar_add">එකතු ක°</string>
-    <string name="radar_back">ආපසු</string>
-    <string name="radar_notify">දන්වනවා</string>
+    <string name="radar_data">චන්ද්‍රිකා සම්ප්‍රේෂණයන්:</string>
+    <string name="radar_inverted">Inverted: %s</string>
+    <string name="radar_mode">ප්‍රාකාරය: %s</string>
+    <string name="radar_no_data">මෙම චන්ද්‍රිකාව සම්ප්‍රෙෂණය නොකරයි</string>
+    <string name="radar_string_no">නෑ</string>
+    <string name="radar_string_yes">ඔව්</string>
+    <string name="radar_visible">දෘශ්‍යමාන</string>
 
     <!-- Map screen -->
-    <string name="map_title">ලෝක සිතියම</string>
-    <string name="map_sat_name">%s</string>
-    <string name="map_sat_id">Id:%d</string>
-    <string name="map_azimuth">දිගංශය: %.1f°</string>
-    <string name="map_elevation">උත්තෝලනය: %.1f°</string>
-    <string name="map_latitude">අක්‍ෂාංශ: %.1f°</string>
-    <string name="map_longitude">දේශාංශ: %.1f°</string>
-    <string name="map_visible">දෘශ්‍ය</string>
-    <string name="map_eclipsed">අදෘශ්‍ය</string>
-    <string name="map_visibility">දෘශ්‍යතාව: %s</string>
-    <string name="map_period">කාලය: %.0f min</string>
-    <string name="map_phase">අංශය: %.1f°</string>
-    <string name="map_altitude">උන්නතාශය: %.0f km</string>,
-    <string name="map_distance">පරතරය: %.0f km</string>
-    <string name="map_velocity">ප්‍රවේශය: %.2f km/s</string>
-    <string name="map_copyright">Wikimedia maps | සිතියම් දත්ත © OpenStreetMap බෙදාහැරීම</string>
     <string name="map_prev">පසුපස</string>
     <string name="map_next">ඊළග</string>
+    <string name="map_azimuth">දිගංශය: %.1f°</string>
+    <string name="map_elevation">උත්තෝලනය: %.1f°</string>
+    <string name="map_altitude">උන්නතාශය: %.0f km</string>,
+    <string name="map_distance">පරතරය: %.0f km</string>
+    <string name="map_latitude">අක්‍ෂාංශ: %.1f°</string>
+    <string name="map_longitude">දේශාංශ: %.1f°</string>
+    <string name="map_phase">අංශය: %.1f°</string>
+    <string name="map_eclipsed">අදෘශ්‍ය</string>
+    <string name="map_period">කාලය: %.0f min</string>
+    <string name="map_velocity">ප්‍රවේශය: %.2f km/s</string>
+    <string name="map_visibility">දෘශ්‍යතාව: %s</string>
+    <string name="map_visible">දෘශ්‍ය</string>
 
     <!-- Settings screen -->
-    <string name="settings_location_title">පොළෙහි පිහිටීම</string>
-    <string name="settings_location_lat">අක්‍ෂාංශ: %.4f°</string>
-    <string name="settings_location_lon">දේශාංශ: %.4f°</string>
-    <string name="settings_location_null">භූ ස්ථාන දත්ත නොමැත</string>
-    <string name="settings_location_gps_error">ඔබගේ location අවසර පරීක්ෂා ක°</string>
-    <string name="settings_location_manual_error">ඇතුළත් කළ ස්ථානය වලංගු නොවේ</string>
-    <string name="settings_location_qth_error">QTH locator වලංගු නොවේ</string>
-    <string name="settings_location_success">පිහිටීම යාවත්කාලීනය සාර්ථකයි</string>
+    <string name="prefs_donate">දායකත්ව</string>
+    <string name="prefs_license">GPLv3 බලපත්‍රය</string>
+    <string name="prefs_privacy">Privacy Policy</string>
+    <string name="prefs_fdroid">F-Droid</string>
+    <string name="prefs_github">GitHub</string>
 
-    <string name="settings_data_title">චන්ද්‍රිකා දත්ත යාවත්කාලීනයි</string>
-    <string name="settings_data_error">දෝෂ සහිතව යාවත්කාලීනය සම්පූර්ණයි</string>
-    <string name="settings_data_update">අවසන් යාවත්කාලීනය: %s</string>
-    <string name="settings_data_entries">චන්ද්‍රිකා: %s</string>
-    <string name="settings_data_radios">සම්ප්‍රෙේෂණය: %s</string>
-    <string name="settings_data_success">යාවත්කාලීනය සම්පූර්ණ කිරීම සාර්ථකයි</string>
-    <string name="settings_data_clear_success">දත්ත ඉවත් කිරීම සාර්ථකයි</string>
+    <string name="prefs_updated_title">අවසන් යාවත්කාලීනය: %s</string>
+    <string name="prefs_updated_time">d MMM yyyy - HH:mm:ss</string>
 
-    <string name="settings_remote_title">භ්‍රමක මනාප</string>
-    <string name="settings_remote_switch">දුරස්ථ පාලනය සබල ක°</string>
-    <string name="settings_remote_ip_hint">IP ලිපිනය</string>
-    <string name="settings_remote_port_hint">Port</string>
+    <string name="prefs_loc_title">පොළෙහි පිහිටීම</string>
+    <string name="prefs_loc_gps_title">GPS</string>
+    <string name="prefs_loc_gps_error">ඔබගේ location අවසර පරීක්ෂා ක°</string>
+    <string name="prefs_loc_manual_title">අතින්</string>
+    <string name="prefs_loc_manual_error">ඇතුළත් කළ ස්ථානය වලංගු නොවේ</string>
+    <string name="prefs_loc_qth_title">QTH</string>
+    <string name="prefs_loc_qth_error">QTH locator වලංගු නොවේ</string>
+    <string name="prefs_loc_success">පිහිටීම යාවත්කාලීනය සාර්ථකයි</string>
+    <string name="prefs_station_title">පොළෙහි පිහිටීම් පසුතල</string>
+    <string name="prefs_station_lat_text">ඔබගේ පොළෙහි අක්‍ෂාංශය සකසන්න</string>
+    <string name="prefs_station_lon_text">ඔබගේ පොළෙහි දේශාංශය සකසන්න</string>
+    <string name="prefs_locator_title">QTH locator පසුතල</string>
+    <string name="prefs_locator_text"> ඔබගේ locator භාවිතා කර පොළහි පිහිටීම සකසන්න</string>
 
-    <string name="settings_BTremote_title">Bluetooth දත්ත ප්‍රතිදානය</string>
-    <string name="settings_BTremote_switch">ප්‍රතිදානය සබල ක°</string>
-    <string name="settings_BTremote_device_hint">උපාංග id</string>
-    <string name="settings_BTremote_output_hint">දත්ත අකාරය</string>
-    <string name="settings_BTremote_perm_error">Bluetooth අවසර පරික්‍ෂා ක°</string>
+    <string name="prefs_data_title">චන්ද්‍රිකා දත්ත යාවත්කාලීනයි</string>
+    <string name="prefs_data_entries">චන්ද්‍රිකා: %s</string>
+    <string name="prefs_data_radios">සම්ප්‍රෙේෂණය: %s</string>
+    <string name="prefs_data_online">මාර්ගගතව</string>
+    <string name="prefs_data_import">Import</string>
+    <string name="prefs_data_clear">පිරිසිදු ක°</string>
+    <string name="prefs_data_clear_success">දත්ත ඉවත් කිරීම සාර්ථකයි</string>
+    <string name="prefs_data_update_success">යාවත්කාලීනය සම්පූර්ණ කිරීම සාර්ථකයි</string>
 
-    <string name="settings_other_switch_utc">පසුකර වේලාවන් UTC මගින්</string>
-    <string name="settings_other_switch_update">ස්වයං දත්ත යාවත්කාලීනය</string>
-    <string name="settings_other_switch_sweep">radar sweep සජීවිකරණය සබල කරන්න</string>
-    <string name="settings_other_switch_sensors">Radar දර්ශනය කරකැවීමට සංවේදක භාවිතා කරන්න </string>
+    <string name="prefs_remote_title">භ්‍රමක මනාප</string>
+    <string name="prefs_remote_switch">දුරස්ථ පාලනය සබල ක°</string>
+    <string name="prefs_remote_ip_hint">IP ලිපිනය</string>
+    <string name="prefs_remote_port_hint">Port</string>
 
-    <string name="settings_station_gps">GPS</string>
-    <string name="settings_station_manual">අතින්</string>
-    <string name="settings_station_qth">QTH</string>
-    <string name="settings_data_online">මාර්ගගතව</string>
-    <string name="settings_data_import">Import</string>
-    <string name="settings_github">GitHub</string>
-    <string name="settings_donate">දායකත්ව</string>
-    <string name="settings_fdroid">F-Droid</string>
-    <string name="settings_license">GPLv3 බලපත්‍රය</string>
-    <string name="settings_privacy">Privacy Policy</string>
-    <string name="settings_data_clear">පිරිසිදු ක°</string>
+    <string name="prefs_BTremote_title">Bluetooth දත්ත ප්‍රතිදානය</string>
+    <string name="prefs_BTremote_switch">ප්‍රතිදානය සබල ක°</string>
+    <string name="prefs_BTremote_device_hint">උපාංග id</string>
+    <string name="prefs_BTremote_output_hint">දත්ත අකාරය</string>
+    <string name="prefs_BTremote_perm_error">Bluetooth අවසර පරික්‍ෂා ක°</string>
 
-    <string name="settings_last_updated_pattern">d MMM yyyy - HH:mm:ss</string>
+    <string name="prefs_other_switch_utc">පසුකර වේලාවන් UTC මගින්</string>
+    <string name="prefs_other_switch_update">ස්වයං දත්ත යාවත්කාලීනය</string>
+    <string name="prefs_other_switch_sweep">radar sweep සජීවිකරණය සබල කරන්න</string>
+    <string name="prefs_other_switch_sensors">Radar දර්ශනය කරකැවීමට සංවේදක භාවිතා කරන්න </string>
 
-    <string name="settings_locator_title">QTH locator පසුතල</string>
-    <string name="settings_locator_text"> ඔබගේ locator භාවිතා කර පොළහි පිහිටීම සකසන්න</string>
-    <string name="settings_position_title">පොළෙහි පිහිටීම් පසුතල</string>
-    <string name="settings_position_lat_text">ඔබගේ පොළෙහි අක්‍ෂාංශය සකසන්න</string>
-    <string name="settings_position_lon_text">ඔබගේ පොළෙහි දේශාංශය සකසන්න</string>
-
-    <string name="settings_outro_title">මම ස්තුති කිරීමට කැමති:</string>
-    <string name="settings_outro_thanks">බාගෙන භාවිතා කළ ඔබට! \nඅහස සදා ඔබ වෙනුවෙන් පැහැදිලියි!
+    <string name="prefs_outro_title">මම ස්තුති කිරීමට කැමති:</string>
+    <string name="prefs_outro_thanks">බාගෙන භාවිතා කළ ඔබට! \nඅහස සදා ඔබ වෙනුවෙන් පැහැදිලියි!
         \n<a href="https://github.com/g4dpz">David A. B. Johnson</a>
         සහ <a href="https://github.com/davidmoten">Dave Moten</a>ඔවුනට ප්‍රයෝජනවත් predict4java පුස්තකාලය නිර්මාණයට.
         \nසහ <a href="https://github.com/csete">Alexandru Csete</a> සඳහා Gpredict නිර්මාණයට සහ
@@ -153,6 +139,6 @@
         \n<a href="https://libre.space/">Libre Space Foundation</a>ට ඔවුන්ගේ
         <a href="https://db.satnogs.org/">SatNOGS</a>Web අඩවියට API හා DB විශාල දත්ත ප්‍රමාණයක් ලබාදීම සඳහා.
         \n<a href="https://appoftheday.downloadastro.com/app/look4sat-satellite-tracker/">DownloadAstro</a> කණ්ඩායමට යෙදුම පිළිබඳ ඔවුන්ගේ උනන්දුව සහ කැපවීම ලැබිම සම්බන්ධයෙන්.</string>
-    <string name="settings_outro_license">මෘදුකාංගය වගකීමක් සමග නොලැබේ</string>
+    <string name="prefs_outro_license">මෘදුකාංගය වගකීමක් සමග නොලැබේ</string>
 
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 05c1ff2e..67d122c1 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -6,144 +6,130 @@
     <string name="empty_list_message">No items to display</string>
 
     <!-- Navigation -->
-    <string name="nav_satellites">Супутники</string>
-    <string name="nav_passes">Прольоти</string>
+    <string name="nav_sat">Супутники</string>
+    <string name="nav_pass">Прольоти</string>
     <string name="nav_radar">Radar</string>
     <string name="nav_map">Карта</string>
-    <string name="nav_settings">Налаштування</string>
+    <string name="nav_prefs">Налаштування</string>
 
     <!-- Satellites screen -->
-    <string name="satellites_select_all">Вибрати всі</string>
-    <string name="satellites_clear_all">Очистити</string>
-    <string name="satellites_select_type">Виберіть тип супутника</string>
-    <string name="satellites_type">Вибраний тип: %s</string>
-    <string name="satellites_search_hint">Пошук за Назвою / Id</string>
-    <string name="satellites_empty_list_message">
+    <string name="sat_type_hint">Вибраний тип: %s</string>
+    <string name="sat_type_title">Виберіть тип супутника</string>
+    <string name="sat_search_hint">Id - Назва</string>
+    <string name="sat_search_clear">Очистити</string>
+    <string name="sat_clear_all">Очистити</string>
+    <string name="sat_select_all">Вибрати всі</string>
+    <string name="sat_empty_list_message">
         Make sure your search query is correct and the DB is updated</string>
-    <string name="satellites_warning_title">Warning\!</string>
-    <string name="satellites_warning_message">
+    <string name="sat_warning_title">Warning\!</string>
+    <string name="sat_warning_message">
         There are over 9000 satellites listed in this app.
         It makes no sense to track them all at the same time.
         \n\nAlways try to narrow down the list to only the ones
         you\'re interested in via search and types selector.</string>
 
     <!-- Passes screen -->
-    <string name="passes_filter_passes">Фільтр прольотів</string>
-    <string name="passes_filter_within">Кількість годин</string>
-    <string name="passes_filter_above">Мінімальне піднесення</string>
-    <string name="passes_filter_modes">Виберіть тип модуляції</string>
-    <string name="passes_deep_space">DeepSpace</string>
-    <string name="passes_error">Немає майбутніх прольотів супутників</string>
-    <string name="passes_empty_db">Немає даних для відображення. Будь ласка, оновіть базу даних через меню Налаштування</string>
-    <string name="passes_elevation">Піднес.: %.1f°</string>
-    <string name="passes_altitude">Висота: %.0f км</string>
-    <string name="passes_placeholder"> - - : - - </string>
-    <string name="passes_empty_list_message">
+    <string name="pass_filter_title">Фільтр прольотів</string>
+    <string name="pass_filter_elev">Мінімальне піднесення</string>
+    <string name="pass_filter_hours">Кількість годин</string>
+    <string name="pass_modes_title">Виберіть тип модуляції</string>
+    <string name="pass_elevation">Піднес.: %.1f°</string>
+    <string name="pass_altitude">Висота: %.0f км</string>
+    <string name="pass_empty_db_message">Немає даних для відображення. Будь ласка, оновіть базу даних через меню Налаштування</string>
+    <string name="pass_empty_list_message">
         Make sure your filters are correct and you have selected satellites</string>
-    <string name="passes_welcome_title">Welcome to Look4Sat\!</string>
-    <string name="passes_welcome_message">
+    <string name="pass_error_message">Немає майбутніх прольотів супутників</string>
+    <string name="pass_welcome_title">Welcome to Look4Sat\!</string>
+    <string name="pass_welcome_message">
         Make sure to set your position via GPS, Lat/Lon or QTH in Settings.
         \n\nPlease update the database at least weekly to get accurate predictions.</string>
 
     <!-- Radar screen -->
+    <string name="radar_back">Назад</string>
+    <string name="radar_notify">Сповістити</string>
     <string name="radar_az_text">Азимут</string>
     <string name="radar_el_text">Піднес.</string>
     <string name="radar_alt_text">Висота</string>
     <string name="radar_dist_text">Відстань</string>
-    <string name="radar_visible">Видимий</string>
     <string name="radar_eclipsed">В тіні</string>
-    <string name="radar_mode">Модуляція: %s</string>
-    <string name="radar_inverted">Інверсія: %s</string>
-    <string name="radar_info">%s</string>
-    <string name="radar_no_link">- - . - -</string>
-    <string name="radar_link_low">%.4f</string>
-    <string name="radar_link_lowHigh">%.4f - %.4f</string>
-    <string name="radar_data">Супутникові трансивери:</string>
-    <string name="radar_no_data">Цей супутник не має трансиверів</string>
-    <string name="radar_string_yes">Так</string>
-    <string name="radar_string_no">Ні</string>
     <string name="radar_downlink">Downlink</string>
     <string name="radar_uplink">Uplink</string>
     <string name="radar_add">Додати</string>
-    <string name="radar_notify">Сповістити</string>
-    <string name="radar_back">Назад</string>
+    <string name="radar_data">Супутникові трансивери:</string>
+    <string name="radar_inverted">Інверсія: %s</string>
+    <string name="radar_mode">Модуляція: %s</string>
+    <string name="radar_no_data">Цей супутник не має трансиверів</string>
+    <string name="radar_string_no">Ні</string>
+    <string name="radar_string_yes">Так</string>
+    <string name="radar_visible">Видимий</string>
 
     <!-- Map screen -->
-    <string name="map_title">Карта світу</string>
-    <string name="map_sat_name">%s</string>
-    <string name="map_sat_id">Id:%d</string>
-    <string name="map_azimuth">Азимут: %.1f°</string>
-    <string name="map_elevation">Піднесення: %.1f°</string>
-    <string name="map_latitude">Широта: %.1f°</string>
-    <string name="map_longitude">Довгота: %.1f°</string>
-    <string name="map_visible">Видимий</string>
-    <string name="map_eclipsed">Затемнений</string>
-    <string name="map_visibility">Видимість: %s</string>
-    <string name="map_period">Період: %.0f хв</string>
-    <string name="map_phase">Фаза: %.1f°</string>
-    <string name="map_altitude">Висота: %.0f км</string>
-    <string name="map_distance">Дистанція: %.0f км</string>
-    <string name="map_velocity">Швидкість: %.2f км/с</string>
-    <string name="map_copyright">Wikimedia maps | Map data © OpenStreetMap contributors</string>
     <string name="map_prev">Попередній</string>
     <string name="map_next">Наступний</string>
+    <string name="map_azimuth">Азимут: %.1f°</string>
+    <string name="map_elevation">Піднесення: %.1f°</string>
+    <string name="map_altitude">Висота: %.0f км</string>
+    <string name="map_distance">Дистанція: %.0f км</string>
+    <string name="map_latitude">Широта: %.1f°</string>
+    <string name="map_longitude">Довгота: %.1f°</string>
+    <string name="map_phase">Фаза: %.1f°</string>
+    <string name="map_eclipsed">Затемнений</string>
+    <string name="map_period">Період: %.0f хв</string>
+    <string name="map_velocity">Швидкість: %.2f км/с</string>
+    <string name="map_visibility">Видимість: %s</string>
+    <string name="map_visible">Видимий</string>
 
     <!-- Settings screen -->
-    <string name="settings_location_title">Місцезнаходження</string>
-    <string name="settings_location_lat">Широта: %.4f°</string>
-    <string name="settings_location_lon">Довгота: %.4f°</string>
-    <string name="settings_location_null">Немає даних геолокації</string>
-    <string name="settings_location_gps_error">Перевірте дозволи на визначення місця</string>
-    <string name="settings_location_manual_error">Введені некоректні дані</string>
-    <string name="settings_location_qth_error">Некоректний локатор QTH</string>
-    <string name="settings_location_success">Позицію успішно оновлено</string>
+    <string name="prefs_donate">Підтримати</string>
+    <string name="prefs_license">Ліцензія GPLv3</string>
+    <string name="prefs_privacy">Конфіденційність</string>
+    <string name="prefs_fdroid">F-Droid</string>
+    <string name="prefs_github">GitHub</string>
 
-    <string name="settings_data_title">Оновлення даних</string>
-    <string name="settings_data_error">Помилка при оновлені даних</string>
-    <string name="settings_data_update">Останнє оновлення: %s</string>
-    <string name="settings_data_entries">Супутників: %s</string>
-    <string name="settings_data_radios">Трансиверів: %s</string>
-    <string name="settings_data_success">Оновлення успішне</string>
-    <string name="settings_data_clear_success">Дані успішно очищено</string>
+    <string name="prefs_updated_title">Останнє оновлення: %s</string>
+    <string name="prefs_updated_time">d MMM yyyy - HH:mm:ss</string>
 
-    <string name="settings_remote_title">Налаштування ротатора</string>
-    <string name="settings_remote_switch">Віддалене керування</string>
-    <string name="settings_remote_ip_hint">IP адреса</string>
-    <string name="settings_remote_port_hint">Порт</string>
+    <string name="prefs_loc_title">Місцезнаходження</string>
+    <string name="prefs_loc_gps_title">GPS</string>
+    <string name="prefs_loc_gps_error">Перевірте дозволи на визначення місця</string>
+    <string name="prefs_loc_manual_title">Вручну</string>
+    <string name="prefs_loc_manual_error">Введені некоректні дані</string>
+    <string name="prefs_loc_qth_title">QTH</string>
+    <string name="prefs_loc_qth_error">Некоректний локатор QTH</string>
+    <string name="prefs_loc_success">Позицію успішно оновлено</string>
+    <string name="prefs_station_title">Налаштування місцезнаходження станції</string>
+    <string name="prefs_station_lat_text">Задайте широту станції</string>
+    <string name="prefs_station_lon_text">Задайте довготу станції</string>
+    <string name="prefs_locator_title">Налаштування QTH локатора</string>
+    <string name="prefs_locator_text">Задати позицію за QTH локатором</string>
 
-    <string name="settings_BTremote_title">Передача даних через Bluetooth</string>
-    <string name="settings_BTremote_switch">Увімкнути передачу</string>
-    <string name="settings_BTremote_device_hint">Id пристрою</string>
-    <string name="settings_BTremote_output_hint">Формат даних</string>
-    <string name="settings_BTremote_perm_error">Перевірте дозвіл Bluetooth</string>
+    <string name="prefs_data_title">Оновлення даних</string>
+    <string name="prefs_data_entries">Супутників: %s</string>
+    <string name="prefs_data_radios">Трансиверів: %s</string>
+    <string name="prefs_data_online">Онлайн</string>
+    <string name="prefs_data_import">Імпорт</string>
+    <string name="prefs_data_clear">Очистити</string>
+    <string name="prefs_data_clear_success">Дані успішно очищено</string>
+    <string name="prefs_data_update_success">Оновлення успішне</string>
 
-    <string name="settings_other_switch_utc">Показувати час в UTC</string>
-    <string name="settings_other_switch_update">Автоматичне оновлення даних</string>
-    <string name="settings_other_switch_sweep">Показувати анімацію радара</string>
-    <string name="settings_other_switch_sensors">Використовувати сенсори пристрою</string>
+    <string name="prefs_remote_title">Налаштування ротатора</string>
+    <string name="prefs_remote_switch">Віддалене керування</string>
+    <string name="prefs_remote_ip_hint">IP адреса</string>
+    <string name="prefs_remote_port_hint">Порт</string>
 
-    <string name="settings_data_clear">Очистити</string>
-    <string name="settings_station_gps">GPS</string>
-    <string name="settings_station_manual">Вручну</string>
-    <string name="settings_station_qth">QTH</string>
-    <string name="settings_data_online">Онлайн</string>
-    <string name="settings_data_import">Імпорт</string>
-    <string name="settings_github">GitHub</string>
-    <string name="settings_donate">Підтримати</string>
-    <string name="settings_fdroid">F-Droid</string>
-    <string name="settings_license">Ліцензія GPLv3</string>
-    <string name="settings_privacy">Конфіденційність</string>
+    <string name="prefs_BTremote_title">Передача даних через Bluetooth</string>
+    <string name="prefs_BTremote_switch">Увімкнути передачу</string>
+    <string name="prefs_BTremote_device_hint">Id пристрою</string>
+    <string name="prefs_BTremote_output_hint">Формат даних</string>
+    <string name="prefs_BTremote_perm_error">Перевірте дозвіл Bluetooth</string>
 
-    <string name="settings_last_updated_pattern">d MMM yyyy - HH:mm:ss</string>
+    <string name="prefs_other_switch_utc">Показувати час в UTC</string>
+    <string name="prefs_other_switch_update">Автоматичне оновлення даних</string>
+    <string name="prefs_other_switch_sweep">Показувати анімацію радара</string>
+    <string name="prefs_other_switch_sensors">Використовувати сенсори пристрою</string>
 
-    <string name="settings_locator_title">Налаштування QTH локатора</string>
-    <string name="settings_locator_text">Задати позицію за QTH локатором</string>
-    <string name="settings_position_title">Налаштування місцезнаходження станції</string>
-    <string name="settings_position_lat_text">Задайте широту станції</string>
-    <string name="settings_position_lon_text">Задайте довготу станції</string>
-
-    <string name="settings_outro_title">Я хотів би подякувати:</string>
-    <string name="settings_outro_thanks">Вам за завантаження та використання Look4Sat!
+    <string name="prefs_outro_title">Я хотів би подякувати:</string>
+    <string name="prefs_outro_thanks">Вам за завантаження та використання Look4Sat!
         \nБажаю завжди чистого неба над головою!
         \n<a href="https://github.com/g4dpz">David A. B. Johnson</a>
         та <a href="https://github.com/davidmoten">Dave Moten</a> за створення бібліотеки predict4java.
@@ -155,6 +141,6 @@
         \nКоманді <a href="https://appoftheday.downloadastro.com/app/look4sat-satellite-tracker/">DownloadAstro</a>
         за інтерес до застосунку та публікацію інтерв\'ю на сайті.
     </string>
-    <string name="settings_outro_license">Це ПЗ поставляється без жодних гарантій.</string>
+    <string name="prefs_outro_license">Це ПЗ поставляється без жодних гарантій.</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 772f407b..96880c5f 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -6,135 +6,122 @@
     <string name="empty_list_message">没有可显示的内容</string>
 
     <!-- Navigation -->
-    <string name="nav_satellites">卫星</string>
-    <string name="nav_passes">过境</string>
+    <string name="nav_sat">卫星</string>
+    <string name="nav_pass">过境</string>
     <string name="nav_radar">Radar</string>
     <string name="nav_map">地图</string>
-    <string name="nav_settings">设置</string>
+    <string name="nav_prefs">设置</string>
 
     <!-- Satellites screen -->
-    <string name="satellites_select_all">全选</string>
-    <string name="satellites_clear_all">全部清空</string>
-    <string name="satellites_select_type">选择卫星类型</string>
-    <string name="satellites_type">选择类型：%s</string>
-    <string name="satellites_search_hint">Name / Id</string>
-    <string name="satellites_empty_list_message">请确保您的搜素无误并且卫星数据已更新</string>
-    <string name="satellites_warning_title">警告!</string>
-    <string name="satellites_warning_message">此应用收录了超过9000颗卫星信息\n同时追踪所有卫星并不现实\n建议始终通过搜索和分类筛选功能仅勾选您感兴趣的卫星</string>
+    <string name="sat_type_hint">选择类型：%s</string>
+    <string name="sat_type_title">选择卫星类型</string>
+    <string name="sat_search_hint">Id - Name</string>
+    <string name="sat_search_clear">清空</string>
+    <string name="sat_clear_all">全部清空</string>
+    <string name="sat_select_all">全选</string>
+    <string name="sat_empty_list_message">请确保您的搜素无误并且卫星数据已更新</string>
+    <string name="sat_warning_title">警告!</string>
+    <string name="sat_warning_message">此应用收录了超过9000颗卫星信息\n同时追踪所有卫星并不现实\n建议始终通过搜索和分类筛选功能仅勾选您感兴趣的卫星</string>
 
     <!-- Passes screen -->
-    <string name="passes_filter_passes">筛选过境</string>
-    <string name="passes_filter_within">小时数</string>
-    <string name="passes_filter_above">仰角值</string>
-    <string name="passes_filter_modes">选择调制类型</string>
-    <string name="passes_error">没有即将过境的卫星</string>
-    <string name="passes_empty_db">没有数据可显示，请通过设置菜单更新卫星数据。</string>
-    <string name="passes_deep_space">DeepSpace</string>
-    <string name="passes_elevation">仰角：%.1f°</string>
-    <string name="passes_altitude">高度：%d km</string>
-    <string name="passes_placeholder"> -- : -- : -- </string>
-    <string name="passes_empty_list_message">请确保您的筛选设置正确并且已勾选卫星</string>
-    <string name="passes_welcome_title">欢迎使用Look4Sat!</string>
-    <string name="passes_welcome_message">请务必在设置中通过GPS、经纬度或QTH定位您的位置\n建议至少每周更新一次数据库，以确保预测结果的准确性</string>
+    <string name="pass_filter_title">筛选过境</string>
+    <string name="pass_filter_elev">仰角值</string>
+    <string name="pass_filter_hours">小时数</string>
+    <string name="pass_modes_title">选择调制类型</string>
+    <string name="pass_elevation">仰角：%.1f°</string>
+    <string name="pass_altitude">高度：%d km</string>
+    <string name="pass_empty_db_message">没有数据可显示，请通过设置菜单更新卫星数据。</string>
+    <string name="pass_empty_list_message">请确保您的筛选设置正确并且已勾选卫星</string>
+    <string name="pass_error_message">没有即将过境的卫星</string>
+    <string name="pass_welcome_title">欢迎使用Look4Sat!</string>
+    <string name="pass_welcome_message">请务必在设置中通过GPS、经纬度或QTH定位您的位置\n建议至少每周更新一次数据库，以确保预测结果的准确性</string>
 
     <!-- Radar screen -->
+    <string name="radar_back">后退</string>
+    <string name="radar_notify">通知</string>
     <string name="radar_az_text">方位角</string>
     <string name="radar_el_text">仰角</string>
     <string name="radar_alt_text">高度</string>
     <string name="radar_dist_text">距离</string>
-    <string name="radar_visible">日照中</string>
     <string name="radar_eclipsed">地影中</string>
-    <string name="radar_mode">调制：%s</string>
-    <string name="radar_inverted">倒置：%s</string>
-    <string name="radar_info">%s</string>
-    <string name="radar_no_link">- - . - -</string>
-    <string name="radar_link_low">%.4f</string>
-    <string name="radar_link_lowHigh">%.4f - %.4f</string>
-    <string name="radar_data">卫星收发器：</string>
-    <string name="radar_no_data">这颗卫星没有收发器</string>
-    <string name="radar_string_yes">是</string>
-    <string name="radar_string_no">否</string>
     <string name="radar_downlink">下行链路</string>
     <string name="radar_uplink">上行链路</string>
     <string name="radar_add">添加</string>
-    <string name="radar_back">后退</string>
-    <string name="radar_notify">通知</string>
+    <string name="radar_data">卫星收发器：</string>
+    <string name="radar_inverted">倒置：%s</string>
+    <string name="radar_mode">调制：%s</string>
+    <string name="radar_no_data">这颗卫星没有收发器</string>
+    <string name="radar_string_no">否</string>
+    <string name="radar_string_yes">是</string>
+    <string name="radar_visible">日照中</string>
 
     <!-- Map screen -->
-    <string name="map_title">世界地图</string>
-    <string name="map_sat_name">%s</string>
-    <string name="map_sat_id">Id:%d</string>
-    <string name="map_azimuth">方位角：%.1f°</string>
-    <string name="map_elevation">仰角：%.1f°</string>
-    <string name="map_latitude">纬度：%.1f°</string>
-    <string name="map_longitude">经度：%.1f°</string>
-    <string name="map_visible">日照中</string>
-    <string name="map_eclipsed">地影中</string>
-    <string name="map_visibility">能见度：%s</string>
-    <string name="map_period">周期：% .0f min</string>
-    <string name="map_phase">相位：%.1f°</string>
-    <string name="map_altitude">高度：%.0f km</string>
-    <string name="map_distance">距离：%.0f km</string>
-    <string name="map_velocity">速度：%.2f km/s</string>
-    <string name="map_copyright">维基媒体地图 | 地图数据 贡献者 © OpenStreetMap</string>
     <string name="map_prev">上一个</string>
     <string name="map_next">下一个</string>
+    <string name="map_azimuth">方位角：%.1f°</string>
+    <string name="map_elevation">仰角：%.1f°</string>
+    <string name="map_altitude">高度：%.0f km</string>
+    <string name="map_distance">距离：%.0f km</string>
+    <string name="map_latitude">纬度：%.1f°</string>
+    <string name="map_longitude">经度：%.1f°</string>
+    <string name="map_phase">相位：%.1f°</string>
+    <string name="map_eclipsed">地影中</string>
+    <string name="map_period">周期：% .0f min</string>
+    <string name="map_velocity">速度：%.2f km/s</string>
+    <string name="map_visibility">能见度：%s</string>
+    <string name="map_visible">日照中</string>
 
     <!-- Settings screen -->
-    <string name="settings_location_title">站位</string>
-    <string name="settings_location_lat">纬度：%.4f°</string>
-    <string name="settings_location_lon">经度：%.4f°</string>
-    <string name="settings_location_null">没有地理位置数据</string>
-    <string name="settings_location_gps_error">检查您的位置权限</string>
-    <string name="settings_location_manual_error">输入的位置无效</string>
-    <string name="settings_location_qth_error">无效的 QTH 网格</string>
-    <string name="settings_location_success">位置更新成功</string>
+    <string name="prefs_donate">支持</string>
+    <string name="prefs_license">GNU GPLv3</string>
+    <string name="prefs_privacy">隐私政策</string>
+    <string name="prefs_fdroid">F-Droid</string>
+    <string name="prefs_github">GitHub</string>
 
-    <string name="settings_data_title">卫星数据更新</string>
-    <string name="settings_data_error">更新完成但出现错误</string>
-    <string name="settings_data_update">最后更新时间：%s</string>
-    <string name="settings_data_entries">卫星：%s</string>
-    <string name="settings_data_radios">收发器：%s</string>
-    <string name="settings_data_success">更新成功</string>
-    <string name="settings_data_clear_success">数据清空成功</string>
+    <string name="prefs_updated_title">最后更新时间：%s</string>
+    <string name="prefs_updated_time">yyyy MMM d - HH:mm:ss</string>
 
-    <string name="settings_last_updated_pattern">yyyy MMM d - HH:mm:ss</string>
-    <string name="settings_remote_title">旋转器首选项</string>
-    <string name="settings_remote_switch">启用远程控制</string>
-    <string name="settings_remote_ip_hint">IP地址</string>
-    <string name="settings_remote_port_hint">端口</string>
+    <string name="prefs_loc_title">站位</string>
+    <string name="prefs_loc_gps_title">GPS 定位</string>
+    <string name="prefs_loc_gps_error">检查您的位置权限</string>
+    <string name="prefs_loc_manual_title">手动输入</string>
+    <string name="prefs_loc_manual_error">输入的位置无效</string>
+    <string name="prefs_loc_qth_title">QTH 网格</string>
+    <string name="prefs_loc_qth_error">无效的 QTH 网格</string>
+    <string name="prefs_loc_success">位置更新成功</string>
+    <string name="prefs_station_title">站位设置</string>
+    <string name="prefs_station_lat_text">输入站位的纬度</string>
+    <string name="prefs_station_lon_text">输入站位的经度</string>
+    <string name="prefs_locator_title">QTH 网格</string>
+    <string name="prefs_locator_text">使用梅登黑德网格设置站位</string>
 
-    <string name="settings_BTremote_title">蓝牙数据输出</string>
-    <string name="settings_BTremote_switch">启用输出</string>
-    <string name="settings_BTremote_device_hint">蓝牙设备 ID</string>
-    <string name="settings_BTremote_output_hint">数据格式</string>
-    <string name="settings_BTremote_perm_error">请检查蓝牙权限</string>
+    <string name="prefs_data_title">卫星数据更新</string>
+    <string name="prefs_data_entries">卫星：%s</string>
+    <string name="prefs_data_radios">收发器：%s</string>
+    <string name="prefs_data_online">在线更新</string>
+    <string name="prefs_data_import">导入文件</string>
+    <string name="prefs_data_clear">清空</string>
+    <string name="prefs_data_clear_success">数据清空成功</string>
+    <string name="prefs_data_update_success">更新成功</string>
 
-    <string name="settings_other_switch_utc">以 UTC 时间显示</string>
-    <string name="settings_other_switch_update">启用卫星数据自动更新</string>
-    <string name="settings_other_switch_sweep">启用雷达扫描动画</string>
-    <string name="settings_other_switch_sensors">使用传感器旋转雷达视图</string>
+    <string name="prefs_remote_title">旋转器首选项</string>
+    <string name="prefs_remote_switch">启用远程控制</string>
+    <string name="prefs_remote_ip_hint">IP地址</string>
+    <string name="prefs_remote_port_hint">端口</string>
 
-    <string name="settings_data_clear">清空</string>
-    <string name="settings_station_gps">GPS 定位</string>
-    <string name="settings_station_manual">手动输入</string>
-    <string name="settings_station_qth">QTH 网格</string>
-    <string name="settings_data_online">在线更新</string>
-    <string name="settings_data_import">导入文件</string>
-    <string name="settings_github">GitHub</string>
-    <string name="settings_donate">支持</string>
-    <string name="settings_fdroid">F-Droid</string>
-    <string name="settings_license">GNU GPLv3</string>
-    <string name="settings_privacy">隐私政策</string>
+    <string name="prefs_BTremote_title">蓝牙数据输出</string>
+    <string name="prefs_BTremote_switch">启用输出</string>
+    <string name="prefs_BTremote_device_hint">蓝牙设备 ID</string>
+    <string name="prefs_BTremote_output_hint">数据格式</string>
+    <string name="prefs_BTremote_perm_error">请检查蓝牙权限</string>
 
-    <string name="settings_locator_title">QTH 网格</string>
-    <string name="settings_locator_text">使用梅登黑德网格设置站位</string>
-    <string name="settings_position_title">站位设置</string>
-    <string name="settings_position_lat_text">输入站位的纬度</string>
-    <string name="settings_position_lon_text">输入站位的经度</string>
+    <string name="prefs_other_switch_utc">以 UTC 时间显示</string>
+    <string name="prefs_other_switch_update">启用卫星数据自动更新</string>
+    <string name="prefs_other_switch_sweep">启用雷达扫描动画</string>
+    <string name="prefs_other_switch_sensors">使用传感器旋转雷达视图</string>
 
-    <string name="settings_outro_title">我要感谢：</string>
-    <string name="settings_outro_thanks">感谢下载和使用 Look4Sat！愿你的天空永远晴朗！
+    <string name="prefs_outro_title">我要感谢：</string>
+    <string name="prefs_outro_thanks">感谢下载和使用 Look4Sat！愿你的天空永远晴朗！
         \n简体中文版翻译由 <a href="https://github.com/BA7LWN">BA7LWN</a> 于 2022.5.10 创建。
         \n<a href="https://github.com/g4dpz">David A. B. Johnson</a>
         and <a href="https://github.com/davidmoten">Dave Moten</a> for creating predict4java lib
@@ -148,6 +135,6 @@
         \n<a href="https://appoftheday.downloadastro.com/app/look4sat-satellite-tracker/">DownloadAstro</a>
         team for their interest to the app and the interview published.
     </string>
-    <string name="settings_outro_license">该应用程序不提供任何保修.</string>
+    <string name="prefs_outro_license">该应用程序不提供任何保修.</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dc1d26d5..0cc29358 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,48 +7,51 @@
     <string name="empty_list_message">No items to display</string>
 
     <!-- Navigation -->
-    <string name="nav_satellites">Satellites</string>
-    <string name="nav_passes">Passes</string>
+    <string name="nav_sat">Satellites</string>
+    <string name="nav_pass">Passes</string>
     <string name="nav_radar">Radar</string>
     <string name="nav_map">Map</string>
-    <string name="nav_settings">Settings</string>
+    <string name="nav_prefs">Settings</string>
 
     <!-- Satellites screen -->
-    <string name="satellites_type">Selected type: %s</string>
-    <string name="satellites_search_hint">Id - Name</string>
-    <string name="satellites_clear_all">Clear all</string>
-    <string name="satellites_select_all">Select all</string>
-    <string name="satellites_select_type">Select satellite type</string>
-    <string name="satellites_empty_list_message">
+    <string name="sat_type_hint">Selected type: %s</string>
+    <string name="sat_type_title">Select satellite type</string>
+    <string name="sat_search_hint">Id - Name</string>
+    <string name="sat_search_clear">Clear</string>
+    <string name="sat_clear_all">Clear all</string>
+    <string name="sat_select_all">Select all</string>
+    <string name="sat_empty_list_message">
         Make sure your search query is correct and the DB is updated</string>
-    <string name="satellites_warning_title">Warning\!</string>
-    <string name="satellites_warning_message">
+    <string name="sat_warning_title">Warning\!</string>
+    <string name="sat_warning_message">
         There are over 9000 satellites listed in this app.
         It makes no sense to track them all at the same time.
         \n\nAlways try to narrow down the list to only the ones
         you\'re interested in via search and types selector.</string>
 
     <!-- Passes screen -->
-    <string name="passes_filter_passes">Filter passes</string>
-    <string name="passes_filter_above">Minimal elevation</string>
-    <string name="passes_filter_within">Hours ahead</string>
-    <string name="passes_filter_modes">Select modulation type</string>
-    <string name="passes_error">There are no upcoming satellite passes to display</string>
-    <string name="passes_empty_db">No data to show. Please update the database via Settings menu.</string>
-    <string name="passes_deep_space">DeepSpace</string>
-    <string name="passes_satId" translatable="false">%05d</string>
-    <string name="passes_aosLos" translatable="false">%03d° - %03d°</string>
-    <string name="passes_elevation">Elevation: %.1f°</string>
-    <string name="passes_altitude">Altitude: %d km</string>
-    <string name="passes_placeholder"> -- : -- : -- </string>
-    <string name="passes_empty_list_message">
+    <string name="pass_filter_title">Filter passes</string>
+    <string name="pass_filter_elev">Minimal elevation</string>
+    <string name="pass_filter_hours">Hours ahead</string>
+    <string name="pass_time_placeholder" translatable="false"> -- : -- : -- </string>
+    <string name="pass_modes_title">Select modulation type</string>
+    <string name="pass_satId" translatable="false">%05d</string>
+    <string name="pass_elevation">Elevation: %.1f°</string>
+    <string name="pass_deep_space" translatable="false">DeepSpace</string>
+    <string name="pass_altitude">Altitude: %d km</string>
+    <string name="pass_aosLos" translatable="false">%03d° - %03d°</string>
+    <string name="pass_empty_db_message">No data to show. Please update the database via Settings menu.</string>
+    <string name="pass_empty_list_message">
         Make sure your filters are correct and you have selected satellites</string>
-    <string name="passes_welcome_title">Welcome to Look4Sat\!</string>
-    <string name="passes_welcome_message">
+    <string name="pass_error_message">There are no upcoming satellite passes to display</string>
+    <string name="pass_welcome_title">Welcome to Look4Sat\!</string>
+    <string name="pass_welcome_message">
         Make sure to set your position via GPS, Lat/Lon or QTH in Settings.
         \n\nPlease update the database at least weekly to get accurate predictions.</string>
 
     <!-- Radar screen -->
+    <string name="radar_back">Back</string>
+    <string name="radar_notify">Notify</string>
     <string name="radar_az_text">Azimuth</string>
     <string name="radar_az_value" translatable="false">%.1f°</string>
     <string name="radar_el_text">Elevation</string>
@@ -57,102 +60,90 @@
     <string name="radar_alt_value" translatable="false">%.0f km</string>
     <string name="radar_dist_text">Distance</string>
     <string name="radar_dist_value" translatable="false">%.0f km</string>
-    <string name="radar_visible">Visible</string>
     <string name="radar_eclipsed">Eclipsed</string>
-    <string name="radar_notify">Notify</string>
-    <string name="radar_mode">Mode: %s</string>
-    <string name="radar_inverted">Inverted: %s</string>
-    <string name="radar_info">%s</string>
-    <string name="radar_no_link">- - . - -</string>
-    <string name="radar_link_low">%.4f</string>
-    <string name="radar_link_lowHigh">%.4f - %.4f</string>
-    <string name="radar_data">Satellite transceivers:</string>
-    <string name="radar_no_data">This satellite has no transceivers</string>
-    <string name="radar_string_yes">Yes</string>
-    <string name="radar_string_no">No</string>
     <string name="radar_downlink">Downlink</string>
     <string name="radar_uplink">Uplink</string>
-    <string name="radar_back">Back</string>
+    <string name="radar_link_low" translatable="false">%.4f</string>
+    <string name="radar_link_lowHigh" translatable="false">%.4f - %.4f</string>
+    <string name="radar_no_link" translatable="false">- - . - -</string>
     <string name="radar_add">Add</string>
+    <string name="radar_data">Satellite transceivers:</string>
+    <string name="radar_inverted">Inverted: %s</string>
+    <string name="radar_mode">Mode: %s</string>
+    <string name="radar_no_data">This satellite has no transceivers</string>
+    <string name="radar_string_no">No</string>
+    <string name="radar_string_yes">Yes</string>
+    <string name="radar_visible">Visible</string>
 
     <!-- Map screen -->
-    <string name="map_title">World Map</string>
-    <string name="map_sat_name">%s</string>
-    <string name="map_sat_id">Id:%d</string>
+    <string name="map_prev">Prev</string>
+    <string name="map_next">Next</string>
+    <string name="map_copyright" translatable="false">© OpenStreetMap contributors</string>
     <string name="map_azimuth">Azimuth: %.1f°</string>
     <string name="map_elevation">Elevation: %.1f°</string>
+    <string name="map_altitude">Altitude: %.0f km</string>
+    <string name="map_distance">Distance: %.0f km</string>
     <string name="map_latitude">Latitude: %.1f°</string>
     <string name="map_longitude">Longitude: %.1f°</string>
     <string name="map_qth" translatable="false">QTH: %s</string>
-    <string name="map_visible">Visible</string>
-    <string name="map_eclipsed">Eclipsed</string>
-    <string name="map_visibility">Visibility: %s</string>
-    <string name="map_period">Period: %.0f min</string>
     <string name="map_phase">Phase: %.1f°</string>
-    <string name="map_altitude">Altitude: %.0f km</string>
-    <string name="map_distance">Distance: %.0f km</string>
+    <string name="map_eclipsed">Eclipsed</string>
+    <string name="map_period">Period: %.0f min</string>
     <string name="map_velocity">Velocity: %.2f km/s</string>
-    <string name="map_copyright">Wikimedia maps | Map data © OpenStreetMap contributors</string>
-    <string name="map_prev">Prev</string>
-    <string name="map_next">Next</string>
+    <string name="map_visibility">Visibility: %s</string>
+    <string name="map_visible">Visible</string>
 
     <!-- Settings screen -->
-    <string name="settings_location_title">Station position</string>
-    <string name="settings_location_lat">Latitude: %.4f°</string>
-    <string name="settings_location_lon">Longitude: %.4f°</string>
-    <string name="settings_location_null">No geolocation data</string>
-    <string name="settings_location_gps_error">Check your location permissions</string>
-    <string name="settings_location_manual_error">Invalid location entered</string>
-    <string name="settings_location_qth_error">Invalid QTH locator</string>
-    <string name="settings_location_success">Position updated successfully</string>
+    <string name="prefs_donate">Donate</string>
+    <string name="prefs_license">GPLv3 Licence</string>
+    <string name="prefs_privacy">Privacy Policy</string>
+    <string name="prefs_fdroid">F-Droid</string>
+    <string name="prefs_github">GitHub</string>
 
-    <string name="settings_data_clear">Clear</string>
-    <string name="settings_station_gps">GPS</string>
-    <string name="settings_station_manual">Manual</string>
-    <string name="settings_station_qth">QTH</string>
-    <string name="settings_data_online">Online</string>
-    <string name="settings_data_import">Import</string>
-    <string name="settings_github">GitHub</string>
-    <string name="settings_donate">Donate</string>
-    <string name="settings_fdroid">F-Droid</string>
-    <string name="settings_license">GPLv3 Licence</string>
-    <string name="settings_privacy">Privacy Policy</string>
+    <string name="prefs_updated_title">Last updated: %s</string>
+    <string name="prefs_updated_time">d MMM yyyy - HH:mm:ss</string>
 
-    <string name="settings_position_title">Station position settings</string>
-    <string name="settings_position_lat_text">Set your ground station\'s latitude</string>
-    <string name="settings_position_lon_text">Set your ground station\'s longitude</string>
+    <string name="prefs_loc_title">Station position</string>
+    <string name="prefs_loc_gps_title">GPS</string>
+    <string name="prefs_loc_gps_error">Check your location permissions</string>
+    <string name="prefs_loc_manual_title">Manual</string>
+    <string name="prefs_loc_manual_error">Invalid location entered</string>
+    <string name="prefs_loc_qth_title">QTH</string>
+    <string name="prefs_loc_qth_error">Invalid QTH locator</string>
+    <string name="prefs_loc_success">Position updated successfully</string>
+    <string name="prefs_station_title">Station position settings</string>
+    <string name="prefs_station_lat_text">Set your ground station\'s latitude</string>
+    <string name="prefs_station_lon_text">Set your ground station\'s longitude</string>
+    <string name="prefs_locator_title">QTH locator settings</string>
+    <string name="prefs_locator_text">Set station\'s position using locator</string>
 
-    <string name="settings_locator_title">QTH locator settings</string>
-    <string name="settings_locator_text">Set station\'s position using locator</string>
+    <string name="prefs_data_title">Satellite data</string>
+    <string name="prefs_data_entries">Satellites: %s</string>
+    <string name="prefs_data_radios">Transceivers: %s</string>
+    <string name="prefs_data_online">Online</string>
+    <string name="prefs_data_import">Import</string>
+    <string name="prefs_data_clear">Clear</string>
+    <string name="prefs_data_clear_success">Data was cleared successfully</string>
+    <string name="prefs_data_update_success">Update completed successfully</string>
 
-    <string name="settings_data_title">Satellite data update</string>
-    <string name="settings_data_error">Update completed with errors</string>
-    <string name="settings_data_update">Last updated: %s</string>
-    <string name="settings_data_entries">Satellites: %s</string>
-    <string name="settings_data_radios">Transceivers: %s</string>
-    <string name="settings_data_success">Update completed successfully</string>
-    <string name="settings_data_clear_success">Data was cleared successfully</string>
+    <string name="prefs_remote_title">Rotator preferences</string>
+    <string name="prefs_remote_switch">Enable remote control</string>
+    <string name="prefs_remote_ip_hint">IP address</string>
+    <string name="prefs_remote_port_hint">Port</string>
 
-    <string name="settings_last_updated_pattern">d MMM yyyy - HH:mm:ss</string>
+    <string name="prefs_BTremote_title">Bluetooth data output</string>
+    <string name="prefs_BTremote_switch">Enable output</string>
+    <string name="prefs_BTremote_device_hint">Device id</string>
+    <string name="prefs_BTremote_output_hint">Data format</string>
+    <string name="prefs_BTremote_perm_error">Check your bluetooth permission</string>
 
-    <string name="settings_remote_title">Rotator preferences</string>
-    <string name="settings_remote_switch">Enable remote control</string>
-    <string name="settings_remote_ip_hint">IP address</string>
-    <string name="settings_remote_port_hint">Port</string>
+    <string name="prefs_other_switch_utc">Show pass time in UTC</string>
+    <string name="prefs_other_switch_update">Enable automatic data update</string>
+    <string name="prefs_other_switch_sweep">Enable radar sweep animation</string>
+    <string name="prefs_other_switch_sensors">Use sensors to rotate radar view</string>
 
-    <string name="settings_BTremote_title">Bluetooth data output</string>
-    <string name="settings_BTremote_switch">Enable output</string>
-    <string name="settings_BTremote_device_hint">Device id</string>
-    <string name="settings_BTremote_output_hint">Data format</string>
-    <string name="settings_BTremote_perm_error">Check your bluetooth permission</string>
-
-    <string name="settings_other_switch_utc">Show pass time in UTC</string>
-    <string name="settings_other_switch_update">Enable automatic data update</string>
-    <string name="settings_other_switch_sweep">Enable radar sweep animation</string>
-    <string name="settings_other_switch_sensors">Use sensors to rotate radar view</string>
-
-    <string name="settings_outro_title">I would like to say thanks to:</string>
-    <string name="settings_outro_thanks">You for downloading and using Look4Sat! \nMay your sky always be clear!
+    <string name="prefs_outro_title">I would like to say thanks to:</string>
+    <string name="prefs_outro_thanks">You for downloading and using Look4Sat! \nMay your sky always be clear!
         \n<a href="https://github.com/g4dpz">David A. B. Johnson</a>
         and <a href="https://github.com/davidmoten">Dave Moten</a> for creating a super useful predict4java library.
         \n<a href="https://github.com/csete">Alexandru Csete</a> for creating Gpredict
@@ -162,6 +153,6 @@
         \n<a href="https://libre.space/">Libre Space Foundation</a> for their
         <a href="https://db.satnogs.org/">SatNOGS</a> API and DB providing a huge amount of data.
     </string>
-    <string name="settings_outro_license">The app comes with no warranty.</string>
+    <string name="prefs_outro_license">The app comes with no warranty.</string>
 
 </resources>