Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

core/ui/src/main/res/values-pt-rBR/strings.xml

@@ -419,7 +419,7 @@
     <string name="autotune_warning">Aviso :</string>
     <string name="autotune_select_profile">Selecione o perfil para ajustar</string>
     <string name="autotune_ic_warning">O perfil selecionado tem %1$d valores de IC. Autotune vai usar %2$.2f g/U</string>
-    <string name="autotune_isf_warning">O perfil selecionado tem %1$d valores de ISF. Autotune vai usar %2$.1f g/U</string>
+    <string name="autotune_isf_warning">O perfil selecionado tem %1$d valores de ISF. Autotune usará %2$.1f %3$s/U</string>
     <string name="autotune_error">Erro nos dados de entrada, tente executar novamente autotune ou reduza o número de dias</string>
     <string name="autotune_warning_during_run">Cálculos do Autotune iniciados, por favor aguarde</string>
     <string name="autotune_warning_after_run">Verifique os resultados cuidadosamente antes de usá-los!</string>

core/ui/src/main/res/values-ru-rRU/strings.xml

@@ -428,7 +428,6 @@
     <string name="autotune_param">Парам</string>
     <string name="autotune_percent">%</string>
     <string name="autotune_missing">Отсутствует</string>
-    <string name="autotune_profile_name">Профиль авто тюн</string>
     <string name="autotune_run">Выполнить Autotune</string>
     <string name="autotune_check_input_profile_button">Проверьте профиль ввода</string>
     <string name="autotune_compare_profile">Сравнить профили</string>

core/ui/src/main/res/values-zh-rCN/strings.xml

@@ -483,7 +483,7 @@
     <!--    Constraints-->
     <string name="limitingbasalratio">最大基础率被限定为 %1$.2f U/h 由于 %2$s</string>
     <string name="pumplimit">泵限制</string>
-    <string name="limitingpercentrate">由于 %2$s, 将最大百分比限制为 %1$d%</string>
+    <string name="limitingpercentrate">由于 %2$s, 将最大百分比限制为 %1$d%%</string>
     <string name="itmustbepositivevalue">它必须是正数</string>
     <string name="limitingbolus">由于 %2$s, 将大剂量限制为 %1$.1f U</string>
     <!-- Locale -->

pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java

@@ -345,7 +345,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
         PumpEnactResult result = new PumpEnactResult(getInjector());
         if (danaPump.isTempBasalInProgress()) {
             sExecutionService.tempBasalStop();
-            result.enacted(true).isTempCancel(true);
+            result.success(true).enacted(true).isTempCancel(true);
         } else {
             result.success(true).isTempCancel(true).comment(info.nightscout.core.ui.R.string.ok);
             aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK");

pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt

@@ -277,7 +277,7 @@ class MsgHistoryEventsV2 constructor(
                 status = "UNKNOWN " + dateUtil.timeString(datetime)
             }
         }
-        if (datetime > danaPump.lastEventTimeLoaded) danaPump.lastEventTimeLoaded = datetime
+        if (datetime > danaRv2Plugin.lastEventTimeLoaded) danaRv2Plugin.lastEventTimeLoaded = datetime
         rxBus.send(EventPumpStatusChanged(rh.gs(info.nightscout.pump.dana.R.string.processinghistory) + ": " + status))
     }
 }

pump/medtronic/src/main/res/values-af-rZA/strings.xml

@@ -35,7 +35,7 @@
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Basale profiel is verkeerd op pomp (moet STD wees).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Verkeerde TBR op pomp (Moet Absoluut wees).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Verkeerde Maks Bolus gestel op Pomp(moet %1$.2f wees).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Verkeerde Maks Basale op Pomp (moet %1$.2f %1$.2f wees),.</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Verkeerde Maks Basale op Pomp (moet %1$.2f wees).</string>
     <string name="medtronic_error_operation_not_possible_no_configuration">Operasie nie moontlik.\n\n Jy moet jou Medtronic pomp opstel voordat jy die operasie kan gebruik.</string>
     <string name="medtronic_error_pump_24h_time_change_requested">Oor 24h Tyd was versoek.</string>
     <!-- MDT History -->