Merge branch 'dev' into medtronic_andy_merge

app/src/main/java/info/nightscout/androidaps/Constants.java

@@ -31,7 +31,7 @@ public class Constants {
     public static final long remoteBolusMinDistance = 15 * 60 * 1000L;
 
     // Circadian Percentage Profile
-    public static final int CPP_MIN_PERCENTAGE = 50;
+    public static final int CPP_MIN_PERCENTAGE = 30;
     public static final int CPP_MAX_PERCENTAGE = 200;
     public static final int CPP_MIN_TIMESHIFT = -6;
     public static final int CPP_MAX_TIMESHIFT = 23;

app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.java

@@ -52,7 +52,7 @@ public class HistoryBrowseActivity extends AppCompatActivity {
     ImageButton chartButton;
 
     boolean showBasal = true;
-    boolean showIob, showCob, showDev, showRat, showDevslope;
+    boolean showIob, showCob, showDev, showRat, showActPrim, showActSec, showDevslope;
 
 
     @BindView(R.id.historybrowse_date)
@@ -285,6 +285,10 @@ public class HistoryBrowseActivity extends AppCompatActivity {
         // set manual x bounds to have nice steps
         graphData.formatAxis(fromTime, toTime);
 
+        if(showActPrim) {
+            graphData.addActivity(fromTime, toTime, false,1d);
+        }
+
         // Treatments
         graphData.addTreatments(fromTime, toTime);
 
@@ -305,6 +309,7 @@ public class HistoryBrowseActivity extends AppCompatActivity {
             boolean useCobForScale = false;
             boolean useDevForScale = false;
             boolean useRatioForScale = false;
+            boolean useIAForScale = false;
             boolean useDSForScale = false;
 
             if (showIob) {
@@ -315,6 +320,8 @@ public class HistoryBrowseActivity extends AppCompatActivity {
                 useDevForScale = true;
             } else if (showRat) {
                 useRatioForScale = true;
+            } else if (showActSec) {
+                useIAForScale = true;
             } else if (showDevslope) {
                 useDSForScale = true;
             }
@@ -327,6 +334,8 @@ public class HistoryBrowseActivity extends AppCompatActivity {
                 secondGraphData.addDeviations(fromTime, toTime, useDevForScale, 1d);
             if (showRat)
                 secondGraphData.addRatio(fromTime, toTime, useRatioForScale, 1d);
+            if (showActSec)
+                secondGraphData.addActivity(fromTime, toTime, useIAForScale, useIAForScale? 2d: 1d);
             if (showDevslope)
                 secondGraphData.addDeviationSlope(fromTime, toTime, useDSForScale, 1d);
 
@@ -337,14 +346,14 @@ public class HistoryBrowseActivity extends AppCompatActivity {
 
             // do GUI update
             runOnUiThread(() -> {
-                if (showIob || showCob || showDev || showRat || showDevslope) {
+                if (showIob || showCob || showDev || showRat || showActSec || showDevslope) {
                     iobGraph.setVisibility(View.VISIBLE);
                 } else {
                     iobGraph.setVisibility(View.GONE);
                 }
                 // finally enforce drawing of graphs
                 graphData.performUpdate();
-                if (showIob || showCob || showDev || showRat || showDevslope)
+                if (showIob || showCob || showDev || showRat || showActSec || showDevslope)
                     secondGraphData.performUpdate();
             });
         }).start();
@@ -353,22 +362,37 @@ public class HistoryBrowseActivity extends AppCompatActivity {
     private void setupChartMenu() {
         chartButton = (ImageButton) findViewById(R.id.overview_chartMenuButton);
         chartButton.setOnClickListener(v -> {
-            MenuItem item;
+            MenuItem item,dividerItem;
             CharSequence title;
+            int titleMaxChars = 0;
             SpannableString s;
             PopupMenu popup = new PopupMenu(v.getContext(), v);
 
 
             item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.BAS.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_basals));
             title = item.getTitle();
+            if (titleMaxChars < title.length()) titleMaxChars =  title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.basal, null)), 0, s.length(), 0);
             item.setTitle(s);
             item.setCheckable(true);
             item.setChecked(showBasal);
 
+            item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.ACTPRIM.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_activity));
+            title = item.getTitle();
+            if (titleMaxChars < title.length()) titleMaxChars =  title.length();
+            s = new SpannableString(title);
+            s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.activity, null)), 0, s.length(), 0);
+            item.setTitle(s);
+            item.setCheckable(true);
+            item.setChecked(showActPrim);
+
+            dividerItem = popup.getMenu().add("");
+            dividerItem.setEnabled(false);
+
             item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.IOB.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_iob));
             title = item.getTitle();
+            if (titleMaxChars < title.length()) titleMaxChars =  title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.iob, null)), 0, s.length(), 0);
             item.setTitle(s);
@@ -377,6 +401,7 @@ public class HistoryBrowseActivity extends AppCompatActivity {
 
             item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.COB.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_cob));
             title = item.getTitle();
+            if (titleMaxChars < title.length()) titleMaxChars =  title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.cob, null)), 0, s.length(), 0);
             item.setTitle(s);
@@ -385,6 +410,7 @@ public class HistoryBrowseActivity extends AppCompatActivity {
 
             item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.DEV.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_deviations));
             title = item.getTitle();
+            if (titleMaxChars < title.length()) titleMaxChars =  title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.deviations, null)), 0, s.length(), 0);
             item.setTitle(s);
@@ -393,15 +419,27 @@ public class HistoryBrowseActivity extends AppCompatActivity {
 
             item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.SEN.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_sensitivity));
             title = item.getTitle();
+            if (titleMaxChars < title.length()) titleMaxChars =  title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.ratio, null)), 0, s.length(), 0);
             item.setTitle(s);
             item.setCheckable(true);
             item.setChecked(showRat);
 
+            item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.ACTSEC.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_activity));
+            title = item.getTitle();
+            if (titleMaxChars < title.length()) titleMaxChars =  title.length();
+            s = new SpannableString(title);
+            s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.activity, null)), 0, s.length(), 0);
+            item.setTitle(s);
+            item.setCheckable(true);
+            item.setChecked(showActSec);
+
+
             if (MainApp.devBranch) {
                 item = popup.getMenu().add(Menu.NONE, OverviewFragment.CHARTTYPE.DEVSLOPE.ordinal(), Menu.NONE, "Deviation slope");
                 title = item.getTitle();
+                if (titleMaxChars < title.length()) titleMaxChars =  title.length();
                 s = new SpannableString(title);
                 s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.devslopepos, null)), 0, s.length(), 0);
                 item.setTitle(s);
@@ -409,6 +447,10 @@ public class HistoryBrowseActivity extends AppCompatActivity {
                 item.setChecked(showDevslope);
             }
 
