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 812aa1d753..55198e4599 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 @@ -36,10 +36,8 @@ import info.nightscout.androidaps.data.DetailedBolusInfo; import info.nightscout.androidaps.data.Profile; import info.nightscout.androidaps.data.PumpEnactResult; import info.nightscout.androidaps.db.CareportalEvent; -import info.nightscout.androidaps.db.DatabaseHelper; import info.nightscout.androidaps.db.Source; import info.nightscout.androidaps.db.TemporaryBasal; -import info.nightscout.androidaps.db.Treatment; import info.nightscout.androidaps.events.EventInitializationChanged; import info.nightscout.androidaps.events.EventRefreshOverview; import info.nightscout.androidaps.interfaces.ConstraintsInterface; @@ -159,7 +157,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf ? "E" + ps.activeAlert.errorCode + ": " + ps.activeAlert.message : "W" + ps.activeAlert.warningCode + ": " + ps.activeAlert.message; } else if (ps.menu == null) - return MainApp.gs(R.string.combo_pump_state_disconnected); + return MainApp.gs(R.string.combo_pump_state_initializing); else if (ps.suspended && (ps.batteryState == PumpState.EMPTY || ps.insulinState == PumpState.EMPTY)) return MainApp.gs(R.string.combo_pump_state_suspended_due_to_error); else if (ps.suspended) @@ -373,7 +371,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf } } - CommandResult stateResult = runCommand(MainApp.gs(R.string.combo_pump_action_initializing),1, ruffyScripter::readPumpState); + CommandResult stateResult = runCommand(MainApp.gs(R.string.combo_pump_action_refreshing),1, ruffyScripter::readPumpState); if (!stateResult.success) { return; } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7c033bc908..794675c887 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -736,7 +736,7 @@ Wegen eines Fehlers wurden nur %.2f IE von den angeforderten %.2f IE abgegeben. Bitte prüfe den abgegebenen Bolus auf der Pumpe. Historie Status wird aktualisiert - Die Pumpe wird initialisiert + Die Pumpe wird initialisiert Jetzt Nie Der Alarm \"TBR ABBRUCH\" wurde bestätigt diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 39af5b8c6c..ca434cc35a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -743,7 +743,7 @@ Geen verbinding gedurende %d minuten %d%% (%d min resterend) %.1f E (%s, %s) - Initialiseren + Initialiseren Verbinding verbroken Herstel van verbroken verbindng Waarschuwing diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 83aa616621..14005716f8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -821,7 +821,7 @@ No connection for %d min %d%% (%d min remaining) %.1f U (%s, %s) - Initializing + Initializing Disconnected Suspended due to error Suspended by user