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

2018-09-06 11:18:27 +02:00 · 2018-09-06 11:18:27 +02:00 · f5873f9f87
commit f5873f9f87
parent e4f95c7a4e 65f7f9cbfb
12 changed files with 149 additions and 11 deletions
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
@ -74,7 +74,7 @@ public class NewExtendedBolusDialog extends DialogFragment implements View.OnCli
                    Double insulinAfterConstraint = MainApp.getConstraintChecker().applyExtendedBolusConstraints(new Constraint<>(insulin)).value();
                    confirmMessage += " " + insulinAfterConstraint + " U  ";
                    confirmMessage += MainApp.gs(R.string.duration) + " " + durationInMinutes + "min ?";
-                    if (insulinAfterConstraint - insulin != 0d)
+                    if (Math.abs(insulinAfterConstraint - insulin) > 0.01d)
                        confirmMessage += "\n" + MainApp.gs(R.string.constraintapllied);
                    insulin = insulinAfterConstraint;

--- a/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewTempBasalDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewTempBasalDialog.java
@ -136,7 +136,7 @@ public class NewTempBasalDialog extends DialogFragment implements View.OnClickLi
                        absolute = MainApp.getConstraintChecker().applyBasalConstraints(new Constraint<>(basalAbsoluteInput), profile).value();
                        confirmMessage += "\n" + absolute + " U/h ";
                        confirmMessage += "\n" + MainApp.gs(R.string.duration) + " " + durationInMinutes + "min ?";
-                        if (absolute - basalAbsoluteInput != 0d)
+                        if (Math.abs(absolute - basalAbsoluteInput) > 0.01d)
                            confirmMessage += "\n" + MainApp.gs(R.string.constraintapllied);
                    }

--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
@ -141,7 +141,7 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                    }
                    if (carbsAfterConstraints > 0)
                        confirmMessage += "<br/>" + MainApp.gs(R.string.carbs) + ": " + carbsAfterConstraints + "g";
-                    if (insulinAfterConstraints - insulin != 0 || !Objects.equals(carbsAfterConstraints, carbs))
+                    if (Math.abs(insulinAfterConstraints - insulin) > 0.01d || !Objects.equals(carbsAfterConstraints, carbs))
                        confirmMessage += "<br/>" + MainApp.gs(R.string.constraintapllied);


--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
@ -339,7 +339,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
                    if (carbsAfterConstraints > 0)
                        confirmMessage += "<br/>" + MainApp.gs(R.string.carbs) + ": " + "<font color='" + MainApp.gc(R.color.carbs) + "'>" + carbsAfterConstraints + "g" + "</font>";

