diff --git a/app/src/main/java/com/geeksville/mesh/ui/AdvancedSettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/AdvancedSettingsFragment.kt index 5f86ef62f..8ff347746 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/AdvancedSettingsFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/AdvancedSettingsFragment.kt @@ -112,7 +112,7 @@ class AdvancedSettingsFragment : ScreenFragment("Advanced Settings"), Logging { binding.shutdownButton.setOnClickListener { MaterialAlertDialogBuilder(requireContext()) - .setMessage("${getString(R.string.update_firmware)}?") + .setMessage("${getString(R.string.shutdown)}?") .setNeutralButton(R.string.cancel) { _, _ -> } .setPositiveButton(getString(R.string.okay)) { _, _ -> @@ -123,7 +123,7 @@ class AdvancedSettingsFragment : ScreenFragment("Advanced Settings"), Logging { binding.rebootButton.setOnClickListener { MaterialAlertDialogBuilder(requireContext()) - .setMessage("${getString(R.string.update_firmware)}?") + .setMessage("${getString(R.string.reboot)}?") .setNeutralButton(R.string.cancel) { _, _ -> } .setPositiveButton(getString(R.string.okay)) { _, _ -> diff --git a/app/src/main/res/layout/advanced_settings.xml b/app/src/main/res/layout/advanced_settings.xml index 5d22f6a58..e19cedb84 100644 --- a/app/src/main/res/layout/advanced_settings.xml +++ b/app/src/main/res/layout/advanced_settings.xml @@ -73,7 +73,7 @@ android:layout_marginStart="16dp" android:layout_marginTop="16dp" android:layout_marginEnd="4dp" - android:text="shutdown" + android:text="@string/shutdown" app:layout_constraintEnd_toStartOf="@id/rebootButton" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/lsSleepView" /> @@ -84,7 +84,7 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:layout_marginEnd="16dp" - android:text="reboot" + android:text="@string/reboot" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/shutdownButton" app:layout_constraintTop_toTopOf="@id/shutdownButton" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a3ecbf49e..5788505eb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -142,4 +142,6 @@ System default Map style Resend + Shutdown + Reboot