diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java
index ce32f0cd2d..cbdfdfab94 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java
@@ -94,7 +94,7 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
// activity
String activity = plugin.getPump().activity;
- activityView.setText(activity != null ? activity : getString(R.string.combo_action_idle));
+ activityView.setText(activity != null ? activity : getString(R.string.combo_pump_action_idle));
if (plugin.isInitialized()) {
// battery
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
index c0b9a8a48c..c3dd9f29a5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
@@ -479,7 +479,7 @@ public class ComboPlugin implements PluginBase, PumpInterface {
}
final int finalAdjustedPercent = adjustedPercent;
- CommandResult commandResult = runCommand(MainApp.sResources.getString(R.string.combo_action_setting_tbr), () -> ruffyScripter.setTbr(finalAdjustedPercent, durationInMinutes));
+ CommandResult commandResult = runCommand(MainApp.sResources.getString(R.string.combo_pump_action_setting_tbr), () -> ruffyScripter.setTbr(finalAdjustedPercent, durationInMinutes));
if (commandResult.enacted) {
pump.tbrSetTime = System.currentTimeMillis();
@@ -526,7 +526,7 @@ public class ComboPlugin implements PluginBase, PumpInterface {
if (activeTemp == null || userRequested) {
/* v1 compatibility to sync DB to pump if they diverged (activeTemp == null) */
log.debug("cancelTempBasal: hard-cancelling TBR since user requested");
- commandResult = runCommand(MainApp.sResources.getString(R.string.combo_action_cancelling_tbr), ruffyScripter::cancelTbr);
+ commandResult = runCommand(MainApp.sResources.getString(R.string.combo_pump_action_cancelling_tbr), ruffyScripter::cancelTbr);
if (commandResult.enacted) {
tempBasal = new TemporaryBasal(System.currentTimeMillis());
@@ -549,7 +549,7 @@ public class ComboPlugin implements PluginBase, PumpInterface {
// on whether the TBR we're cancelling is above or below 100%.
final int percentage = (activeTemp.percentRate > 100) ? 110 : 90;
log.debug("cancelTempBasal: changing TBR to " + percentage + "% for 15 mins.");
- commandResult = runCommand(MainApp.sResources.getString(R.string.combo_action_setting_tbr), () -> ruffyScripter.setTbr(percentage, 15));
+ commandResult = runCommand(MainApp.sResources.getString(R.string.combo_pump_action_setting_tbr), () -> ruffyScripter.setTbr(percentage, 15));
if (commandResult.enacted) {
tempBasal = new TemporaryBasal(System.currentTimeMillis());
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5d4e1e10c2..dd7410f36b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -690,7 +690,7 @@
Normaler Betrieb
Statistiken
Bolusabgabe wird vorbereitet
- TBR wird abgebrochen
- TBR wird gesetzt
- Bolus wird abgegeben
+ TBR wird abgebrochen
+ TBR wird gesetzt
+ Bolus wird abgegeben
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b1f4f55dae..02476ad886 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -771,10 +771,11 @@
Suspended by user
Normal
Checking pump history
- Cancelling TBR
- Setting TBR
- Bolusing
- Idle
+ Cancelling TBR
+ Setting TBR
+ Bolusing
+ Refreshing
+ Idle
Pump unreachable
Missed BG readings
raise_urgent_alarms_as_android_notification