-                    if (insulinAfterConstraints - calculatedTotalInsulin != 0 || !carbsAfterConstraints.equals(calculatedCarbs)) {
+                    if (Math.abs(insulinAfterConstraints - calculatedTotalInsulin) > 0.01d || !carbsAfterConstraints.equals(calculatedCarbs)) {
                        okClicked = false;
                        AlertDialog.Builder builder = new AlertDialog.Builder(context);
                        builder.setTitle(MainApp.gs(R.string.treatmentdeliveryerror));
@ -496,13 +496,13 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
        Double corrAfterConstraint = c_correction;
        if (c_correction > 0)
            c_correction = MainApp.getConstraintChecker().applyBolusConstraints(new Constraint<>(c_correction)).value();
-        if (c_correction - corrAfterConstraint != 0) { // c_correction != corrAfterConstraint doesn't work
+        if (Math.abs(c_correction - corrAfterConstraint) > 0.01d) { // c_correction != corrAfterConstraint doesn't work
            editCorr.setValue(0d);
            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.bolusconstraintapplied));
            return;
        }
        Integer carbsAfterConstraint = MainApp.getConstraintChecker().applyCarbsConstraints(new Constraint<>(c_carbs)).value();
-        if (c_carbs - carbsAfterConstraint != 0) {
+        if (Math.abs(c_carbs - carbsAfterConstraint) > 0.01d) {
            editCarbs.setValue(0d);
            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.carbsconstraintapplied));
            return;
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsProfileSwitchFragment.java
@ -20,10 +20,14 @@ import android.widget.TextView;

 import com.squareup.otto.Subscribe;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.List;

 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.services.Intents;
 import info.nightscout.androidaps.data.Profile;
@ -42,6 +46,7 @@ import info.nightscout.utils.SP;
 */

 public class TreatmentsProfileSwitchFragment extends SubscriberFragment implements View.OnClickListener {
+    private Logger log = LoggerFactory.getLogger(L.UI);

    RecyclerView recyclerView;
    LinearLayoutManager llm;
@ -129,6 +134,10 @@ public class TreatmentsProfileSwitchFragment extends SubscriberFragment implemen
            @Override
            public void onClick(View v) {
                final ProfileSwitch profileSwitch = (ProfileSwitch) v.getTag();
+                if (profileSwitch == null) {
+                    log.error("profileSwitch == null");
+                    return;
+                }
                switch (v.getId()) {
                    case R.id.profileswitch_remove:
                        AlertDialog.Builder builder = new AlertDialog.Builder(context);
--- a/app/src/main/java/info/nightscout/androidaps/services/DataService.java
+++ b/app/src/main/java/info/nightscout/androidaps/services/DataService.java
@ -208,6 +208,10 @@ public class DataService extends IntentService {
        double insulin = JsonHelper.safeGetDouble(json, "insulin");
        double carbs = JsonHelper.safeGetDouble(json, "carbs");
        String eventType = JsonHelper.safeGetString(json, "eventType");
+        if (eventType == null) {
+            log.debug("Wrong treatment. Ignoring : " + json.toString());
+            return;
+        }
        if (insulin > 0 || carbs > 0) {
            EventNsTreatment evtTreatment = new EventNsTreatment(mode, json);
            MainApp.bus().post(evtTreatment);
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -897,6 +897,7 @@
  <string name="basal_set_correctly">Bazál nastaven správně</string>
  <string name="limitingpercentrate">Bazál omezen na %1$d%%: %2$s</string>
  <string name="limitingbolus">Bolus omezen na %1$.1f U: %2$s</string>
+  <string name="limitingextendedbolus">Prodloužený bolus omezen na %1$.1f U: %2$s</string>
  <string name="limitingmaxiob">Max IOB omezeno na %1$.1f U: %2$s</string>
  <string name="limitingcarbs">Sacharidy omezeny na %1$d g: %2$s</string>
  <string name="limitingiob">IOB omezeno na %1$.1f U: %2$s</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -12,7 +12,7 @@
  <string name="danar_useextended_title">&gt;200% 주입위한 확장식사주입</string>
  <string name="danar_bt_name_title">다나R 블루투스</string>
  <string name="ns_sync_use_absolute_title">기초주입량 절대값 사용하기</string>
-  <string name="alert_dialog_storage_permission_text">폰을 재부팅하고나 AndroidAPS를 재시작하세요 \n그렇지 않으면 로그가 기록이되지 않습니다.(알고리즘이 제대로 작동하는지 확인하기 위해 로그가 필요합니다.)!</string>
+  <string name="alert_dialog_storage_permission_text">폰을 재부팅하거나 AndroidAPS를 재시작하세요 \n그렇지 않으면 로그 기록이 되지 않습니다.(알고리즘이 정상적인 작동하는지 확인하기 위해 로그가 필요합니다.)!</string>
  <string name="description_actions">일반 기능을 빠르게 실행시킬 버튼</string>
  <string name="description_careportal">고급 로그 항목을 입력합니다.</string>
  <string name="description_config_builder">활성화된 플러그인을 구성하는 데 사용됩니다.</string>
@ -236,9 +236,7 @@
  <string name="disconnected">연결 끊김</string>
  <string name="danar_pump_settings">다나R 펌프 설정</string>
  <string name="end_user_license_agreement">최종 사용자 라이선스 동의서</string>
-  <string name="end_user_license_agreement_text">이 프로그램을 의학적 결정을 내리는 데 사용해서는 안되며, 여기에 대한 어떠한 보증도 없습니다. 이 프로그램의 품질과 성능에 관한 모든 위험은 사용자에게 있습니다.
-
-MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
+  <string name="end_user_license_agreement_text">이 프로그램을 의학적 결정을 내리는 데 사용해서는 안되며, 여기에 대한 어떠한 보증도 없습니다. 이 프로그램의 품질과 성능에 관한 모든 위험은 사용자에게 있습니다.\nMUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
  <string name="end_user_license_agreement_i_understand">모두 이해하였고 동의합니다.</string>
  <string name="save">저장</string>
  <string name="nobtadapter">블루투스 어댑터를 찾지 못했습니다</string>
@ -460,6 +458,7 @@ MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM
  <string name="openapsama_autosens_adjusttargets">Autosens가 목표도 조절합니다.</string>
  <string name="openapsama_autosens_adjusttargets_summary">기본값: 활성\n이것은 autosens가 ISF와 기초주입뿐만 아니라, 혈당 목표범위를 조절할 수 있게 합니다.</string>
  <string name="openapsama_bolussnooze_dia_divisor_summary">기본값: 2\n식사주입 후 Bolus snooze가 수행되게 되고, 따라서 식사주입 직후엔 loop가 low temp에 대응하지 않게 됩니다. 기본값이 2일때 예제는 다음과 같습니다; DIA가 3시간일 경우  bolus snooz는 점차적으로 1.5시간에 걸쳐 단계적으로 사라지게 됩니다.(3DIA/2).</string>
+  <string name="openapsama_min_5m_carbimpact_summary">기본값: 3.0 (AMA) 또는 8.0 (SMB). 5분당 탄수화물이 얼만큼 흡수되었는지에 대한 기본값 설정입니다. 기본값은 3mg/dl / 5분 입니다. 이는 혈당이 예상보다 빨리 떨어지거나 혹은 예상보다 오르지 않을때, COB가 얼마나 빨리 사라지게 되는지에 영향을 주게 되고, 추정된 탄수화물 흡수량이 미래 혈당 예측 계산시에도 영향을 주게 됩니다.</string>
  <string name="openapsama_link_to_preferncejson_doc_txt">주의!\n보통의 경우 아래의 값을 변경하면 안됩니다. 이 값들을 변경하기 전에 반드시 이곳을 클릭하고 글을 정독해서 확실하게 이해를 하여야 합니다.</string>
  <string name="error_only_numeric_digits_allowed">숫자만 입력가능합니다.</string>
  <string name="error_only_numeric_digits_range_allowed">이 범위(%1$s - %2$s)안에 해당하는 숫자만 입력가능합니다.</string>
@ -898,6 +897,7 @@ MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM
  <string name="basal_set_correctly">기초주입이 정상적으로 설정되었습니다.</string>
  <string name="limitingpercentrate">%2$s로 인해 최대 비율이 %1$d%%로 제한됩니다.</string>
  <string name="limitingbolus">%2$s로 인해 식사주입이 %1$.1f U로 제한됩니다.</string>
+  <string name="limitingextendedbolus">%2$s로 인해 확장식사주입이 %1$.1f U로 제한됩니다.</string>
  <string name="limitingmaxiob">%2$s로 인해 최대 IOB가 %1$.1f U로 제한됩니다.</string>
  <string name="limitingcarbs">%2$s로 인해 탄수화물이 %1$d g로 제한됩니다.</string>
  <string name="limitingiob">%2$s로 인해 IOB가 %1$.1f U으로 제한됩니다.</string>
@ -929,6 +929,7 @@ MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM
  <string name="nav_setupwizard">설정 마법사</string>
  <string name="setupwizard_finish">완료</string>
  <string name="setupwizard_language_prompt">언어를 선택하세요</string>
+  <string name="boluserrorcode">요청: %1$.2fU 전송: %2$.2fU 에러코드: %3$s</string>
  <string name="firstinsulinincrement">1차 인슐린 증분</string>
  <string name="secondinsulinincrement">2차 인슐린 증분</string>
  <string name="thirdinsulinincrement">3차 인슐린 증분</string>
@ -1043,6 +1044,10 @@ MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM
  <string name="calculation_short">Calc</string>
  <string name="handshaking">통신 확인</string>
  <string name="sendlogfiles">예상치 못한 상황 보고를 위해 오늘의 로그 파일을 개발자에게 전송합니다.</string>
+  <string name="maxbolusviolation">최대 식사주입 위반</string>
+  <string name="commanderror">명령 오류</string>
+  <string name="speederror">속도 오류</string>
+  <string name="insulinlimitviolation">인슐린 제한 위반</string>
  <plurals name="objective_days">
    <item quantity="other">%1$d 일</item>
  </plurals>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -611,10 +611,15 @@
  <string name="virtualpump_extendedbolus_label_short">EST</string>
  <string name="keep_screen_on_title">Manter ecrã ligado</string>
  <string name="keep_screen_on_summary">Impedir Android de desligar o ecrã. Isto irá consumir muita bateria quando não ligado ao carregador.</string>
+  <string name="sensitivity_warning">Ao activar a função Autosense lembre-se de introduzir todos os hidratos de carbono (carbs) que comeu. Caso contra contrário os desvios de carbs serão erroneamente identificados como uma variação da sensibilidade!!</string>
+  <string name="sensitivityweightedaverage">Média ponderada da Sensibilidade</string>
  <string name="mdtp_ok">OK</string>
  <string name="mdtp_cancel">Cancelar</string>
  <string name="notloadedplugins">Nem todos perfis foram carregados!</string>
  <string name="valuesnotstored">Valores não guardados!</string>
+  <string name="ns_localbroadcasts">Activar partilha para outras aplicações (como xDrip).</string>
+  <string name="ns_localbroadcasts_title">Activar partilha local.</string>
+  <string name="careportal_activity_label">FEEDBACK ACTIVIDADE &amp;</string>
  <string name="careportal_carbsandbolus_label">HIDRATOS &amp; BÓLUS</string>
  <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
  <string name="careportal_pump_label">BOMBA</string>
@ -624,11 +629,18 @@
  <string name="smb_shortname">SMB</string>
  <string name="enableuam">Activar UAM</string>
  <string name="enablesmb">Activar SMB</string>
+  <string name="enablesmb_summary">Use Super Micro Boluses em vez de basal temp para uma acção mais rápida</string>
+  <string name="enableuam_summary">Detecção de refeições não Introduzidas</string>
+  <string name="insulin_oref_peak">Tempo Pico da curva de IOB</string>
  <string name="insulin_peak_time">Tempo Pico [min]</string>
+  <string name="free_peak_oref">Oref Pico-Livre</string>
+  <string name="rapid_acting_oref">Oref Acção Rápida</string>
  <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
+  <string name="dia_too_short">Duração de Acção da Insulina (DIA) de %1$f demasiado curto - corrigido para %2$f!</string>
  <string name="activate_profile">Activar perfil</string>
  <string name="date">Data</string>
  <string name="invalid">INVÁLIDO</string>
+  <string name="waitingforpairing">Aguardando emparelhamento na bomba</string>
  <string name="pairingok">Emparelhamento OK</string>
  <string name="pairingtimedout">Tempo limite emparelhamento</string>
  <string name="pairing">A EMPARELHAR</string>
@ -641,6 +653,7 @@
  <string name="selectedpump">Bomba seleccionada</string>
  <string name="pairpump">Emparelhar nova bomba</string>
  <string name="bolusspeed">Velocidade Bólus</string>
+  <string name="danar_setbasalstep001">Coloque o incremento da basal em 0.01 U/h</string>
  <string name="serialnumber">Número de série</string>
  <string name="careportal_newnstreatment_percentage_label">Percentagem</string>
  <string name="careportal_newnstreatment_timeshift_label">Alteração Turno</string>
@ -651,7 +664,11 @@
  <string name="activity_target">alvo actividade</string>
  <string name="hypo_duration">duração hipo</string>
  <string name="hypo_target">alvo hipo</string>
+  <string name="danar_history_prime">Purge/Encha</string>
+  <string name="gettingextendedbolusstatus">Procurando o status do bolus estendido</string>
  <string name="gettingbolusstatus">A obter estado bólus</string>
+  <string name="gettingtempbasalstatus">A obter o status da basal temporária</string>
+  <string name="gettingpumpsettings">A obter as definições da bomba</string>
  <string name="gettingpumptime">A obter hora bomba</string>
  <string name="reuse">reutilizar</string>
  <string name="wearcontrol_title">Controles do Relógio</string>
@ -667,24 +684,36 @@
  <string name="shortprotein">Pr</string>
  <string name="shortfat">Gor</string>
  <string name="active"><![CDATA[<Activo>]]></string>
+  <string name="waitingforestimatedbolusend">A aguardar o final do bolus. Restam %1$d sec.</string>
+  <string name="processinghistory">A processar acção</string>
  <string name="startingbolus">A iniciar administração de bolus</string>
  <string name="executingrightnow">Comando será executado agora</string>
+  <string name="pumpdrivercorrected">Controlador bomba corrigido</string>
  <string name="pump_unreachable">Bomba inacessível</string>
  <string name="missed_bg_readings">Leituras Glic. perdidas</string>
+  <string name="raise_notifications_as_android_notifications">Usar as notificações do sistema para alertas e notificações</string>
  <string name="localalertsettings_title">Alertas local</string>
  <string name="enable_missed_bg_readings_alert">Alerta caso nenhuma glicemia seja recebida</string>
  <string name="enable_pump_unreachable_alert">Alerta caso não seja possivel alcançar a bomba</string>
+  <string name="pump_unreachable_threshold">Limite para bomba inacessível [min]</string>
  <string name="urgent_alarm">Alarme Urgente</string>
  <string name="info">INFO</string>
  <string name="bluetooth">Bluetooth</string>
+  <string name="btwatchdog_title">Watchdog BT</string>
  <string name="btwatchdog_summary">Desliga o bluetooth do telefone durante um segundo se nenhuma conexão com bomba for possível. Este parâmetro pode ser util em alguns telefones, onde a pilha bluetooth congela.</string>
+  <string name="DexcomG5">Aplicação DexcomG5 (com patch)</string>
  <string name="dexcomg5_nsupload_title">Enviar dados Glic. para NS</string>
  <string name="dexcomg5_upload">Definições envio G5</string>
+  <string name="poctech_upload">Definições de upload para Poctech</string>
  <string name="wear_detailed_delta_title">Mostrar Delta detalho</string>
+  <string name="wear_detailed_delta_summary">Mostrar delta com mais um ponto decimal</string>
+  <string name="smbmaxminutes_summary">Limite de minutos de basal para SMB</string>
  <string name="unsupportedfirmware">Firmware bomba não suportado</string>
  <string name="dexcomg5_xdripupload_title">Enviar dados Glic. para xDrip+</string>
  <string name="dexcomg5_xdripupload_summary">Seleccionar 640g/Eversense como fonte no xDrip+</string>
  <string name="nsclientbg">Glic NSCliente</string>
+  <string name="minimalbasalvaluereplaced">Valor da basal alterado para o valor mínimo suportado: %s</string>
+  <string name="maximumbasalvaluereplaced">Valor da basal alterado para o valor máximo suportado: %s</string>
  <string name="overview_editquickwizard_usebg">Cálculos Glic</string>
  <string name="overview_editquickwizard_usebolusiob">Cálculo de Bólus IOB</string>
  <string name="overview_editquickwizard_usebasaliob">Cálculo de Basal IOB</string>
@ -719,19 +748,27 @@
  <string name="combo_pump_action_bolusing">Injectando (%.1f U)</string>
  <string name="combo_pump_action_refreshing">A actualizar</string>
  <string name="combo_pump_unsupported_operation">Operação solicitada não suportada pela bomba</string>
+  <string name="combo_low_suspend_forced_notification">Ultilização nao segura: bolus estendudos ou multionda estão activos. Modo do loop foi alterado para apenas suspender em limite inferior por 6h. Apenas são suportados bolus normais em modo loop</string>
+  <string name="combo_force_disabled_notification">Utilização insegura: A bomba utiliza uma perfil de basal diferente do primeiro. O loop foi desactivado. Seleccionar o primeiro perfil da bomba e reinicie.</string>
+  <string name="bolus_frequency_exceeded">Um bolus com o mesmo valor foi introduzido nos 2 últimos minutos. Para evitar introduções acidentais e segurança contra bugs existentes o bolus foi cancelado.</string>
  <string name="combo_pump_connected_now">Agora</string>
  <string name="combo_activity_reading_pump_history">A ler histórico bomba</string>
  <string name="danar_history">histórico bomba</string>
  <string name="combo_activity_setting_basal_profile">A definir perfil basal</string>
  <string name="combo_pump_cartridge_low_warrning">Nível cartucho da bomba está baixo</string>
  <string name="combo_pump_battery_low_warrning">Bateria da bomba está fraca</string>
+  <string name="combo_is_in_error_state">A bomba está a dar o erro E%1$d: %2$s</string>
  <string name="combo_reservoir_low">Baixo</string>
  <string name="combo_reservoir_empty">Vazio</string>
  <string name="combo_reservoir_normal">Normal</string>
  <string name="combo_notification_check_time_date">Necesário actualizar relógio da bomba</string>
  <string name="combo_warning">Aviso</string>
+  <string name="combo_pump_tbr_cancelled_warrning">Basal Temporária CANCELADA. O aviso foi confirmado</string>
  <string name="combo_error_no_connection_no_bolus_delivered">Não foi possivel establecer comunicação com a bomba. Nenhum bolus foi administrado.</string>
  <string name="combo_error_no_bolus_delivered">Administração de bolus falhou. Nenhum bolus parece ter sido administrado. Para confirmar, por favor verifique a bomba de forma a evitar uma dupla administração de bolus e programe novamente o bolus. De forma a evitar qualquer problema, os bolus não são reprogramados de forma automatica.</string>
+  <string name="combo_error_partial_bolus_delivered">Apenas %1$.2f U do bolus de %2$.2f U foi injectado de devido a um erro. Por favor verifique a bomba e tome as medidas necessárias.</string>
+  <string name="combo_error_bolus_verification_failed">A injeção do bolus e a verificação do histórico da bomba falharam, por favor verifique a bomba. Se o bolus foi injetado será adicionado ao histórico de tratamentos durante a próxima conexão com a bomba.</string>
+  <string name="combo_reservoir_level_insufficient_for_bolus">Não há insulina suficiente no reservatório para bolus</string>
  <string name="extendedbolusdeliveryerror">Erro na entrega Bólus Estendido</string>
  <string name="insightpump_shortname">Insight</string>
  <string name="insightpump">Bomba Insight</string>
@ -746,16 +783,23 @@
  <string name="log_book">Diário</string>
  <string name="insight_last_completed_action">Última Acção Terminada</string>
  <string name="insight_min">min</string>
+  <string name="insight_remaining_over">a restar mais de</string>
  <string name="insight_total_with">total com</string>
+  <string name="insight_upfront_with">atenção com</string>
  <string name="insight_stay_always_connected">Ficar sempre ligada</string>
  <string name="insight_history_idle">PARADO</string>
  <string name="insight_history_syncing">A SINCRONIZAR</string>
  <string name="insight_history_busy">OCUPADO</string>
  <string name="insight_history_synced">SINCRONIZADO</string>
+  <string name="insight_startup_uppercase">INICIANDO</string>
  <string name="insight_needs">necessita</string>
+  <string name="insight_not_connected_to_companion_app">Nãp conectado com a aplicação acompanhante!</string>
+  <string name="insight_companion_app_not_installed">Aplicação acompanhante aparentemente não instalada!</string>
+  <string name="insight_incompatible_compantion_app_we_need_version">Aplicação acompanhante incompatível. Versão necessitada</string>
  <string name="insight_unknown">Desconhecido</string>
  <string name="insight_waiting_for_code">A aguardar por código de confirmação</string>
  <string name="insight_code_rejected">Codigo rejeitado</string>
+  <string name="insight_app_binding">Associação de aplicação</string>
  <string name="insight_not_authorized">Não autorizado</string>
  <string name="insight_incompatible">Incompativel</string>
  <string name="second">segundo</string>
@ -767,51 +811,92 @@
  <string name="insight_keepalive_format_string">%1$ds expira %2$s</string>
  <string name="insight_keep_alive_status">Estado manter ligado</string>
  <string name="statistics">Estatísticas</string>
+  <string name="connect_preemptively">Ligar preventivamente</string>
+  <string name="automatically_connect_when">Conectar automaticamente quando se inicia o AndroidAPS, antes que seja efectuado qualquer comando, de maneira a reduzir o atraso na conexão</string>
  <string name="not_recommended_due_to_battery_drain">Não é recomendado devido ao gasto de bateria</string>
  <string name="enablesmbalways">SMB sempre activado</string>
+  <string name="enablesmbalways_summary">SMB sempre activo independentemente dos bolus. Possível apenas quando o medidor tive um bom filtro de dados como o G5</string>
  <string name="enablesmbaftercarbs">Activar SMB após hidratos</string>
+  <string name="enablesmbaftercarbs_summary">SMB activo por 6h após carbs, mesmo com 0 COB. Possível apenas quando o medidor tive um bom filtro de dados como o G5</string>
  <string name="enablesmbwithcob">Activar SMB com COB</string>
  <string name="enablesmbwithcob_summary">Activar SMB quando tem COB activo.</string>
+  <string name="enablesmbwithtemptarget">SMB activo com valores alvo temporários</string>
+  <string name="enablesmbwithtemptarget_summary">SMB activo quando há valor alvo temporário activo (exercício, etc)</string>
+  <string name="enablesmbwithhightemptarget">SMB activo com alvos temporários elevados</string>
+  <string name="enablesmbwithhightemptarget_summary">SMB activo com alvos temporários elevados em curso (exercicio)</string>
+  <string name="let_temp_basal_run">Permitir basal temp correr</string>
  <string name="mute">Silêncio</string>
  <string name="overview_insulin_label">Insulina</string>
  <string name="overview_carbs_label">Hidratos</string>
  <string name="overview_buttons_selection">Botões</string>
+  <string name="show_calibration_button_summary">Enviar calibrações para o xDrip+ ou abrir sistema de calibração do G5</string>
  <string name="show_cgm_button_summary">Abre xDrip+, botão retorcer volta ao AAPS</string>
+  <string name="carb_increment_button_message">Número de carboidratos a adicionar quando o botão é premido</string>
+  <string name="insulin_increment_button_message">Unidades de insulina a adicionar quando o botão é premido</string>
+  <string name="error_starting_cgm">Não foi possível lançar aplicação de monitorização contínua. Por favor verifique que está instalada.</string>
  <string name="overview_cgm">CGM</string>
  <string name="nav_historybrowser">Navegador do histórico</string>
  <string name="wear_notifysmb_title">Notificar no SMB</string>
+  <string name="wear_notifysmb_summary">Mostrar SMB no relogio como bolus normal.</string>
+  <string name="ns_create_announcements_from_errors_title">Criar anúncios dos erros</string>
+  <string name="ns_create_announcements_from_errors_summary">Criar um anúncio no Nightscout para caixas de diálogo de erro e alertas locais (também podem ser visualizados em Careportal sob tratamentos)</string>
+  <string name="wear_predictions_summary">Mostrar a predições na face do relogio.</string>
  <string name="wear_predictions_title">Previsão</string>
  <string name="data_choices">Escolha de Dados</string>
  <string name="fabric_upload">Envio Fabric</string>
+  <string name="allow_automated_crash_reporting">Permitir que seja enviado automaticamente à equipa de desenvolvimento o report de crashes e das funções utilizadas, utilizando o serviço fabric.io.</string>
+  <string name="g5appnotdetected">Por favor actualize a sua versão da app G5 para a versão suportada</string>
  <string name="start_activity_tt">Iniciar atividade TT</string>
  <string name="start_eating_soon_tt">Iniciar Comer em breve TT</string>
  <string name="temptargetshort">TT</string>
  <string name="do_not_bolus_record_only">Sem bólus, registar apenas</string>
  <string name="category">Categoria</string>
  <string name="subcategory">Subcategoria</string>
+  <string name="bolusrecordedonly">O bolus apenas será gravado</string>
+  <string name="ns_autobackfill_summary">Preencher glicemias em falta com NS</string>
  <string name="loop_smbsetbypump_label">SMB definido pela bomba</string>
  <string name="overview_show_sensitivity">Sensibilidade</string>
+  <string name="overview_show_deviations">Desvios</string>
+  <string name="overview_show_cob">Carboidratos a bordo</string>
+  <string name="overview_show_iob">Insulina a bordo</string>
  <string name="overview_show_basals">Basais</string>
+  <string name="no_action_selected">Nenhuma acção seleccionada, nada irá acontecer</string>
  <string name="start_hypo_tt">Começar TT Hipo</string>
+  <string name="closed_loop_disabled_on_dev_branch">A correr a versão dev. O Loop fechado está desabilitado.</string>
  <string name="engineering_mode_enabled">Modo engenheiro activado</string>
+  <string name="not_eng_mode_or_release">Modo de engenharia não habilitado e não no na versão mestra</string>
  <string name="pump_basebasalrate">%.2f U/h</string>
  <string name="combo_actvity_reading_basal_profile">A ler perfil basal</string>
+  <string name="combo_bolus_rejected_due_to_pump_history_change">O histórico da bomba foi alterado após o cálculo do bolo ter sido realizado. O bolus não foi injectado. Por favor, verifique se bolus ainda é necessário.</string>
+  <string name="combo_error_updating_treatment_record">O bolus foi injectado, mas não foi possível adicionar ao histórico. Isto é possível se dois bolus do mesmo valor baixo foram administrados nos últimos dois minutos. Por favor verifique o histórico da bomba e use o Careportal para adicionar os dados em falta caso necessário. Cuidado para não adicionar dados com o mesmo valor no mesmo minuto.</string>
+  <string name="combo_high_temp_rejected_due_to_pump_history_changes">A rejeitar a temporal alta uma vez que o cálculo não considerou as mudanças do histórico da bomba</string>
  <string name="combo_activity_checking_pump_state">A actualizar estado bomba</string>
+  <string name="combo_activity_checking_for_history_changes">A verificar se há alterações de histórico</string>
  <string name="combo_bolus_count">Contagem Bólus</string>
  <string name="combo_tbr_count">Contagem TBR</string>
+  <string name="objectivenotstarted">Objetivo %1$d não iniciado</string>
+  <string name="objectivenotfinished">Objetivo %1$d não concluido</string>
+  <string name="pumpisnottempbasalcapable">A bomba não é capaz de basais temporárias</string>
+  <string name="novalidbasalrate">Nenhum valor de basal temporaria valido foi lido da bomba</string>
+  <string name="closedmodedisabledinpreferences">Loop fecchado disabilitado nas preferências</string>
+  <string name="autosensdisabledinpreferences">Autosens desabilitado nas preferências</string>
  <string name="smbdisabledinpreferences">SMB desactivado nas configurações</string>
+  <string name="limitingbasalratio">A basal max está limitada a %1$.2f U/h por %2$s</string>
  <string name="pumplimit">limite bomba</string>
  <string name="itmustbepositivevalue">deve ser valor positivo</string>
  <string name="maxbasalmultiplier">multiplicador de basal máx</string>
  <string name="maxdailybasalmultiplier">multiplicador de basal máx diária</string>
+  <string name="smb_frequency_exceeded">Um bolus foi injectado nos últimos 3 minutos, saltando SMB</string>
  <string name="basal_set_correctly">Basal correctamente definida</string>
  <string name="maxvalueinpreferences">valor máx nas preferências</string>
  <string name="unsafeusage">uso não seguro</string>
  <string name="readstatusfailed">Erro na leitura de estado</string>
  <string name="record_pump_site_change">Registar mudança de sítio</string>
  <string name="record_insulin_cartridge_change">Registar mudança cartucho</string>
+  <string name="smbnotallowedinopenloopmode">SMB não permitido no modo open loop</string>
  <string name="food_short">Alimentos</string>
  <string name="reset">repor</string>
+  <string name="loopdisconnectedfor">Desligado (%1$d m)</string>
  <string name="pump_stopped">Bomba parada</string>
  <string name="pump_started">Bomba iniciada</string>
  <string name="pump_paused">Bomba suspensa</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -458,6 +458,7 @@
  <string name="openapsama_autosens_adjusttargets">Autosens тоже подстроит цели</string>
  <string name="openapsama_autosens_adjusttargets_summary">значение по умолчанию : верно. используется чтобы разрешить юстировку целевых СК, а также ISF и базала</string>
  <string name="openapsama_bolussnooze_dia_divisor_summary">значение по умолчанию :2 bolus snoose активируется после введения болюса на еду чтобы цикл не взаимодействовал с временными низкими СК сразу после еды. так, трехчасовой DIA при величине 2 означает постыпенное затихание bolus snooze после 1.5 часов (3DIA/2)</string>
+  <string name="openapsama_min_5m_carbimpact_summary">Значение по умолчанию: 3.0 (AMA) или 8.0 (SMB). Эта настройка на усвоение углеводов за 5 мин. По умолчанию ожидается 3мг/дл/5мин. Влияет на скорость учета поглощения углеводов COB и усвоения в расчетах прогнозируемой гликемии, когда СК падает быстрее или не растет так как ожидается.</string>
  <string name="openapsama_link_to_preferncejson_doc_txt">Внимание! Обычно нет необходимости изменять приведенные ниже величины. Нажмите ЗДЕСЬ, ПРОЧТИТЕ и убедитесь что вы ПОНИМАЕТЕ изложенное прежде чем менять какую-либо из этих величин</string>
  <string name="error_only_numeric_digits_allowed">разрешены только цифровые значения</string>
  <string name="error_only_numeric_digits_range_allowed">разрешены только цифровые значения в диапазоне %1$s - %2$s</string>
@ -894,7 +895,7 @@
  <string name="maxdailybasalmultiplier">множитель макс суточного базала</string>
  <string name="smb_frequency_exceeded">Болюс был подан в течение последних трех минут, минуя супер микро болюс SMB</string>
  <string name="basal_set_correctly">Базал задан корректно</string>
-  <string name="limitingpercentrate">Макс процент базала ограничен до %1$d% ед/ч вследствие %2$s</string>
+  <string name="limitingpercentrate">Макс процент базала ограничен до %1$d%% ед/ч вследствие %2$s</string>
  <string name="limitingbolus">Макс уровень болюса ограничен до %1$.1f ед вследствие %2$s</string>
  <string name="limitingmaxiob">Ограничение максимума активного инсулина IOB до %1$.1f U из-за %2$s</string>
  <string name="limitingcarbs">Ограничение максимума углеводов до %1$d грамм из-за %2$s</string>
@ -927,6 +928,7 @@
  <string name="nav_setupwizard">Мастер настройки</string>
  <string name="setupwizard_finish">ГОТОВО</string>
  <string name="setupwizard_language_prompt">Выберите Ваш язык</string>
+  <string name="boluserrorcode">Запрошено: %1$.2f ед. Подано: %2$.2f ед. Код ошибки: %3$s</string>
  <string name="firstinsulinincrement">Первый шаг увеличения инсулина</string>
  <string name="secondinsulinincrement">Второй шаг увеличения инсулина</string>
  <string name="thirdinsulinincrement">Третий шаг увеличения инсулина</string>
@ -1043,4 +1045,8 @@ Context | Edit Context</string>
  <string name="calculation_short">Кальк</string>
  <string name="handshaking">Подтверждение связи</string>
  <string name="sendlogfiles">Отправьте файлы сегодняшнего лога разработчикам наряду с этим. Непредвиденная ситуация.</string>
+  <string name="maxbolusviolation">Макс нарушение болюса</string>
+  <string name="commanderror">Ошибка в команде</string>
+  <string name="speederror">Ошибка в скорости</string>
+  <string name="insulinlimitviolation">Нарушение ограничения инсулина</string>
 </resources>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -459,6 +459,7 @@
  <string name="openapsama_autosens_adjusttargets">Úprava cieľovej glykémie pomocou automatickej detekcie citlivosti</string>
  <string name="openapsama_autosens_adjusttargets_summary">Štandardná hodnota: zapnuté\nToto nastavenie hovorí, že automatická detekcia citlivosti môže meniť tiež cieľové hodnoty glykémií.</string>
  <string name="openapsama_bolussnooze_dia_divisor_summary">Štandardná hodnota: 2\nToto nastavenie hovorí, po akú časť z hodnoty DIA uzavretý okruh po boluse čaká a nereaguje na zmeny glykémií (tu 3DIA/2 = 1,5h).</string>
+  <string name="openapsama_min_5m_carbimpact_summary">Štandardná hodnota: 3.0 (AMA), alebo 8.0 (SMB) mg/dl/5min. Táto hodnota definuje minimálnu časť vstrebaných sacharidov za každých 5min. Táto hodnota ovplyvňuje výpočet COB.</string>
  <string name="openapsama_link_to_preferncejson_doc_txt">Pozor!\nZa normálnych okolností tieto hodnoty nemusíte meniť. Kliknete TU, PREČÍTAJTE si informácie a UISTITE sa, že im rozumiete skôr, ako ich začnete meniť.</string>
  <string name="error_only_numeric_digits_allowed">Povolené iba číslice.</string>
  <string name="error_only_numeric_digits_range_allowed">Povolené iba čísla v rozsahu %1$s - %2$s.</string>
@ -897,6 +898,7 @@
  <string name="basal_set_correctly">Bazál nastavený správne</string>
  <string name="limitingpercentrate">Bazál obmedzený na %1$d%%: %2$s</string>
  <string name="limitingbolus">Bolus obmedzený na %1$.1f U: %2$s</string>
+  <string name="limitingextendedbolus">Predĺžený bolus obmedzený na %1$.1f U: %2$s</string>
  <string name="limitingmaxiob">Max IOB obmedzený na %1$.1f U: %2$s</string>
  <string name="limitingcarbs">Sacharidy obmedzené na %1$d g: %2$s</string>
  <string name="limitingiob">IOB obmedzený na %1$.1f U: %2$s</string>
@ -928,6 +930,7 @@
  <string name="nav_setupwizard">Sprievodca nastavením</string>
  <string name="setupwizard_finish">Dokončiť</string>
  <string name="setupwizard_language_prompt">Vyberte jazyk</string>
+  <string name="boluserrorcode">Požadované: %1$.2fU Podané: %2$.2fU Chyba: %3$s</string>
  <string name="firstinsulinincrement">Prvý prídavok inzulínu</string>
  <string name="secondinsulinincrement">Druhý prídavok inzulínu</string>
  <string name="thirdinsulinincrement">Tretí prídavok inzulínu</string>
@ -947,6 +950,10 @@
  <string name="openapsama_max_daily_safety_multiplier">Max násobiteľ denného najvyššieho bazálu</string>
  <string name="openapsama_current_basal_safety_multiplier">Max násobiteľ súčasného bazálu</string>
  <string name="value_unavailable_short">---</string>
+  <string name="virtualpump_type">Typ virtuálnej pumpy</string>
+  <string name="virtualpump_definition">Definícia pumpy</string>
+  <string name="virtualpump_pump_def">Bolus: Krok =%1$s\nPredl. bolus: [Krok=%2$s, Dĺžka=%3$smin-%4$sh]\nBazál: Krok=%5$s\nDoč. bazál: %6$s (%7$s), Dĺžka=%8$smin-%9$sh\n%10$s</string>
+  <string name="virtualpump_pump_def_extended_note">* Rozdielne hodnoty podľa rozsahu nie sú podporované.</string>
  <string name="ns_autobackfill_title">Automatické doplňovanie glykémií z NS</string>
  <string name="wear_wizard_settings">Nastavenie wizardu</string>
  <string name="wear_wizard_settings_summary">Kalkulácia použitá vo výsledku wizardu:</string>
@ -1037,6 +1044,11 @@
  <string name="treatments_wizard_total_label">Spolu</string>
  <string name="calculation_short">Kalk</string>
  <string name="handshaking">Overovanie</string>
+  <string name="sendlogfiles">Odošlite dnešné súbory protokolov vývojárom spolu s týmto časom. Neočakávaná situácia.</string>
+  <string name="maxbolusviolation">Prekročený maximálny bolus</string>
+  <string name="commanderror">Chyba príkazu</string>
+  <string name="speederror">Chyba rýchlosti</string>
+  <string name="insulinlimitviolation">Prekročený limit inzulínu</string>
  <plurals name="objective_days">
    <item quantity="one">%1$d deň</item>
    <item quantity="few">%1$d dní</item>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -458,6 +458,7 @@
  <string name="openapsama_autosens_adjusttargets">Autosens justerar även mål-BG</string>
  <string name="openapsama_autosens_adjusttargets_summary">Standardvärde: sant. Detta för att tillåta autosens justera mål-BG utöver ISF och basaler.</string>
  <string name="openapsama_bolussnooze_dia_divisor_summary">Standardvärde: 2  Bolus snooze är aktivt efter att du givit en måltidsbolus, detta för att inte loop ska lågtempa när du just ätit. I detta exempel och grundvärde är 2; innebär att DIA på 3 tim kommer bolus snooze kommer att fasas ut under 1,5 tim (3DIA/2).</string>
+  <string name="openapsama_min_5m_carbimpact_summary">Standardvärde: 3.0 (AMA) eller 8.0 (SMB). Detta är grundinställning för KH-absorption per 5 min. Detta styr hur snabbt COB minskar, dvs hur snabbt programmet kalkylerar att KH tagits upp, och påverkar BG framöver när BG faller mer än väntat, eller inte stiger som väntat.</string>
  <string name="openapsama_link_to_preferncejson_doc_txt">Viktigt!\nNormalt behöver du inte ändra dessa värden. Vg KLICKA HÄR och LÄS texten och försäkra dig om att du FÖRSTÅTT innan du ändrar dessa värden.</string>
  <string name="error_only_numeric_digits_allowed">Endast siffror tillåtna.</string>
  <string name="error_only_numeric_digits_range_allowed">Endast siffror mellan %1$s - %2$s är tillåtna.</string>
@ -896,6 +897,7 @@
  <string name="basal_set_correctly">Basal justerad korrekt</string>
  <string name="limitingpercentrate">Begränsar max procent hastighet till %1$d%% pga %2$s</string>
  <string name="limitingbolus">Begränsar bolus till %1$.1f enheter pga %2$s</string>
+  <string name="limitingextendedbolus">Begränsar bolus till %1$.1f enheter pga %2$s</string>
  <string name="limitingmaxiob">Begränsar max IOB till %1$.1f pga %2$s</string>
  <string name="limitingcarbs">Begränsar kolhydrater till %1$d g pga %2$s</string>
  <string name="limitingiob">Begränsar IOB till %1$.1f pga %2$s</string>
@ -927,6 +929,7 @@
  <string name="nav_setupwizard">Installationsguide</string>
  <string name="setupwizard_finish">Avsluta</string>
  <string name="setupwizard_language_prompt">Välj språk</string>
+  <string name="boluserrorcode">Angivet: %1$.2f enheter. Levererat: %2$.2f enheter. Felkod: %3$s</string>
  <string name="firstinsulinincrement">Första snabbknabben för insulin</string>
  <string name="secondinsulinincrement">Andra snabbknabben för insulin</string>
  <string name="thirdinsulinincrement">Tredje snabbknabben för insulin</string>
@ -946,6 +949,10 @@
  <string name="openapsama_max_daily_safety_multiplier">Multiplikator för max daglig basal (max_daily)</string>
  <string name="openapsama_current_basal_safety_multiplier">Multiplikator för nuvarande basal (max_current)</string>
  <string name="value_unavailable_short">-</string>
+  <string name="virtualpump_type">Typ av virtuell pump</string>
+  <string name="virtualpump_definition">Pumpdefinition</string>
+  <string name="virtualpump_pump_def">Bolus: Steg =%1$s\nFörlängd bolus: [Steg=%2$s, duration =%3$smin -%4$sh] \nBasal: Steg=%5$s\nTempbasal: %6$s (av %7$s), duration =%8$smin -%9$sh\n%10$s</string>
+  <string name="virtualpump_pump_def_extended_note">* Den virtuella pumpen kräver fasta värden för basal/bolus.</string>
  <string name="ns_autobackfill_title">Auto Backfill BG</string>
  <string name="wear_wizard_settings">Kalkylatorinställningar</string>
  <string name="wear_wizard_settings_summary">Kalkyler inkluderade i resultatet</string>
@ -1032,6 +1039,15 @@
  <string name="as">AS</string>
  <string name="versionavailable">Version %1$s tillgänglig</string>
  <string name="time_offset">Tidsförskjutning</string>
+  <string name="setupwizard_preferred_aps_mode">Föredraget APS-läge</string>
+  <string name="treatments_wizard_total_label">Total</string>
+  <string name="calculation_short">Kalkyl</string>
+  <string name="handshaking">Handskakning</string>
+  <string name="sendlogfiles">Skicka dagens loggfiler till utvecklarna tillsammans med denna datumstämpel. Oväntad situation.</string>
+  <string name="maxbolusviolation">Max bolus nådd</string>
+  <string name="commanderror">Kommandofel</string>
+  <string name="speederror">Felaktig hastighet</string>
+  <string name="insulinlimitviolation">Insulingräns nådd</string>
  <plurals name="objective_days">
    <item quantity="one">%1$d dag</item>
    <item quantity="other">%1$d dagar</item>