diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt index 0a4da54cf1..b42a51e8be 100644 --- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt @@ -347,8 +347,8 @@ class MainActivity : DaggerAppCompatActivityWithResult() { message += "${rh.gs(info.nightscout.configuration.R.string.configbuilder_nightscoutversion_label)} ${activePlugin.activeNsClient?.detectedNsVersion() ?: rh.gs(info.nightscout.plugins.R.string.not_available_full)}" if (config.isEngineeringMode()) message += "\n${rh.gs(info.nightscout.configuration.R.string.engineering_mode_enabled)}" if (config.isUnfinishedMode()) message += "\nUnfinished mode enabled" - if (!fabricPrivacy.fabricEnabled()) message += "\n${rh.gs(R.string.fabric_upload_disabled)}" - message += rh.gs(info.nightscout.pump.combo.R.string.about_link_urls) + if (!fabricPrivacy.fabricEnabled()) message += "\n${rh.gs(info.nightscout.core.ui.R.string.fabric_upload_disabled)}" + message += rh.gs(info.nightscout.core.ui.R.string.about_link_urls) val messageSpanned = SpannableString(message) Linkify.addLinks(messageSpanned, Linkify.WEB_URLS) MaterialAlertDialogBuilder(this, info.nightscout.core.ui.R.style.DialogTheme) @@ -356,7 +356,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() { .setIcon(iconsProvider.getIcon()) .setMessage(messageSpanned) .setPositiveButton(rh.gs(info.nightscout.core.ui.R.string.ok), null) - .setNeutralButton(rh.gs(R.string.cta_dont_kill_my_app_info)) { _, _ -> + .setNeutralButton(rh.gs(info.nightscout.core.ui.R.string.cta_dont_kill_my_app_info)) { _, _ -> startActivity( Intent( Intent.ACTION_VIEW, diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 854ed3570b..1d6598226b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -78,8 +78,6 @@ Chart menu Authorization failed Unable to create profile. Profile is invalid. - Don\'t kill my app? - Crash logs upload disabled! Clear filter Cannula Email address diff --git a/core/ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml index 4f5f9b7ff3..2b4c48f452 100644 --- a/core/ui/src/main/res/values/strings.xml +++ b/core/ui/src/main/res/values/strings.xml @@ -602,6 +602,11 @@ Missing SMS permission + + Don\'t kill my app? + Crash logs upload disabled! + \n\nDocumentation:\nhttps://wiki.aaps.app\n\nFacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers + %1$d day %1$d days @@ -615,4 +620,4 @@ %1$d minutes - \ No newline at end of file + diff --git a/pump/combo/src/main/res/values/strings.xml b/pump/combo/src/main/res/values/strings.xml index d9d248cebc..97719a6392 100644 --- a/pump/combo/src/main/res/values/strings.xml +++ b/pump/combo/src/main/res/values/strings.xml @@ -46,7 +46,6 @@ Basal rate changed on pump, but reading it failed Checking for history changes Multiple boluses with the same amount within the same minute were just imported. Only one record could be added to treatments. Please check the pump and manually add a bolus record using the Careportal tab. Make sure to create a bolus with a time no other bolus uses. - \n\ndocumentation:\nhttps://wiki.aaps.app\n\nfacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers The last bolus is older than 24 hours or is in the future. Please check the date on the pump is set correctly. Time/date of the delivered bolus on pump seems wrong, IOB is likely incorrect. Please check pump time/date. Bolus count