diff --git a/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/SettingsScreen.kt b/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/SettingsScreen.kt index 1e17af9f..f355c3a4 100644 --- a/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/SettingsScreen.kt +++ b/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/SettingsScreen.kt @@ -744,7 +744,8 @@ private fun DeveloperSettingsTab(vm: ChatViewModel, onDirty: (Boolean) -> Unit, /* Dialogs */ if (configFailure || databaseReset.failed) AlertDialog( onDismissRequest = { configFailure = false; vm.dismissDatabaseResetError() }, title = { Text(stringResource(R.string.settings)) }, - text = { Text(stringResource(R.string.settings_update_failed)) }, confirmButton = { + text = { Text(stringResource(if (databaseReset.failed) R.string.database_reset_failed else R.string.settings_update_failed)) }, + confirmButton = { TextButton(onClick = { configFailure = false; vm.dismissDatabaseResetError() }) { Text(stringResource(R.string.close)) } }) if (clearingDb) AlertDialog(onDismissRequest = {}, title = { Text(stringResource(R.string.settings)) }, diff --git a/tools/chatgui-android/app/src/main/res/values-ru/strings.xml b/tools/chatgui-android/app/src/main/res/values-ru/strings.xml index 7d797950..9aadb56f 100644 --- a/tools/chatgui-android/app/src/main/res/values-ru/strings.xml +++ b/tools/chatgui-android/app/src/main/res/values-ru/strings.xml @@ -599,4 +599,5 @@ Выбранное устройство отключено. Используется микрофон и динамик телефона. Не удалось использовать выбранное аудиоустройство. Проверьте текущие микрофон и выход. Не удалось обновить настройки. Повторите попытку. + Не удалось завершить очистку базы. Повторите попытку. diff --git a/tools/chatgui-android/app/src/main/res/values/strings.xml b/tools/chatgui-android/app/src/main/res/values/strings.xml index a386f92c..e1e53d17 100644 --- a/tools/chatgui-android/app/src/main/res/values/strings.xml +++ b/tools/chatgui-android/app/src/main/res/values/strings.xml @@ -598,4 +598,5 @@ The selected device is disconnected. Phone audio is in use. Could not use the selected audio device. Check the current microphone and output. Could not update the settings. Try again. + Could not finish clearing the database. Try again.