+            // Fairly good guestimate for required divider text size...
+            title = new String(new char[titleMaxChars+10]).replace("\0", "_");
+            dividerItem.setTitle(title);
+
             popup.setOnMenuItemClickListener(item1 -> {
                 if (item1.getItemId() == OverviewFragment.CHARTTYPE.BAS.ordinal()) {
                     showBasal = !item1.isChecked();
@@ -420,6 +462,10 @@ public class HistoryBrowseActivity extends AppCompatActivity {
                     showDev = !item1.isChecked();
                 } else if (item1.getItemId() == OverviewFragment.CHARTTYPE.SEN.ordinal()) {
                     showRat = !item1.isChecked();
+                } else if (item1.getItemId() == OverviewFragment.CHARTTYPE.ACTPRIM.ordinal()) {
+                    showActPrim = !item1.isChecked();
+                } else if (item1.getItemId() == OverviewFragment.CHARTTYPE.ACTSEC.ordinal()) {
+                    showActSec = !item1.isChecked();
                 } else if (item1.getItemId() == OverviewFragment.CHARTTYPE.DEVSLOPE.ordinal()) {
                     showDevslope = !item1.isChecked();
                 }

app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java

@@ -7,8 +7,10 @@ import java.util.List;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 
 /**
  * Created by mike on 04.06.2016.
@@ -53,8 +55,8 @@ public interface PumpInterface {
 
     // Status to be passed to NS
     JSONObject getJSONStatus(Profile profile, String profileName);
-    String manufacter();
+    ManufacturerType manufacturer();
-    String model();
+    PumpType model();
     String serialNumber();
 
     // Pump capabilities

app/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.java

@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.plugins.common;
+
+public enum ManufacturerType {
+
+    AndroidAPS("AndroidAPS"),
+    Medtronic("Medtronic"),
+    Sooil("SOOIL"),
+
+    Tandem("Tandem"),
+    Insulet("Insulet"),
+    Animas("Animas"), Cellnovo("Cellnovo"), Roche("Roche");
+
+
+
+    private String description;
+
+    ManufacturerType(String description) {
+
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+
+}

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/dialogs/FillDialog.java

@@ -103,7 +103,7 @@ public class FillDialog extends DialogFragment implements OnClickListener {
         Double maxInsulin = MainApp.getConstraintChecker().getMaxBolusAllowed().value();
         double bolusstep = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep;
         editInsulin = view.findViewById(R.id.fill_insulinamount);
-        editInsulin.setParams(0d, 0d, maxInsulin, bolusstep, DecimalFormatter.pumpSupportedBolusFormat(), false, textWatcher);
+        editInsulin.setParams(0d, 0d, maxInsulin, bolusstep, DecimalFormatter.pumpSupportedBolusFormat(), false, view.findViewById(R.id.ok), textWatcher);
 
 
         Button preset1Button = view.findViewById(R.id.fill_preset_button1);

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/dialogs/NewExtendedBolusDialog.java

@@ -42,12 +42,12 @@ public class NewExtendedBolusDialog extends DialogFragment implements View.OnCli
 
         Double maxInsulin = MainApp.getConstraintChecker().getMaxExtendedBolusAllowed().value();
         editInsulin = (NumberPicker) view.findViewById(R.id.overview_newextendedbolus_insulin);
-        editInsulin.setParams(0d, 0d, maxInsulin, 0.1d, new DecimalFormat("0.00"), false);
+        editInsulin.setParams(0d, 0d, maxInsulin, 0.1d, new DecimalFormat("0.00"), false, view.findViewById(R.id.ok));
 
         double extendedDurationStep = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().extendedBolusDurationStep;
         double extendedMaxDuration = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().extendedBolusMaxDuration;
         editDuration = (NumberPicker) view.findViewById(R.id.overview_newextendedbolus_duration);
-        editDuration.setParams(extendedDurationStep, extendedDurationStep, extendedMaxDuration, extendedDurationStep, new DecimalFormat("0"), false);
+        editDuration.setParams(extendedDurationStep, extendedDurationStep, extendedMaxDuration, extendedDurationStep, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
 
         view.findViewById(R.id.ok).setOnClickListener(this);
         view.findViewById(R.id.cancel).setOnClickListener(this);

app/src/main/java/info/nightscout/androidaps/plugins/general/actions/dialogs/NewTempBasalDialog.java

@@ -66,17 +66,17 @@ public class NewTempBasalDialog extends DialogFragment implements View.OnClickLi
         basalPercent = (NumberPicker) view.findViewById(R.id.overview_newtempbasal_basalpercentinput);
         double maxTempPercent = pumpDescription.maxTempPercent;
         double tempPercentStep = pumpDescription.tempPercentStep;
-        basalPercent.setParams(100d, 0d, maxTempPercent, tempPercentStep, new DecimalFormat("0"), true);
+        basalPercent.setParams(100d, 0d, maxTempPercent, tempPercentStep, new DecimalFormat("0"), true, view.findViewById(R.id.ok));
 
         Profile profile = ProfileFunctions.getInstance().getProfile();
         Double currentBasal = profile != null ? profile.getBasal() : 0d;
         basalAbsolute = (NumberPicker) view.findViewById(R.id.overview_newtempbasal_basalabsoluteinput);
-        basalAbsolute.setParams(currentBasal, 0d, pumpDescription.maxTempAbsolute, pumpDescription.tempAbsoluteStep, new DecimalFormat("0.00"), true);
+        basalAbsolute.setParams(currentBasal, 0d, pumpDescription.maxTempAbsolute, pumpDescription.tempAbsoluteStep, new DecimalFormat("0.00"), true, view.findViewById(R.id.ok));
 
         double tempDurationStep = pumpDescription.tempDurationStep;
         double tempMaxDuration = pumpDescription.tempMaxDuration;
         duration = (NumberPicker) view.findViewById(R.id.overview_newtempbasal_duration);
-        duration.setParams(tempDurationStep, tempDurationStep, tempMaxDuration, tempDurationStep, new DecimalFormat("0"), false);
+        duration.setParams(tempDurationStep, tempDurationStep, tempMaxDuration, tempDurationStep, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
 
         if ((pumpDescription.tempBasalStyle & PumpDescription.PERCENT) == PumpDescription.PERCENT && (pumpDescription.tempBasalStyle & PumpDescription.ABSOLUTE) == PumpDescription.ABSOLUTE) {
             // Both allowed

app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java

@@ -266,14 +266,14 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
         editBg = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_bginput);
         editTemptarget = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_temptarget);
         if (profile == null) {
-            editBg.setParams(bg, 0d, 500d, 0.1d, new DecimalFormat("0.0"), false, bgTextWatcher);
+            editBg.setParams(bg, 0d, 500d, 0.1d, new DecimalFormat("0.0"), false, view.findViewById(R.id.ok), bgTextWatcher);
-            editTemptarget.setParams(bg, 0d, 500d, 0.1d, new DecimalFormat("0.0"), false);
+            editTemptarget.setParams(bg, 0d, 500d, 0.1d, new DecimalFormat("0.0"), false, view.findViewById(R.id.ok));
         } else if (units.equals(Constants.MMOL)) {
-            editBg.setParams(bg, 0d, 30d, 0.1d, new DecimalFormat("0.0"), false, bgTextWatcher);
+            editBg.setParams(bg, 0d, 30d, 0.1d, new DecimalFormat("0.0"), false, view.findViewById(R.id.ok), bgTextWatcher);
-            editTemptarget.setParams(bg, 0d, 30d, 0.1d, new DecimalFormat("0.0"), false);
+            editTemptarget.setParams(bg, 0d, 30d, 0.1d, new DecimalFormat("0.0"), false, view.findViewById(R.id.ok));
         } else {
-            editBg.setParams(bg, 0d, 500d, 1d, new DecimalFormat("0"), false, bgTextWatcher);
+            editBg.setParams(bg, 0d, 500d, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok), bgTextWatcher);
-            editTemptarget.setParams(bg, 0d, 500d, 1d, new DecimalFormat("0"), false);
+            editTemptarget.setParams(bg, 0d, 500d, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
         }
 
         sensorRadioButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
@@ -287,16 +287,16 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
 
         Integer maxCarbs = MainApp.getConstraintChecker().getMaxCarbsAllowed().value();
         editCarbs = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_carbsinput);
-        editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false);
+        editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
 
         Double maxInsulin = MainApp.getConstraintChecker().getMaxBolusAllowed().value();
         editInsulin = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_insulininput);
-        editInsulin.setParams(0d, 0d, maxInsulin, 0.05d, new DecimalFormat("0.00"), false);
+        editInsulin.setParams(0d, 0d, maxInsulin, 0.05d, new DecimalFormat("0.00"), false, view.findViewById(R.id.ok));
 
         editSplit = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_splitinput);
-        editSplit.setParams(100d, 0d, 100d, 5d, new DecimalFormat("0"), true);
+        editSplit.setParams(100d, 0d, 100d, 5d, new DecimalFormat("0"), true, view.findViewById(R.id.ok));
         editDuration = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_durationinput);
-        editDuration.setParams(0d, 0d, 24 * 60d, 10d, new DecimalFormat("0"), false);
+        editDuration.setParams(0d, 0d, 24 * 60d, 10d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
 
         TextWatcher percentTextWatcher = new TextWatcher() {
             @Override
@@ -320,7 +320,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
         if (profile != null)
             maxPercent = MainApp.getConstraintChecker().getMaxBasalPercentAllowed(profile).value();
         editPercent = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_percentinput);
-        editPercent.setParams(0d, -100d, (double) maxPercent, 5d, new DecimalFormat("0"), true, percentTextWatcher);
+        editPercent.setParams(0d, -100d, (double) maxPercent, 5d, new DecimalFormat("0"), true, view.findViewById(R.id.ok), percentTextWatcher);
 
         TextWatcher absoluteTextWatcher = new TextWatcher() {
             @Override
@@ -344,16 +344,16 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
         if (profile != null)
             maxAbsolute = MainApp.getConstraintChecker().getMaxBasalAllowed(profile).value();
         editAbsolute = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_absoluteinput);
-        editAbsolute.setParams(0d, 0d, maxAbsolute, 0.05d, new DecimalFormat("0.00"), true, absoluteTextWatcher);
+        editAbsolute.setParams(0d, 0d, maxAbsolute, 0.05d, new DecimalFormat("0.00"), true, view.findViewById(R.id.ok), absoluteTextWatcher);
 
         editCarbTime = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_carbtimeinput);
-        editCarbTime.setParams(0d, -60d, 60d, 5d, new DecimalFormat("0"), false);
+        editCarbTime.setParams(0d, -60d, 60d, 5d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
 
         editPercentage = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_percentage);
-        editPercentage.setParams(100d, (double) Constants.CPP_MIN_PERCENTAGE, (double) Constants.CPP_MAX_PERCENTAGE, 1d, new DecimalFormat("0"), false);
+        editPercentage.setParams(100d, (double) Constants.CPP_MIN_PERCENTAGE, (double) Constants.CPP_MAX_PERCENTAGE, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
 
         editTimeshift = (NumberPicker) view.findViewById(R.id.careportal_newnstreatment_timeshift);
-        editTimeshift.setParams(0d, (double) Constants.CPP_MIN_TIMESHIFT, (double) Constants.CPP_MAX_TIMESHIFT, 1d, new DecimalFormat("0"), false);
+        editTimeshift.setParams(0d, (double) Constants.CPP_MIN_TIMESHIFT, (double) Constants.CPP_MAX_TIMESHIFT, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
 
         ProfileSwitch ps = TreatmentsPlugin.getPlugin().getProfileSwitchFromHistory(DateUtil.now());
         if (ps != null && ps.isCPP) {

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java

@@ -189,7 +189,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     Handler sLoopHandler = new Handler();
     Runnable sRefreshLoop = null;
 
-    public enum CHARTTYPE {PRE, BAS, IOB, COB, DEV, SEN, DEVSLOPE}
+    public enum CHARTTYPE {PRE, BAS, IOB, COB, DEV, SEN, ACTPRIM, ACTSEC, DEVSLOPE}
 
     private static final ScheduledExecutorService worker = Executors.newSingleThreadScheduledExecutor();
     private static ScheduledFuture<?> scheduledUpdate = null;
@@ -350,14 +350,15 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             else
                 predictionsAvailable = false;
 
-            MenuItem item;
+            MenuItem item,dividerItem;
             CharSequence title;
+            int titleMaxChars = 0;
             SpannableString s;
             PopupMenu popup = new PopupMenu(v.getContext(), v);
-
             if (predictionsAvailable) {
                 item = popup.getMenu().add(Menu.NONE, CHARTTYPE.PRE.ordinal(), Menu.NONE, "Predictions");
                 title = item.getTitle();
+                if (titleMaxChars < title.length()) titleMaxChars =  title.length();
                 s = new SpannableString(title);
                 s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.prediction, null)), 0, s.length(), 0);
                 item.setTitle(s);
@@ -367,14 +368,28 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
             item = popup.getMenu().add(Menu.NONE, CHARTTYPE.BAS.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_basals));
             title = item.getTitle();
+            if (titleMaxChars < title.length()) titleMaxChars =  title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.basal, null)), 0, s.length(), 0);
             item.setTitle(s);
             item.setCheckable(true);
             item.setChecked(SP.getBoolean("showbasals", true));
 
+            item = popup.getMenu().add(Menu.NONE, CHARTTYPE.ACTPRIM.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_activity));
+            title = item.getTitle();
+            if (titleMaxChars < title.length()) titleMaxChars =  title.length();
+            s = new SpannableString(title);
+            s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.activity, null)), 0, s.length(), 0);
+            item.setTitle(s);
+            item.setCheckable(true);
+            item.setChecked(SP.getBoolean("showactivityprimary", true));
+
+            dividerItem = popup.getMenu().add("");
+            dividerItem.setEnabled(false);
+
             item = popup.getMenu().add(Menu.NONE, CHARTTYPE.IOB.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_iob));
             title = item.getTitle();
+            if (titleMaxChars < title.length()) titleMaxChars =  title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.iob, null)), 0, s.length(), 0);
             item.setTitle(s);
@@ -383,6 +398,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
             item = popup.getMenu().add(Menu.NONE, CHARTTYPE.COB.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_cob));
             title = item.getTitle();
+            if (titleMaxChars < title.length()) titleMaxChars =  title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.cob, null)), 0, s.length(), 0);
             item.setTitle(s);
@@ -391,6 +407,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
             item = popup.getMenu().add(Menu.NONE, CHARTTYPE.DEV.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_deviations));
             title = item.getTitle();
+            if (titleMaxChars < title.length()) titleMaxChars =  title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.deviations, null)), 0, s.length(), 0);
             item.setTitle(s);
@@ -399,15 +416,26 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
             item = popup.getMenu().add(Menu.NONE, CHARTTYPE.SEN.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_sensitivity));
             title = item.getTitle();
+            if (titleMaxChars < title.length()) titleMaxChars =  title.length();
             s = new SpannableString(title);
             s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.ratio, null)), 0, s.length(), 0);
             item.setTitle(s);
             item.setCheckable(true);
             item.setChecked(SP.getBoolean("showratios", false));
 
+            item = popup.getMenu().add(Menu.NONE, CHARTTYPE.ACTSEC.ordinal(), Menu.NONE, MainApp.gs(R.string.overview_show_activity));
+            title = item.getTitle();
+            if (titleMaxChars < title.length()) titleMaxChars =  title.length();
+            s = new SpannableString(title);
+            s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.activity, null)), 0, s.length(), 0);
+            item.setTitle(s);
+            item.setCheckable(true);
+            item.setChecked(SP.getBoolean("showactivitysecondary", true));
+
             if (MainApp.devBranch) {
                 item = popup.getMenu().add(Menu.NONE, CHARTTYPE.DEVSLOPE.ordinal(), Menu.NONE, "Deviation slope");
                 title = item.getTitle();
+                if (titleMaxChars < title.length()) titleMaxChars =  title.length();
                 s = new SpannableString(title);
                 s.setSpan(new ForegroundColorSpan(ResourcesCompat.getColor(getResources(), R.color.devslopepos, null)), 0, s.length(), 0);
                 item.setTitle(s);
@@ -415,6 +443,10 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 item.setChecked(SP.getBoolean("showdevslope", false));
             }
 
+            // Fairly good guestimate for required divider text size...
+            title = new String(new char[titleMaxChars+10]).replace("\0", "_");
+            dividerItem.setTitle(title);
+
             popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                 @Override
                 public boolean onMenuItemClick(MenuItem item) {
@@ -430,6 +462,10 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                         SP.putBoolean("showdeviations", !item.isChecked());
                     } else if (item.getItemId() == CHARTTYPE.SEN.ordinal()) {
                         SP.putBoolean("showratios", !item.isChecked());
+                    } else if (item.getItemId() == CHARTTYPE.ACTPRIM.ordinal()) {
+                        SP.putBoolean("showactivityprimary", !item.isChecked());
+                    } else if (item.getItemId() == CHARTTYPE.ACTSEC.ordinal()) {
+                        SP.putBoolean("showactivitysecondary", !item.isChecked());
                     } else if (item.getItemId() == CHARTTYPE.DEVSLOPE.ordinal()) {
                         SP.putBoolean("showdevslope", !item.isChecked());
                     }
@@ -1424,6 +1460,10 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             // set manual x bounds to have nice steps
             graphData.formatAxis(fromTime, endTime);
 
+            if(SP.getBoolean("showactivityprimary", true)) {
+                graphData.addActivity(fromTime, endTime, false,1d);
+            }
+
             // Treatments
             graphData.addTreatments(fromTime, endTime);
 
@@ -1449,6 +1489,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             boolean useDevForScale = false;
             boolean useRatioForScale = false;
             boolean useDSForScale = false;
+            boolean useIAForScale = false;
 
             if (SP.getBoolean("showiob", true)) {
                 useIobForScale = true;
@@ -1458,6 +1499,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 useDevForScale = true;
             } else if (SP.getBoolean("showratios", false)) {
                 useRatioForScale = true;
+            } else if (SP.getBoolean("showactivitysecondary", false)) {
+                useIAForScale = true;
             } else if (SP.getBoolean("showdevslope", false)) {
                 useDSForScale = true;
             }
@@ -1470,6 +1513,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 secondGraphData.addDeviations(fromTime, now, useDevForScale, 1d);
             if (SP.getBoolean("showratios", false))
                 secondGraphData.addRatio(fromTime, now, useRatioForScale, 1d);
+            if(SP.getBoolean("showactivitysecondary", true))
+                secondGraphData.addActivity(fromTime, endTime, useIAForScale,useIAForScale ? 2d: 1d);
             if (SP.getBoolean("showdevslope", false) && MainApp.devBranch)
                 secondGraphData.addDeviationSlope(fromTime, now, useDSForScale, 1d);
 
@@ -1486,6 +1531,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                             || SP.getBoolean("showcob", true)
                             || SP.getBoolean("showdeviations", false)
                             || SP.getBoolean("showratios", false)
+                            || SP.getBoolean("showactivitysecondary", false)
                             || SP.getBoolean("showdevslope", false)) {
                         iobGraph.setVisibility(View.VISIBLE);
                     } else {

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/CalibrationDialog.java

@@ -66,9 +66,9 @@ public class CalibrationDialog extends DialogFragment implements View.OnClickLis
         bgNumber = (NumberPicker) view.findViewById(R.id.overview_calibration_bg);
 
         if (units.equals(Constants.MMOL))
-            bgNumber.setParams(bg, 0d, 30d, 0.1d, new DecimalFormat("0.0"), false);
+            bgNumber.setParams(bg, 0d, 30d, 0.1d, new DecimalFormat("0.0"), false, view.findViewById(R.id.ok));
         else
-            bgNumber.setParams(bg, 0d, 500d, 1d, new DecimalFormat("0"), false);
+            bgNumber.setParams(bg, 0d, 500d, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
 
         unitsView = (TextView) view.findViewById(R.id.overview_calibration_units);
         unitsView.setText(units);

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewCarbsDialog.java

@@ -130,15 +130,15 @@ public class NewCarbsDialog extends DialogFragment implements OnClickListener, C
         startHypoTTCheckbox = view.findViewById(R.id.newcarbs_hypo_tt);
 
         editTime = view.findViewById(R.id.newcarbs_time);
-        editTime.setParams(0d, -12 * 60d, 12 * 60d, 5d, new DecimalFormat("0"), false, textWatcher);
+        editTime.setParams(0d, -12 * 60d, 12 * 60d, 5d, new DecimalFormat("0"), false, view.findViewById(R.id.ok), textWatcher);
 
         editDuration = view.findViewById(R.id.new_carbs_duration);
-        editDuration.setParams(0d, 0d, 10d, 1d, new DecimalFormat("0"), false, textWatcher);
+        editDuration.setParams(0d, 0d, 10d, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok), textWatcher);
 
         maxCarbs = MainApp.getConstraintChecker().getMaxCarbsAllowed().value();
 
         editCarbs = view.findViewById(R.id.newcarb_carbsamount);
-        editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, textWatcher);
+        editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok), textWatcher);
 
         Button fav1Button = view.findViewById(R.id.newcarbs_plus1);
         fav1Button.setOnClickListener(this);

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewInsulinDialog.java

@@ -126,12 +126,12 @@ public class NewInsulinDialog extends DialogFragment implements OnClickListener
         editLayout = view.findViewById(R.id.newinsulin_time_layout);
         editLayout.setVisibility(View.GONE);
         editTime = view.findViewById(R.id.newinsulin_time);
-        editTime.setParams(0d, -12 * 60d, 12 * 60d, 5d, new DecimalFormat("0"), false, textWatcher);
+        editTime.setParams(0d, -12 * 60d, 12 * 60d, 5d, new DecimalFormat("0"), false, view.findViewById(R.id.ok), textWatcher);
 
         maxInsulin = MainApp.getConstraintChecker().getMaxBolusAllowed().value();
 
         editInsulin = view.findViewById(R.id.newinsulin_amount);
-        editInsulin.setParams(0d, 0d, maxInsulin, ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep, DecimalFormatter.pumpSupportedBolusFormat(), false, textWatcher);
+        editInsulin.setParams(0d, 0d, maxInsulin, ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep, DecimalFormatter.pumpSupportedBolusFormat(), false, view.findViewById(R.id.ok), textWatcher);
 
         Button plus1Button = view.findViewById(R.id.newinsulin_plus05);
         plus1Button.setOnClickListener(this);

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/NewTreatmentDialog.java

@@ -101,8 +101,8 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
         editCarbs = (NumberPicker) view.findViewById(R.id.treatments_newtreatment_carbsamount);
         editInsulin = (NumberPicker) view.findViewById(R.id.treatments_newtreatment_insulinamount);
 
-        editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, textWatcher);
+        editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok), textWatcher);
-        editInsulin.setParams(0d, 0d, maxInsulin, ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep, DecimalFormatter.pumpSupportedBolusFormat(), false, textWatcher);
+        editInsulin.setParams(0d, 0d, maxInsulin, ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep, DecimalFormatter.pumpSupportedBolusFormat(), false, view.findViewById(R.id.ok), textWatcher);
 
         recordOnlyCheckbox = (CheckBox) view.findViewById(R.id.newtreatment_record_only);
 

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/WizardDialog.java

@@ -238,11 +238,11 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         Integer maxCarbs = MainApp.getConstraintChecker().getMaxCarbsAllowed().value();
         Double maxCorrection = MainApp.getConstraintChecker().getMaxBolusAllowed().value();
 
-        editBg.setParams(0d, 0d, 500d, 0.1d, new DecimalFormat("0.0"), false, textWatcher);
+        editBg.setParams(0d, 0d, 500d, 0.1d, new DecimalFormat("0.0"), false, view.findViewById(R.id.ok), textWatcher);
-        editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, textWatcher);
+        editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok), textWatcher);
         double bolusstep = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription().bolusStep;
-        editCorr.setParams(0d, -maxCorrection, maxCorrection, bolusstep, DecimalFormatter.pumpSupportedBolusFormat(), false, textWatcher);
+        editCorr.setParams(0d, -maxCorrection, maxCorrection, bolusstep, DecimalFormatter.pumpSupportedBolusFormat(), false, view.findViewById(R.id.ok), textWatcher);
-        editCarbTime.setParams(0d, -60d, 60d, 5d, new DecimalFormat("0"), false);
+        editCarbTime.setParams(0d, -60d, 60d, 5d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
         initDialog();
 
         setCancelable(true);

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.java

@@ -21,6 +21,7 @@ import java.util.List;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.CareportalEvent;
@@ -46,6 +47,7 @@ import info.nightscout.androidaps.plugins.general.overview.graphExtensions.TimeA
 import info.nightscout.androidaps.plugins.treatments.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.Round;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 18.10.2017.
@@ -344,6 +346,59 @@ public class GraphData {
                 ? Profile.fromMgdlToUnits(bgReadingsArray.get(0).value, units) : Profile.fromMgdlToUnits(100, units);
     }
 
+    public void addActivity(long fromTime, long toTime, boolean useForScale, double scale) {
+        FixedLineGraphSeries<ScaledDataPoint> actSeriesHist;
+        List<ScaledDataPoint> actArrayHist = new ArrayList<>();
+        FixedLineGraphSeries<ScaledDataPoint> actSeriesPred;
+        List<ScaledDataPoint> actArrayPred = new ArrayList<>();
+
+        double now = System.currentTimeMillis();
+        Scale actScale = new Scale();
+        IobTotal total = null;
+
+        for (long time = fromTime; time <= toTime; time += 5 * 60 * 1000L) {
+            Profile profile = ProfileFunctions.getInstance().getProfile(time);
+            double act = 0d;
+            if (profile == null) continue;
+            total = iobCobCalculatorPlugin.calculateFromTreatmentsAndTempsSynchronized(time, profile);
+            act = total.activity;
+
+            if(time<=now)
+                actArrayHist.add(new ScaledDataPoint(time, act, actScale));
+            else
+                actArrayPred.add(new ScaledDataPoint(time, act, actScale));
+        }
+
+        ScaledDataPoint[] actData = new ScaledDataPoint[actArrayHist.size()];
+        actData = actArrayHist.toArray(actData);
+        actSeriesHist = new FixedLineGraphSeries<>(actData);
+        actSeriesHist.setDrawBackground(false);
+        actSeriesHist.setColor(MainApp.gc(R.color.activity));
+        actSeriesHist.setThickness(3);
+
+        addSeries(actSeriesHist);
+
+        actData = new ScaledDataPoint[actArrayPred.size()];
+        actData = actArrayPred.toArray(actData);
+        actSeriesPred = new FixedLineGraphSeries<>(actData);
+
+        Paint paint = new Paint();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(3);
+        paint.setPathEffect(new DashPathEffect(new float[]{4, 4}, 0));
+        paint.setColor(MainApp.gc(R.color.activity));
+        actSeriesPred.setCustomPaint(paint);
+
+        double maxIAValue = SP.getDouble(R.string.key_scale_insulin_activity, 0.05);
+        if (useForScale) {
+            maxY = maxIAValue;
+            minY = -maxIAValue;
+        }
+        actScale.setMultiplier(maxY * scale / maxIAValue);
+
+        addSeries(actSeriesPred);
+    }
+
     // scale in % of vertical size (like 0.3)
     public void addIob(long fromTime, long toTime, boolean useForScale, double scale) {
         FixedLineGraphSeries<ScaledDataPoint> iobSeries;

app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.java

@@ -790,7 +790,7 @@ public class SmsCommunicatorPlugin extends PluginBase {
         passCode += Character.toString((char) (startChar2 + Math.random() * ('z' - 'a' + 1)));
         int startChar3 = Math.random() > 0.5 ? 'a' : 'A';
         passCode += Character.toString((char) (startChar3 + Math.random() * ('z' - 'a' + 1)));
-        passCode.replace('l', 'k').replace('I', 'J');
+        passCode = passCode.replace('l', 'k').replace('I', 'J');
         return passCode;
     }
 

app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.java

@@ -78,7 +78,7 @@ public class LocalProfileFragment extends SubscriberFragment {
         PumpDescription pumpDescription = ConfigBuilderPlugin.getPlugin().getActivePump().getPumpDescription();
         View layout = inflater.inflate(R.layout.localprofile_fragment, container, false);
         diaView = (NumberPicker) layout.findViewById(R.id.localprofile_dia);
-        diaView.setParams(LocalProfilePlugin.getPlugin().dia, 2d, 48d, 0.1d, new DecimalFormat("0.0"), false, textWatch);
+        diaView.setParams(LocalProfilePlugin.getPlugin().dia, 2d, 48d, 0.1d, new DecimalFormat("0.0"), false, layout.findViewById(R.id.localprofile_save), textWatch);
         mgdlView = (RadioButton) layout.findViewById(R.id.localprofile_mgdl);
         mmolView = (RadioButton) layout.findViewById(R.id.localprofile_mmol);
         icView = new TimeListEdit(getContext(), layout, R.id.localprofile_ic, MainApp.gs(R.string.nsprofileview_ic_label) + ":", LocalProfilePlugin.getPlugin().ic, null, 0.5, 50d, 0.1d, new DecimalFormat("0.0"), save);
@@ -124,7 +124,7 @@ public class LocalProfileFragment extends SubscriberFragment {
             LocalProfilePlugin.getPlugin().loadSettings();
             mgdlView.setChecked(LocalProfilePlugin.getPlugin().mgdl);
             mmolView.setChecked(LocalProfilePlugin.getPlugin().mmol);
-            diaView.setParams(LocalProfilePlugin.getPlugin().dia, 5d, 12d, 0.1d, new DecimalFormat("0.0"), false, textWatch);
+            diaView.setParams(LocalProfilePlugin.getPlugin().dia, 5d, 12d, 0.1d, new DecimalFormat("0.0"), false, view.findViewById(R.id.localprofile_save), textWatch);
             icView = new TimeListEdit(getContext(), layout, R.id.localprofile_ic, MainApp.gs(R.string.nsprofileview_ic_label) + ":", LocalProfilePlugin.getPlugin().ic, null, 0.5, 50d, 0.1d, new DecimalFormat("0.0"), save);
             isfView = new TimeListEdit(getContext(), layout, R.id.localprofile_isf, MainApp.gs(R.string.nsprofileview_isf_label) + ":", LocalProfilePlugin.getPlugin().isf, null, 0.5, 500d, 0.1d, new DecimalFormat("0.0"), save);
             basalView = new TimeListEdit(getContext(), layout, R.id.localprofile_basal, MainApp.gs(R.string.nsprofileview_basal_label) + ": " + getSumLabel(), LocalProfilePlugin.getPlugin().basal, null, pumpDescription.basalMinimumRate, 10, 0.01d, new DecimalFormat("0.00"), save);

app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java

@@ -39,6 +39,7 @@ import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderFragment;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
@@ -1313,13 +1314,13 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
     }
 
     @Override
-    public String manufacter() {
+    public ManufacturerType manufacturer() {
-        return "Roche";
+        return ManufacturerType.Roche;
     }
 
     @Override
-    public String model() {
+    public PumpType model() {
-        return "Combo";
+        return PumpType.AccuChekCombo;
     }
 
     @Override

app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.pump.common.data.DoseSettings;
 import info.nightscout.androidaps.utils.Round;
 
@@ -18,7 +19,7 @@ import info.nightscout.androidaps.utils.Round;
 
 public enum PumpType {
 
-    GenericAAPS("Generic AAPS", "AndroidAPS", "VirutalPump", 0.1d, null, //
+    GenericAAPS("Generic AAPS", ManufacturerType.AndroidAPS, "VirutalPump", 0.1d, null, //
             new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
             PumpTempBasalType.Percent, //
             new DoseSettings(10, 30, 24 * 60, 0d, 500d), PumpCapability.BasalRate_Duration15and30minAllowed, //
@@ -26,7 +27,7 @@ public enum PumpType {
 
     // Cellnovo
 
-    Cellnovo1("Cellnovo", "Cellnovo", "Cellnovo", 0.05d, null, //
+    Cellnovo1("Cellnovo", ManufacturerType.Cellnovo, "Cellnovo", 0.05d, null, //
             new DoseSettings(0.05d, 30, 24 * 60, 1d, null),
             PumpTempBasalType.Percent,
             new DoseSettings(5, 30, 24 * 60, 0d, 200d), PumpCapability.BasalRate_Duration30minAllowed, //
@@ -34,32 +35,32 @@ public enum PumpType {
 
     // Accu-Chek
 
-    AccuChekCombo("Accu-Chek Combo", "Roche", "Combo", 0.1d, null, //
+    AccuChekCombo("Accu-Chek Combo", ManufacturerType.Roche, "Combo", 0.1d, null, //
             new DoseSettings(0.1d, 15, 12 * 60, 0.1d), //
             PumpTempBasalType.Percent,
             new DoseSettings(10, 15, 12 * 60, 0d, 500d), PumpCapability.BasalRate_Duration15and30minAllowed, //
             0.01d, 0.01d, DoseStepSize.ComboBasal, PumpCapability.ComboCapabilities), //
 
-    AccuChekSpirit("Accu-Chek Spirit", "Roche", "Spirit", 0.1d, null, //
+    AccuChekSpirit("Accu-Chek Spirit", ManufacturerType.Roche, "Spirit", 0.1d, null, //
             new DoseSettings(0.1d, 15, 12 * 60, 0.1d), //
             PumpTempBasalType.Percent,
             new DoseSettings(10, 15, 12 * 60, 0d, 500d), PumpCapability.BasalRate_Duration15and30minAllowed, //
             0.01d, 0.1d, null, PumpCapability.VirtualPumpCapabilities), //
 
-    AccuChekInsight("Accu-Chek Insight", "Roche", "Insight", 0.05d, DoseStepSize.InsightBolus, //
+    AccuChekInsight("Accu-Chek Insight", ManufacturerType.Roche, "Insight", 0.05d, DoseStepSize.InsightBolus, //
             new DoseSettings(0.05d, 15, 24 * 60, 0.05d), //
             PumpTempBasalType.Percent,
             new DoseSettings(10, 15, 24 * 60, 0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, //
             0.02d, 0.01d, null, PumpCapability.InsightCapabilities), //
 
-    AccuChekInsightBluetooth("Accu-Chek Insight", "Roche", "Insight", 0.01d, null, //
+    AccuChekInsightBluetooth("Accu-Chek Insight", ManufacturerType.Roche, "Insight", 0.01d, null, //
             new DoseSettings(0.01d, 15, 24 * 60, 0.05d), //
             PumpTempBasalType.Percent,
             new DoseSettings(10, 15, 24 * 60, 0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, //
             0.02d, 0.01d, DoseStepSize.InsightBolus, PumpCapability.InsightCapabilities), //
 
     // Animas
-    AnimasVibe("Animas Vibe","Animas", "Vibe", 0.05d, null, // AnimasBolus?
+    AnimasVibe("Animas Vibe",ManufacturerType.Animas, "Vibe", 0.05d, null, // AnimasBolus?
             new DoseSettings(0.05d, 30, 12 * 60, 0.05d), //
             PumpTempBasalType.Percent, //
             new DoseSettings(10, 30, 24 * 60, 0d, 300d), PumpCapability.BasalRate_Duration30minAllowed, //
@@ -68,19 +69,19 @@ public enum PumpType {
     AnimasPing("Animas Ping", "Ping", AnimasVibe),
 
     // Dana
-    DanaR("DanaR", "SOOIL", "DanaR", 0.05d, null, //
+    DanaR("DanaR", ManufacturerType.Sooil, "DanaR", 0.05d, null, //
             new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
             PumpTempBasalType.Percent, //
             new DoseSettings(10d, 60, 24 * 60, 0d, 200d), PumpCapability.BasalRate_Duration15and30minNotAllowed, //
             0.04d, 0.01d, null, PumpCapability.DanaCapabilities),
 
-    DanaRKorean("DanaR Korean", "SOOIL", "DanaRKorean", 0.05d, null, //
+    DanaRKorean("DanaR Korean", ManufacturerType.Sooil, "DanaRKorean", 0.05d, null, //
             new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
             PumpTempBasalType.Percent, //
             new DoseSettings(10d, 60, 24 * 60, 0d, 200d), PumpCapability.BasalRate_Duration15and30minNotAllowed, //
             0.1d, 0.01d, null, PumpCapability.DanaCapabilities),
 
-    DanaRS("DanaRS", "SOOIL", "DanaRS", 0.05d, null, //
+    DanaRS("DanaRS", ManufacturerType.Sooil, "DanaRS", 0.05d, null, //
             new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
             PumpTempBasalType.Percent, //
             new DoseSettings(10d, 60, 24 * 60, 0d, 200d), PumpCapability.BasalRate_Duration15and30minAllowed, //
@@ -90,14 +91,14 @@ public enum PumpType {
 
 
     // Insulet
-    Insulet_Omnipod("Insulet Omnipod", "Insulet", "Omnipod", 0.05d, null, //
+    Insulet_Omnipod("Insulet Omnipod", ManufacturerType.Insulet, "Omnipod", 0.05d, null, //
             new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
             PumpTempBasalType.Absolute, //
             new DoseSettings(0.05d, 30, 12 * 60, 0d, 30.0d), PumpCapability.BasalRate_Duration30minAllowed, // cannot exceed max basal rate 30u/hr
             0.05d, 0.05d, null, PumpCapability.VirtualPumpCapabilities),
 
     // Medtronic
-    Medtronic_512_712("Medtronic 512/712", "Medtronic", "512/712", 0.05d, null, //
+    Medtronic_512_712("Medtronic 512/712", ManufacturerType.Medtronic, "512/712", 0.05d, null, //
             new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
             PumpTempBasalType.Absolute, //
             new DoseSettings(0.05d, 30, 24*60, 0d, 35d), PumpCapability.BasalRate_Duration30minAllowed, //
@@ -106,7 +107,7 @@ public enum PumpType {
     Medtronic_515_715("Medtronic 515/715", "515/715", Medtronic_512_712),
     Medtronic_522_722("Medtronic 522/722", "522/722", Medtronic_512_712),
 
-    Medtronic_523_723_Revel("Medtronic 523/723 (Revel)", "Medtronic", "523/723 (Revel)", 0.05d, null, //
+    Medtronic_523_723_Revel("Medtronic 523/723 (Revel)", ManufacturerType.Medtronic, "523/723 (Revel)", 0.05d, null, //
             new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
             PumpTempBasalType.Absolute, //
             new DoseSettings(0.05d, 30, 24*60, 0d, 35d), PumpCapability.BasalRate_Duration30minAllowed, //
@@ -114,14 +115,14 @@ public enum PumpType {
 
     Medtronic_554_754_Veo("Medtronic 554/754 (Veo)", "554/754 (Veo)", Medtronic_523_723_Revel), // TODO
 
-    Medtronic_640G("Medtronic 640G", "Medtronic", "640G", 0.025d, null, //
+    Medtronic_640G("Medtronic 640G", ManufacturerType.Medtronic, "640G", 0.025d, null, //
             new DoseSettings(0.05d, 30, 8 * 60, 0.05d), //
             PumpTempBasalType.Absolute, //
             new DoseSettings(0.05d, 30, 24 * 60, 0d, 35d), PumpCapability.BasalRate_Duration30minAllowed, //
             0.025d, 0.025d, DoseStepSize.MedtronicVeoBasal, PumpCapability.VirtualPumpCapabilities), //
 
     // Tandem
-    TandemTSlim("Tandem t:slim", "Tandem", "t:slim", 0.01d, null, //
+    TandemTSlim("Tandem t:slim", ManufacturerType.Tandem, "t:slim", 0.01d, null, //
             new DoseSettings(0.01d, 15, 8 * 60, 0.4d),
             PumpTempBasalType.Percent,
             new DoseSettings(1, 15, 8 * 60, 0d, 250d), PumpCapability.BasalRate_Duration15and30minAllowed, //
@@ -130,10 +131,14 @@ public enum PumpType {
     TandemTFlex("Tandem t:flex", "t:flex", TandemTSlim), //
     TandemTSlimG4("Tandem t:slim G4", "t:slim G4", TandemTSlim), //
     TandemTSlimX2("Tandem t:slim X2", "t:slim X2", TandemTSlim), //
+
+    // MDI
+    MDI("MDI", ManufacturerType.AndroidAPS, "MDI")
     ;
 
+
     private String description;
-    private String manufacter;
+    private ManufacturerType manufacturer;
     private String model;
     private double bolusSize;
     private DoseStepSize specialBolusSize;
@@ -163,9 +168,18 @@ public enum PumpType {
     {
         this.description = description;
         this.parent = parent;
-        parent.model = model;
+        this.model = model;
     }
 
+
+    PumpType(String description, ManufacturerType manufacturer, String model)
+    {
+        this.description = description;
+        this.manufacturer = manufacturer;
+        this.model = model;
+    }
+
+
     PumpType(String description, String model, PumpType parent, PumpCapability pumpCapability)
     {
         this.description = description;
@@ -174,20 +188,20 @@ public enum PumpType {
         parent.model = model;
     }
 
-    PumpType(String description, String manufacter, String model, double bolusSize, DoseStepSize specialBolusSize, //
+    PumpType(String description, ManufacturerType manufacturer, String model, double bolusSize, DoseStepSize specialBolusSize, //
              DoseSettings extendedBolusSettings, //
              PumpTempBasalType pumpTempBasalType, DoseSettings tbrSettings,  PumpCapability specialBasalDurations, //
              double baseBasalMinValue, double baseBasalStep, DoseStepSize baseBasalSpecialSteps, PumpCapability pumpCapability)
     {
-        this(description, manufacter, model, bolusSize, specialBolusSize, extendedBolusSettings, pumpTempBasalType, tbrSettings, specialBasalDurations, baseBasalMinValue, null, baseBasalStep, baseBasalSpecialSteps, pumpCapability);
+        this(description, manufacturer, model, bolusSize, specialBolusSize, extendedBolusSettings, pumpTempBasalType, tbrSettings, specialBasalDurations, baseBasalMinValue, null, baseBasalStep, baseBasalSpecialSteps, pumpCapability);
     }
 
-    PumpType(String description, String manufacter, String model, double bolusSize, DoseStepSize specialBolusSize, //
+    PumpType(String description, ManufacturerType manufacturer, String model, double bolusSize, DoseStepSize specialBolusSize, //
              DoseSettings extendedBolusSettings, //
              PumpTempBasalType pumpTempBasalType, DoseSettings tbrSettings, PumpCapability specialBasalDurations, //
              double baseBasalMinValue, Double baseBasalMaxValue, double baseBasalStep, DoseStepSize baseBasalSpecialSteps, PumpCapability pumpCapability) {
         this.description = description;
-        this.manufacter = manufacter;
+        this.manufacturer = manufacturer;
         this.model = model;
         this.bolusSize = bolusSize;
         this.specialBolusSize = specialBolusSize;
@@ -207,8 +221,8 @@ public enum PumpType {
         return description;
     }
 
-    public String getManufacter() {
+    public ManufacturerType getManufacturer() {
-        return isParentSet() ? parent.manufacter : manufacter;
+        return isParentSet() ? parent.manufacturer : manufacturer;
     }
 
     public String getModel() {

app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java

@@ -28,6 +28,7 @@ import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
@@ -376,9 +377,9 @@ public abstract class AbstractDanaRPlugin extends PluginBase implements PumpInte
     }
 
     @Override
-    public String manufacter() {
+    public ManufacturerType manufacturer() {
-        return "SOOIL";
+        return ManufacturerType.Sooil;
-    };
+    }
 
     @Override
     public String serialNumber() {

app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java

@@ -361,8 +361,8 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
     }
 
     @Override
-    public String model() {
+    public PumpType model() {
-        return "DanaR";
+        return PumpType.DanaR;
     }
 
     private PumpEnactResult cancelRealTempBasal() {

app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.java

@@ -97,10 +97,10 @@ public class DanaRUserOptionsActivity extends Activity {
                     + "\npumpUnits:" + pump.units
                     + "\nlowReservoir:" + pump.lowReservoirRate);
 
-        screenTimeout.setParams((double) pump.lcdOnTimeSec, 5d, 240d, 5d, new DecimalFormat("1"), false);
+        screenTimeout.setParams((double) pump.lcdOnTimeSec, 5d, 240d, 5d, new DecimalFormat("1"), false, findViewById(R.id.ok));
-        backlightTimeout.setParams((double) pump.backlightOnTimeSec, 1d, 60d, 1d, new DecimalFormat("1"), false);
+        backlightTimeout.setParams((double) pump.backlightOnTimeSec, 1d, 60d, 1d, new DecimalFormat("1"), false, findViewById(R.id.ok));
-        shutdown.setParams((double) pump.shutdownHour, 0d, 24d, 1d, new DecimalFormat("1"), true);
+        shutdown.setParams((double) pump.shutdownHour, 0d, 24d, 1d, new DecimalFormat("1"), true, findViewById(R.id.ok));
-        lowReservoir.setParams((double) pump.lowReservoirRate, 10d, 60d, 10d, new DecimalFormat("10"), false);
+        lowReservoir.setParams((double) pump.lowReservoirRate, 10d, 60d, 10d, new DecimalFormat("10"), false, findViewById(R.id.ok));
         switch (pump.beepAndAlarm) {
             case 0x01:
                 pumpAlarmSound.setChecked(true);

app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java

@@ -365,8 +365,8 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
     }
 
     @Override
-    public String model() {
+    public PumpType model() {
-        return "DanaRKorean";
+        return PumpType.DanaRKorean;
     }
 
     private PumpEnactResult cancelRealTempBasal() {

app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java

@@ -38,6 +38,7 @@ import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderFragment;
 import info.nightscout.androidaps.plugins.configBuilder.DetailedBolusInfoStorage;
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
@@ -769,13 +770,13 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
     }
 
     @Override
-    public String manufacter() {
+    public ManufacturerType manufacturer() {
-        return "SOOIL";
+        return ManufacturerType.Sooil;
     }
 
     @Override
-    public String model() {
+    public PumpType model() {
-        return "DanaRS";
+        return PumpType.DanaRS;
     }
 
     @Override

app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java

@@ -403,8 +403,8 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
     }
 
     @Override
-    public String model() {
+    public PumpType model() {
-        return "DanaRv2";
+        return PumpType.DanaRv2;
     }
 
     @Override

app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java

@@ -8,6 +8,7 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 
+import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.*;
@@ -945,13 +946,13 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
     }
 
     @Override
-    public String manufacter() {
+    public ManufacturerType manufacturer() {
-        return "Roche";
+        return ManufacturerType.Roche;
     }
 
     @Override
-    public String model() {
+    public PumpType model() {
-        return "Insight";
+        return PumpType.AccuChekInsightBluetooth;
     }
 
     @Override

app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java

@@ -19,8 +19,10 @@ import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.InstanceId;
@@ -237,13 +239,13 @@ public class MDIPlugin extends PluginBase implements PumpInterface {
     }
 
     @Override
-    public String manufacter() {
+    public ManufacturerType manufacturer() {
-        return "AndroidAPS";
+        return ManufacturerType.AndroidAPS;
     }
 
     @Override
-    public String model() {
+    public PumpType model() {
-        return "MDI";
+        return PumpType.MDI;
     }
 
     @Override
@@ -258,7 +260,7 @@ public class MDIPlugin extends PluginBase implements PumpInterface {
 
     @Override
     public String shortStatus(boolean veryShort) {
-        return model();
+        return model().getModel();
     }
 
     @Override

app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.java

@@ -28,6 +28,7 @@ import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
@@ -438,13 +439,13 @@ public class VirtualPumpPlugin extends PluginBase implements PumpInterface {
     }
 
     @Override
-    public String manufacter() {
+    public ManufacturerType manufacturer() {
-        return pumpDescription.pumpType.getManufacter();
+        return pumpDescription.pumpType.getManufacturer();
     }
 
     @Override
-    public String model() {
+    public PumpType model() {
-        return pumpDescription.pumpType.getModel();
+        return pumpDescription.pumpType;
     }
 
     @Override

app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java

@@ -223,13 +223,13 @@ public class DateUtil {
                 t = t / 60;
                 if (t != 1) unit = MainApp.gs(R.string.unit_hours);
                 if (t > 24) {
-                    unit = MainApp.gs(R.string.unit_day);
+                    unit = MainApp.gs(R.string.unit_day) + "\"";
                     t = t / 24;
-                    if (t != 1) unit = MainApp.gs(R.string.unit_days);
+                    if (t != 1) unit = MainApp.gs(R.string.unit_days) + "\"";
                     if (t > 28) {
-                        unit = MainApp.gs(R.string.unit_week);
+                        unit = MainApp.gs(R.string.unit_week) + "\"";
                         t = t / 7;
-                        if (t != 1) unit = MainApp.gs(R.string.unit_weeks);
+                        if (t != 1) unit = MainApp.gs(R.string.unit_weeks) + "\"";
                     }
                 }
             }

app/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java

@@ -14,7 +14,6 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +33,7 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
         View.OnTouchListener, View.OnClickListener {
     private static Logger log = LoggerFactory.getLogger(NumberPicker.class);
 
-    TextView editText;
+    EditText editText;
     Button minusButton;
     Button plusButton;
 
@@ -46,6 +45,8 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
     boolean allowZero = false;
     TextWatcher textWatcher = null;
 
+    Button okButton = null;
+
     private Handler mHandler;
     private ScheduledExecutorService mUpdater;
 
@@ -56,7 +57,7 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
 
         private final int doubleLimit = 5;
 
-        public UpdateCounterTask(boolean inc) {
+        UpdateCounterTask(boolean inc) {
             mInc = inc;
         }
 
@@ -85,39 +86,32 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
     public NumberPicker(Context context, AttributeSet attrs) {
         super(context, attrs);
 
-        this.initialize(context, attrs);
+        this.initialize(context);
     }
 
-    public NumberPicker(Context context, AttributeSet attrs, int defStyleAttr) {
+    private void initialize(Context context) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    private void initialize(Context context, AttributeSet attrs) {
         // set layout view
         LayoutInflater.from(context).inflate(R.layout.number_picker_layout, this, true);
 
         // init ui components
-        minusButton = (Button) findViewById(R.id.decrement);
+        minusButton = findViewById(R.id.decrement);
         minusButton.setId(View.generateViewId());
-        plusButton = (Button) findViewById(R.id.increment);
+        plusButton = findViewById(R.id.increment);
         plusButton.setId(View.generateViewId());
-        editText = (EditText) findViewById(R.id.display);
+        editText = findViewById(R.id.display);
         editText.setId(View.generateViewId());
 
-        mHandler = new Handler() {
+        mHandler = new Handler(msg -> {
-            @Override
-            public void handleMessage(Message msg) {
             switch (msg.what) {
                 case MSG_INC:
                     inc(msg.arg1);
-                        return;
+                    return true;
                 case MSG_DEC:
                     dec(msg.arg1);
-                        return;
+                    return true;
             }
-                super.handleMessage(msg);
+            return false;
-            }
+        });
-        };
 
         minusButton.setOnTouchListener(this);
         minusButton.setOnKeyListener(this);
@@ -139,6 +133,13 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
             @Override
             public void afterTextChanged(Editable s) {
                 value = SafeParse.stringToDouble(editText.getText().toString());
+                if (okButton != null) {
+                    if (value > maxValue || value < minValue)
+                        okButton.setVisibility(INVISIBLE);
+                    else
+                        okButton.setVisibility(VISIBLE);
+                }
+
             }
         });
     }
@@ -146,24 +147,42 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
     public void setTextWatcher(TextWatcher textWatcher) {
         this.textWatcher = textWatcher;
         editText.addTextChangedListener(textWatcher);
+        editText.setOnFocusChangeListener((v, hasFocus) -> {
+            if (!hasFocus) {
+                value = SafeParse.stringToDouble(editText.getText().toString());
+                if (value > maxValue) {
+                    value = maxValue;
+                    ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.youareonallowedlimit));
+                    updateEditText();
+                    okButton.setVisibility(VISIBLE);
+                }
+                if (value < minValue) {
+                    value = minValue;
+                    ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.youareonallowedlimit));
+                    updateEditText();
+                    okButton.setVisibility(VISIBLE);
+                }
+            }
+        });
     }
 
-    public void setParams(Double initValue, Double minValue, Double maxValue, Double step, NumberFormat formater, boolean allowZero, TextWatcher textWatcher) {
+    public void setParams(Double initValue, Double minValue, Double maxValue, Double step, NumberFormat formater, boolean allowZero, Button okButton, TextWatcher textWatcher) {
         if (this.textWatcher != null) {
             editText.removeTextChangedListener(this.textWatcher);
         }
-        setParams(initValue, minValue, maxValue, step, formater, allowZero);
+        setParams(initValue, minValue, maxValue, step, formater, allowZero, okButton);
         this.textWatcher = textWatcher;
         editText.addTextChangedListener(textWatcher);
     }
 
-    public void setParams(Double initValue, Double minValue, Double maxValue, Double step, NumberFormat formater, boolean allowZero) {
+    public void setParams(Double initValue, Double minValue, Double maxValue, Double step, NumberFormat formater, boolean allowZero, Button okButton) {
         this.value = initValue;
         this.minValue = minValue;
         this.maxValue = maxValue;
         this.step = step;
         this.formater = formater;
         this.allowZero = allowZero;
+        this.okButton = okButton;
 
         editText.setKeyListener(DigitsKeyListener.getInstance(minValue < 0, step != Math.rint(step)));
 

app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java

@@ -244,8 +244,8 @@ public class TimeListEdit {
         if (i == 0) next = ONEHOURINSECONDS;
         fillSpinner(timeSpinner, secondFromMidnight(i), previous, next);
 
-        editText1.setParams(value1(i), min, max, step, formatter, false);
+        editText1.setParams(value1(i), min, max, step, formatter, false, view.findViewById(R.id.localprofile_save));
-        editText2.setParams(value2(i), min, max, step, formatter, false);
+        editText2.setParams(value2(i), min, max, step, formatter, false, view.findViewById(R.id.localprofile_save));
 
         if (data2 == null) {
             editText2.setVisibility(View.GONE);

app/src/main/res/values-af/strings.xml

@@ -865,6 +865,7 @@
     <string name="fabric_upload">Fabric Upload</string>
     <string name="allow_automated_crash_reporting">Laat outomatiese Foutverslagdoening en kenmerk data stuur na die ontwikkelaars via die fabric.io diens.</string>
     <string name="g5appnotdetected">Hernuwe asseblief jou G5 toepassing na \'n ondersteunde weergawe</string>
+    <string name="dexcom_app_not_installed">Dexcom toep is nie geïnstalleer nie.</string>
     <string name="start_activity_tt">Begin aktiwiteit TT</string>
     <string name="start_eating_soon_tt">Begin eet gou TT</string>
     <string name="temptargetshort">TT</string>
@@ -874,6 +875,7 @@
     <string name="bolusrecordedonly">Bolus sal slegs opgeneem word</string>
     <string name="ns_autobackfill_summary">Autobackfill vermiste BGs vanaf NS</string>
     <string name="loop_smbsetbypump_label">SMB gestel deur pomp</string>
+    <string name="overview_show_activity">Aktiwiteit</string>
     <string name="overview_show_sensitivity">Sensitiewiteit</string>
     <string name="overview_show_deviations">Afwykings</string>
     <string name="overview_show_cob">Karbs AanBoord</string>
@@ -1148,6 +1150,31 @@
     <string name="dexcom_lognssensorchange_summary">Skep geleentheid \"sensor verandering\" in NS automaties op sensor begin</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
+    <string name="unit_second">sekonde</string>
+    <string name="unit_minute">minuut</string>
+    <string name="unit_hour">uur</string>
+    <string name="unit_day">dag</string>
+    <string name="unit_week">week</string>
+    <string name="unit_seconds">sekondes</string>
+    <string name="unit_minutes">minute</string>
+    <string name="unit_hours">ure</string>
+    <string name="unit_days">dae</string>
+    <string name="unit_weeks">weke</string>
+    <string name="summary_tidepool_username">JouTidepool login gebruiker, normaallweg \'n email adres</string>
+    <string name="title_tidepool_username">Login Gebruiker Naam</string>
+    <string name="summary_tidepool_password">Jou Tidepool login kode</string>
+    <string name="title_tidepool_password">Login wagwoord</string>
+    <string name="title_tidepool_test_login">Toets Tidepool Login</string>
+    <string name="summary_tidepool_dev_servers">As ge-aktiveer sal data oplaai na https://int-app.tidepool.org instede van die gewone https://app.tidepool.org/</string>
+    <string name="title_tidepool_dev_servers">Gebruik Integrasie (toets) bedieners</string>
+    <string name="tidepool">Tidepool</string>
+    <string name="tidepool_shortname">TDP</string>
+    <string name="description_tidepool">Laai data op na Tidepool</string>
+    <string name="tidepool_upload_cgm">Laai CGM data op</string>
+    <string name="tidepool_upload_bolus">Laai behandelings op (insulien, karbs)</string>
+    <string name="tidepool_upload_tbr">Laai tydelike basale op</string>
+    <string name="tidepool_upload_profile">Laai profiel veranderings, tydelike teikens op</string>
+    <string name="tidepool_upload_bg">Laai BG toetse op</string>
     <string name="dst_in_24h_warning">Daglig spaar tyd verandering in 24 h of minder</string>
     <string name="dst_loop_disabled_warning">Daglig spaar tyd het verander minder as 3 ure terug - Geslote lus afgeskakel</string>
     <string name="storage">interne berging beperking</string>
@@ -1160,8 +1187,12 @@
     <string name="old_version">ou weergawe</string>
     <string name="very_old_version">baie ou weergawe</string>
     <string name="new_version_warning">Nuwe weergawe reeds beskikbaar vir %1$d! Sal na 60 dae terugval na LGS, lus sal ongeldig gemaak word na 90 dae</string>
+    <string name="scale_insulin_activity">Grafiek skall insulien aktiwiteit [U/min]</string>
     <string name="twohours">2h</string>
     <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="dexcom_app_patched">DexcomG App (opgedateerde)</string>
+    <string name="dexcom_short">DXCM</string>
+    <string name="description_source_dexcom">Ontvang BG waardes vanaf die opgedateerde Dexcom app.</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d dae</item>
         <item quantity="other">%1$d dae</item>

app/src/main/res/values-bg/strings.xml

@@ -865,6 +865,7 @@
     <string name="fabric_upload">Качване на статистики във Fabric</string>
     <string name="allow_automated_crash_reporting">Позволява автоматично изпращане на данни за грешки и статистически данни до разработчиците чрез услугата fabric.io .</string>
     <string name="g5appnotdetected">Моля обновете Dexcom приложението до поддържана версия</string>
+    <string name="dexcom_app_not_installed">Приложението на Dexcom не е инсталирано.</string>
     <string name="start_activity_tt">Старт на вр.цел за физ. активност</string>
     <string name="start_eating_soon_tt">Старт на вр. цел за Eating soon</string>
     <string name="temptargetshort">Вр.цел</string>
@@ -1148,6 +1149,27 @@
     <string name="dexcom_lognssensorchange_summary">Създаване на събитие \"Смяна на сеснзор\" в NS автоматично при старт на сензор</string>
     <string name="tomato">Tomato(MяоМяо)</string>
     <string name="tomato_short">Tomato</string>
+    <string name="unit_second">секунда</string>
+    <string name="unit_minute">минута</string>
+    <string name="unit_hour">час</string>
+    <string name="unit_seconds">секунди</string>
+    <string name="unit_minutes">минути</string>
+    <string name="unit_hours">часове</string>
+    <string name="summary_tidepool_username">Потребителското Ви име за Tidepool, обикновено е Вашия имейл</string>
+    <string name="title_tidepool_username">Потребителско име</string>
+    <string name="summary_tidepool_password">Tidepool парола</string>
+    <string name="title_tidepool_password">Парола </string>
+    <string name="title_tidepool_test_login">Тест на Tidepool</string>
+    <string name="summary_tidepool_dev_servers">Когато е активирано, данните ще отиват към https://int-app.tidepool.org вместо към стандартния адрес https://app.tidepool.org/</string>
+    <string name="title_tidepool_dev_servers">Използвай тестовите сървъри</string>
+    <string name="tidepool">Tidepool</string>
+    <string name="tidepool_shortname">TDP</string>
+    <string name="description_tidepool">Качване на данни в Tidepool</string>
+    <string name="tidepool_upload_cgm">Качвай данни за КЗ</string>
+    <string name="tidepool_upload_bolus">Качвай лечения (инсулин, въглехидрати)</string>
+    <string name="tidepool_upload_tbr">Качвай временни базали</string>
+    <string name="tidepool_upload_profile">Качвай смени на профил и временни цели</string>
+    <string name="tidepool_upload_bg">Качвай ръчните измервания на КЗ</string>
     <string name="dst_in_24h_warning">Смяна на времето след по-малко от 24ч</string>
     <string name="dst_loop_disabled_warning">Смяна на времето след по-малко от 3 часа - минавам в отворен режим</string>
     <string name="storage">Ограничение поради липса на памет</string>
@@ -1162,6 +1184,9 @@
     <string name="new_version_warning">Има нова версия от най-малко %1$d дни! Връщане към LGS след 60 дни, цикълът ще бъде изключен след 90 дни</string>
     <string name="twohours">2ч</string>
     <string name="formatinsulinunits">%1$.2fЕ</string>
+    <string name="dexcom_app_patched">Dexcom приложение (модифицирано)</string>
+    <string name="dexcom_short">DXCM</string>
+    <string name="description_source_dexcom">Да получава данни за КЗ от модифицираното приложение на Dexcom.</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d дeн</item>
         <item quantity="other">%1$d дни</item>

app/src/main/res/values-cs/strings.xml

@@ -865,6 +865,7 @@
     <string name="fabric_upload">Odesílání do Fabric</string>
     <string name="allow_automated_crash_reporting">Automatické odesílání chyb aplikace a statistiky používání vývojářům pomocí služby fabric.io.</string>
     <string name="g5appnotdetected">Prosím aktualizujte Dexcom aplikaci na podporovanou verzi</string>
+    <string name="dexcom_app_not_installed">Aplikace Dexcom není nainstalována.</string>
     <string name="start_activity_tt">Spustit Dočasný cíl Aktivita</string>
     <string name="start_eating_soon_tt">Spustit Dočasný cíl Blížící se jídlo</string>
     <string name="temptargetshort">DoCíl</string>
@@ -874,6 +875,7 @@
     <string name="bolusrecordedonly">Bolus bude pouze zaznamenán</string>
     <string name="ns_autobackfill_summary">Automaticky doplňovat chybějící glykémie z NS</string>
     <string name="loop_smbsetbypump_label">SMB provedené pumpou</string>
+    <string name="overview_show_activity">Aktivita</string>
     <string name="overview_show_sensitivity">Citlivost</string>
     <string name="overview_show_deviations">Odchylky</string>
     <string name="overview_show_cob">Zbývající sacharidy</string>
@@ -1148,6 +1150,31 @@
     <string name="dexcom_lognssensorchange_summary">Vytvořit událost \"Výměna senzoru\" v NS automaticky po spuštění senzoru</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
+    <string name="unit_second">sekunda</string>
+    <string name="unit_minute">minuta</string>
+    <string name="unit_hour">hodina</string>
+    <string name="unit_day">den</string>
+    <string name="unit_week">týden</string>
+    <string name="unit_seconds">sekund</string>
+    <string name="unit_minutes">minut</string>
+    <string name="unit_hours">hodin</string>
+    <string name="unit_days">dnů</string>
+    <string name="unit_weeks">týdnů</string>
+    <string name="summary_tidepool_username">Vaše uživatelské jméno na Tidepoolu, obvykle vaše e-mailová adresa</string>
+    <string name="title_tidepool_username">Uživatelské jméno</string>
+    <string name="summary_tidepool_password">Heslo na Tidepoolu</string>
+    <string name="title_tidepool_password">Heslo</string>
+    <string name="title_tidepool_test_login">Otestovat přihlášení na Tidepool</string>
+    <string name="summary_tidepool_dev_servers">Pokud je povoleno, data budou nahrávána na https://int-app.tidepool.org místo na https://app.tidepool.org/</string>
+    <string name="title_tidepool_dev_servers">Používat testovací servery</string>
+    <string name="tidepool">Tidepool</string>
+    <string name="tidepool_shortname">TDP</string>
+    <string name="description_tidepool">Nahrávání dat do Tidepoolu</string>
+    <string name="tidepool_upload_cgm">Nahrávat CGM data</string>
+    <string name="tidepool_upload_bolus">Nahrávat ošetření (inzulín, sacharidy)</string>
+    <string name="tidepool_upload_tbr">Nahrávat dočasné bazály</string>
+    <string name="tidepool_upload_profile">Nahrávat přepnutí profilu, dočasné cíle</string>
+    <string name="tidepool_upload_bg">Nahrávat měření z prstu</string>
     <string name="dst_in_24h_warning">Změna letního času za méně než 24 hodin</string>
     <string name="dst_loop_disabled_warning">Změna letního času za méně než 3 hodiny - Uzavřená smyčka zastavena</string>
     <string name="storage">omezení vnitřního úložiště</string>
@@ -1160,6 +1187,12 @@
     <string name="old_version">stará verze</string>
     <string name="very_old_version">velmi stará verze</string>
     <string name="new_version_warning">Nová verze je dostupná minimálně %1$d dní! Přepnutí na ochranu před nízkou glykémií po 60 dnech, vypnutí smyčky po 90 dnech</string>
+    <string name="scale_insulin_activity">Měřítko grafu aktivity inzulinu [U/min]</string>
+    <string name="twohours">2h</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="dexcom_app_patched">Aplikace Dexcom (upravená)</string>
+    <string name="dexcom_short">DXCM</string>
+    <string name="description_source_dexcom">Příjem hodnot glykémií z upravené aplikace Dexcom.</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d den</item>
         <item quantity="few">%1$d dnů</item>

app/src/main/res/values-de/strings.xml

@@ -866,6 +866,7 @@ maxIOB = durchschnittlicher Essensbolus + 3 x maximale Basalrate</string>
     <string name="fabric_upload">Fabric-Upload</string>
     <string name="allow_automated_crash_reporting">Erlauben, dass automatische Fehler-Berichte und Nutzungsstatistiken an die Entwickler über den Service von Fabric.io gesendet werden</string>
     <string name="g5appnotdetected">Bitte aktualisiere deine Dexcom App auf eine unterstützte Version</string>
+    <string name="dexcom_app_not_installed">Dexcom App ist nicht installiert.</string>
     <string name="start_activity_tt">Starte Aktivitäts-TT</string>
     <string name="start_eating_soon_tt">Starte Essens-TT</string>
     <string name="temptargetshort">TT</string>
@@ -875,6 +876,7 @@ maxIOB = durchschnittlicher Essensbolus + 3 x maximale Basalrate</string>
     <string name="bolusrecordedonly">Bolus wird nur erfasst.</string>
     <string name="ns_autobackfill_summary">Lade fehlende Blutzuckerwerte automatisch aus Nightscout nach.</string>
     <string name="loop_smbsetbypump_label">SMB von der Pumpe abgegeben</string>
+    <string name="overview_show_activity">Aktivität</string>
     <string name="overview_show_sensitivity">Sensitivität</string>
     <string name="overview_show_deviations">Abweichungen</string>
     <string name="overview_show_cob">Aktive Kohlenhydrate</string>
@@ -1150,6 +1152,31 @@ Unerwartetes Verhalten.</string>
     <string name="dexcom_lognssensorchange_summary">Ereignis \"Sensorwechsel\" bei Sensorstart automatisch in NS erstellen</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
+    <string name="unit_second">Sekunde</string>
+    <string name="unit_minute">Minute</string>
+    <string name="unit_hour">Stunde</string>
+    <string name="unit_day">Tag</string>
+    <string name="unit_week">Woche</string>
+    <string name="unit_seconds">Sekunden</string>
+    <string name="unit_minutes">Minuten</string>
+    <string name="unit_hours">Stunden</string>
+    <string name="unit_days">Tage</string>
+    <string name="unit_weeks">Wochen</string>
+    <string name="summary_tidepool_username">Dein Tidepool-Login-Benutzername, normalerweise deine E-Mail-Adresse</string>
+    <string name="title_tidepool_username">Login-Benutzername</string>
+    <string name="summary_tidepool_password">Dein Tidepool Anmeldekennwort</string>
+    <string name="title_tidepool_password">Anmeldekennwort</string>
+    <string name="title_tidepool_test_login">Teste den Tidepool Login</string>
+    <string name="summary_tidepool_dev_servers">Wenn diese Option aktiviert ist, werden die Uploads an https://int-app.tidepool.org statt an die reguläre https://app.tidepool.org/ weitergeleitet</string>
+    <string name="title_tidepool_dev_servers">Integrations (Test) Server verwenden</string>
+    <string name="tidepool">Tidepool</string>
+    <string name="tidepool_shortname">TDP</string>
+    <string name="description_tidepool">Daten zu Tidepool hochladen</string>
+    <string name="tidepool_upload_cgm">CGM Daten hochladen</string>
+    <string name="tidepool_upload_bolus">Behandlungen (Insulin, Kohlenhydrate) hochladen</string>
+    <string name="tidepool_upload_tbr">Temporäre Basalrate hochladen</string>
+    <string name="tidepool_upload_profile">Profilwechsel und temporäre Ziele hochladen</string>
+    <string name="tidepool_upload_bg">BZ-Werte (blutig) hochladen</string>
     <string name="dst_in_24h_warning">Zeitumstellung in weniger als 24 Stunden</string>
     <string name="dst_loop_disabled_warning">Zeitumstellung vor weniger als 3 Stunden - Closed Loop deaktiviert</string>
     <string name="storage">interne Speicherbegrenzung</string>
@@ -1162,8 +1189,12 @@ Unerwartetes Verhalten.</string>
     <string name="old_version">Vorherige Version</string>
     <string name="very_old_version">sehr alte Version</string>
     <string name="new_version_warning">Neue Version für mindestens %1$d Tage verfügbar! Rückfall zur sensorunterstützten Pumpentherapie nach 60 Tagen, Loop wird nach 90 Tagen deaktiviert</string>
+    <string name="scale_insulin_activity">Skala Insulinaktivität [IE/min.]</string>
     <string name="twohours">2h</string>
     <string name="formatinsulinunits">%1$.2f IE</string>
+    <string name="dexcom_app_patched">gepatchte Dexcom App</string>
+    <string name="dexcom_short">DXCM</string>
+    <string name="description_source_dexcom">Empfange Blutzucker-Werte von der gepatchten Dexcom App.</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d Tag</item>
         <item quantity="other">%1$d Tage</item>

app/src/main/res/values-el/strings.xml

@@ -865,6 +865,7 @@
     <string name="fabric_upload">Αποστολή δεδομένων στο εργοστάσιο</string>
     <string name="allow_automated_crash_reporting">Να επιτρέπεται η αυτόματη αποστολή αναφορών σφάλματος και χαρακτηριστικά χρήσης δεδομένων στους προγραμματιστές μέσω του fabric.io. service.</string>
     <string name="g5appnotdetected">Ενημερώστε την εφαρμογή G5 στην υποστηριζόμενη έκδοση</string>
+    <string name="dexcom_app_not_installed">Η εφαρμογή Dexcom δεν είναι εγκατεστημένη.</string>
     <string name="start_activity_tt">Εκκίνηση δραστηριότητας TT</string>
     <string name="start_eating_soon_tt">Εκκίνηση Τρώω σύντομα ΤΤ</string>
     <string name="temptargetshort">TT</string>
@@ -1148,6 +1149,27 @@
     <string name="dexcom_lognssensorchange_summary">Δημιουργία συμβάντος «Αλλαγή αισθητήρα» στο NS αυτόματα με έναρξη αισθητήρα</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
+    <string name="unit_second">δευτερόλεπτο</string>
+    <string name="unit_minute">λεπτό</string>
+    <string name="unit_hour">ώρα</string>
+    <string name="unit_seconds">δευτερόλεπτα</string>
+    <string name="unit_minutes">λεπτά</string>
+    <string name="unit_hours">ώρες</string>
+    <string name="summary_tidepool_username">Το όνομα χρήστη του Tidepool, συνήθως το mail σας</string>
+    <string name="title_tidepool_username">Όνομα Χρήστη</string>
+    <string name="summary_tidepool_password">Το συνθηματικό του Tidepool</string>
+    <string name="title_tidepool_password">Συνθηματικό εισόδου</string>
+    <string name="title_tidepool_test_login">Δοκιμή εισόδου Tidepool</string>
+    <string name="summary_tidepool_dev_servers">Αν ενεργοποιήθηκε, τα δεδομένα θα ανέβουν στο https://int-app.tidepool.org αντί για το σύνηθες https://app.tidepool.org/</string>
+    <string name="title_tidepool_dev_servers">Χρησιμοποιήστε διακομιστές ολοκλήρωσης (δοκιμής)</string>
+    <string name="tidepool">Tidepool</string>
+    <string name="tidepool_shortname">TDP</string>
+    <string name="description_tidepool">Αποστολή δεδομένων στο Tidepool</string>
+    <string name="tidepool_upload_cgm">Αποστολή δεδομένων CGM</string>
+    <string name="tidepool_upload_bolus">Αποστολή θεραπειών (ινσουλίνης, υδατανθράκων)</string>
+    <string name="tidepool_upload_tbr">Αποστολή προσωρινών ρυθμών</string>
+    <string name="tidepool_upload_profile">Αποστολή αλλαγών προφίλ, προσωρινών στόχων</string>
+    <string name="tidepool_upload_bg">Αποστολή BG βαθμονομήσεων</string>
     <string name="dst_in_24h_warning">Αλλαγή σε Θερινή ώρα σε 24h ή λιγότερο</string>
     <string name="dst_loop_disabled_warning">Η Θερινή ώρα αλλάζει σε λιγότερο από 3 ώρες - Απενεργοποιήθηκε το κλειστό κύκλωμα</string>
     <string name="storage">περιορισμός εσωτερικής μνήμης</string>
@@ -1160,6 +1182,11 @@
     <string name="old_version">παλιά έκδοση</string>
     <string name="very_old_version">πολύ παλιά έκδοση</string>
     <string name="new_version_warning">Νέα έκδοση για τουλάχιστον %1$d ημέρες διαθέσιμη! Επιστροφή σε LGS μετά από 60 ημέρες, το κύκλωμα θα απενεργοποιηθεί μετά από 90 ημέρες</string>
+    <string name="twohours">2ώρες</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="dexcom_app_patched">Εφαρμογή Dexcom (τροποποιημένη)</string>
+    <string name="dexcom_short">DXCM</string>
+    <string name="description_source_dexcom">Λάβετε τις τιμές BG από την εφαρμογή του Dexcom.</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d ημέρα</item>
         <item quantity="other">%1$d ημέρες</item>

app/src/main/res/values-es/strings.xml

@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
+    <string name="treatmentssafety_title">Seguridad de tratamientos</string>
+    <string name="treatmentssafety_maxbolus_title">Máximo Bolo permitido [U]</string>
     <string name="treatmentssafety_maxcarbs_title">Máximos carbohidratos permitidos [g]</string>
     <string name="nav_preferences">Preferencias</string>
     <string name="nav_refreshtreatments">Actualizar los tratamientos desde NS</string>
     <string name="nav_resetdb">Restablecer las bases de datos</string>
     <string name="reset_db_confirm">¿Realmente quiere restablecer las bases de datos?</string>
     <string name="nav_exit">Salir</string>
+    <string name="danar_useextended_title">Usar bolos extendidos para &gt;200%%</string>
     <string name="danar_bt_name_title">Dispositivo Bluetooth DanaR</string>
     <string name="ns_sync_use_absolute_title">Usar siempre valores basales absolutos</string>
     <string name="alert_dialog_storage_permission_text">Por favor reinicia el teléfono o AndroidAPS desde ajustes de sistema, sino AndroidAPS no guardará registros (importante para trazar y verificar que el algoritmo funcione correctamente)</string>
@@ -51,6 +54,7 @@
     <string name="description_wear">Usar tu reloj WearOS para observar y controlar AndroidAPS.</string>
     <string name="description_xdrip_status_line">Mostrar información sobre tu lazo en tu esfera xDrip+.</string>
     <string name="description_sms_communicator">Control remoto de AndroidAPS mediante comandos SMS.</string>
+    <string name="objectives_button_back">Atrás</string>
     <string name="objectives_button_start">Inicio</string>
     <string name="objectives_button_verify">Verificar</string>
     <string name="nsprofileview_units_label">Unidades</string>
@@ -143,6 +147,8 @@
     <string name="constraints_violation">Violación restricciones</string>
     <string name="treatmentdeliveryerror">Error de administración del bolo</string>
     <string name="tempbasaldeliveryerror">Basal Temporal no emitida</string>
+    <string name="overview_newtempbasal_basalpercent">Dosis basal [%%]</string>
+    <string name="overview_newtempbasal_percent_label">%% (100%% = actual)</string>
     <string name="setbasalquestion">Aceptar nueva basal temporal:</string>
     <string name="overview_treatment_label">Tratamiento</string>
     <string name="overview_calculator_label">Calculadora</string>
@@ -242,6 +248,7 @@
     <string name="danar_iob_label">Bomba IOB</string>
     <string name="danar_dailyunits">Unidades diarias</string>
     <string name="pump_lastbolus_label">Último bolo</string>
+    <string name="hoursago">Hace %1$.1fh</string>
     <string name="danar_invalidinput">Datos inválidos</string>
     <string name="danar_valuenotsetproperly">Valor no establecido correctamente</string>
     <string name="reloadprofile">Recargar Perfil</string>
@@ -259,6 +266,10 @@
     <string name="smscommunicator_bolusreplywithcode">Para entregar bolo %1$.2fU responder con código %2$s</string>
     <string name="smscommunicator_calibrationreplywithcode">Para enviar calibración %1$.2f responder con código %2$s</string>
     <string name="smscommunicator_bolusfailed">Bolo falló</string>
+    <string name="bolusdelivered">El bolo %1$.2fU se ha infundido correctamente</string>
+    <string name="bolusrequested">Se van a infundir %1$.2fU</string>
+    <string name="smscommunicator_bolusdelivered">El bolo %1$.2fU se ha infundido correctamente</string>
+    <string name="bolusdelivering">Infundiendo %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Permitir comandos remotos vía SMS</string>
     <string name="glucosetype_finger">Dedo</string>
     <string name="glucosetype_sensor">Sensor</string>
@@ -303,6 +314,7 @@
     <string name="overview_bolusprogress_stop">Detener</string>
     <string name="overview_bolusprogress_stoppressed">DETENER PULSADO</string>
     <string name="waitingforpump">Esperando bomba</string>
+    <string name="overview_bolusprogress_goingtodeliver">Se van a infundir %1$.2fU</string>
     <string name="objectives_0_objective">Configuración de visualización y monitorización, y análisis de basales y ratios</string>
     <string name="objectives_0_gate">Comprobar que los datos de BG están disponibles en Nightscout, y que los datos de la bomba de insulina se están subiendo</string>
     <string name="objectives_1_objective">Empezar con lazo abierto</string>
@@ -325,12 +337,26 @@
     <string name="smscommunicator_loopisdisabled">Lazo inactivo</string>
     <string name="smscommunicator_loopisenabled">Lazo activo</string>
     <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
+    <string name="valueoutofrange">El valor %1$s está fuera de límites</string>
     <string name="smscommunicator_remotecommandnotallowed">Comando remoto no permitido</string>
+    <string name="smscommunicator_remotebolusnotallowed">El bolo remoto no está disponible. Inténtalo de nuevo más tarde.</string>
+    <string name="smscommunicator_basalreplywithcode">Para iniciar una basal de %1$.2fU/h responder con el código %2$s</string>
+    <string name="smscommunicator_profilereplywithcode">Para cambiar el perfil a %1$s %2$d%% responder con el código %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Para iniciar un bolo extendido de %1$.2fU durante %2$d minutos, responder con el código %3$s</string>
+    <string name="smscommunicator_basalpctreplywithcode">Para iniciar una basal de %1$d%% durante %2$d min, responder con el código %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Para cancelar lazo por %1$d minutos responde con código %2$s</string>
     <string name="smscommunicator_tempbasalset">Basal temporal %1$.2fU/h para %2$d min iniciada correctamente</string>
+    <string name="smscommunicator_extendedset">Bolo ampliado de %1$.2fU durante %2$d min se inició correctamente</string>
+    <string name="smscommunicator_tempbasalset_percent">Basal temporal de %1$d%% durante %2$d min iniciada correctamente</string>
     <string name="smscommunicator_tempbasalfailed">Fallo inicio basal temporal</string>
+    <string name="smscommunicator_extendedfailed">Error al iniciar el bolo extendido</string>
+    <string name="smscommunicator_basalstopreplywithcode">Para cancelar la basal temporal, responder con el código %1$s</string>
+    <string name="smscommunicator_extendedstopreplywithcode">Para parar el bolo extendido, responder con el código %1$s</string>
     <string name="smscommunicator_tempbasalcanceled">Basal temporal cancelada</string>
+    <string name="smscommunicator_extendedcanceled">Bolo extendido cancelado</string>
     <string name="smscommunicator_tempbasalcancelfailed">Fallo cancelación basal temporal</string>
+    <string name="smscommunicator_extendedcancelfailed">Error al cancelar el bolo extendido</string>
+    <string name="smscommunicator_unknowncommand">Comando desconocido o respuesta incorrecta</string>
     <string name="quickwizard">Asistente</string>
     <string name="quickwizardsettings">Asistente configuración</string>
     <string name="overview_editquickwizard_buttontext">Botón Texto:</string>
@@ -438,6 +464,7 @@
     <string name="profile">Perfiles</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Valor predeterminado: 3 Esta es una protección de seguridad en OpenAPS. Lo que esto hace es limitar tus basales a 3x (en este caso) tu mayor índice basal. Probablemente no necesites cambiar esto, pero debes tener en cuenta las discusiones sobre \"3x max diaria; 4x actual\" para protecciones de seguridad.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Ajuste pro defecto: 4 Esto es la otra mitad de los ajustes de seguridad de OpenAPS y la otra mitad de la protección de seguridad de \"3x max diaria, 4x actual\". Esto significa, que tu basal, independientemente de tu máxima basal ajustada en la bomba, no puede ser mas alta que este número de veces el actual nivel de basal. Esto es para evitar que las personas se encuentren en situaciones peligrosas por aumentar mucho la basal sin entender como trabaja el algoritmo. El ajuste por defecto es 4x; la mayoría de las personas nunca tendrá que cambiar estos ajustes, sino que debe modificar otros ajustes en la terapia si se encuentran cerca de este límite de seguridad.</string>
+    <string name="openapsama_autosens_max_summary">Valor por defecto: 1.2\nEste es un límite multiplicador para autosens (y pronto autotune) para establecer un límite máximo de 20%% en cuanto puede ser la ratio de autosens, lo que determina a su vez cuán alto puede ajustar las basales autosens, cuán bajo puede ajustar ISF, y cuán bajo puede establecer el objetivo BG.</string>
     <string name="openapsama_autosens_min_summary">Ajuste por defecto: 0.7\nEl otro lado de los límites de seguridad de autosens, limitando a cuanto puede autosens bajar la basal y a cuanto puede subir ISF y objetivo de glucosa en sangre (BG).</string>
     <string name="openapsama_autosens_adjusttargets">Autosens también ajusta los objetivos</string>
     <string name="openapsama_autosens_adjusttargets_summary">Ajuste por defecto: true\nEsto se usa para permitir a autosens el ajuste de objetivos BG además de ISF y bases.</string>
@@ -450,6 +477,7 @@
     <string name="error_phone_not_valid">Número de teléfono inválido</string>
     <string name="smscommunicator_invalidphonennumber">Número de teléfono incorrecto para SMS</string>
     <string name="overview_calibration">Calibración</string>
+    <string name="send_calibration">¿Enviar la calibración %1$.1f a xDrip?</string>
     <string name="xdripnotinstalled">xDrip+ no instalado</string>
     <string name="calibrationsent">Calibración mandada a xDrip</string>
     <string name="smscommunicator_calibrationsent">Calibración enviada. La recepción debe estar habilitada en xDrip.</string>
@@ -500,6 +528,7 @@
     <string name="resistantadult">Adulto resistente a la insulina</string>
     <string name="patientage_summary">Por favor elige la edad del paciente para ajustar los límites de seguridad</string>
     <string name="Glimp">Glimp</string>
+    <string name="needwhitelisting">%1$s necesita una optimización de la batería para funcionar óptimamente</string>
     <string name="loopsuspended">Loop desactivado</string>
     <string name="loopsuspendedfor">Desactivado (%1$d m)</string>
     <string name="loopsuperbolusfor">Superbolo (%1$d m)</string>
@@ -535,6 +564,8 @@
     <string name="show_statuslights_summary">Habilitar las luces de estado para tiempo de la canula, tiempo de la insulina, tiempo del sensor y nivel de bateria en la pantalla de inicio.</string>
     <string name="statuslights_res_warning">Umbral de advertencia de nivel de reservorio [U]</string>
     <string name="statuslights_res_critical">Umbral crítico de nivel de reservorio [U]</string>
+    <string name="statuslights_bat_warning">Umbral de advertencia de nivel de batería [%%]</string>
+    <string name="statuslights_bat_critical">Umbral crítico de nivel de batería [%%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="virtualpump_firmware_label">Firmware</string>
@@ -587,6 +618,7 @@
     <string name="absorptionsettings_title">Ajustes absorción</string>
     <string name="absorption_maxtime_title">Tiempo max absorción comida [h]</string>
     <string name="absorption_maxtime_summary">Tiempo en horas en el que se espera que todos los carbohidratos hayan sido absorbidos</string>
+    <string name="danar_visualizeextendedaspercentage_title">Visualizar el bolo extendido como %%</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -699,6 +731,8 @@
     <string name="dexcomg5_xdripupload_title">Mandar datos BG a xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">En xDrip+ elige 640g/Eversense como fuente de datos</string>
     <string name="nsclientbg">NSClient BG</string>
+    <string name="minimalbasalvaluereplaced">Valor basal reemplazado por el valor mínimo soportado: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Valor basal reemplazado por el valor mínimo soportado: %1$s</string>
     <string name="overview_editquickwizard_usebg">Cálculo BG</string>
     <string name="overview_editquickwizard_usebolusiob">Cálculo bolo IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Cálculo basal IOB</string>
@@ -716,6 +750,8 @@
     <string name="closedmodeenabled">Lazo cerrado activado</string>
     <string name="maxiobset">Máximo IOB ajustado correctamente</string>
     <string name="hasbgdata">BG disponible desde la fuente seleccionada</string>
+    <string name="basalprofilenotaligned">Valores basales no alineados a las horas: %1$s</string>
+    <string name="zerovalueinprofile">Perfil inválido: %1$s</string>
     <string name="combo_programming_bolus">Programando bomba para emitir bolo</string>
     <string name="combo_refresh">Actualizar</string>
     <string name="combo_pump_state_label">Estado</string>
@@ -728,6 +764,7 @@
     <string name="combo_pump_state_running">Funcionando</string>
     <string name="combo_pump_action_cancelling_tbr">Cancelando TBR</string>
     <string name="combo_pump_action_setting_tbr">Poniendo TBR (%1$d%% / %2$d min)</string>
+    <string name="combo_pump_action_bolusing">Inyectando (%1$.1f U)</string>
     <string name="combo_pump_action_refreshing">Actualizando</string>
     <string name="combo_pump_unsupported_operation">Acción requerida no disponible por la bomba</string>
     <string name="combo_low_suspend_forced_notification">Uso inseguro: bolo extendido o multionda activo. El modo del lazo ha sido fijado a sólo suspensión en baja glucosa durante 6 horas. En modo lazo sólo se soportan los bolo estándar.</string>
@@ -828,6 +865,7 @@
     <string name="fabric_upload">Reporte fallos a Fabric.io</string>
     <string name="allow_automated_crash_reporting">Permita que los informes automáticos de errores y los datos de uso de funciones se envíen a los desarrolladores a través del servicio fabric.io.</string>
     <string name="g5appnotdetected">Actualice su aplicación Dexcom a una versión compatible</string>
+    <string name="dexcom_app_not_installed">La aplicación Dexcom no está instalada.</string>
     <string name="start_activity_tt">Inicio OT Actividad</string>
     <string name="start_eating_soon_tt">Inicio OT ComiendoPronto</string>
     <string name="temptargetshort">OT</string>
@@ -1050,11 +1088,13 @@
     <string name="mute_alert">Silenciar</string>
     <string name="pump_alert">Alerta de infusor</string>
     <string name="log_site_changes">Registro de cambios de cánulas</string>
+    <string name="log_reservoir_changes">Registrar cambios de reservorio</string>
     <string name="log_tube_changes">Registro de cambio de tubo</string>
     <string name="log_battery_changes">Registro de cambio de bateria</string>
     <string name="log_operating_mode_changes">Registro de cambio de modo de funcionamiento</string>
     <string name="log_alerts">Registro de alarmas</string>
     <string name="enable_tbr_emulation">Activar emulación de dosis basal temporal</string>
+    <string name="enable_tbr_emulation_summary">Usa bolos extendidos en lugar de TBRs para pasar por alto el límite de 250%%</string>
     <string name="disconnect_delay">Desconectar el retraso [s]</string>
     <string name="serial_number">Número de serie</string>
     <string name="release_software_version">Versión de software</string>
@@ -1109,7 +1149,48 @@
     <string name="dexcom_lognssensorchange_summary">Crear evento \"Cambio sensor\" en la automatización NS al iniciar el sensor</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
+    <string name="unit_second">segundo</string>
+    <string name="unit_minute">minuto</string>
+    <string name="unit_hour">hora</string>
+    <string name="unit_day">día</string>
+    <string name="unit_week">semana</string>
+    <string name="unit_seconds">segundos</string>
+    <string name="unit_minutes">minutos</string>
+    <string name="unit_hours">horas</string>
+    <string name="unit_days">días</string>
+    <string name="unit_weeks">semanas</string>
+    <string name="summary_tidepool_username">Tu nombre de usuario de Tidepool, normalmente tu dirección de correo electrónico</string>
+    <string name="title_tidepool_username">Nombre de usuario</string>
+    <string name="summary_tidepool_password">Tu contraseña de acceso a Tidepool</string>
+    <string name="title_tidepool_password">Contraseña de inicio de sesión</string>
+    <string name="title_tidepool_test_login">Prueba de acceso Tidepool</string>
+    <string name="summary_tidepool_dev_servers">Si está habilitado, las subidas irán a https://int-app.tidepool.org en lugar de a https://app.tidepool.org/</string>
+    <string name="title_tidepool_dev_servers">Usar servidores de integración (prueba)</string>
+    <string name="tidepool">Tidepool</string>
+    <string name="tidepool_shortname">TDP</string>
+    <string name="description_tidepool">Carga datos a Tidepool</string>
+    <string name="tidepool_upload_cgm">Carga tus datos</string>
+    <string name="tidepool_upload_bolus">Subir tratamientos (insulina, carbohidratos)</string>
+    <string name="tidepool_upload_tbr">Subir basales temporales</string>
+    <string name="tidepool_upload_profile">Subir conmutaciones de perfil, objetivos temps</string>
+    <string name="tidepool_upload_bg">Subir pruebas BG</string>
+    <string name="dst_in_24h_warning">Cambio al horario de verano/invierno en menos de 24 horas</string>
+    <string name="dst_loop_disabled_warning">Cambio al horario de verano/invierno hace menos de 3 horas - Lazo cerrado deshabilitado</string>
     <string name="storage">restricción de almacenamiento interno</string>
+    <string name="diskfull">Libera al menos %1$d MB de almacenamiento interno. ¡Loop desactivado!</string>
+    <string name="wrongformat">Formato incorrecto</string>
+    <string name="sms_wrongcode">Código incorrecto. Comando cancelado.</string>
+    <string name="notconfigured">Sin configurar</string>
+    <string name="profileswitchcreated">Cambio de perfil creado</string>
+    <string name="versionChecker">Verificador de versión</string>
+    <string name="old_version">versión antigua</string>
+    <string name="very_old_version">versión muy antigua</string>
+    <string name="new_version_warning">Nueva versión desde al menos %1$d dias disponible! Respaldo a LGS después de 60 días, se deshabilitará el lazo después de 90 días</string>
+    <string name="twohours">2h</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="dexcom_app_patched">DexcomG App (parcheada)</string>
+    <string name="dexcom_short">DXCM</string>
+    <string name="description_source_dexcom">Recibir valores de glucosa de la app parcheada de Dexcom.</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d día</item>
         <item quantity="other">%1$d días</item>

app/src/main/res/values-fr/strings.xml

@@ -866,6 +866,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="fabric_upload">Téléchargement Fabric</string>
     <string name="allow_automated_crash_reporting">Autoriser l\'envoi automatique des rapports d\'erreur et des données d\'utilisation aux développeurs via le service fabric.io</string>
     <string name="g5appnotdetected">SVP actualisez votre app Dexcom vers une version compatible</string>
+    <string name="dexcom_app_not_installed">L\'application Dexcom n\'est pas installée.</string>
     <string name="start_activity_tt">Début Activités</string>
     <string name="start_eating_soon_tt">Début Repas Imminent</string>
     <string name="temptargetshort">Traitement</string>
@@ -1149,6 +1150,27 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="dexcom_lognssensorchange_summary">Créer automatiquement sur NS un événement \"Changement de capteur\" au démarrage du capteur</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
+    <string name="unit_second">seconde</string>
+    <string name="unit_minute">minute</string>
+    <string name="unit_hour">heure</string>
+    <string name="unit_seconds">secondes</string>
+    <string name="unit_minutes">minutes</string>
+    <string name="unit_hours">heures</string>
+    <string name="summary_tidepool_username">Votre nom d\'utilisateur Tidepool, normalement votre adresse e-mail</string>
+    <string name="title_tidepool_username">Nom d\'utilisateur</string>
+    <string name="summary_tidepool_password">Mot de passe de connexion Tidepool</string>
+    <string name="title_tidepool_password">Mot de passe de connexion</string>
+    <string name="title_tidepool_test_login">Test de la connexion Tidepool</string>
+    <string name="summary_tidepool_dev_servers">Si activé, les transferts iront vers https://int-app.tidepool.org au lieu de https://app.tidepool.org/</string>
+    <string name="title_tidepool_dev_servers">Utiliser les serveurs d\'Intégration (test)</string>
+    <string name="tidepool">Tidepool</string>
+    <string name="tidepool_shortname">TDP</string>
+    <string name="description_tidepool">Transfère les données vers Tidepool</string>
+    <string name="tidepool_upload_cgm">Transférer les données CGM</string>
+    <string name="tidepool_upload_bolus">Transférer les traitements (insuline, glucides)</string>
+    <string name="tidepool_upload_tbr">Transférer les Basal temporaires</string>
+    <string name="tidepool_upload_profile">Transférer les changements de profils, les objectifs temporaires</string>
+    <string name="tidepool_upload_bg">Transférer les tests de glycémies</string>
     <string name="dst_in_24h_warning">Changement d\'heure d\'été dans moins de 24 heures</string>
     <string name="dst_loop_disabled_warning">Changement d\'heure d\'été dans moins de 3 heures - Boucle fermée désactivée</string>
     <string name="storage">stockage interne limité</string>
@@ -1163,6 +1185,9 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="new_version_warning">Une nouvelle version est disponible depuis au moins %1$d jours ! Retour au traitement par pompe assistée par capteur (Arrêt par Glycémie Basse (AGB), Low Glucose Suspend (LGS) ) après 60 jours et la Boucle sera désactivée après 90 jours</string>
     <string name="twohours">2 h</string>
     <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="dexcom_app_patched">App Dexcom (patchée)</string>
+    <string name="dexcom_short">Dexcom</string>
+    <string name="description_source_dexcom">Recevoir les valeurs de glycémie de l’application Dexcom patchée.</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d jour</item>
         <item quantity="other">%1$d jours</item>

app/src/main/res/values-it/insight_alert_codes.xml

@@ -1,3 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="alert_r1_code">Promemoria R1</string>
+    <string name="alert_r2_code">Promemoria R2</string>
+    <string name="alert_r3_code">Promemoria R3</string>
+    <string name="alert_r4_code">Promemoria R4</string>
+    <string name="alert_r7_code">Promemoria R7</string>
+    <string name="alert_w31_code">Avviso W31</string>
+    <string name="alert_w32_code">Avviso W32</string>
+    <string name="alert_w33_code">Avviso W33</string>
+    <string name="alert_w34_code">Avviso W34</string>
+    <string name="alert_w36_code">Avviso W36</string>
+    <string name="alert_w38_code">Avviso W38</string>
+    <string name="alert_w39_code">Avviso W39</string>
+    <string name="alert_m20_code">Manutenzione M20</string>
+    <string name="alert_m21_code">Manutenzione M21</string>
+    <string name="alert_m22_code">Manutenzione M22</string>
+    <string name="alert_m23_code">Manutenzione M23</string>
+    <string name="alert_m24_code">Manutenzione M24</string>
+    <string name="alert_m25_code">Manutenzione M25</string>
+    <string name="alert_m26_code">Manutenzione M26</string>
+    <string name="alert_m27_code">Manutenzione M27</string>
+    <string name="alert_m28_code">Manutenzione M28</string>
+    <string name="alert_m29_code">Manutenzione M29</string>
+    <string name="alert_m30_code">Manutenzione M30</string>
+    <string name="alert_e6_code">Errore E6</string>
+    <string name="alert_e10_code">Errore E10</string>
+    <string name="alert_e13_code">Errore E13</string>
+</resources>

app/src/main/res/values-it/insight_alert_descriptions.xml

@@ -1,3 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="alert_r7_description"><![CDATA[Importo: <b>%1$d%%</b>\nDurata: <b>%2$s h</b>]]></string>
+    <string name="alert_w31_description"><![CDATA[Contenuto cartuccia: <b>%1$s U</b>]]></string>
+    <string name="alert_w32_description">Cambia la batteria.</string>
+    <string name="alert_w33_description">Imposta ora/data.</string>
+    <string name="alert_w34_description">Contatta il supporto Accu-Chek.</string>
+    <string name="alert_w36_description"><![CDATA[Importo: <b>%1$d%%</b><br/>Durata: <b>%2$s h</b>]]></string>
+    <string name="alert_w38_description"><![CDATA[Programmato: <b>%1$s U</b><br/>Consegnato: <b>%2$s U</b>]]></string>
+    <string name="alert_m20_description">Inserisci cartuccia.</string>
+    <string name="alert_m21_description">Cambia cartuccia.</string>
+    <string name="alert_m22_description">Cambia la batteria.</string>
+    <string name="alert_m23_description">Controlla lo stato della pompa.</string>
+    <string name="alert_m24_description">Cambia set infusione.</string>
+    <string name="alert_m25_description">Contatta il supporto Accu-Chek.</string>
+    <string name="alert_m26_description">Cambia cartuccia.</string>
+    <string name="alert_m27_description">Riavvia il download dei dati.</string>
+    <string name="alert_m28_description">Controlla lo stato della pompa.</string>
+    <string name="alert_m29_description">Imposta il tipo di batteria.</string>
+    <string name="alert_m30_description">Imposta tipo di cartuccia.</string>
+    <string name="alert_e6_description">Cambia batteria e cartuccia.</string>
+    <string name="alert_e10_description">Cambia cartuccia.</string>
+    <string name="alert_e13_description">Cambia lingua.</string>
+</resources>

app/src/main/res/values-it/insight_alert_titles.xml

@@ -1,3 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="alert_r1_title">Bolo consegnato</string>
+    <string name="alert_r2_title">Bolo perso</string>
+    <string name="alert_r3_title">Sveglia</string>
+    <string name="alert_r4_title">Cambia set infusione</string>
+    <string name="alert_r7_title">TBR completato</string>
+    <string name="alert_w31_title">Cartuccia bassa</string>
+    <string name="alert_w32_title">Batteria scarica</string>
+    <string name="alert_w33_title">Ora/data non valida</string>
+    <string name="alert_w34_title">Fine della garanzia</string>
+    <string name="alert_w36_title">TBR annullato</string>
+    <string name="alert_w38_title">Bolo annullato</string>
+    <string name="alert_w39_title">Avviso di prestito</string>
+    <string name="alert_m20_title">Cartuccia non inserita</string>
+    <string name="alert_m21_title">Cartuccia vuota</string>
+    <string name="alert_m22_title">Batteria vuota</string>
+    <string name="alert_m23_title">Spegnimento automatico - pompa interrotta</string>
+    <string name="alert_m24_title">Occlusione</string>
+    <string name="alert_m25_title">Prestito oltre - fine operazione</string>
+    <string name="alert_m26_title">Modifica cartuccia non completata</string>
+    <string name="alert_m27_title">Download dati fallito</string>
+    <string name="alert_m28_title">Timeout modalità pausa</string>
+    <string name="alert_m29_title">Tipo di batteria non impostato</string>
+    <string name="alert_m30_title">Tipo di cartuccia non impostato</string>
+    <string name="alert_e6_title">Errore meccanico</string>
+    <string name="alert_e10_title">Rivedi errore</string>
+    <string name="alert_e13_title">Errore lingua</string>
+</resources>

app/src/main/res/values-it/insight_exceptions.xml

@@ -1,3 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="connection_failed">Connessione non riuscita</string>
+    <string name="connection_lost">Connessione persa</string>
+    <string name="pairing_rejected">Accoppiamento rifiutato</string>
+    <string name="socket_creation_failed">Creazione documento fallita</string>
+    <string name="timeout">Timeout</string>
+    <string name="maximum_number_of_bolus_type_already_running">Numero massimo di tipi di boli già in esecuzione</string>
+    <string name="no_active_tbr_to_cancel">Nessun TBR attivo da annullare</string>
+    <string name="no_active_tbr_to_change">Nessun TBR attivo da modificare</string>
+    <string name="no_such_bolus_to_cancel">Nessun bolo da annullare</string>
+    <string name="pump_already_in_that_state_exception">Pompa già in questo stato</string>
+    <string name="run_mode_not_allowed">Modalità di esecuzione non consentita</string>
+</resources>

app/src/main/res/values-it/strings.xml

@@ -9,6 +9,7 @@
     <string name="nav_resetdb">Ripristinare i database</string>
     <string name="reset_db_confirm">Vuoi davvero ripristinare le impostazioni?</string>
     <string name="nav_exit">Uscita</string>
+    <string name="danar_useextended_title">Usa bolo esteso per &gt;200%%</string>
     <string name="danar_bt_name_title">Dispositivo Bluetooh DanaR</string>
     <string name="ns_sync_use_absolute_title">Utilizzare sempre valori assoluti basali</string>
     <string name="alert_dialog_storage_permission_text">per favore riavvia il tuo telefonoo riavvia AndroidAPS dalle Impostazioni di Sistema o Android APS non lo registrera\' </string>
@@ -43,6 +44,8 @@
     <string name="description_sensitivity_oref1">La sensibilità è calcolata dai dati delle ultime 8h e i carboidrati (se non assorbito) vengono recuperati dopo il tempo specificato nelle preferenze. Plugin calcola anche UAM.</string>
     <string name="description_sensitivity_weighted_average">La sensibilità è calcolata come media ponderata da deviazioni. Le deviazioni più recenti hanno peso maggiore. Assorbimento minimo carb è calcolato da tempo di assorbimento max carb da preferenze. Questo algoritmo è il più veloce nei seguenti cambiamenti di sensibilità.</string>
     <string name="description_source_dexcom_g5">Ricevi i valori BG dall\'app Dexcom G5 con patch.</string>
+    <string name="description_source_dexcom_g6">Ricevi i valori BG dall\'app Eversense.</string>
+    <string name="description_source_eversense">Ricevi i valori BG dall\'app Eversense.</string>
     <string name="description_source_glimp">Ricevi valori Bg da Glimp.</string>
     <string name="description_source_mm640g">Ricevi valori BG da 600SeriesAndroidUploader.</string>
     <string name="description_source_ns_client">Scarica i valori BG da Nightscout </string>
@@ -51,6 +54,7 @@
     <string name="description_wear">Monitorare e controllare AndroidAPS usando il tuo orologio WearOS.</string>
     <string name="description_xdrip_status_line">Visualizza informazioni del loop sull\'interfaccia dell\'orologio.</string>
     <string name="description_sms_communicator">Controlla AndroidAPS in remoto dai comandi SMS.</string>
+    <string name="objectives_button_back">Indietro</string>
     <string name="objectives_button_start">Avvio</string>
     <string name="objectives_button_verify">Verificato</string>
     <string name="nsprofileview_units_label">Unita\'</string>
@@ -143,6 +147,8 @@
     <string name="constraints_violation">Vincolo Violato</string>
     <string name="treatmentdeliveryerror">Errore di erogazione del bolo</string>
     <string name="tempbasaldeliveryerror">Errore di somministrazione basale temporale</string>
+    <string name="overview_newtempbasal_basalpercent">Valore Basale [%%]</string>
+    <string name="overview_newtempbasal_percent_label">%% (100%%=corrente)</string>
     <string name="setbasalquestion">Accettare il nuovo basale temp</string>
     <string name="overview_treatment_label">Boli</string>
     <string name="overview_calculator_label">Calcolatore</string>
@@ -242,6 +248,7 @@
     <string name="danar_iob_label">IOB Microinfusore</string>
     <string name="danar_dailyunits">Unita\' giornaliera</string>
     <string name="pump_lastbolus_label">Ultimo Bolo</string>
+    <string name="hoursago">%1$.1f ore fa</string>
     <string name="danar_invalidinput">Data Errata</string>
     <string name="danar_valuenotsetproperly">Valore non impostato correttamente</string>
     <string name="reloadprofile">Aggiorna Profilo</string>
@@ -259,6 +266,10 @@
     <string name="smscommunicator_bolusreplywithcode">Per fornire risposta %1$.2fU bolo con codice %2$s</string>
     <string name="smscommunicator_calibrationreplywithcode">Invia la taratura %1$.2f risposta con codice %2$s</string>
     <string name="smscommunicator_bolusfailed">Bolo fallito</string>
+    <string name="bolusdelivered">Bolo %1$.2fU inviato con successo</string>
+    <string name="bolusrequested">Pronto a inviare %1$.2fU</string>
+    <string name="smscommunicator_bolusdelivered">Bolo %1$.2fU inviato con successo </string>
+    <string name="bolusdelivering">Inviato %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Consenti comandi remoti tramite SMS</string>
     <string name="glucosetype_finger">Dito</string>
     <string name="glucosetype_sensor">Sensore</string>
@@ -303,6 +314,7 @@
     <string name="overview_bolusprogress_stop">Arresta</string>
     <string name="overview_bolusprogress_stoppressed">PREMUTO STOP</string>
     <string name="waitingforpump">In attesa del micro</string>
+    <string name="overview_bolusprogress_goingtodeliver">Inviando %1$.2fU</string>
     <string name="objectives_0_objective">Impostazione di visualizzazione, monitoraggio e analisi basali e rapporti</string>
     <string name="objectives_0_gate">Verifica che Bg sia disponibile in Nightscout, e la data micro e\' ben allineata</string>
     <string name="objectives_1_objective">Partenza con Open loop</string>
@@ -325,12 +337,26 @@
     <string name="smscommunicator_loopisdisabled">Loop e\' disabilitato</string>
     <string name="smscommunicator_loopisenabled">Loop abilitato</string>
     <string name="valuelimitedto">%1$.2f limitato a %2$.2f</string>
+    <string name="valueoutofrange">Il valore %1$s è fuori limite massimo</string>
     <string name="smscommunicator_remotecommandnotallowed">il comando da remoto non e\' permesso</string>
+    <string name="smscommunicator_remotebolusnotallowed">Bolo remoto non disponibile. Riprovare più tardi.</string>
+    <string name="smscommunicator_basalreplywithcode">Per iniziare basale %1$.2fU/h per %2$d min risposta con il codice %3$s</string>
+    <string name="smscommunicator_profilereplywithcode">Per passare al profilo a %2$d%% di risposta con codice %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Per iniziare bolo esteso %1$.2fU/h per %2$d min risposta con il codice %3$s</string>
+    <string name="smscommunicator_basalpctreplywithcode">Per iniziare basale %1$d%U/h per %2$d min risposta con il codice %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Sospendi il loop per %1$d minuti riprendi %2$s</string>
     <string name="smscommunicator_tempbasalset">Basale temporanea %1$.2fU/h for %2$d min avviata con successo</string>
+    <string name="smscommunicator_extendedset">Bolo esteso %1$.2fU/h for %2$d min avviato con successo</string>
+    <string name="smscommunicator_tempbasalset_percent">Basale temporanea %1$d%U/h per %2$d min avviata con successo</string>
     <string name="smscommunicator_tempbasalfailed">Avvio Basale temporanea fallita</string>
+    <string name="smscommunicator_extendedfailed">Partenza Bolo esteso fallito</string>
+    <string name="smscommunicator_basalstopreplywithcode">Interrompere la basale temporanea con il codice %1$s</string>
+    <string name="smscommunicator_extendedstopreplywithcode">Per interrompere il bolo esteso con il codice %1$s</string>
     <string name="smscommunicator_tempbasalcanceled">Baasale temporanea cancellata</string>
+    <string name="smscommunicator_extendedcanceled">Bolo esteso cancellato</string>
     <string name="smscommunicator_tempbasalcancelfailed">Cancellazione temporanea fallita</string>
+    <string name="smscommunicator_extendedcancelfailed">Cancellazione bolo esteso fallito</string>
+    <string name="smscommunicator_unknowncommand">comando sconosciuto o risposta errata </string>
     <string name="quickwizard">QuickWizard</string>
     <string name="quickwizardsettings">Impostazioni QuickWizard</string>
     <string name="overview_editquickwizard_buttontext">Tasto testo:</string>
@@ -393,6 +419,7 @@
     <string name="array_of_elements">Matrice di %1$d elementi. \nActual valore:</string>
     <string name="openapsma_autosensdata_label">Autosens dati</string>
     <string name="openapsma_scriptdebugdata_label">Debug di script</string>
+    <string name="openapsama_useautosens">Usa la funzione Autosens</string>
     <string name="refresheventsfromnightscout">Aggiornare gli eventi da NS</string>
     <string name="deletefuturetreatments">Eliminare trattamenti in futuro</string>
     <string name="eatingsoon">Pranzo</string>
@@ -437,6 +464,7 @@
     <string name="profile">Profilo</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Valore predefinito: 3 Questo è una chiave di sicurezza di OpenAPS. Ciò che fa è limitare le tue basali a essere 3 volte la quantità massima. Probabilmente non avrai bisogno di cambiarlo, ma dovresti essere consapevole di ciò che viene discusso in merito a \"3x max al giorno; Corrente 4x \"per sicurezza.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Valore predefinito: 4 questo è l\'altra metà delle chiavi di sicurezza di OpenAPS e l\'altra metà del \"3 volte al giorno max; 4 x corrente\"le chiavi di sicurezza. Ciò significa che il tuo basale, indipendentemente dal basale di max impostato sulla pompa, non può essere più in alto di questo numero di volte il livello attuale del tuo basale. Si tratta di impedire alle persone di entrare in regime pericoloso da basals max eccessivamente alta prima di capire come funziona l\'algoritmo. Ancora una volta, il valore predefinito è 4x; maggior parte delle persone non sarà necessario modificare questo e invece sono più probabili avere bisogno di regolare le altre impostazioni se si sentono come sono \"in esecuzione in\" questo chiave di sicurezza.</string>
+    <string name="openapsama_autosens_max_summary">Valore predefinito: 1.2\n Questo è un valore di moltiplicatore per autosens (e presto autotune) per impostare un limite massimo del 20%% su quanto in alto può essere il rapporto di autosens, che a sua volta determina quanto in alto autosens può regolare la basale, quanto in basso può regolare ISF e quanto in basso è possibile impostare la destinazione di BG.</string>
     <string name="openapsama_autosens_min_summary">Valore predefinito: 0,7\n L\'altro lato dei limiti di sicurezza di autosens, mettendo un limite su quanto in basso gli autosens possono regolare le basili e quanto alto può regolare i target CF e BG.</string>
     <string name="openapsama_autosens_adjusttargets">Autosens regolare obiettivi</string>
     <string name="openapsama_autosens_adjusttargets_summary">Valore predefinito: true\n viene utilizzato per consentire autosens regolare gli obiettivi di BG, oltre a Cf e basale.</string>
@@ -449,6 +477,7 @@
     <string name="error_phone_not_valid">Numero di telefono non corretto</string>
     <string name="smscommunicator_invalidphonennumber">Numero non valido per SMS</string>
     <string name="overview_calibration">Calibrazione</string>
+    <string name="send_calibration">Invia calibrazione %1$.1f a xDrip?</string>
     <string name="xdripnotinstalled">xDrip non installato</string>
     <string name="calibrationsent">Invio calibrazione xDrip</string>
     <string name="smscommunicator_calibrationsent">La calibrazione è stata inviata. La ricezione deve essere abilitata in xDrip.</string>
@@ -499,6 +528,7 @@
     <string name="resistantadult">Insulina resistente</string>
     <string name="patientage_summary">Si prega di selezionare l\'età paziente e di impostare i limiti di sicurezza</string>
     <string name="Glimp">Glimp</string>
+    <string name="needwhitelisting">%1$s ha bisogno dell\'ottimizzazione della batteria per un buon funzionamento</string>
     <string name="loopsuspended">Sospensione Loop</string>
     <string name="loopsuspendedfor">Sospendi (%1$d m)</string>
     <string name="loopsuperbolusfor">Superbolo (%1$d m)</string>
@@ -512,6 +542,7 @@
     <string name="disconnectpumpfor2h">Sconnetti Micro per 2 H</string>
     <string name="disconnectpumpfor3h">Sconnetti Micro per 3 H</string>
     <string name="resume">Storia</string>
+    <string name="reconnect">Ricollegare la pompa</string>
     <string name="smscommunicator_wrongduration">Durata errata</string>
     <string name="smscommunicator_loopsuspended">Loop sospeso</string>
     <string name="smscommunicator_loopresumed">Storia del Loop</string>
@@ -529,6 +560,12 @@
     <string name="insulin_shortname">INS</string>
     <string name="enablesuperbolus">Abilitare super bolus</string>
     <string name="enablesuperbolus_summary">Abilita funzionalità superbolus nella procedura guidata. Non abilitare fino a quando non impari quello che realmente fa. PUÒ CAUSARE L\'INVERTIMENTO INSULINO SE USATO BLINDLY!</string>
+    <string name="show_statuslights">Mostra le luci di stato sulla schermata iniziale</string>
+    <string name="show_statuslights_summary">Abilita indicatori di stato per ago, catetere, serbatoio e batteria livello sulla schermata iniziale.</string>
+    <string name="statuslights_res_warning">Soglia di avviso serbatoio livello [U]</string>
+    <string name="statuslights_res_critical">Soglia critica serbatoio livello [U]</string>
+    <string name="statuslights_bat_warning">Avviso livello batteria [%%]</string>
+    <string name="statuslights_bat_critical">Soglia livello batteria critica [%%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="virtualpump_firmware_label">Firmware</string>
@@ -536,6 +573,7 @@
     <string name="danar_bluetooth_status">Stato Bluetooh</string>
     <string name="nav_about">Spegnere</string>
     <string name="smscommunicator_missingsmspermission">Invio SMS permesso</string>
+    <string name="smscommunicator_missingphonestatepermission">Autorizzazione Stato del telefono mancante</string>
     <string name="xdripstatus_settings">Stato xDripe</string>
     <string name="xdripstatus">XDrip in linea</string>
     <string name="xdripstatus_shortname">xdi</string>
@@ -580,6 +618,7 @@
     <string name="absorptionsettings_title">Impostazioni di assorbimento</string>
     <string name="absorption_maxtime_title">Assorbimento max pasto tempo [h]</string>
     <string name="absorption_maxtime_summary">Tempo in ore in cui è previsto che tutti i carboidrati del pasto vengano assorbiti</string>
+    <string name="danar_visualizeextendedaspercentage_title">Visualizza bolo esteso come %%</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -681,7 +720,10 @@
     <string name="btwatchdog_title">BT Watchdog</string>
     <string name="btwatchdog_summary">Spegnere il bluetooth del telefono per un secondo se non è possibile alcuna connessione al micro. Questo può aiutare in alcuni telefoni.</string>
     <string name="DexcomG5">DexcomG5 App (con correzione)</string>
+    <string name="DexcomG6">DexcomG6 App (con correzione)</string>
+    <string name="eversense">App Eversense (con patch)</string>
     <string name="dexcomg5_nsupload_title">Caricare dati di BG al NS</string>
+    <string name="bgsource_upload">Impostazioni caricamento BG</string>
     <string name="wear_detailed_delta_title">Visualizza dettagliata delta</string>
     <string name="wear_detailed_delta_summary">Visualizza delta con una cifra decimale più</string>
     <string name="smbmaxminutes_summary">Minuti max di basale per limitare SMB per</string>
@@ -689,6 +731,8 @@
     <string name="dexcomg5_xdripupload_title">Inviare i dati di BG xDrip +</string>
     <string name="dexcomg5_xdripupload_summary">In xDrip + selezionare origine dati 640g/Eversense</string>
     <string name="nsclientbg">NSClient BG</string>
+    <string name="minimalbasalvaluereplaced">Valore basale sostituito dal valore massimo: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Valore basale sostituito dal valore massimo: %1$s</string>
     <string name="overview_editquickwizard_usebg">Calcolo di BG</string>
     <string name="overview_editquickwizard_usebolusiob">Calcolo di bolo Bolo</string>
     <string name="overview_editquickwizard_usebasaliob">Calcolo di bolo</string>
@@ -706,6 +750,8 @@
     <string name="closedmodeenabled">Chiusa modalità attivata</string>
     <string name="maxiobset">IOB massima impostata correttamente</string>
     <string name="hasbgdata">BG disponibile da sorgente selezionata</string>
+    <string name="basalprofilenotaligned">Valori basali non allineati alle ore: %1$s</string>
+    <string name="zerovalueinprofile">Profilo non valido: %1$s</string>
     <string name="combo_programming_bolus">Programmazione micro per bolusing</string>
     <string name="combo_refresh">Aggiorna</string>
     <string name="combo_pump_state_label">Stato</string>
@@ -718,6 +764,7 @@
     <string name="combo_pump_state_running">In esecuzione</string>
     <string name="combo_pump_action_cancelling_tbr">Annullamento di TBR</string>
     <string name="combo_pump_action_setting_tbr">L\'impostazione di TBR (%1$d%% / %2$d min)</string>
+    <string name="combo_pump_action_bolusing">Bolusing (%1$.1f U)</string>
     <string name="combo_pump_action_refreshing">Aggiornando</string>
     <string name="combo_pump_unsupported_operation">Richiesta operazione non supportata dal micro</string>
     <string name="combo_low_suspend_forced_notification">L\'utilizzo non sicuro: estesi o multiwave boli sono attivi. Modalità loop è stato impostato basso-sospendere solo 6 ore. Solo normali boli sono supportati in modalità loop</string>
@@ -742,6 +789,7 @@
     <string name="combo_error_bolus_verification_failed">Erogare il bolo e la verifica di storia della pompa non è riuscita, si prega di controllare la pompa. Se è stato somministrato un bolo, si aggiungerà ai trattamenti durante il successivo collegamento alla pompa.</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">Poca insulina per erogare il bolo</string>
     <string name="extendedbolusdeliveryerror">Errore di avvio bolo esteso</string>
+    <string name="insightpump_shortname">Vista</string>
     <string name="insightpump">Pompa di Insight</string>
     <string name="status_no_colon">Stato</string>
     <string name="changed">Cambia</string>
@@ -816,6 +864,8 @@
     <string name="data_choices">Opzioni dati</string>
     <string name="fabric_upload">Upload di fabbrica</string>
     <string name="allow_automated_crash_reporting">Consentire l\'invio degli errori a fine di ricerca agli sviluppatori tramite il servizio fabric.io.</string>
+    <string name="g5appnotdetected">Si prega di aggiornare l\'app di Dexcom a versione supportata</string>
+    <string name="dexcom_app_not_installed">L\'applicazione Dexcom non installata.</string>
     <string name="start_activity_tt">Inizia attività</string>
     <string name="start_eating_soon_tt">Iniziare a mangiare presto TT</string>
     <string name="temptargetshort">TT</string>
@@ -825,6 +875,7 @@
     <string name="bolusrecordedonly">Sarà memorizzato solo il bolo</string>
     <string name="ns_autobackfill_summary">Autobackfill missig BGs da NS</string>
     <string name="loop_smbsetbypump_label">SMB impostato dal micro</string>
+    <string name="overview_show_activity">Attivita\'</string>
     <string name="overview_show_sensitivity">Sensibilità</string>
     <string name="overview_show_deviations">Deviazione</string>
     <string name="overview_show_cob">Carboidrato attivi</string>
@@ -858,6 +909,8 @@
     <string name="closedmodedisabledinpreferences">Modalità ciclo chiuso disattivata nelle preferenze</string>
     <string name="autosensdisabledinpreferences">Autosens disattivato nelle preferenze</string>
     <string name="smbdisabledinpreferences">SMB disattivato nelle preferenze</string>
+    <string name="uamdisabledinpreferences">SMB disattivato nelle preferenze</string>
+    <string name="uamdisabledoref1notselected">attivita\'</string>
     <string name="limitingbasalratio">La limitazione di velocità max basale a %1$.2f U/h a causa di %2$s</string>
     <string name="pumplimit">limite micro</string>
     <string name="itmustbepositivevalue">esso deve essere il valore positivo</string>
@@ -979,6 +1032,7 @@
     <string name="nth_objective">%1$d. Obiettivo</string>
     <string name="poctech">Poctech</string>
     <string name="description_source_poctech">Ricevere i valori BG da app Poctech</string>
+    <string name="description_source_tomato">Ricevere i valori BG da Tomato app (dispositivo MiaoMiao)</string>
     <string name="high_temptarget_raises_sensitivity_title">Genera temptarget ad alta sensibilità</string>
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Aumentare la sensibilità per temptargets> = 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Temptarget basso. abbassare la sensibilità</string>
@@ -1020,7 +1074,125 @@
     <string name="insulinlimitviolation">Violazione del limite di insulina</string>
     <string name="loop_openmode_min_change">Cambiare richiesta minima [%]</string>
     <string name="loop_openmode_min_change_summary">Loop sarà nuova richiesta di modifica popup solo se il cambiamento è più grande di questo valore. Valore predefinito è 20%</string>
+    <string name="pairfirst">Per favore accoppia la pompa con il tuo telefono!</string>
+    <string name="searching_for_devices">Ricerca di dispositivi…</string>
+    <string name="please_wait">Attendi…</string>
+    <string name="pairing_completed">Collegamento completato</string>
+    <string name="code_compare">I codici mostrati su questo dispositivo e sulla pompa?</string>
+    <string name="insight_pairing">associazione Insight</string>
+    <string name="insight_local">Accu-Chek Insight</string>
+    <string name="insight_delivered">%1$.2fU / %2$.2fU consegnato</string>
+    <string name="insight_alert_formatter">%1$s: %2$s</string>
+    <string name="tube_changed">Cambio Catetere</string>
+    <string name="pump_time_updated">Tempo di aggiornamento della pompa</string>
+    <string name="confirm">Conferma</string>
+    <string name="mute_alert">Muto</string>
+    <string name="pump_alert">Avviso pompa</string>
+    <string name="log_site_changes">Registro modifiche al sito</string>
+    <string name="log_reservoir_changes">Modifiche di registro serbatoio</string>
+    <string name="log_tube_changes">Registro modifiche al sito</string>
+    <string name="log_battery_changes">Registra modifiche batteria</string>
+    <string name="log_operating_mode_changes">Modifica modalità di funzionamento log</string>
+    <string name="log_alerts">Avvisi log</string>
+    <string name="enable_tbr_emulation">Abilita emulazione TBR</string>
+    <string name="enable_tbr_emulation_summary">Usa i bolli estesi invece dei TBR per aggirare il limite del 250%%</string>
+    <string name="disconnect_delay">Disconnetti ritardo [s]</string>
+    <string name="serial_number">Numero di serie</string>
+    <string name="release_software_version">Versione software di rilascio</string>
+    <string name="ui_processor_software_version">Versione software di processore UI</string>
+    <string name="pc_processor_software_version">Versione software del PC </string>
+    <string name="md_tel_processor_software_version">Versione software di processore UI</string>
+    <string name="safety_processor_software_version">Versione software del processore</string>
+    <string name="bt_info_page_version">Versione pagina info BT</string>
+    <string name="bluetooth_address">Indirizzo Bluetooth</string>
+    <string name="system_id_appendix">Accoglienza ID sistema</string>
+    <string name="manufacturing_date">Data di produzione</string>
+    <string name="delete_pairing">Elimina accoppiamento</string>
+    <string name="pairing_information">Informazioni di abbinamento</string>
+    <string name="refreh_status">Aggiorna stato</string>
+    <string name="start_pump">Avvia pompa</string>
+    <string name="stop_pump">Ferma pompa</string>
+    <string name="operating_mode">Modalità operativa</string>
+    <string name="insight_status">Stato</string>
+    <string name="tdd_bolus">Bolo TDD</string>
+    <string name="tdd_basal">TDD Basale</string>
+    <string name="tdd_total">Totale TDD</string>
+    <string name="recovering">Recuperando</string>
+    <string name="not_paired">Non accoppiato</string>
+    <string name="last_connected">Ultimo connesso</string>
+    <string name="started">Avviato</string>
+    <string name="stopped">Stoppato</string>
+    <string name="tbr_formatter">%1$d%% per %2$d / %3$d min</string>
+    <string name="extended_bolus">Bolo Esteso</string>
+    <string name="multiwave_bolus">Portale Multi</string>
+    <string name="eb_formatter">%1$.2f / %2$.2f U per %3$d minuto</string>
+    <string name="enable_tbr_over_notification">Abilita notifica di fine TBR e \n(impostazione pompa)</string>
+    <string name="disable_tbr_over_notification">Abilita notifica di fine TBR e \n(impostazione pompa)</string>
+    <string name="refresh">Ricarica</string>
+    <string name="description_pump_insight_local">Integrazione pompa per pompe di Accu-Chek Insight</string>
+    <string name="not_inserted">Non inserito</string>
+    <string name="short_status_last_connected">Ultima conn: %1$d minuti fa</string>
+    <string name="short_status_tbr">TBR: %1$d% per %2$d/%3$d min</string>
+    <string name="short_status_extended">Esteso: %1$.2f / %2$.2f U per %3$d min</string>
+    <string name="short_status_multiwave">Esteso: %1$.2f/ %2$.2f U per %3$d min</string>
+    <string name="short_status_tdd">TDD: %1$.2f</string>
+    <string name="short_status_reservoir">Reser.: %1$.2fU</string>
     <string name="short_status_battery">Batt: %1$d%%</string>
+    <string name="max_recovery_duration">Durata massima [s]</string>
+    <string name="min_recovery_duration">Durata Minima [s]</string>
+    <string name="recovery_duration">Durata recupero</string>
+    <string name="timeout_during_handshake">Timeout durante la comunicazione - riavvia bluetooth</string>
+    <string name="profile_total">== ∑  %1$s U</string>
+    <string name="profile_ins_units_per_hout">U/o</string>
+    <string name="profile_carbs_per_unit">g/U</string>
+    <string name="profile_per_unit">/U</string>
+    <string name="dexcom_lognssensorchange_title">Cambia il sensore di log in NS</string>
+    <string name="dexcom_lognssensorchange_summary">Crea evento \"Cambia sensore\" in NS all\'avvio del sensore</string>
+    <string name="tomato">Tomato (MiaoMiao)</string>
+    <string name="tomato_short">Pomodoro</string>
+    <string name="unit_second">secondi</string>
+    <string name="unit_minute">minuto</string>
+    <string name="unit_hour">ora</string>
+    <string name="unit_day">giorni</string>
+    <string name="unit_week">settimana</string>
+    <string name="unit_seconds">secondi</string>
+    <string name="unit_minutes">minuti</string>
+    <string name="unit_hours">ore</string>
+    <string name="unit_days">giorni</string>
+    <string name="unit_weeks">settimane</string>
+    <string name="summary_tidepool_username">Il tuo nome utente di accesso Tidepool, normalmente il tuo indirizzo email</string>
+    <string name="title_tidepool_username">Nome utente</string>
+    <string name="summary_tidepool_password">La tua password di accesso Tidepool</string>
+    <string name="title_tidepool_password">Password di accesso</string>
+    <string name="title_tidepool_test_login">Test accesso Tidepool</string>
+    <string name="summary_tidepool_dev_servers">Se abilitato, gli upload andranno su https://int-app.tidepool.org invece che su https://app.tidepool.org/</string>
+    <string name="title_tidepool_dev_servers">Usa server di integrazione (test)</string>
+    <string name="tidepool">Tidepool</string>
+    <string name="tidepool_shortname">TDP</string>
+    <string name="description_tidepool">Carica dati in Tidepool</string>
+    <string name="tidepool_upload_cgm">Carica i dati del CGM</string>
+    <string name="tidepool_upload_bolus">Carica trattamenti (insulina, carbo)</string>
+    <string name="tidepool_upload_tbr">Carica basali temporanee</string>
+    <string name="tidepool_upload_profile">Carica gli eventi del profilo, obiettivi temp</string>
+    <string name="tidepool_upload_bg">Carica i test BG</string>
+    <string name="dst_in_24h_warning">Il tempo di salvataggio cambia in 24h o meno</string>
+    <string name="dst_loop_disabled_warning">Il tempo di salvataggio dei dati avviene ogni 3 ore - ciclo chiuso disattivato</string>
+    <string name="storage">vincolo di archiviazione interna</string>
+    <string name="diskfull">Libera almeno %1$d MB dalla memoria interna! Loop disabilitato!</string>
+    <string name="wrongformat">Formato errato</string>
+    <string name="sms_wrongcode">Codice errato. Comando annullato.</string>
+    <string name="notconfigured">Non configurato</string>
+    <string name="profileswitchcreated">Cambia profilo creato</string>
+    <string name="versionChecker">Controllo Versione</string>
+    <string name="old_version">versione precedente</string>
+    <string name="very_old_version">versione molto vecchia</string>
+    <string name="new_version_warning">Nuova versione per almeno %1$d giorni disponibile! Torna ai LGS dopo 60 giorni, il ciclo sarà disattivato dopo 90 giorni</string>
+    <string name="scale_insulin_activity">Attività su scala grafica [U/min]</string>
+    <string name="twohours">2 ore</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="dexcom_app_patched">Dexcom App (con correzione)</string>
+    <string name="dexcom_short">DXCM</string>
+    <string name="description_source_dexcom">Ricevi i valori BG dall\'app Dexcom con patch.</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d giorni</item>
         <item quantity="other">%1$d giorni</item>

app/src/main/res/values-ko/insight_alert_codes.xml

@@ -1,3 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="alert_r1_code">R1 미리 알림</string>
+    <string name="alert_r2_code">R2 미리 알림</string>
+    <string name="alert_r3_code">R3 미리 알림</string>
+    <string name="alert_r4_code">R4 미리 알림</string>
+    <string name="alert_r7_code">R7 미리 알림</string>
+    <string name="alert_w31_code">경고 W31</string>
+    <string name="alert_w32_code">경고 W32</string>
+    <string name="alert_w33_code">경고 W33</string>
+    <string name="alert_w34_code">경고 W34</string>
+    <string name="alert_w36_code">경고 W36</string>
+    <string name="alert_w38_code">경고 W38</string>
+    <string name="alert_w39_code">경고 W39</string>
+    <string name="alert_m20_code">관리 M20</string>
+    <string name="alert_m21_code">관리 M21</string>
+    <string name="alert_m22_code">관리 M22</string>
+    <string name="alert_m23_code">관리 M23</string>
+    <string name="alert_m24_code">관리 M24</string>
+    <string name="alert_m25_code">관리 M25</string>
+    <string name="alert_m26_code">관리 M26</string>
+    <string name="alert_m27_code">관리 M27</string>
+    <string name="alert_m28_code">관리 M28</string>
+    <string name="alert_m29_code">관리 M29</string>
+    <string name="alert_m30_code">관리 M30</string>
+    <string name="alert_e6_code">에러 E6</string>
+    <string name="alert_e10_code">에러 E10</string>
+    <string name="alert_e13_code">에러 E13</string>
+</resources>

app/src/main/res/values-ko/insight_alert_descriptions.xml

@@ -1,3 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="alert_r7_description"><![CDATA[총량: <b>%1$d%%</b>\n기간: <b>%2$s h</b>]]></string>
+    <string name="alert_w31_description"><![CDATA[카트리지 내용: <b>%1$s U</b>]]></string>
+    <string name="alert_w32_description">베터리 교체.</string>
+    <string name="alert_w33_description">시간/날짜 설정</string>
+    <string name="alert_w34_description">아큐-첵 지원 문의</string>
+    <string name="alert_w36_description"><![CDATA[총량: <b>%1$d%%</b><br/>기간: <b>%2$s h</b>]]></string>
+    <string name="alert_w38_description"><![CDATA[설정: <b>%1$s U</b><br/>주입: <b>%2$s U</b>]]></string>
+    <string name="alert_m20_description">카트리지를 삽입.</string>
+    <string name="alert_m21_description">카트리지를 교체.</string>
+    <string name="alert_m22_description">베터리를 교체.</string>
+    <string name="alert_m23_description">펌프 상태를 체크.</string>
+    <string name="alert_m24_description">주입세트를 교체.</string>
+    <string name="alert_m25_description">아큐-첵 지원 문의</string>
+    <string name="alert_m26_description">카트리지를 교체.</string>
+    <string name="alert_m27_description">데이터 다운로드 재시작</string>
+    <string name="alert_m28_description">펌프 상태를 체크.</string>
+    <string name="alert_m29_description">베터리 타입 설정.</string>
+    <string name="alert_m30_description">카트리지 타입 설정.</string>
+    <string name="alert_e6_description">베터리와 카트리지를 교체.</string>
+    <string name="alert_e10_description">카트리지를 교체.</string>
+    <string name="alert_e13_description">언어 변경.</string>
+</resources>

app/src/main/res/values-ko/insight_alert_titles.xml

@@ -1,3 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="alert_r1_title">Bolus 주입.</string>
+    <string name="alert_r2_title">Bolus 누락</string>
+    <string name="alert_r3_title">알람 시계</string>
+    <string name="alert_r4_title">주입세트를 교체</string>
+    <string name="alert_r7_title">TBR 완료</string>
+    <string name="alert_w31_title">카트리지 부족</string>
+    <string name="alert_w32_title">베터리 부족</string>
+    <string name="alert_w33_title">유효하지 시간/날짜</string>
+    <string name="alert_w34_title">보증기간 만료</string>
+    <string name="alert_w36_title">TBR 취소</string>
+    <string name="alert_w38_title">Bolus 취소</string>
+    <string name="alert_w39_title">Loantime 경고</string>
+    <string name="alert_m20_title">카트리지가 삽입되지 않음</string>
+    <string name="alert_m21_title">카트리지가 비어 있음</string>
+    <string name="alert_m22_title">배터리 방전됨</string>
+    <string name="alert_m23_title">오토매틱 오프 - 펌프 종료</string>
+    <string name="alert_m24_title">막힘</string>
+    <string name="alert_m25_title">Loantime 종료 - 작동 종료</string>
+    <string name="alert_m26_title">카트리지 변경이 완료되지 않음</string>
+    <string name="alert_m27_title">데이터 다운로드 실패</string>
+    <string name="alert_m28_title">일시정지 모드 시간초과</string>
+    <string name="alert_m29_title">베터리 타입이 설정되지 않음</string>
+    <string name="alert_m30_title">카트리지 타입이 설정되지 않음</string>
+    <string name="alert_e6_title">기계적인 오류</string>
+    <string name="alert_e10_title">되감기 오류</string>
+    <string name="alert_e13_title">언어 오류</string>
+</resources>

app/src/main/res/values-ko/insight_exceptions.xml

@@ -1,3 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="connection_failed">연결실패</string>
+    <string name="connection_lost">연결 끊김</string>
+    <string name="pairing_rejected">페어링 거절됨</string>
+    <string name="socket_creation_failed">소켓 생성 실패</string>
+    <string name="timeout">시간 초과</string>
+    <string name="maximum_number_of_bolus_type_already_running">최대치의 Bolus가 이미 실행중입니다.</string>
+    <string name="no_active_tbr_to_cancel">취소 할 활성 TBR 없음</string>
+    <string name="no_active_tbr_to_change">변경 할 활성 TBR 없음</string>
+    <string name="no_such_bolus_to_cancel">취소 할 Bolus가 없습니다.</string>
+    <string name="pump_already_in_that_state_exception">이미 그 상태로 펌프 중</string>
+    <string name="run_mode_not_allowed">실행 모드가 허용되지 않음</string>
+</resources>

app/src/main/res/values-ko/strings.xml

@@ -9,6 +9,7 @@
     <string name="nav_resetdb">데이터베이스 초기화</string>
     <string name="reset_db_confirm">데이터 베이스를 정말 초기화하시겠습니까?</string>
     <string name="nav_exit">종료</string>
+    <string name="danar_useextended_title">200%%이상 주입 위해 확장 Bolus 사용</string>
     <string name="danar_bt_name_title">다나R 블루투스</string>
     <string name="ns_sync_use_absolute_title">Basal 절대값 사용하기</string>
     <string name="alert_dialog_storage_permission_text">폰을 재부팅하거나 AndroidAPS를 재시작하세요 \n그렇지 않으면 로그 기록이 되지 않습니다.(알고리즘이 정상적인 작동하는지 확인하기 위해 로그가 필요합니다.)!</string>
@@ -43,6 +44,8 @@
     <string name="description_sensitivity_oref1">민감도가 과거 8시간의 데이터로 부터 계산됩니다. (흡수되지 않은 경우) 탄수화물은 설정에서 설정된 시간이 지나면 없어집니다. UAM(알리지 않은 음식)도 계산합니다.</string>
     <string name="description_sensitivity_weighted_average">민감도가 편차의 가중평균으로 계산됩니다. 최근의 편차가 더 가중됩니다. 최소 탄수화물 흡수는 설정에서 최대 탄수화물 흡수 시간으로 부터 계산됩니다. 이 알고리즘의 민감도가 가장 빠릅니다.</string>
     <string name="description_source_dexcom_g5">패치된 DexcomG5 앱에서 혈당값 받기</string>
+    <string name="description_source_dexcom_g6">패치된 DexcomG6 앱에서 혈당값 받기</string>
+    <string name="description_source_eversense">패치된 Eversense 앱에서 혈당값 받기</string>
     <string name="description_source_glimp">Glimp에서 혈당값 받기</string>
     <string name="description_source_mm640g">600SeriesAndroidUploader에서 혈당값 받기</string>
     <string name="description_source_ns_client">Nightscout에서 다운로드하여 혈당값 받기</string>
@@ -51,6 +54,7 @@
     <string name="description_wear">WearOS 워치를 이용하여 AndroidAPS를 모니터하고 제어합니다.</string>
     <string name="description_xdrip_status_line">xDrip+ 워치페이스에서 Loop정보 보여주기</string>
     <string name="description_sms_communicator">SMS 전송을 이용하여 AndroidAPS를 원격 제어합니다.</string>
+    <string name="objectives_button_back">뒤로</string>
     <string name="objectives_button_start">시작</string>
     <string name="objectives_button_verify">확인</string>
     <string name="nsprofileview_units_label">단위</string>
@@ -143,6 +147,8 @@
     <string name="constraints_violation">제한 위반</string>
     <string name="treatmentdeliveryerror">Bolus 주입 에러</string>
     <string name="tempbasaldeliveryerror">임시Basal 주입 에러</string>
+    <string name="overview_newtempbasal_basalpercent">Basal 값[%%]</string>
+    <string name="overview_newtempbasal_percent_label">%% (100%% = 현재)</string>
     <string name="setbasalquestion">새 임시Basal 적용:</string>
     <string name="overview_treatment_label">관리</string>
     <string name="overview_calculator_label">계산기</string>
@@ -242,6 +248,7 @@
     <string name="danar_iob_label">펌프 IOB</string>
     <string name="danar_dailyunits">일 인슐린 총량</string>
     <string name="pump_lastbolus_label">최근 Bolus:</string>
+    <string name="hoursago">%1$.1f시간 전</string>
     <string name="danar_invalidinput">사용할수 없는 입력 데이터</string>
     <string name="danar_valuenotsetproperly">값이 제대로 설정되지 않았습니다</string>
     <string name="reloadprofile">프로파일 새로고침</string>
@@ -259,6 +266,10 @@
     <string name="smscommunicator_bolusreplywithcode">Bolus %1$.2fU 을 주입하려면 %2$s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_calibrationreplywithcode">보정값 %1$.2f을 전송하려면 %2$s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_bolusfailed">Bolus failed</string>
+    <string name="bolusdelivered">Bolus %1$.2fU이 주입 완료되었습니다.</string>
+    <string name="bolusrequested">%1$.2fU을 주입합니다</string>
+    <string name="smscommunicator_bolusdelivered">Bolus %1$.2fU이 주입 완료되었습니다</string>
+    <string name="bolusdelivering">%1$.2fU 주입중</string>
     <string name="smscommunicator_remotecommandsallowed">SMS 원격 명령 사용하기</string>
     <string name="glucosetype_finger">체혈</string>
     <string name="glucosetype_sensor">센서</string>
@@ -303,6 +314,7 @@
     <string name="overview_bolusprogress_stop">정지</string>
     <string name="overview_bolusprogress_stoppressed">정지 누름</string>
     <string name="waitingforpump">펌프를 기다리는 중</string>
+    <string name="overview_bolusprogress_goingtodeliver">%1$.2fU을 주입합니다</string>
     <string name="objectives_0_objective">표시설정과 모니터설정을 완료하고, Basal과 비율을 분석한다.</string>
     <string name="objectives_0_gate">나이트스카우트에서 혈당 데이터가 잘 들어오는지, 펌프데이터가 업로드 되는지 확인한다.</string>
     <string name="objectives_1_objective">Open Loop를 시작한다.</string>
@@ -325,12 +337,26 @@
     <string name="smscommunicator_loopisdisabled">Loop가 중지중입니다.</string>
     <string name="smscommunicator_loopisenabled">Loop가 실행중입니다.</string>
     <string name="valuelimitedto">%1$.2f, %2$.2f으로 제한됨</string>
+    <string name="valueoutofrange">%1$s값이 하드한계를 벗어났습니다</string>
     <string name="smscommunicator_remotecommandnotallowed">원격 명령이 허가되지 않았습니다</string>
+    <string name="smscommunicator_remotebolusnotallowed">원격 주입이 불가능합니다. 나중에 다시 시도해주세요.</string>
+    <string name="smscommunicator_basalreplywithcode">%2$d분 동안 Basal %1$.2fU/h 주입하려면 %3$s 를 입력하고 답장하세요</string>
+    <string name="smscommunicator_profilereplywithcode">프로파일을 %1$s %2$d%%로 변경하려면 %3$s 를 입력하고 답장하세요</string>
+    <string name="smscommunicator_extendedreplywithcode">%2$d분 동안 확장 Bolus %1$.2fU 주입하려면 %3$s 를 입력하고 답장하세요</string>
+    <string name="smscommunicator_basalpctreplywithcode">%2$d 분 동안 Basal %1$d%% 주입하려면 %3$s을 입력하고 답장하세요</string>
     <string name="smscommunicator_suspendreplywithcode">%1$d분동안 Loop 일시중지하려면 %2$s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_tempbasalset">Temp Basal %1$.2fU/h for %2$d min started successfully</string>
+    <string name="smscommunicator_extendedset">%2$d분 동안 확장Bolus %1$.2fU주입이 성공적으로 시작되었습니다</string>
+    <string name="smscommunicator_tempbasalset_percent">%2$d분 동안 임시Basal %1$d%%주입이 성공적으로 시작되었습니다</string>
     <string name="smscommunicator_tempbasalfailed">Temp Basal start failed</string>
+    <string name="smscommunicator_extendedfailed">확장 Bolus 실행 실패</string>
+    <string name="smscommunicator_basalstopreplywithcode">임시Basal을 중지하려면 %1$s 를 입력하고 답장하세요</string>
+    <string name="smscommunicator_extendedstopreplywithcode">확장 Bolus를 중지하려면 %1$s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_tempbasalcanceled">Temp Basal canceled</string>
+    <string name="smscommunicator_extendedcanceled">확장 Bolus 취소</string>
     <string name="smscommunicator_tempbasalcancelfailed">Canceling Temp Basal failed</string>
+    <string name="smscommunicator_extendedcancelfailed">확장 Bolus 취소가 실패하였습니다.</string>
+    <string name="smscommunicator_unknowncommand">알려지지 않은 명령이거나 잘못된 답장입니다</string>
     <string name="quickwizard">빠른마법사</string>
     <string name="quickwizardsettings">빠른마법사 설정</string>
     <string name="overview_editquickwizard_buttontext">버튼명:</string>
@@ -393,6 +419,7 @@
     <string name="array_of_elements">%1$d 요소의 배열.\n실제 값:</string>
     <string name="openapsma_autosensdata_label">Autosens 정보</string>
     <string name="openapsma_scriptdebugdata_label">스크립트 디버그</string>
+    <string name="openapsama_useautosens">Autosens 기능 사용</string>
     <string name="refresheventsfromnightscout">NS에서 이벤트 새로고침</string>
     <string name="deletefuturetreatments">미래시점의 관리 삭제</string>
     <string name="eatingsoon">식사직전</string>
@@ -437,6 +464,7 @@
     <string name="profile">프로파일</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">기본값: 3\n이 값은 중요한 OpenAPS 안전장치입니다. 이 값의 역할은 펌프에 설정되어 있는 최대Basal보다 3배를 초과할 수 없게 제한하는 것입니다. 이 값을 변경할 필요는 없을 것이지만, 안전을 위해 \"3x max daily; 4x current\"이 의미하는 바를 알고 있어야 합니다.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">기본값: 4\n이 값은 \"3x max daily; 4x current\"의 나머지 절반에 해당하는 또 다른 중요한 OpenAPS 안전장치입니다. 이것은, 펌프에 설정된 최대 Basal과는 관계없이, Basal이 설정된 현재시간의 Basal에 이 값을 곱한 양을 초과할 수 없다는 것을 의미합니다. 이는 알고리즘의 작동 방식을 이해하기 전에 과도하게 높은 최대 기본을 설정하여 위험한 상황에 빠지지 않도록 보호하기 위한 것입니다. 다시한번, 기본 값은 4배인 것을 알아두세요; 일반적으로 이것을 조정할 필요는 전혀 없으며, 대신 이 안전장치를 변경해야할것처럼 생각이 된다면, 다른 설정을 변경해야 할 가능성이 더 큽니다.</string>
+    <string name="openapsama_autosens_max_summary">기본값: 1.2\n이 옵션은 autosens의 최대 한계 값을 20%%로 제한하기 위해 autosens(곧 autotune)이 이용하는 승수값입니다. 이 값이 autosens에 대한 Basal의 최대 값, 인슐린 민감도(ISF)의 최소값 및 혈당 목표의 최소값을 결정케 합니다.</string>
     <string name="openapsama_autosens_min_summary">기본값: 0.7\nautosens 안전 제한의 나머지 부분입니다. 이는 Basal을 얼마나 낮게 조절할 수 있는지, ISF와 혈당 목표범위를 얼마나 높게 설정할 수 있는지를 결정합니다.</string>
     <string name="openapsama_autosens_adjusttargets">Autosens가 목표도 조절합니다.</string>
     <string name="openapsama_autosens_adjusttargets_summary">기본값: 활성\n이것은 autosens가 ISF와 Basal뿐만 아니라, 혈당 목표범위를 조절할 수 있게 합니다.</string>
@@ -449,6 +477,7 @@
     <string name="error_phone_not_valid">폰번호가 유효하지 않습니다</string>
     <string name="smscommunicator_invalidphonennumber">SMS폰번호가 유효하지 않습니다</string>
     <string name="overview_calibration">보정</string>
+    <string name="send_calibration">보정값 %1$.1f을 xDrip에 전송하시겠습니까?</string>
     <string name="xdripnotinstalled">xDrip+가 설치되지 않았습니다</string>
     <string name="calibrationsent">보정이 xDrip으로 전송되었습니다</string>
     <string name="smscommunicator_calibrationsent">보정 전송됨. xDrip에서 수신이 되도록 설정되어 있어야 합니다.</string>
@@ -499,6 +528,7 @@
     <string name="resistantadult">인슐린 저항성 높은 성인</string>
     <string name="patientage_summary">안전제한을 설정하기 위해 당뇨인의 나이를 선택하세요</string>
     <string name="Glimp">Glimp</string>
+    <string name="needwhitelisting">최적의 성능을 위해 %1$s에서 배터리 최적화를 해제해야합니다.</string>
     <string name="loopsuspended">Loop 일시중지</string>
     <string name="loopsuspendedfor">일시중지중 (%d분)</string>
     <string name="loopsuperbolusfor">Superbolus (%1$d 분)</string>
@@ -512,6 +542,7 @@
     <string name="disconnectpumpfor2h">2시간동안 펌프 일시중지</string>
     <string name="disconnectpumpfor3h">3시간동안 펌프 일시중지</string>
     <string name="resume">재실행</string>
+    <string name="reconnect">펌프 재연결</string>
     <string name="smscommunicator_wrongduration">기간이 잘못되었습니다.</string>
     <string name="smscommunicator_loopsuspended">Loop가 일시중지 되었습니다.</string>
     <string name="smscommunicator_loopresumed">Loop가 재실행 되었습니다.</string>
@@ -529,6 +560,12 @@
     <string name="insulin_shortname">INS</string>
     <string name="enablesuperbolus">마법사에서 Superbolus 활성화하기</string>
     <string name="enablesuperbolus_summary">마법사에서 Superbolus 기능을 활성화합니다. 어떤 기능인지 확실히 알기전까지 활성화 하지 마세요. 제대로 알지 못하고 사용하면 일슐린이 과다 주입될 수 있습니다!</string>
+    <string name="show_statuslights">홈화면에 상태 표시등 보여주기</string>
+    <string name="show_statuslights_summary">홈화면에 캐뉼라 사용기간, 인슐린 사용기간, 센서 사용기간, 펌프용 주사기와 배터리 남은 양의 표시등을 활성화합니다.</string>
+    <string name="statuslights_res_warning">주사기량 경고 기준값[U]</string>
+    <string name="statuslights_res_critical">주사기량 위험 기준값[U]</string>
+    <string name="statuslights_bat_warning">배터리량 경고 기준값[%%]</string>
+    <string name="statuslights_bat_critical">배터리량 위험 기준값[%%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="virtualpump_firmware_label">펌웨어</string>
@@ -536,6 +573,7 @@
     <string name="danar_bluetooth_status">블루투스 상태</string>
     <string name="nav_about">버전정보</string>
     <string name="smscommunicator_missingsmspermission">SMS 권한 누락</string>
+    <string name="smscommunicator_missingphonestatepermission">전화 상태 권한이 허가되지 않았습니다</string>
     <string name="xdripstatus_settings">xDrip 상태(워치)</string>
     <string name="xdripstatus">xDrip 상태표시라인(워치)</string>
     <string name="xdripstatus_shortname">xds</string>
@@ -580,6 +618,7 @@
     <string name="absorptionsettings_title">흡수 설정</string>
     <string name="absorption_maxtime_title">식사 최대 흡수 시간 [h]</string>
     <string name="absorption_maxtime_summary">식사로 섭취한 탄수화물이 모두 흡수될기까지 예상되는 시간</string>
+    <string name="danar_visualizeextendedaspercentage_title">확장Bolus를 %%로 표시하기</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -681,7 +720,10 @@
     <string name="btwatchdog_title">블루투스 감시기능</string>
     <string name="btwatchdog_summary">펌프에 연결이 되지 않을때 폰의 블루투스를 1초간 껐다 켭니다. 블루투스 스택이 정지되는 일부폰에 이 기능이 도움이 됩니다.</string>
     <string name="DexcomG5">DexcomG5 앱(패치버전)</string>
+    <string name="DexcomG6">DexcomG6 앱(패치버전)</string>
+    <string name="eversense">Eversense 앱(패치버전)</string>
     <string name="dexcomg5_nsupload_title">NS에 혈당데이터 업로드하기</string>
+    <string name="bgsource_upload">혈당 업로드 설정</string>
     <string name="wear_detailed_delta_title">델타(혈당증분값) 자세히 보여주기</string>
     <string name="wear_detailed_delta_summary">소수점 자리 추가된 증분값 보여주기</string>
     <string name="smbmaxminutes_summary">SMB가 Basal을 제한할 수 있는 최대 시간(분)</string>
@@ -689,6 +731,8 @@
     <string name="dexcomg5_xdripupload_title">혈당 데이터를 xDrip+에 전송하기</string>
     <string name="dexcomg5_xdripupload_summary">xDrip+ 데이터 소스에서 640g/Eversense을 선택하세요</string>
     <string name="nsclientbg">NSClient 혈당</string>
+    <string name="minimalbasalvaluereplaced">지원되는 최소값으로 Basal값이 대체되었습니다:%1$s</string>
+    <string name="maximumbasalvaluereplaced">지원되는 최대값으로 Basal값이 대체되었습니다:%1$s</string>
     <string name="overview_editquickwizard_usebg">혈당 계산</string>
     <string name="overview_editquickwizard_usebolusiob">Bolus IOB 계산</string>
     <string name="overview_editquickwizard_usebasaliob">Basal IOB 계산</string>
@@ -706,6 +750,8 @@
     <string name="closedmodeenabled">Closed 모드가 활성화됨</string>
     <string name="maxiobset">최대 IOB가 바르게 설정됨</string>
     <string name="hasbgdata">선택한 소스에서 혈당이 들어옵니다.</string>
+    <string name="basalprofilenotaligned">Basal값이 시간단위로 설정되지 않았습니다: %1$s</string>
+    <string name="zerovalueinprofile">유효하지 않은 프로파일: %1$s</string>
     <string name="combo_programming_bolus">Bolus 주입을 위한 펌프 프로그래밍</string>
     <string name="combo_refresh">새로고침</string>
     <string name="combo_pump_state_label">상태</string>
@@ -718,6 +764,7 @@
     <string name="combo_pump_state_running">실행중</string>
     <string name="combo_pump_action_cancelling_tbr">임시기초주입 취소중</string>
     <string name="combo_pump_action_setting_tbr">임시기초주입 설정중 (%1$d%% / %2$d분)</string>
+    <string name="combo_pump_action_bolusing">Bolus 주입중 (%1$.1f U)</string>
     <string name="combo_pump_action_refreshing">새로고침중</string>
     <string name="combo_pump_unsupported_operation">요청하신 동작은 펌프에서 지원하지 않습니다.</string>
     <string name="combo_low_suspend_forced_notification">위험한 사용: 확장Bolus 혹은 멀티웨이브Bolus가 활성화 됩니다. Loop 모드가 저혈당 방지로 오직 6시간만 설정됩니다. Loop 모드에선 일반 Bolus만 지원합니다.</string>
@@ -742,6 +789,7 @@
     <string name="combo_error_bolus_verification_failed">Bolus를 주입하고 펌프 이력을 확인하는데 실패하였습니다. 펌프를 확인해보세요. 만약 Bolus 주입이 되었다면 펌프와 다음번 연결시 그 내용이 관리에 추가될 것입니다.</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">Bolus 주입 위한 인슐린이 주사기에 부족합니다.</string>
     <string name="extendedbolusdeliveryerror">확장Bolus 주입 에러</string>
+    <string name="insightpump_shortname">Sight</string>
     <string name="insightpump">Insight 펌프</string>
     <string name="status_no_colon">상태</string>
     <string name="changed">변경됨</string>
@@ -816,6 +864,8 @@
     <string name="data_choices">데이터선택</string>
     <string name="fabric_upload">Fabric 업로드</string>
     <string name="allow_automated_crash_reporting">fabric.io 서비스를 통해 개발자에게 앱 오류 및 특정 데이터를 자동 전송합니다.</string>
+    <string name="g5appnotdetected">Dexcom앱을 지원가능한 버전으로 업데이트하세요.</string>
+    <string name="dexcom_app_not_installed">Dexcom 앱이 설치되지 않았습니다.</string>
     <string name="start_activity_tt">활동 임시목표 시작</string>
     <string name="start_eating_soon_tt">식사직전 임시목표 시작</string>
     <string name="temptargetshort">TT</string>
@@ -825,6 +875,7 @@
     <string name="bolusrecordedonly">Bolus가 기록만 됩니다.</string>
     <string name="ns_autobackfill_summary">NS에서 누락된 혈당이 자동으로 채워집니다.</string>
     <string name="loop_smbsetbypump_label">펌프에 의한 SMB 설정</string>
+    <string name="overview_show_activity">활동</string>
     <string name="overview_show_sensitivity">민감도</string>
     <string name="overview_show_deviations">편차</string>
     <string name="overview_show_cob">체내탄수화물양(COB)</string>
@@ -858,6 +909,8 @@
     <string name="closedmodedisabledinpreferences">설정에서 Closed Loop 모드가 비활성화되었습니다.</string>
     <string name="autosensdisabledinpreferences">설정에서 Autosens가 비활성화 되었습니다.</string>
     <string name="smbdisabledinpreferences">설정에서 SMB가 비활성화 되었습니다.</string>
+    <string name="uamdisabledinpreferences">설정에서 UAM이 비활성화 되었습니다.</string>
+    <string name="uamdisabledoref1notselected">Oref1 민감도 플러그인이 필요하므로 UAM이 비활성화 되었습니다.</string>
     <string name="limitingbasalratio">%2$s로 인해 최대 Basal양이 %1$.2f U/h으로 제한됩니다.</string>
     <string name="pumplimit">펌프 제한</string>
     <string name="itmustbepositivevalue">양의 값이어야 합니다.</string>
@@ -979,6 +1032,7 @@
     <string name="nth_objective">%1$d. 목표</string>
     <string name="poctech">Poctech</string>
     <string name="description_source_poctech">Poctech 앱에서 혈당값 받기</string>
+    <string name="description_source_tomato">혈당값이 Tomato앱(MiaoMaio장치) 으로부터 수신되었습니다.</string>
     <string name="high_temptarget_raises_sensitivity_title">높은 임시목표는 민감도를 올립니다.</string>
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[임시목표 100이상을 위해 민감도를 올립니다.]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">낮은 임시목표는 민감도를 내립니다.</string>
@@ -1020,6 +1074,125 @@
     <string name="insulinlimitviolation">인슐린 제한 위반</string>
     <string name="loop_openmode_min_change">최소 요청 변화 [%]</string>
     <string name="loop_openmode_min_change_summary">이 값보다 변화가 클때만 Loop가 새 변화 요청창을 띄울것 입니다. 기본 값은 20%입니다.</string>
+    <string name="pairfirst">펌프를 폰과 동기화 하십시오</string>
+    <string name="searching_for_devices">장치 검색중...</string>
+    <string name="please_wait">잠시 기다려 주세요...</string>
+    <string name="pairing_completed">동기화 완료</string>
+    <string name="code_compare">이 장치에서 보여지는 코드와 펌프에서 보여지는 코드가 동일한가요?</string>
+    <string name="insight_pairing">Insight와 동기화</string>
+    <string name="insight_local">아큐-첵 Insight</string>
+    <string name="insight_delivered">%1$.2fU / %2$.2fU 주입됨</string>
+    <string name="insight_alert_formatter">%1$s: %2$s</string>
+    <string name="tube_changed">튜브 변경</string>
+    <string name="pump_time_updated">펌프 시간 업데이트</string>
+    <string name="confirm">확인</string>
+    <string name="mute_alert">음소거</string>
+    <string name="pump_alert">펌프 경고</string>
+    <string name="log_site_changes">위치 변경 기록</string>
+    <string name="log_reservoir_changes">주사기 교체 기록</string>
+    <string name="log_tube_changes">튜브 교체 기록</string>
+    <string name="log_battery_changes">배터리 교체 기록</string>
+    <string name="log_operating_mode_changes">작동 모드 변경 기록</string>
+    <string name="log_alerts">경고 기록</string>
+    <string name="enable_tbr_emulation">임시Basal 에뮬레이션 활성화</string>
+    <string name="enable_tbr_emulation_summary">250%% 제한을 무시하기 위해 임시Basal 대신 확정Boluses 사용</string>
+    <string name="disconnect_delay">연결해제 지연 [초]</string>
+    <string name="serial_number">시리얼번호</string>
+    <string name="release_software_version">출시 소프트웨어 버전</string>
+    <string name="ui_processor_software_version">UI 프로세서 소프트웨어 버전</string>
+    <string name="pc_processor_software_version">PC 프로세서 소프트웨어 버전</string>
+    <string name="md_tel_processor_software_version">MD tel 프로세서 소프트웨어 버전</string>
+    <string name="safety_processor_software_version">안전 프로세서 소프트웨어 버전</string>
+    <string name="bt_info_page_version">블루투스 정보 페이지 버전</string>
+    <string name="bluetooth_address">블루투스 주소</string>
+    <string name="system_id_appendix">시스템 ID 부록</string>
+    <string name="manufacturing_date">제조일</string>
+    <string name="delete_pairing">동기화 삭제</string>
+    <string name="pairing_information">동기화 정보</string>
+    <string name="refreh_status">상태 새로고침</string>
+    <string name="start_pump">펌프 시작</string>
+    <string name="stop_pump">펌프 중지</string>
+    <string name="operating_mode">작동 모드</string>
+    <string name="insight_status">상태</string>
+    <string name="tdd_bolus">TDD Bolus</string>
+    <string name="tdd_basal">TDD Basal</string>
+    <string name="tdd_total">TDD Total</string>
+    <string name="recovering">복구중</string>
+    <string name="not_paired">동기화 되지 않음</string>
+    <string name="last_connected">최신 연결</string>
+    <string name="started">시작됨</string>
+    <string name="stopped">중지됨</string>
+    <string name="tbr_formatter">%2$d / %3$d분 동안 %1$d%%</string>
+    <string name="extended_bolus">확장 Bolus</string>
+    <string name="multiwave_bolus">Multiwave Bolus</string>
+    <string name="eb_formatter">%3$d분 동안 %1$.2f / %2$.2f U</string>
+    <string name="enable_tbr_over_notification">임시Basal 종료 알림 활성\n(펌프설정)</string>
+    <string name="disable_tbr_over_notification">임시Basal 종료 알림 비활성\n(펌프설정)</string>
+    <string name="refresh">새로고침</string>
+    <string name="description_pump_insight_local">아큐-첵 Insight 펌프 연동</string>
+    <string name="not_inserted">삽입되지 않음</string>
+    <string name="short_status_last_connected">최신연결: %1$d 분전</string>
+    <string name="short_status_tbr">임시: %2$d / %3$d 분 동안 %1$d%%</string>
+    <string name="short_status_extended">확장: %3$d분 동안 %1$.2f / %2$.2f U</string>
+    <string name="short_status_multiwave">Multiwave: %3$d 분 동안 %1$.2f / %2$.2f U</string>
+    <string name="short_status_tdd">TDD: %1$.2f</string>
+    <string name="short_status_reservoir">Reser.: %1$.2fU</string>
+    <string name="short_status_battery">Batt.: %1$d%%</string>
+    <string name="max_recovery_duration">최대 복구 기간 [초]</string>
+    <string name="min_recovery_duration">최소 복구 기간 [초]</string>
+    <string name="recovery_duration">복구 기간</string>
+    <string name="timeout_during_handshake">연결 시간 초과 - 블루투스 재설정</string>
+    <string name="profile_total">== ∑  %1$s U</string>
+    <string name="profile_ins_units_per_hout">U/h</string>
+    <string name="profile_carbs_per_unit">g/U</string>
+    <string name="profile_per_unit">/U</string>
+    <string name="dexcom_lognssensorchange_title">센서 교체 NS에 기록하기</string>
+    <string name="dexcom_lognssensorchange_summary">센서교체시 NS에 자동으로 \"센서 교체\" 이벤트를 생성합니다.</string>
+    <string name="tomato">Tomato (MiaoMiao)</string>
+    <string name="tomato_short">Tomato</string>
+    <string name="unit_second">초</string>
+    <string name="unit_minute">분</string>
+    <string name="unit_hour">시</string>
+    <string name="unit_day">일</string>
+    <string name="unit_week">주</string>
+    <string name="unit_seconds">초</string>
+    <string name="unit_minutes">분</string>
+    <string name="unit_hours">시</string>
+    <string name="unit_days">일</string>
+    <string name="unit_weeks">주</string>
+    <string name="summary_tidepool_username">Tidepool 사용자명, 보통 이메일 주소입니다.</string>
+    <string name="title_tidepool_username">로그인 사용자명</string>
+    <string name="summary_tidepool_password">Tidepool 로그인 비밀번호</string>
+    <string name="title_tidepool_password">로그인 비밀번호</string>
+    <string name="title_tidepool_test_login">Tidepool 로그인 테스트하기</string>
+    <string name="summary_tidepool_dev_servers">활성화하면 업로드 정보가 https://app.tidepool.org/이 아닌 https://int-app.tidepool.org/로 전송됩니다.</string>
+    <string name="title_tidepool_dev_servers">테스트 서버 사용</string>
+    <string name="tidepool">Tidepool</string>
+    <string name="tidepool_shortname">TDP</string>
+    <string name="description_tidepool">데이터를 Tidepool로 업로드</string>
+    <string name="tidepool_upload_cgm">CGM 데이터 업로드</string>
+    <string name="tidepool_upload_bolus">관리정보(인슐린, 탄수화물) 업로드</string>
+    <string name="tidepool_upload_tbr">임시 Basal 업로드</string>
+    <string name="tidepool_upload_profile">프로파일변경, 임시목표 업로드</string>
+    <string name="tidepool_upload_bg">혈당 테스트 업로드</string>
+    <string name="dst_in_24h_warning">24시간 이내 썸머타임 변경</string>
+    <string name="dst_loop_disabled_warning">썸머타임 변경이 3시간 미만입니다 - Closed Loop 비활성됨</string>
+    <string name="storage">내부 저장 용량 제한</string>
+    <string name="diskfull">내부 저장 공간을 최소 %1$d MB 이상 비우세요! Loop가 비활성화되었습니다!</string>
+    <string name="wrongformat">잘못된 형식</string>
+    <string name="sms_wrongcode">잘못된 코드입니다. 명령이 취소됩니다.</string>
+    <string name="notconfigured">설정되지 않음</string>
+    <string name="profileswitchcreated">프로파일 변경 생성됨</string>
+    <string name="versionChecker">버전 검사기</string>
+    <string name="old_version">오래된 버전</string>
+    <string name="very_old_version">아주 오래된 버전</string>
+    <string name="new_version_warning">최소 %1$d일 새버전이 가능합니다! 60일 후엔 LGS(저혈당 주입중지기능)으로 복귀되며, 90일이후엔 Loop가 비활성화 될 것입니다.</string>
+    <string name="scale_insulin_activity">인슐린 활동 그래프 크기[U/min]</string>
+    <string name="twohours">2h</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="dexcom_app_patched">Dexcom 앱(패치버전)</string>
+    <string name="dexcom_short">DXCM</string>
+    <string name="description_source_dexcom">패치된 Dexcom 앱에서 혈당값 받기</string>
     <plurals name="objective_days">
         <item quantity="other">%1$d 일</item>
     </plurals>

app/src/main/res/values-lt/strings.xml

@@ -1148,6 +1148,14 @@
     <string name="dexcom_lognssensorchange_summary">Sukurti įvykį \"Sensoriaus keitimas\" NS automatiškai, startavus sensorių</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
+    <string name="unit_second">sekundė</string>
+    <string name="unit_minute">minutė</string>
+    <string name="unit_hour">valanda</string>
+    <string name="unit_seconds">sekundės</string>
+    <string name="unit_minutes">minutės</string>
+    <string name="unit_hours">valandos</string>
+    <string name="summary_tidepool_username">Jūsų Tidepool vartotojo vardas, įprastai jūsų el. pašto adresas</string>
+    <string name="title_tidepool_username">Vartotojo vardas</string>
     <string name="dst_in_24h_warning">Laiko persukimas įvyks po 24 val ar mažiau</string>
     <string name="dst_loop_disabled_warning">Laikas persuktas prieš mažiau nei 3 val - Uždaras ciklas deaktyvuotas</string>
     <string name="storage">vidinės saugyklos apribojimas</string>

app/src/main/res/values-pl/strings.xml

@@ -866,6 +866,7 @@
     <string name="fabric_upload">Przesyłanie danych fabric</string>
     <string name="allow_automated_crash_reporting">Zezwalaj na automatyczne zgłaszanie awarii i danych o użytkowaniu aplikacji do deweloperów za pośrednictwem usługi fabric.io.</string>
     <string name="g5appnotdetected">Proszę uaktualnij swoją Apkę Dexcom do wersji wspieranej</string>
+    <string name="dexcom_app_not_installed">Apka Dexcom nie jest zainstalowana.</string>
     <string name="start_activity_tt">Rozpocznij TT Ćwiczenia</string>
     <string name="start_eating_soon_tt">Rozpocznij TT WkrótcePosiłek</string>
     <string name="temptargetshort">TT</string>
@@ -1161,6 +1162,11 @@
     <string name="old_version">stara wersja</string>
     <string name="very_old_version">bardzo stara wersja</string>
     <string name="new_version_warning">Nowa wersja dostępna co najmniej %1$d dni! Powrót do LGS (zawieszania podawania bazy przy niskim poziomie) po 60 dniach, pętla zostanie wyłączona po 90 dniach</string>
+    <string name="twohours">2 h</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="dexcom_app_patched">Apka Dexcom (spatchowana)</string>
+    <string name="dexcom_short">DXCM</string>
+    <string name="description_source_dexcom">Pobieraj wartości BG ze spatchowanej aplikacji Dexcom.</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d dzień</item>
         <item quantity="few">%1$d dni</item>

app/src/main/res/values-pt/strings.xml

@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-    <string name="treatmentssafety_title">Segurança de tratamentos</string>
+    <string name="treatmentssafety_title">Segurança do Tratamento</string>
-    <string name="treatmentssafety_maxbolus_title">Max bolus permitido [U]</string>
+    <string name="treatmentssafety_maxbolus_title">Máximo bolus permitido [U]</string>
-    <string name="treatmentssafety_maxcarbs_title">Max hidratos permitidos [g]</string>
+    <string name="treatmentssafety_maxcarbs_title">Máximo de carbs permitidos [g]</string>
     <string name="nav_preferences">Preferências</string>
-    <string name="nav_refreshtreatments">Atualizar tratamentos do NS</string>
+    <string name="nav_refreshtreatments">Atualizar tratamentos de NS</string>
-    <string name="nav_resetdb">Reinicializar base de dados</string>
+    <string name="nav_resetdb">Redefinir banco de dados</string>
-    <string name="reset_db_confirm">Quer realmente reiniciar a base de dados?</string>
+    <string name="reset_db_confirm">Você realmente quer redefinir os bancos de dados?</string>
     <string name="nav_exit">Sair</string>
     <string name="danar_useextended_title">Usar bólus prolongado de &gt;200%%</string>
     <string name="danar_bt_name_title">Dispositivo Bluetooth DanaR</string>
-    <string name="ns_sync_use_absolute_title">Usar sempre valores absolutos de basal</string>
+    <string name="ns_sync_use_absolute_title">Sempre usar valores absolutos basais</string>
-    <string name="alert_dialog_storage_permission_text">Por favor, reinicie o seu telefone ou reinicie o AndroidAPS a partir das Configurações do Sistema \ncaso contrário, o AndroidAPS não terá registro (importante para controlar e verificar se os algoritmos estão a funcionar corretamente)!</string>
+    <string name="alert_dialog_storage_permission_text">Por favor, reinicie seu telefone ou reinicie o AndroidAPS nas Configurações do Sistema \nCaso contrário o Android APS não terá registro (importante para rastrear e verificar que os algoritmos estão funcionando corretamente)!</string>
-    <string name="description_actions">Alguns botões para aceder rapidamente a funções comuns</string>
+    <string name="description_actions">Alguns botões para acessar rapidamente a funções comuns</string>
-    <string name="description_careportal">Inserir as entradas avançadas do livro de registo.</string>
+    <string name="description_careportal">Digite as entradas avançadas do livro de log.</string>
     <string name="description_config_builder">Usado para configurar os plugins ativos</string>
     <string name="description_objectives">Programa de aprendizagem</string>
     <string name="description_food">Exibe as predefinições de comida definidas no Nightscout</string>
-    <string name="description_insulin_rapid">Predefinição de Insulina Humalog e NovoRapid / NovoLog</string>
+    <string name="description_insulin_rapid">Predefinição de Insulina para Humalog e NovoRapid / NovoLog</string>
-    <string name="description_insulin_ultra_rapid">Predefinição de Insulina Fiasp</string>
+    <string name="description_insulin_ultra_rapid">Pré-ajuste de Insulina para Fiasp</string>
-    <string name="description_insulin_free_peak">Permite definir o pico de atividade da insulina e deve ser usado somente por usuários avançados</string>
+    <string name="description_insulin_free_peak">Permite que você defina o pico da atividade de insulina, deve ser usado apenas por usuários avançados</string>
     <string name="description_loop">Ativar ou desativar a aplicação que desencadeia o loop.</string>
-    <string name="description_ns_client">Sincroniza os seus dados com o Nightscout</string>
+    <string name="description_ns_client">Sincroniza seus dados com o Nightscout</string>
     <string name="description_ma">Estado do algoritmo em 2016</string>
     <string name="description_ama">Estado do algoritmo em 2017</string>
     <string name="description_smb">Algoritmo mais recente para usuários avançados</string>
@@ -865,6 +865,7 @@
     <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 atualize as sua aplicação Dexcom para uma versão suportada</string>
+    <string name="dexcom_app_not_installed">App Dexcom não está instalada.</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>
@@ -1162,6 +1163,9 @@
     <string name="new_version_warning">Nova versão para pelo menos %1$d dias disponíveis! Voltar para o LGS após 60 dias, o loop será desativado após 90 dias</string>
     <string name="twohours">2h</string>
     <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="dexcom_app_patched">App Dexcom (com patch)</string>
+    <string name="dexcom_short">DXCM</string>
+    <string name="description_source_dexcom">Receber valores da Glicemia da app Dexcom (com patch).</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d dia</item>
         <item quantity="other">%1$d dias</item>

app/src/main/res/values-ru/strings.xml

@@ -865,6 +865,7 @@
     <string name="fabric_upload">Загрузка отчета для разработчиков</string>
     <string name="allow_automated_crash_reporting">Разрешить отправлять сообщения о неполадках и данные об использовании опций разработчикам при помощи сервиса fabric.io.</string>
     <string name="g5appnotdetected">Пожалуйста, обновите приложение Dexcom до поддерживаемой версии</string>
+    <string name="dexcom_app_not_installed">Приложение Dexcom не установлено</string>
     <string name="start_activity_tt">Включить временную цель TT Нагрузка</string>
     <string name="start_eating_soon_tt">Включить временную цель TT Ожидаемый прием пищи</string>
     <string name="temptargetshort">Временная цель (TT)</string>
@@ -874,6 +875,7 @@
     <string name="bolusrecordedonly">Болюс будет только записан</string>
     <string name="ns_autobackfill_summary">Заполнять пропущенные данные из NS</string>
     <string name="loop_smbsetbypump_label">Супер микро болюс SMB задан помпой</string>
+    <string name="overview_show_activity">Нагрузка</string>
     <string name="overview_show_sensitivity">Чувствительность</string>
     <string name="overview_show_deviations">Отклонение</string>
     <string name="overview_show_cob">Активные углеводы COB</string>
@@ -1150,6 +1152,31 @@ Context | Edit Context</string>
     <string name="dexcom_lognssensorchange_summary">Автоматически создать событие \"Замена сенсора\" в NS при запуске сенсора</string>
     <string name="tomato">Томато (MiaoMiao)</string>
     <string name="tomato_short">Томато</string>
+    <string name="unit_second">сек</string>
+    <string name="unit_minute">мин</string>
+    <string name="unit_hour">час</string>
+    <string name="unit_day">дн</string>
+    <string name="unit_week">нед</string>
+    <string name="unit_seconds">сек</string>
+    <string name="unit_minutes">мин</string>
+    <string name="unit_hours">час</string>
+    <string name="unit_days">дн</string>
+    <string name="unit_weeks">нед</string>
+    <string name="summary_tidepool_username">Имя пользователя Tidepool, обычно ваш адрес электронной почты</string>
+    <string name="title_tidepool_username">Имя пользователя</string>
+    <string name="summary_tidepool_password">Ваш пароль для входа в Tidepool</string>
+    <string name="title_tidepool_password">Пароль для входа</string>
+    <string name="title_tidepool_test_login">Тест входа в Tidepool</string>
+    <string name="summary_tidepool_dev_servers">Если активировано, загрузки перейдут на https://int-app.tidepool.org вместо обычного https://app.tidepool.org/</string>
+    <string name="title_tidepool_dev_servers">Использовать серверы интеграции (тест)</string>
+    <string name="tidepool">Tidepool</string>
+    <string name="tidepool_shortname">TDP</string>
+    <string name="description_tidepool">Загружает данные в Tidepool</string>
+    <string name="tidepool_upload_cgm">Загрузить данные мониторинга</string>
+    <string name="tidepool_upload_bolus">Загрузить лечение (инсулин, углеводы)</string>
+    <string name="tidepool_upload_tbr">Загрузить временные базалы</string>
+    <string name="tidepool_upload_profile">Загрузить переключения профиля, временные цели</string>
+    <string name="tidepool_upload_bg">Загрузить тесты ГК</string>
     <string name="dst_in_24h_warning">Переход на летнее/зимнее время через 24 часа или менее</string>
     <string name="dst_loop_disabled_warning">Переход на летнее время меньше 3 часов назад - Замкнутый цикл отключен</string>
     <string name="storage">ограничение по объему карты памяти</string>
@@ -1162,6 +1189,28 @@ Context | Edit Context</string>
     <string name="old_version">старая версия</string>
     <string name="very_old_version">очень старая версия</string>
     <string name="new_version_warning">Новая версия доступна не менее %1$d дней! После 60 дней переход на остановку при низкой гликемии LGS, замкнутый цикл будет отключен через 90 дней</string>
+    <string name="scale_insulin_activity">Шкала активности инсулина [ед/мин]</string>
     <string name="twohours">2ч</string>
     <string name="formatinsulinunits">%1$.2f ед</string>
+    <string name="dexcom_app_patched">Приложение Dexcom (модифицированное)</string>
+    <string name="dexcom_short">DXCM</string>
+    <string name="description_source_dexcom">Получать данные ГК от модифицированного приложения Dexcom.</string>
+    <plurals name="objective_days">
+        <item quantity="one">%1$d день</item>
+        <item quantity="few">%1$d дня</item>
+        <item quantity="many">%1$d дней</item>
+        <item quantity="other">%1$d дня</item>
+    </plurals>
+    <plurals name="objective_hours">
+        <item quantity="one">%1$d час</item>
+        <item quantity="few">%1$d часа</item>
+        <item quantity="many">%1$d часов</item>
+        <item quantity="other">%1$d часа</item>
+    </plurals>
+    <plurals name="objective_minutes">
+        <item quantity="one">%1$d минута</item>
+        <item quantity="few">%1$d минуты</item>
+        <item quantity="many">%1$d минут</item>
+        <item quantity="other">%1$d минут</item>
+    </plurals>
 </resources>

app/src/main/res/values-sk/strings.xml

@@ -865,6 +865,7 @@
     <string name="fabric_upload">Odosielanie do Fabric</string>
     <string name="allow_automated_crash_reporting">Automatické odosielanie chýb aplikácie a štatistiky používania vývojárom pomocou služby fabric.io.</string>
     <string name="g5appnotdetected">Prosím aktualizuj tvoju Dexcom aplikáciu na podporovanú verziu</string>
+    <string name="dexcom_app_not_installed">Dexcom aplikácia nie je nainštalovaná.</string>
     <string name="start_activity_tt">Spustiť Dočasný cieľ Aktivita</string>
     <string name="start_eating_soon_tt">Spustiť Dočasný cieľ Blížiace sa jedlo</string>
     <string name="temptargetshort">DC</string>
@@ -874,6 +875,7 @@
     <string name="bolusrecordedonly">Bolus bude iba zaznamenaný</string>
     <string name="ns_autobackfill_summary">Automaticky doplňovať chýbajúcu glykémiu z NS</string>
     <string name="loop_smbsetbypump_label">SMB podané pumpou</string>
+    <string name="overview_show_activity">Aktivita</string>
     <string name="overview_show_sensitivity">Citlivosť</string>
     <string name="overview_show_deviations">Odchýlky</string>
     <string name="overview_show_cob">Aktívne sacharidy</string>
@@ -1148,6 +1150,31 @@
     <string name="dexcom_lognssensorchange_summary">Vytvoriť udalosť \"Výmena senzora\" v NS automaticky pri spustení senzora</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
+    <string name="unit_second">sekunda</string>
+    <string name="unit_minute">minúta</string>
+    <string name="unit_hour">hodina</string>
+    <string name="unit_day">deň</string>
+    <string name="unit_week">týždeň</string>
+    <string name="unit_seconds">sekúnd</string>
+    <string name="unit_minutes">minút</string>
+    <string name="unit_hours">hodín</string>
+    <string name="unit_days">dní</string>
+    <string name="unit_weeks">týždňov</string>
+    <string name="summary_tidepool_username">Vaše meno používateľa na Tidepoole, obvykle Vaša E-mailová adresa</string>
+    <string name="title_tidepool_username">Meno používateľa</string>
+    <string name="summary_tidepool_password">Heslo na Tidepool</string>
+    <string name="title_tidepool_password">Heslo</string>
+    <string name="title_tidepool_test_login">Odtestovať prihlásenie na Tidepool</string>
+    <string name="summary_tidepool_dev_servers">Pokiaľ bude aktivované, dáta sa budú nahrávať na https://int-app.tidepool.org namiesto https://app.tidepool.org/</string>
+    <string name="title_tidepool_dev_servers">Používať testovacie servery</string>
+    <string name="tidepool">Tidepool</string>
+    <string name="tidepool_shortname">TDP</string>
+    <string name="description_tidepool">Nahrávánie dát na Tidepool</string>
+    <string name="tidepool_upload_cgm">Nahrávať CGM dáta</string>
+    <string name="tidepool_upload_bolus">Nahrávať ošetrenia (inzulín, sacharidy)</string>
+    <string name="tidepool_upload_tbr">Nahrávať dočasné bazály</string>
+    <string name="tidepool_upload_profile">Nahrávať prepnutia profilu, dočasné ciele</string>
+    <string name="tidepool_upload_bg">Nahrávať merania z prsta</string>
     <string name="dst_in_24h_warning">Zmena letného času za menej ako 24 hodín</string>
     <string name="dst_loop_disabled_warning">Zmena letného času za menej ako 3 hodiny - Uzavretý okruh pozastavený</string>
     <string name="storage">obmedzenie interného úložiska</string>
@@ -1160,6 +1187,11 @@
     <string name="old_version">stará verzia</string>
     <string name="very_old_version">veľmi stará verzia</string>
     <string name="new_version_warning">Nová verzia dostupná najmenej %1$d dní! Návrat k liečbe inzulínovou pumpou s podporou senzora po 60 dňoch, okruh bude deaktivovaný po 90 dňoch.</string>
+    <string name="twohours">2h</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="dexcom_app_patched">Dexcom aplikácia (upravená)</string>
+    <string name="dexcom_short">DXCM</string>
+    <string name="description_source_dexcom">Prijímaj hodnoty glykémie z upravenej Dexcom aplikácie.</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d deň</item>
         <item quantity="few">%1$d dní</item>

app/src/main/res/values-sv/strings.xml

@@ -148,6 +148,8 @@ Eversense-appen.</string>
     <string name="constraints_violation">Begränsning nådd</string>
     <string name="treatmentdeliveryerror">Fel vid bolusleverans</string>
     <string name="tempbasaldeliveryerror">Fel vid justering av temp basal</string>
+    <string name="overview_newtempbasal_basalpercent">Basaldos [%%]</string>
+    <string name="overview_newtempbasal_percent_label">%% (100%% = profilens värde)</string>
     <string name="setbasalquestion">Acceptera ny temp basal:</string>
     <string name="overview_treatment_label">Behandling</string>
     <string name="overview_calculator_label">Kalkylator</string>
@@ -247,6 +249,7 @@ Eversense-appen.</string>
     <string name="danar_iob_label">Pumpens IOB</string>
     <string name="danar_dailyunits">Enheter per dag</string>
     <string name="pump_lastbolus_label">Senaste bolus</string>
+    <string name="hoursago">%1$.1f tim sedan</string>
     <string name="danar_invalidinput">Fel på inmatning</string>
     <string name="danar_valuenotsetproperly">Misslyckades med inställning</string>
     <string name="reloadprofile">Ladda om profil</string>
@@ -526,6 +529,7 @@ Eversense-appen.</string>
     <string name="resistantadult">Insulinresistent vuxen</string>
     <string name="patientage_summary">Vg ange personens ålder för inställningar av gränser</string>
     <string name="Glimp">Glimp</string>
+    <string name="needwhitelisting">%1$s behöver kunna kringgå batterisparfunktionerna för att fungera korrekt</string>
     <string name="loopsuspended">Loop pausad</string>
     <string name="loopsuspendedfor">Pausad (%1$d min)</string>
     <string name="loopsuperbolusfor">Superbolus (%1$d min)</string>
@@ -561,6 +565,8 @@ Eversense-appen.</string>
     <string name="show_statuslights_summary">Aktivera statusindikationerna för cage, iage, sage, reservoar och batterinivå på hemskärmen.</string>
     <string name="statuslights_res_warning">Varningsnivå för reservoar [U]</string>
     <string name="statuslights_res_critical">Akut varningsnivå för reservoar [U]</string>
+    <string name="statuslights_bat_warning">Varningsnivå för batteri [%%]</string>
+    <string name="statuslights_bat_critical">Akut varningsnivå för batteri [%%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="virtualpump_firmware_label">Firmwareversion</string>
@@ -759,6 +765,7 @@ Eversense-appen.</string>
     <string name="combo_pump_state_running">Körs</string>
     <string name="combo_pump_action_cancelling_tbr">Avbryter temp basal</string>
     <string name="combo_pump_action_setting_tbr">Sätter temp basal (%1$d%% / %2$d min)</string>
+    <string name="combo_pump_action_bolusing">Levererar bolus (%1$.1f enheter)</string>
     <string name="combo_pump_action_refreshing">Uppdaterar</string>
     <string name="combo_pump_unsupported_operation">Önskad åtgärd stöds inte av pumpen</string>
     <string name="combo_low_suspend_forced_notification">Osäker användning: Förlängd- eller kombibolus är aktiv. Loop mode är satt till att bromsa vid lågt BG i 6 timmar. Endast normala bolusar tillåtna i loopläge.</string>
@@ -859,6 +866,7 @@ Eversense-appen.</string>
     <string name="fabric_upload">Uppladdning till Fabric</string>
     <string name="allow_automated_crash_reporting">Tillåt automatisk rapportering av appkrascher och användningsinformation till utvecklarna via fabric.io-tjänsten.</string>
     <string name="g5appnotdetected">Vänligen uppdatera din Dexcom-app till en supportad version</string>
+    <string name="dexcom_app_not_installed">Dexcom-appen är inte installerad.</string>
     <string name="start_activity_tt">Starta \"Träning\"</string>
     <string name="start_eating_soon_tt">Starta \"Äta snart\"</string>
     <string name="temptargetshort">TT</string>
@@ -868,6 +876,7 @@ Eversense-appen.</string>
     <string name="bolusrecordedonly">Bolusen sparas bara i loggboken</string>
     <string name="ns_autobackfill_summary">Hämta saknad BG-data från Nightscout</string>
     <string name="loop_smbsetbypump_label">SMB satt i pump</string>
+    <string name="overview_show_activity">Aktivitet</string>
     <string name="overview_show_sensitivity">Känslighet (Sens)</string>
     <string name="overview_show_deviations">Avvikelser (Dev)</string>
     <string name="overview_show_cob">Aktiva KH (COB)</string>
@@ -1142,6 +1151,31 @@ Eversense-appen.</string>
     <string name="dexcom_lognssensorchange_summary">Loggar automatiskt ett sensorbyte i NS när en sensor startas</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
+    <string name="unit_second">sekund</string>
+    <string name="unit_minute">minut</string>
+    <string name="unit_hour">timme</string>
+    <string name="unit_day">day</string>
+    <string name="unit_week">vecka</string>
+    <string name="unit_seconds">sekunder</string>
+    <string name="unit_minutes">minuter</string>
+    <string name="unit_hours">timmar</string>
+    <string name="unit_days">dagar</string>
+    <string name="unit_weeks">veckor</string>
+    <string name="summary_tidepool_username">Ditt användarnamn på Tidepool. Normalt din e-postadress</string>
+    <string name="title_tidepool_username">Användarnamn</string>
+    <string name="summary_tidepool_password">Ditt Tidepool-lösenord</string>
+    <string name="title_tidepool_password">Lösenord</string>
+    <string name="title_tidepool_test_login">Testlogin på Tidepool</string>
+    <string name="summary_tidepool_dev_servers">Om man slår på denna, kommer datat skickas till https://int-app.tidepool.org istället för https://app.tidepool.org</string>
+    <string name="title_tidepool_dev_servers">Använd Integration (test) servrar</string>
+    <string name="tidepool">Tidepool</string>
+    <string name="tidepool_shortname">TDP</string>
+    <string name="description_tidepool">Laddar upp data till Tidepool</string>
+    <string name="tidepool_upload_cgm">Ladda upp CGM-data</string>
+    <string name="tidepool_upload_bolus">Ladda upp behandlingar (insulin, kolhydrater)</string>
+    <string name="tidepool_upload_tbr">Ladda upp temp basaler</string>
+    <string name="tidepool_upload_profile">Ladda upp profilbyten och temp mål</string>
+    <string name="tidepool_upload_bg">Ladda upp BG-test</string>
     <string name="dst_in_24h_warning">Sommar/vintertid inträffar inom 24 timmar</string>
     <string name="dst_loop_disabled_warning">Sommar/vintertid ändrades för mindre än 3 timmar sedan. Closed Loop avstängt</string>
     <string name="storage">intern lagringsbegränsning</string>
@@ -1150,6 +1184,16 @@ Eversense-appen.</string>
     <string name="sms_wrongcode">Fel kod. Kommandot avbrutet.</string>
     <string name="notconfigured">Inte konfigurerad</string>
     <string name="profileswitchcreated">Skapade ett profilbyte</string>
+    <string name="versionChecker">Versionskontroll</string>
+    <string name="old_version">gammal version</string>
+    <string name="very_old_version">väldigt gammal version</string>
+    <string name="new_version_warning">Ny version tillgänglig sedan %1$d dagar! Systemet kommer att byta läge till \"stopp innan lågt\" efter 60 dagar och sluta loopa helt efter 90 dagar</string>
+    <string name="scale_insulin_activity">Skala för insulinaktivitet [U/min]</string>
+    <string name="twohours">2 tim</string>
+    <string name="formatinsulinunits">%1$.2f enheter</string>
+    <string name="dexcom_app_patched">Dexcoms app (modifierad)</string>
+    <string name="dexcom_short">DXCM</string>
+    <string name="description_source_dexcom">Ta emot BG-data från den modifierade Dexcom-appen.</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dagar</item>

app/src/main/res/values/colors.xml

@@ -9,6 +9,7 @@
     <color name="uam">#c9bd60</color>
     <color name="zt">#00d2d2</color>
     <color name="ratio">#FFFFFF</color>
+    <color name="activity">#d3f166</color>
     <color name="devslopepos">#FFFFFF00</color>
     <color name="devslopeneg">#FFFF00FF</color>
     <color name="inrange">#00FF00</color>

app/src/main/res/values/strings.xml

@@ -1002,6 +1002,7 @@
     <string name="ns_autobackfill_summary">Autobackfill missig BGs from NS</string>
     <string name="key_ns_autobackfill" translatable="false">ns_autobackfill</string>
     <string name="loop_smbsetbypump_label">SMB set by pump</string>
+    <string name="overview_show_activity">Activity</string>
     <string name="overview_show_sensitivity">Sensitivity</string>
     <string name="overview_show_deviations">Deviations</string>
     <string name="overview_show_cob">Carbs On Board</string>
@@ -1320,13 +1321,13 @@
     <string name="unit_second">second</string>
     <string name="unit_minute">minute</string>
     <string name="unit_hour">hour</string>
-    <string name="unit_day">day"</string>
+    <string name="unit_day">day</string>
-    <string name="unit_week">week"</string>
+    <string name="unit_week">week</string>
     <string name="unit_seconds">seconds</string>
     <string name="unit_minutes">minutes</string>
     <string name="unit_hours">hours</string>
-    <string name="unit_days">days"</string>
+    <string name="unit_days">days</string>
-    <string name="unit_weeks">weeks"</string>
+    <string name="unit_weeks">weeks</string>
     <string name="key_tidepool_username" translatable="false">tidepool_username</string>
     <string name="key_tidepool_password" translatable="false">tidepool_password</string>
     <string name="key_tidepool_dev_servers" translatable="false">tidepool_dev_servers</string>
@@ -1374,6 +1375,8 @@
     <string name="old_version">old version</string>
     <string name="very_old_version">very old version</string>
     <string name="new_version_warning">New version for at least %1$d days available! Fallback to LGS after 60 days, loop will be disabled after 90 days</string>
+    <string name="key_scale_insulin_activity" translatable="false">scale_insulin_activity</string>
+    <string name="scale_insulin_activity">Graph scale insulin activity [U/min]</string>
     <string name="twohours">2h</string>
     <string name="formatinsulinunits">%1$.2fU</string>
 

app/src/main/res/xml/pref_overview.xml

@@ -10,6 +10,18 @@
             android:title="@string/keep_screen_on_title"
             android:summary="@string/keep_screen_on_summary"/>
 
+        <com.andreabaccega.widget.ValidatingEditTextPreference
+            android:defaultValue="0.05"
+            android:inputType="numberDecimal"
+            android:key="@string/key_scale_insulin_activity"
+            android:maxLines="1"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/scale_insulin_activity"
+            validate:floatmaxNumber="10.0"
+            validate:floatminNumber="0.0"
+            validate:testType="floatNumericRange" />
+
         <PreferenceScreen android:title="@string/overview_buttons_selection">
 
             <SwitchPreference