From c7e1338d660deaedfc729616b53d535edad9e3db Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 26 Dec 2019 18:52:09 +0100
Subject: [PATCH 01/56] Leaked certificate update

---
 app/src/main/assets/revoked_certs.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/assets/revoked_certs.txt b/app/src/main/assets/revoked_certs.txt
index 59a55d9e42..41177d5667 100644
--- a/app/src/main/assets/revoked_certs.txt
+++ b/app/src/main/assets/revoked_certs.txt
@@ -1,2 +1,4 @@
 #Demo certificate
-51:6D:12:67:4C:27:F4:9B:9F:E5:42:9B:01:B3:98:E4:66:2B:85:B7:A8:DD:70:32:B7:6A:D7:97:9A:0D:97:10
\ No newline at end of file
+51:6D:12:67:4C:27:F4:9B:9F:E5:42:9B:01:B3:98:E4:66:2B:85:B7:A8:DD:70:32:B7:6A:D7:97:9A:0D:97:10
+#Leaked
+55:5D:70:C9:BE:10:41:7E:4B:01:A9:C4:C6:44:4A:F8:69:71:35:25:ED:95:23:16:C7:15:E8:EB:C6:08:FC:B1

From a4fa64efe2053be873daeda80b4a5a573f9461bd Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 27 Jan 2020 23:07:48 +0100
Subject: [PATCH 02/56] more logging

---
 .../nightscout/androidaps/db/DbRequest.java   | 56 ++++++-------------
 .../plugins/general/nsclient/NSUpload.java    |  4 +-
 .../plugins/general/nsclient/UploadQueue.java | 12 +---
 3 files changed, 20 insertions(+), 52 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java b/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java
index bec190a353..6cd0491907 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java
@@ -41,79 +41,55 @@ public class DbRequest {
     }
 
     // dbAdd
-    public DbRequest(String action, String collection, JSONObject data) {
+    public DbRequest(String action, String collection, JSONObject json) {
         this.action = action;
         this.collection = collection;
         this.nsClientID = "" + DateUtil.now();
         try {
-            data.put("NSCLIENT_ID", nsClientID);
+            json.put("NSCLIENT_ID", nsClientID);
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        this.data = data.toString();
+        this.data = json.toString();
         this._id = "";
     }
 
     // dbUpdate, dbUpdateUnset
-    public DbRequest(String action, String collection, String _id, JSONObject data) {
+    public DbRequest(String action, String collection, String _id, JSONObject json) {
         this.action = action;
         this.collection = collection;
         this.nsClientID = "" + DateUtil.now();
         try {
-            data.put("NSCLIENT_ID", nsClientID);
+            json.put("NSCLIENT_ID", nsClientID);
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        this.data = data.toString();
+        this.data = json.toString();
         this._id = _id;
     }
 
     // dbRemove
     public DbRequest(String action, String collection,
                      String _id) {
-        JSONObject data = new JSONObject();
+        JSONObject json = new JSONObject();
         this.action = action;
         this.collection = collection;
         this.nsClientID = "" + DateUtil.now();
         try {
-            data.put("NSCLIENT_ID", nsClientID);
+            json.put("NSCLIENT_ID", nsClientID);
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        this.data = data.toString();
+        this.data = json.toString();
         this._id = _id;
     }
 
-    public JSONObject toJSON() {
-        JSONObject object = new JSONObject();
-        try {
-            object.put("action", action);
-            object.put("collection", collection);
-            object.put("data", new JSONObject(data));
-            if (_id != null) object.put("_id", _id);
-            if (nsClientID != null) object.put("nsClientID", nsClientID);
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return object;
-    }
-
-    public static DbRequest fromJSON(JSONObject jsonObject) {
-        DbRequest result = new DbRequest();
-        try {
-            if (jsonObject.has("action"))
-                result.action = jsonObject.getString("action");
-            if (jsonObject.has("collection"))
-                result.collection = jsonObject.getString("collection");
-            if (jsonObject.has("data"))
-                result.data = jsonObject.getJSONObject("data").toString();
-            if (jsonObject.has("_id"))
-                result._id = jsonObject.getString("_id");
-            if (jsonObject.has("nsClientID"))
-                result.nsClientID = jsonObject.getString("nsClientID");
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return result;
+    public String log() {
+        return
+                "\nnsClientID:" + nsClientID +
+                "\naction:" + action +
+                "\ncollection:" + collection +
+                "\ndata:" + data +
+                "\n_id:" + _id;
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
index b735a153fb..7fd6694481 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
@@ -323,7 +323,9 @@ public class NSUpload {
                 prebolus.put("created_at", DateUtil.toISOString(preBolusDate));
                 uploadCareportalEntryToNS(prebolus);
             }
-            UploadQueue.add(new DbRequest("dbAdd", "treatments", data));
+            DbRequest dbr = new DbRequest("dbAdd", "treatments", data);
+            log.debug("Prepared: " + dbr.log());
+            UploadQueue.add(dbr);
         } catch (Exception e) {
             log.error("Unhandled exception", e);
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
index f513f12756..aa5759fc22 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
@@ -43,27 +43,17 @@ public class UploadQueue {
 
     public static void add(final DbRequest dbr) {
         startService();
-        if (NSClientService.handler != null) {
-            NSClientService.handler.post(() -> {
                 if (L.isEnabled(L.NSCLIENT))
-                    log.debug("Adding to queue: " + dbr.data);
+                    log.debug("Adding to queue: " + dbr.log());
                 try {
                     MainApp.getDbHelper().create(dbr);
                 } catch (Exception e) {
                     log.error("Unhandled exception", e);
-                    dbr.nsClientID += "1";
-                    try {
-                        MainApp.getDbHelper().create(dbr);
-                    } catch (Exception e1) {
-                        log.error("Unhandled exception", e1);
-                    }
                 }
                 NSClientPlugin plugin = NSClientPlugin.getPlugin();
                 if (plugin != null) {
                     plugin.resend("newdata");
                 }
-            });
-        }
     }
 
     public static void clearQueue() {

From 6b26ef2e88069652669184c48ef3def152facc1d Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 1 Feb 2020 22:44:23 +0100
Subject: [PATCH 03/56] prevent NPE

---
 .../pump/danaR/activities/DanaRHistoryActivity.kt      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
index 361f8e716e..d63ab0eb14 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
@@ -100,23 +100,23 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
         danar_history_reload.setOnClickListener {
             val selected = danar_history_spinner.selectedItem as TypeList
             runOnUiThread {
-                danar_history_reload.visibility = View.GONE
-                danar_history_status.visibility = View.VISIBLE
+                danar_history_reload?.visibility = View.GONE
+                danar_history_status?.visibility = View.VISIBLE
             }
             clearCardView()
             ConfigBuilderPlugin.getPlugin().commandQueue.loadHistory(selected.type, object : Callback() {
                 override fun run() {
                     loadDataFromDB(selected.type)
                     runOnUiThread {
-                        danar_history_reload.visibility = View.VISIBLE
-                        danar_history_status.visibility = View.GONE
+                        danar_history_reload?.visibility = View.VISIBLE
+                        danar_history_status?.visibility = View.GONE
                     }
                 }
             })
         }
         danar_history_spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
-                val selected = danar_history_spinner.selectedItem as TypeList
+                val selected = danar_history_spinner?.selectedItem as TypeList? ?: return
                 loadDataFromDB(selected.type)
                 showingType = selected.type
             }

From 4b07adb2a8bbe21d4bdc2c390e67d9ded050a962 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 1 Feb 2020 23:46:23 +0100
Subject: [PATCH 04/56] Restore ns_noupload function. Thanks to @twain47

---
 .../plugins/general/nsclient/UploadQueue.java | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
index aa5759fc22..f87cee7900 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
@@ -14,10 +14,12 @@ import org.slf4j.LoggerFactory;
 import java.sql.SQLException;
 
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.db.DbRequest;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService;
+import info.nightscout.androidaps.utils.SP;
 
 /**
  * Created by mike on 21.02.2016.
@@ -42,21 +44,22 @@ public class UploadQueue {
     }
 
     public static void add(final DbRequest dbr) {
+        if (SP.getBoolean(R.string.key_ns_noupload, false)) return;
         startService();
-                if (L.isEnabled(L.NSCLIENT))
-                    log.debug("Adding to queue: " + dbr.log());
-                try {
-                    MainApp.getDbHelper().create(dbr);
-                } catch (Exception e) {
-                    log.error("Unhandled exception", e);
-                }
-                NSClientPlugin plugin = NSClientPlugin.getPlugin();
-                if (plugin != null) {
-                    plugin.resend("newdata");
-                }
+        if (L.isEnabled(L.NSCLIENT))
+            log.debug("Adding to queue: " + dbr.log());
+        try {
+            MainApp.getDbHelper().create(dbr);
+        } catch (Exception e) {
+            log.error("Unhandled exception", e);
+        }
+        NSClientPlugin plugin = NSClientPlugin.getPlugin();
+        if (plugin != null) {
+            plugin.resend("newdata");
+        }
     }
 
-    public static void clearQueue() {
+    static void clearQueue() {
         startService();
         if (NSClientService.handler != null) {
             NSClientService.handler.post(() -> {
@@ -104,7 +107,7 @@ public class UploadQueue {
         }
     }
 
-    public String textList() {
+    String textList() {
         String result = "";
         CloseableIterator<DbRequest> iterator;
         try {

From 8bcf901e6fc6815698aeefb7be3361600bbd8a04 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 1 Feb 2020 23:47:12 +0100
Subject: [PATCH 05/56] New Crowdin translations (#2405)

* New translations strings.xml (Russian)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations objectives.xml (Korean)

* New translations exam.xml (Korean)

* New translations exam.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Korean)

* New translations exam.xml (Korean)

* New translations strings.xml (Korean)
---
 app/src/main/res/values-bg-rBG/strings.xml    |   3 +
 app/src/main/res/values-ko-rKR/exam.xml       | 168 +++++++++++++++++-
 app/src/main/res/values-ko-rKR/objectives.xml |  64 ++++++-
 app/src/main/res/values-ko-rKR/strings.xml    | 153 +++++++++++++++-
 app/src/main/res/values-ru-rRU/strings.xml    |   2 +
 wear/src/main/res/values-ko-rKR/strings.xml   | 109 +++++++++++-
 6 files changed, 489 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index e5e933fa3e..d3a01e2d86 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -1446,4 +1446,7 @@
     <string name="ebstopsloop">Използване на удължен болус ще спре режим затворен цикъл за времето на болуса. Сигурни ли сте?</string>
     <string name="closed_loop_disabled_with_eb">Затворен цикъл е недостъпен поради стартиран Удължен болус</string>
     <string name="extended_bolus_short">УБ</string>
+    <string name="phonechecker">\"PhoneChecker\"</string>
+    <string name="chartmenu">Меню на графиката</string>
+    <string name="sensitivity_short">АS</string>
 </resources>
diff --git a/app/src/main/res/values-ko-rKR/exam.xml b/app/src/main/res/values-ko-rKR/exam.xml
index 70489fbc5e..2b76f2c396 100644
--- a/app/src/main/res/values-ko-rKR/exam.xml
+++ b/app/src/main/res/values-ko-rKR/exam.xml
@@ -1,3 +1,169 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="dia_whatmeansdia">DIA에 대하여 올바른 것은?</string>
+    <string name="dia_label">주제: Duration of Insulin Action(DIA)</string>
+    <string name="dia_minimumis3h">최소값은 3시간입니다.</string>
+    <string name="dia_minimumis5h">최소값은 5시간입니다.</string>
+    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Configuration/Config-Builder.html?#insulin</string>
+    <string name="dia_meaningisequaltodiapump">당신이 사용중인 펌프의 DIA값과 동일합니다.</string>
+    <string name="dia_valuemustbedetermined">당신이 값을 결정해야합니다(최소 5시간 이상)</string>
+    <string name="hypott_label">주제: 저혈당 임시 목표</string>
+    <string name="hypott_whenhypott">저혈당 임시 목표를 설정하는 주된 이유가 무엇입니까?</string>
+    <string name="hypott_goinglow">임시 Basal이 0일 경우 저혈당을 방지하기 위해서.</string>
+    <string name="hypott_preventoversmb">저혈당때문에 섭취한 탄수화물로 인해 급격하게 혈당이 올라간 후 AAPS가 인슐린을 너무 많이 주입하는 것을 방지하기 위해서.</string>
+    <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/temptarget.html</string>
+    <string name="offlineprofile_whatprofile">어떤 프로파일이 오프라인에서 설정할 수 있습니까?</string>
+    <string name="offlineprofile_label">주제: 오프라인 프로파일</string>
+    <string name="offlineprofile_nsprofile">NS 프로파일이 사용될 수 있지만, 오프라인 상에서 설정할 수는 없습니다.</string>
+    <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Configuration/Config-Builder.html#profile</string>
+    <string name="pumpdisconnect_label">주제: 펌프 일시중지하기</string>
+    <string name="pumpdisconnect_whattodo">펌프 일시중지할땐 무엇을 해야합니까?</string>
+    <string name="pumpdisconnect_letknow">인슐린이 주입되지 않을것이라는 것을 AAPS가 인지하도록 \'펌프 일시중지\'를 누릅니다.</string>
+    <string name="pumpdisconnect_suspend">펌프가 일시중지되는 동안 \'Loop 일시중지\'를 눌러서 Loop를 중지합니다.</string>
+    <string name="pumpdisconnect_dontchnage">AAPS에선 아무 작업도 하지 않고, 그냥 펌프와 연결을 해제합니다.</string>
+    <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#other-settings</string>
+    <string name="objectives_label">주제: AndroidAPS 설정</string>
+    <string name="objectives_howtosave">다음중 당신의 AAPS 설정을 백업하기 위한 좋은 사례는 무엇입니까?</string>
+    <string name="objectives_exportsettings">정비 메뉴에서 설정 저장하기 합니다.</string>
+    <string name="objectives_storeelsewhere">저장된 설정파일을 이메일, 드롭박스, 구글드라이브 등에 저장한다…</string>
+    <string name="objectives_doexportonstart">AAPS 설치 후 바로 설정을 저장합니다.</string>
+    <string name="objectives_doexportafterchange">설정을 변경한 이후 바로 설정을 저장합니다.</string>
+    <string name="objectives_doexportafterobjective">목표수행을 완료한 후 설정을 저장합니다.</string>
+    <string name="objectives_doexportafterfirtssettings">초기 설정이 완료되면 설정을 저장합니다.</string>
+    <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/ExportImportSettings.html</string>
+    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
+    <string name="noisycgm_label">주제: CGM의 혈당 노이즈가 심할 때</string>
+    <string name="noisycgm_whattodo">CGM 혈당의 노이즈가 심하다면 어떻게 해야합니까?</string>
+    <string name="nothing">아무것도 하지 않고, AAPS가 알아서 하게 내버려둔다.</string>
+    <string name="noisycgm_pause">과도한 주입을 방지하기 위해 Loop를 중지한다.</string>
+    <string name="noisycgm_replacesensor">CGM 센서를 교체한다.</string>
+    <string name="noisycgm_turnoffphone">폰을 끈다.</string>
+    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
+    <string name="noisycgm_checksmoothing">CGM앱의 혈당 평활화 기능 작동 여부를 확인한다.</string>
+    <string name="exercise_label">주제: 운동</string>
+    <string name="exercise_whattodo">운동시 어떻게 하는 것이 도움이 됩니까?</string>
+    <string name="exercise_setactivitytt">임시 목표 기능 사용.</string>
+    <string name="exercise_switchprofilebelow100">100%이하로 프로파일을 변경합니다.</string>
+    <string name="exercise_switchprofileabove100">100%이상으로 프로파일을 변경합니다.</string>
+    <string name="exercise_stoploop">Loop를 중지합니다.</string>
+    <string name="exercise_doitbeforestart">운동 시작전 운동 임시목표를 설정합니다.</string>
+    <string name="exercise_afterstart">운동 시작 후 운동 임시목표를 설정하는 것은 운동 시작 전에 설정하는 것보다 나쁜 결과를 초래합니다.</string>
+    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/temptarget.html#activity-temp-target</string>
+    <string name="suspendloop_label">주제: Loop 중지/일시중지</string>
+    <string name="suspendloop_doigetinsulin">Loop가 중지/일시중지 되었을때 인슐린이 주입됩니까?</string>
+    <string name="suspendloop_yes">네, Basal 인슐린은 계속 주입됩니다.</string>
+    <string name="suspendloop_no">아니오, 인슐린 주입이 모두 중지됩니다.</string>
+    <string name="basaltest_label">주제: Basal, ISF, and IC 테스트</string>
+    <string name="basaltest_when">Basal, ISF 그리고 IC 값은 언제 확인해야 합니까?</string>
+    <string name="basaltest_beforeloop">Loop를 시작하기 전.</string>
+    <string name="basaltest_havingregularhypo">저혈당 빈도가 많을 때</string>
+    <string name="basaltest_havingregularhyper">고혈당 빈도가 많을 때</string>
+    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#androidaps-settings</string>
+    <string name="prerequisites_label">주제: 사전 요구사항</string>
+    <string name="prerequisites_what">필요한 것이 무엇입니까?</string>
+    <string name="prerequisites_determinedcorrectprofile">유효한 프로파일 정보 (Basal, IC, ISF, DIA).</string>
+    <string name="prerequisites_computer">APK파일을 빌드하기 위한 컴퓨터.</string>
+    <string name="prerequisites_phone">지원되는 폰.</string>
+    <string name="prerequisites_car">자동차.</string>
+    <string name="prerequisites_nightscout">목표수행하기 위해 필요한 Nightscout.</string>
+    <string name="prerequisites_tidepoolaccount">Tidepool 계정.</string>
+    <string name="prerequisites_googleaccount">구글(Google) 계정.</string>
+    <string name="prerequisites_githubaccount">깃허브(Github) 계정.</string>
+    <string name="prerequisites_beanandroiddeveloper">안드로이드 개발 경험.</string>
+    <string name="prerequisites_own670g">미니메드(MiniMed) 670G 펌프.</string>
+    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Module/module.html</string>
+    <string name="prerequisites_smartwatch">스마트워치.</string>
+    <string name="prerequisites_supportedcgm">지원되는 연속혈당측정기(CGM).</string>
+    <string name="update_label">주제: AndroidAPS 업데이트</string>
+    <string name="whatistrue">올바른 것을 선택하세요.</string>
+    <string name="update_git">Git이 설치되어 있어야 합니다.</string>
+    <string name="update_asap">신버전이 나온 후 시간이 되면 바로 업데이트 하세요.</string>
+    <string name="update_keys">동일한 signing keys를 사용하여야 합니다.</string>
+    <string name="update_neverupdate">시스템이 잘 작동한다면 절대 업데이트하지마세요.</string>
+    <string name="update_askfriend">지인에게 신버전의 APK를 달라고 요청합니다.</string>
+    <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
+    <string name="troubleshooting_label">주제: 문제해결</string>
+    <string name="troubleshooting_wheretoask">어디에 도움을 요청해야 합니까?</string>
+    <string name="troubleshooting_fb">AndroidAPS 페이스북 그룹에 가입합니다.</string>
+    <string name="troubleshooting_wiki">AndroidAPS documentation을 읽어봅니다.</string>
+    <string name="troubleshooting_gitter">AndroidAPS Gitter Room을 방문합니다.</string>
+    <string name="troubleshooting_googlesupport">AndroidAPS Google support에 방문합니다.</string>
+    <string name="troubleshooting_yourendo">내분비과 의사와 상담해봅니다.</string>
+    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
+    <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
+    <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
+    <string name="insulin_label">주제: 인슐린 플러그인</string>
+    <string name="insulin_ultrarapid">\'초-초속효성 Oref\' 플러그인과 사용해야할 인슐린은 무엇입니까?</string>
+    <string name="insulin_fiasp">피아스프(Fiasp®)</string>
+    <string name="insulin_novorapid">노보래피드(NovoRapid®)</string>
+    <string name="insulin_humalog">휴마로그(Humalog®)</string>
+    <string name="insulin_actrapid">액트라피드(Actrapid®)</string>
+    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Configuration/Config-Builder.html#insulin</string>
+    <string name="sensitivity_label">주제: 민감도 플러그인</string>
+    <string name="sensitivity_which">어떤 민감도 알고리즘에 구성 가능한 시간 범위가 있습니까?</string>
+    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="sensitivityuam_which">UAM기능(알려지지않은 탄수화물 인식 기능)을 사용하기 위해서 어떤 민감도 알고리즘을 사용해야합니까?</string>
+    <string name="wrongcarbs_label">주제: 탄수화물 입력 에러</string>
+    <string name="wrongcarbs_whattodo">부적절한 탄수화물을 입력하였다면 어떻게 하여야 합니까?</string>
+    <string name="wrongcarbs_treatmentstab">관리에서, 부적절한 탄수화물 입력을 삭제하고, 새 탄수화물을 입력합니다.</string>
+    <string name="wrongcarbs_addfakeinsulin">채움 기능을 이용하여 거짓으로 인슐린을 추가합니다.</string>
+    <string name="extendedcarbs_label">주제: 지방과 단백질 음식</string>
+    <string name="extendedcarbs_handling">많은 양의 지방 그리고\/또는 단백질이 있는 음식을 섭취할땐 어떻게 합니까?</string>
+    <string name="extendedcarbs_useextendedcarbs">지방과 단백질을 탄수화물로 계산하고 \"확장 탄수화물\"기능을 사용합니다.</string>
+    <string name="extendedcarbs_add">지방과 단백질을 탄수화물로 계산하고 Bolus 계산에 추가합니다.</string>
+    <string name="extendedcarbs_useextendedbolus">지방과 단백질을 보완하기 위해서 확장 Bouls를 사용합니다.</string>
+    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Extended-Carbs.html</string>
+    <string name="nsclient_label">주제: 원격 모니터링</string>
+    <string name="nsclient_howcanyou">당신의 아이의 AAPS를 어떻게 원격으로 모니터합니까?</string>
+    <string name="nsclient_nightscout">Nightscout 사이트를 이용합니다.</string>
+    <string name="nsclient_dexcomfollow">덱스콤 정식앱을 사용한다면 덱스콤 팔로우앱을 사용합니다(혈당만).</string>
+    <string name="nsclient_dexcomfollowxdrip">xDrip앱을 사용한다면 덱스콤 팔로우앱을 사용합니다.</string>
+    <string name="nsclient_xdripfollower">xDrip에서 팔로어 모드를 이용합니다.</string>
+    <string name="nsclient_looponiphone">아이폰에서 Loop앱을 이용합니다.</string>
+    <string name="nsclient_spikeiphone">아이폰에서 Spike앱을 이용합니다.</string>
+    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Children/Children.html</string>
+    <string name="isf_label">주제: ISF(인슐린 민감도)</string>
+    <string name="isf_increasingvalue">높은 ISF 값은 AAPS가 고혈당을 잡으려고 할때 보다 적은 인슐린 주입을 하게끔 합니다.</string>
+    <string name="isf_decreasingvalue">낮은 ISF 값은 AAPS가 고혈당을 잡으려고 할때 보다 적은 인슐린 주입을 하게끔 합니다.</string>
+    <string name="isf_noeffect">ISF 값 변경은 AAPS가 고혈당을 잡으려고 할때의 인슐린양에 아무런 영향을 주지 않습니다.</string>
+    <string name="isf_preferences">설정에서 ISF 값을 입력해야합니다.</string>
+    <string name="isf_profile">변경사항을 적용하는데 프로파일에서 ISF 값 변경하는 것으로 충분합니다.</string>
+    <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
+    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Profiles.html</string>
+    <string name="ic_label">Topic: IC(인슐린 대 탄수화물) 비율</string>
+    <string name="ic_increasingvalue">높은 IC 비율은 탄수화물 섭취시 인슐린이 보다 덜 주입되게 합니다.</string>
+    <string name="ic_decreasingvalue">낮은 IC 비율은 탄수화물 섭취시 인슐린이 보다 덜 주입되게 합니다.</string>
+    <string name="ic_noeffect">COB가 0 인 경우 IC 비율을 변경하면 혈당을 교정하기 위해 다른 양의 인슐린이 주입됩니다.</string>
+    <string name="ic_different">Bread Unit을 10g 혹은 12g으로 계산한다면 IC 값도 달라집니다.</string>
+    <string name="ic_meaning">IC의 의미는 다음과 같습니다: 1U의 인슐린에 대한 적정 Bread Unit 양</string>
+    <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
+    <string name="profileswitch_label">주제: 프로파일 변경</string>
+    <string name="profileswitch_pctwillchange">프로파일을 90%로 설정하면 어떻게 됩니까?</string>
+    <string name="profileswitch_basalhigher">Basal이 10% 높아집니다.</string>
+    <string name="profileswitch_basallower">Basal이 10% 낮아집니다.</string>
+    <string name="profileswitch_ichigher">IC 값이 10% 높아집니다.</string>
+    <string name="profileswitch_iclower">IC 값이 10% 낮아집니다.</string>
+    <string name="profileswitch_isfhigher">ISF 값이 10% 높아집니다.</string>
+    <string name="profileswitch_isflower">ISF 값이 10% 낮아집니다.</string>
+    <string name="profileswitch_overall">전체적으로 약 10 % 더 적은 인슐린이 주입되게 됩니다.</string>
+    <string name="profileswitch_targethigher">목표가 10% 높아집니다.</string>
+    <string name="profileswitch_targetlower">목표가 10% 낮아집니다.</string>
+    <string name="profileswitch_targetbottom">하한 목표만 10% 낮아집니다.</string>
+    <string name="profileswitch_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
+    <string name="profileswitchtime_iwant">평소보다 1 시간 일찍 일어난 경우, AAPS에게 당신의 변경된 일정을 알리려면 어떻게 해야합니까?</string>
+    <string name="profileswitchtime_1">시간이동 1로 프로파일을 변경합니다.</string>
+    <string name="profileswitchtime__1">시간이동 -1로 프로파일을 변경합니다.</string>
+    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
+    <string name="profileswitchtime_60">시간이동 60으로 프로파일을 변경합니다.</string>
+    <string name="profileswitchtime__60">시간이동 -60으로 프로파일을 변경합니다.</string>
+    <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
+    <string name="basalhelp_label">Topic: Basal 값에 대한 도움</string>
+    <string name="basalhelp_where">Basal값 등과 관련된 도움을 어디서 받아야 하나요?</string>
+    <string name="basalhelp_diabetesteam">의료진</string>
+    <string name="basalhelp_google">구글(Google)</string>
+    <string name="basalhelp_facebook">페이스북(Facebook)</string>
+    <string name="other_medication_label">기타 의약품</string>
+    <string name="other_medication_text">AAPS는 혈당을 올리기 위하여 Basal값을 내립니다. SGLT2 억제제(gliflozins) 계열의 의약품들은 예상되는 혈당 상승을 억제하여 인슐린 결핍 (케톤산증)을 유발할 수 있습니다.
+\n일반적인 브랜드명은 다음과 같습니다: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\n본인은 AAPS를 사용할 때 이러한 의약품을 복용하지 않거나 혹은 이러한 의약품을 복용하기 전에 Loop를 비활성화 할것임을 약속합니다.</string>
+</resources>
diff --git a/app/src/main/res/values-ko-rKR/objectives.xml b/app/src/main/res/values-ko-rKR/objectives.xml
index 70489fbc5e..4bc1ebbb35 100644
--- a/app/src/main/res/values-ko-rKR/objectives.xml
+++ b/app/src/main/res/values-ko-rKR/objectives.xml
@@ -1,3 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="objectives_button_back">뒤로</string>
+    <string name="objectives_button_start">시작</string>
+    <string name="objectives_button_verify">확인</string>
+    <string name="nth_objective">%1$d. 목표</string>
+    <string name="objectivenotstarted">목표 %1$d이 시작되지 않았습니다</string>
+    <string name="objectivenotfinished">목표 %1$d이 완료되지 않았습니다</string>
+    <string name="objectives_0_objective">시각화 및 모니터링 설정하고, Basal과 비율을 분석합니다.</string>
+    <string name="objectives_0_gate">Nightscout에서 혈당 데이터가 잘 들어오는지, 펌프, 인슐린 데이터가 업로드 되는지 확인합니다</string>
+    <string name="objectives_openloop_objective">Open Loop를 시작합니다</string>
+    <string name="objectives_openloop_gate">며칠 동안 Open Loop 모드를 사용하고 수동으로 임시Basal을 실행하여 봅니다. 사용자 정의 임시 목표와 (\'활동\', \'저혈당\' 같은) 기본 임시목표를 사용해봅니다</string>
+    <string name="objectives_maxbasal_objective">임시Basal 추천기능과 Open Loop에 대해 이해합니다</string>
+    <string name="objectives_maxbasal_gate">이 경험을 토대로, 최대 Basal을 결정하고 이를 펌프와 설정에 입력합니다</string>
+    <string name="objectives_maxiobzero_objective">Closed Loop를 시작하고 저혈당인슐린 중지 기능(LGS)을 사용해 봅니다</string>
+    <string name="objectives_maxiobzero_gate">최대 IOB = 0 인 상태로 Closed Loop를 몇일동안 실행하되 저혈당 인슐린일시중지(LGS)가 많이 발생하지 않도록 합니다</string>
+    <string name="objectives_maxiob_objective">Closed Loop를 조정하여 최대 IOB를 0 이상으로 올려서 서서히 혈당 목표치를 낮추어 봅니다</string>
+    <string name="objectives_maxiob_gate">혈당을 낮추기 전에 몇일간 사용해보되 최소한 하루는 저혈당 알람이 발생하지 않도록 해봅니다</string>
+    <string name="objectives_autosens_objective">필요하면 Basal과 비율을 조절하고, auto-sens를 활성화합니다</string>
+    <string name="objectives_autosens_gate">섭취한 탄수화물양을 입력하고 1주일동안 낮시간대에 loop를 성공적으로 사용하여 봅니다</string>
+    <string name="objectives_ama_objective">AMA(Advanced Meal Assist)같은 낮시간대를 위한 추가적인 기능들을 실행하여 봅니다</string>
+    <string name="objectives_smb_objective">낮시간대에 SMB(Super Micro Bolus)같은 추가기능을 활성화해 사용해봅니다</string>
+    <string name="objectives_smb_gate">SMB가 잘 작동하게 하기위해서 wiki를 반드시 읽은 다음 maxIOB 값을 올려보세요! maxIOB=평균 식사 Bolus + 3 x 최대하루 Basal이면 적당한 시작값입니다</string>
+    <string name="objectives_bgavailableinns">NS에서 혈당이 확인 가능합니다</string>
+    <string name="objectives_pumpstatusavailableinns">NS에서 펌프상태가 확인 가능합니다</string>
+    <string name="objectives_manualenacts">수동 주입</string>
+    <string name="accomplished">완료: %1$s</string>
+    <string name="objectives_usage_objective">AndroidAPS를 사용하는 방법을 배워봅니다</string>
+    <string name="objectives_usage_gate">AndroidAPS에서 다양한 작업을 수행해보세요</string>
+    <string name="objectives_useprofileswitch">10분동안 프로파일 90%를 설정해보세요(개요에서 프로파일명을 길게 눌러보세요)</string>
+    <string name="objectives_usedisconnectpump">샤워한다고 가정하고 펌프를 1시간 동안 펌프를 일시중지하세요 (개요에서 Open Loop를 길게 눌러보세요)</string>
+    <string name="objectives_usereconnectpump">... 그리고 같은 방법으로 펌프를 재연결하세요</string>
+    <string name="objectives_usetemptarget">10분의 사용자정의 임시 목표를 생성해 보세요 (개요에서 본인의 현재 목표혈당을 길게 눌러보세요)</string>
+    <string name="objectives_useactions">구성관리자에서 실행 플러그인을 활성화하고 메뉴에서 표시되게 합니다</string>
+    <string name="objectives_useloop">Loop 플러그인 내용을 표시합니다</string>
+    <string name="objectives_usescale">개요의 혈당 차트를 길게 눌러 차트 시간을 변경하세요</string>
+    <string name="objectives_button_enter">입력</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">당신이 OpenAPS 사용자였고 당신의 NS가 최소 3개월의 Loop 데이터가 저장되어 있다면, objectives@androidaps.org로 메일을 보내 당신의 NS주소를 알려주시고 목표를 건너뛸 수 있는 코드를 요청하세요. 그리고 개발자로 부터 받은 코드를 입력하세요.</string>
+    <string name="codeaccepted">코드 인증</string>
+    <string name="codeinvalid">잘못된 코드</string>
+    <string name="objectives_exam_objective">당신의 지식을 확인해봅니다</string>
+    <string name="objectives_exam_gate">다음 질문에 대해 공부하고 올바른 답을 선택하세요</string>
+    <string name="answerdisabledto">다음 시간까지 답변 불가능: %1$s</string>
+    <string name="wronganswer">잘못된 답변!</string>
+    <string name="unfinshed_button">다음 미답변</string>
+    <string name="requestcode">요청 코드: %1$s</string>
+    <string name="objectives_hint">(올바른 답변을 모두 체크하세요)</string>
+    <string name="disconnectpump_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#what-to-do-when-taking-a-shower-or-bath</string>
+    <string name="usetemptarget_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/Screenshots.html#the-homescreen</string>
+    <string name="useaction_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/Screenshots.html#config-builder</string>
+    <string name="usescale_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/Screenshots.html#the-homescreen</string>
+    <string name="notconnected">인터넷에 연결되지 않음</string>
+    <string name="failedretrievetime">시간을 가져오지 못했습니다</string>
+    <string name="requirementnotmet">목표 요구 사항이 충족되지 않음</string>
+    <plurals name="objective_days">
+        <item quantity="other">%1$d 일</item>
+    </plurals>
+    <plurals name="objective_hours">
+        <item quantity="other">%1$d 시간</item>
+    </plurals>
+    <plurals name="objective_minutes">
+        <item quantity="other">%1$d 분</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 167b2d0412..e4ecfc6ed9 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -96,6 +96,7 @@
     <string name="openapsma_profile_label">프로파일</string>
     <string name="openapsma_mealdata_label">식사 데이터</string>
     <string name="result">결과</string>
+    <string name="result_insulin_carbs">결과: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">혈당 데이터 없음</string>
     <string name="nochangerequested">변경사항 없음</string>
     <string name="openapsma_request_label">요청</string>
@@ -108,7 +109,7 @@
     <string name="configbuilder">구성 관리자</string>
     <string name="objectives">목표</string>
     <string name="openapsma">OpenAPS MA</string>
-    <string name="overview">개요</string>
+    <string name="overview">홈</string>
     <string name="nsprofile">NS 프로파일</string>
     <string name="simpleprofile">Simple 프로파일</string>
     <string name="treatments">관리</string>
@@ -123,7 +124,7 @@
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_aps_description">어떤 APS 알고리즘을 사용합니까?</string>
     <string name="configbuilder_general">일반</string>
-    <string name="configbuilder_general_description">유용한 여러가지 플로그인</string>
+    <string name="configbuilder_general_description">유용한 여러가지 플러그인</string>
     <string name="configbuilder_constraints_description">어떤 제약을 적용합니까?</string>
     <string name="days">일</string>
     <string name="constraints">제한</string>
@@ -142,6 +143,7 @@
     <string name="constraints_violation">제한 위반</string>
     <string name="treatmentdeliveryerror">Bolus 주입 에러</string>
     <string name="tempbasaldeliveryerror">임시Basal 주입 에러</string>
+    <string name="overview_newtempbasal_basalpercent">Basal 값 [%]</string>
     <string name="setbasalquestion">새 임시Basal 적용:</string>
     <string name="overview_treatment_label">관리</string>
     <string name="overview_calculator_label">계산기</string>
@@ -179,6 +181,7 @@
     <string name="careportal_cgmsensorinsert">CGM 센서 삽입</string>
     <string name="careportal_cgmsensorstart">CGM 센서 시작</string>
     <string name="careportal_insulincartridgechange">인슐린 카트리지 교체</string>
+    <string name="careportal_profileswitch">프로파일 변경</string>
     <string name="careportal_snackbolus">간식Bolus</string>
     <string name="careportal_mealbolus">식사Bolus</string>
     <string name="careportal_correctionbolus">교정Bolus</string>
@@ -199,6 +202,7 @@
     <string name="careportal_newnstreatment_percent_label">퍼센트</string>
     <string name="careportal_newnstreatment_absolute_label">절대값</string>
     <string name="careportal_newnstreatment_notes_label">노트</string>
+    <string name="event_time_label">이벤트 시간</string>
     <string name="careportal_newnstreatment_profile_label">프로파일</string>
     <string name="careportal_newnstreatment_enteredby_title">입력자</string>
     <string name="careportal_newnstreatment_glucosetype">혈당 종류</string>
@@ -206,6 +210,7 @@
     <string name="overview_tempbasal_button">임시Basal</string>
     <string name="overview_extendedbolus_button">확장 Bolus</string>
     <string name="configbuilder_nightscoutversion_label">Nightscout 버전:</string>
+    <string name="missing_carbs">누락 %1$dg</string>
     <string name="exported">설정이 저장되었습니다</string>
     <string name="export_to">다음 위치에 설정을 저장하시겠습니까</string>
     <string name="import_from">다음 위치에서 설정을 불러오시겠습니까</string>
@@ -222,6 +227,7 @@
     <string name="connecting">연결중</string>
     <string name="connected">연결됨</string>
     <string name="disconnected">연결 끊김</string>
+    <string name="danar_pump_settings">다나 펌프 설정</string>
     <string name="end_user_license_agreement">최종 사용자 라이선스 동의서</string>
     <string name="end_user_license_agreement_text">이 프로그램을 의학적 결정을 내리는 데 사용해서는 안되며, 여기에 대한 어떠한 보증도 없습니다. 이 프로그램의 품질과 성능에 관한 모든 위험은 사용자에게 있습니다.\nMUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">모두 이해하였고 동의합니다.</string>
@@ -248,16 +254,30 @@
     <string name="smscommunicator_allowednumbers">허가된 전화번호</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Bolus %1$.2fU 을 주입하려면 %2$s 를 입력하고 답장하세요</string>
+    <string name="smscommunicator_mealbolusreplywithcode">식사Bolus %1$.2f을 주입하려면 %2$s를 입력하고 답장하세요</string>
+    <string name="smscommunicator_temptargetwithcode">임시목표 %1$s를 설정하려면 %2$s를 입력하고 답장하세요</string>
+    <string name="smscommunicator_temptargetcancel">임시목표를 취소하려면 %1$s를 입력하고 답장하세요</string>
+    <string name="smscommunicator_stopsmswithcode">SMS 원격 기능을 비활성화려면 %1$s를 입력하고 답장하세요.\n\nAAPS 마스터폰을 통해서만 다시 활성화할 수 있습니다.</string>
+    <string name="smscommunicator_stoppedsms">SMS 원격 기능이 중지되었습니다. 다시 활성화하려면 AAPS 마스터폰을 이용하세요.</string>
     <string name="smscommunicator_calibrationreplywithcode">보정값 %1$.2f을 전송하려면 %2$s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_bolusfailed">Bolus failed</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">원격 Bolus를 주입한 후 얼마간의 시간이 흐른 후에야 다음 원격 Bolus주입이 가능합니다</string>
+    <string name="smscommunicator_remotebolusmindistance">원격 Bolus를 주입한 후 몇분이 지나야 다음 원격 Bolus 주입이 가능하게 합니까</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">안전을 위하여 이 설정을 수정하기 위해 최소 2개의 폰 번호를 추가해야합니다.</string>
     <string name="bolusdelivered">Bolus %1$.2fU이 주입 완료되었습니다.</string>
     <string name="bolusrequested">%1$.2fU을 주입합니다</string>
     <string name="smscommunicator_bolusdelivered">Bolus %1$.2fU이 주입 완료되었습니다</string>
+    <string name="smscommunicator_mealbolusdelivered">식사Bolus %1$.2f이 주입 완료되었습니다</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">%2$d 분 동안 목표 %1$s</string>
+    <string name="smscommunicator_tt_set">%2$d 분 동안 목표 %1$s 설정이 완료되었습니다</string>
+    <string name="smscommunicator_tt_canceled">임시 목표 취소가 완료되었습니다</string>
     <string name="bolusdelivering">%1$.2fU 주입중</string>
     <string name="smscommunicator_remotecommandsallowed">SMS 원격 명령 사용하기</string>
     <string name="glucosetype_finger">체혈</string>
     <string name="glucosetype_sensor">센서</string>
     <string name="manual">수동</string>
+    <string name="careportal_temporarytarget">임시 목표</string>
+    <string name="careportal_temporarytargetcancel">임시 목표 취소</string>
     <string name="danarprofile">DanaR 프로파일 설정</string>
     <string name="danarprofile_dia">인슐린활동시간(DIA) [h]</string>
     <string name="danarprofile_dia_summary">인슐린 활동 기간</string>
@@ -310,10 +330,13 @@
     <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_carbsreplywithcode">%2$s에 %1$dg을 입력하려면 %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_carbsset">탄수화물 %1$dg 입력이 완료되었습니다</string>
+    <string name="smscommunicator_carbsfailed">탄수화물 %1$dg 입력이 실패하였습니다</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>
@@ -347,11 +370,14 @@
     <string name="button1">버튼1</string>
     <string name="button2">버튼2</string>
     <string name="button3">버튼3</string>
+    <string name="units_colon">단위:</string>
+    <string name="units">단위</string>
     <string name="mgdl">mg/dl</string>
     <string name="mmol">mmol/l</string>
+    <string name="dia">DIA</string>
     <string name="target_range">목표 범위:</string>
     <string name="prefs_range_title">차트 표시 범위</string>
-    <string name="prefs_range_summary">스마트워치 차트 고/저혈당 선</string>
+    <string name="prefs_range_summary">홈화면/스마트워치의 차트에서 표시되는 고/저혈당 선</string>
     <string name="low_mark">저혈당 선</string>
     <string name="high_mark">고혈당 선</string>
     <string name="wear">워치</string>
@@ -390,6 +416,7 @@
     <string name="eatingsoon">식사직전</string>
     <string name="hypo">저혈당</string>
     <string name="activity">활동</string>
+    <string name="removerecord">기록 삭제</string>
     <string name="danar_stats">DanaR 통계</string>
     <string name="danar_stats_cumulative_tdd">누적 일총량</string>
     <string name="danar_stats_expweight">지수가중 일총량</string>
@@ -527,8 +554,12 @@
     <string name="enablesuperbolus">마법사에서 Superbolus 활성화하기</string>
     <string name="enablesuperbolus_summary">마법사에서 Superbolus 기능을 활성화합니다. 어떤 기능인지 확실히 알기전까지 활성화 하지 마세요. 제대로 알지 못하고 사용하면 일슐린이 과다 주입될 수 있습니다!</string>
     <string name="show_statuslights">홈화면에 상태 표시등 보여주기</string>
+    <string name="show_statuslights_extended">홈화면에 확장 상태등 표시하기</string>
+    <string name="show_statuslights_extended_summary">홈화면에 캐뉼라 사용기간(cage), 인슐린 사용기간(iage), 센서 사용기간(sage), 펌프용 주사기(reservoir)와 배터리(battery) 남은 양에 대한 확장 표시등을 활성화합니다.</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>
@@ -552,6 +583,7 @@
     <string name="careportal_insulinage_label">인슐린 사용기간</string>
     <string name="hours">시간</string>
     <string name="invalidprofile">프로파일이 유효하지 않습니다!!!</string>
+    <string name="doprofileswitch">프로파일 변경 실행</string>
     <string name="careportal_pbage_label">펌프배터리사용기간</string>
     <string name="careportal_pumpbatterychange">펌프 배터리 교체</string>
     <string name="ns_alarmoptions">알람 옵션</string>
@@ -561,8 +593,8 @@
     <string name="nsalarm_urgentlow">위험 저혈당</string>
     <string name="nsalarm_staledata">누락 데이터</string>
     <string name="nsalarm_urgentstaledata">위험 누락 데이터</string>
-    <string name="nsalarm_staledatavalue_label">누락 데이터 기준값[분]</string>
-    <string name="nsalarm_urgent_staledatavalue_label">위험 누락 데이터 기준값[분]</string>
+    <string name="nsalarm_staledatavalue_label">누락 데이터 기준값 [min]</string>
+    <string name="nsalarm_urgent_staledatavalue_label">위험 누락 데이터 기준값 [min]</string>
     <string name="openapsama_autosens_period">autosens 시간 [h]</string>
     <string name="openapsama_autosens_period_summary">민감도를 감지하기 위해 계산될 총 시간 (탄수화물 흡수 시간은 제외됩니다.)</string>
     <string name="pump">펌프</string>
@@ -594,6 +626,7 @@
     <string name="mdtp_cancel">취소</string>
     <string name="notloadedplugins">모든 프로파일이 로드되지 않았습니다.</string>
     <string name="valuesnotstored">값이 저장되지 않았습니다!</string>
+    <string name="ns_localbroadcasts">다른 앱 (예 : xDrip)으로 데이터 전송을 활성화합니다. AAPS 또는 NSClient 인스턴스를 두 개 이상 설치 한 경우 활성화하지 마세요!</string>
     <string name="ns_localbroadcasts_title">Local Broadcasts 활성화하기</string>
     <string name="careportal_activity_label">활동 &amp; 피드백</string>
     <string name="careportal_carbsandbolus_label">탄수화물 &amp; Bolus</string>
@@ -618,6 +651,7 @@
     <string name="waitingforpairing">펌프연동 대기중</string>
     <string name="pairingok">연동완료</string>
     <string name="pairingtimedout">연동시간초과</string>
+    <string name="pairing">동기화</string>
     <string name="danars_nodeviceavailable">현재까지 발견된 기기가 없습니다.</string>
     <string name="emptyreservoir">빈 주사기</string>
     <string name="bloodsugarmeasurementalert">혈당측정알람</string>
@@ -652,6 +686,7 @@
     <string name="shortgramm">g</string>
     <string name="shortminute">분</string>
     <string name="shorthour">시간</string>
+    <string name="shortday">일</string>
     <string name="none"><![CDATA[<none>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
@@ -680,6 +715,7 @@
     <string name="bgsource_upload">혈당 업로드 설정</string>
     <string name="wear_detailed_delta_title">델타(혈당증분값) 자세히 보여주기</string>
     <string name="wear_detailed_delta_summary">소수점 자리 추가된 증분값 보여주기</string>
+    <string name="smbmaxminutes">SMB 최대 분</string>
     <string name="smbmaxminutes_summary">SMB가 Basal을 제한할 수 있는 최대 시간(분)</string>
     <string name="unsupportedfirmware">지원되지 않는 펌프 펌웨어</string>
     <string name="dexcomg5_xdripupload_title">혈당 데이터를 xDrip+에 전송하기</string>
@@ -726,6 +762,7 @@
     <string name="bolus_frequency_exceeded">2개의 동일한 양의 Bolus 주입이 요청되었습니다. 이중으로 Bolus가 주입 되는 사고를 막고 버그로부터 보호하기 위하여 이는 금지됩니다.</string>
     <string name="combo_pump_connected_now">현재</string>
     <string name="combo_activity_reading_pump_history">펌프 이력 읽기</string>
+    <string name="danar_history">펌프 이력</string>
     <string name="combo_activity_setting_basal_profile">Basal 프로파일 설정</string>
     <string name="combo_pump_cartridge_low_warrning">펌프 카트리지 레벨이 낮습니다.</string>
     <string name="combo_pump_battery_low_warrning">펌프배터리가 부족합니다.</string>
@@ -745,6 +782,7 @@
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">전</string>
     <string name="format_hours">%1$.2f 시간</string>
+    <string name="format_mins">%1$d 분</string>
     <string name="enablesmbalways">항상 SMB를 사용합니다.</string>
     <string name="enablesmbalways_summary">Bolus와 독립적으로 항상 SMB를 사용합니다. G5처럼 잘 필터된 혈당소스와만 사용이 가능합니다.</string>
     <string name="enablesmbaftercarbs">탄수화물 이후 SMB를 사용합니다.</string>
@@ -851,7 +889,7 @@
     <string name="pump_stopped">펌프 중지</string>
     <string name="pump_started">펌프 시작</string>
     <string name="pump_paused">펌프 일시중지</string>
-    <string name="absorption_cutoff_title">식사 최대 흡수 시간[h]</string>
+    <string name="absorption_cutoff_title">식사 최대 흡수 시간 [h]</string>
     <string name="absorption_cutoff_summary">식사가 모두 흡수되었다고 간주되는 시간. 나머지 탄수화물은 모두 없어집니다.</string>
     <string name="time">시간</string>
     <string name="overview_show_notes_field_in_dialogs_title">관리창에 노트 영역 보여주기</string>
@@ -921,7 +959,11 @@
     <string name="danar_pumpalarm_sound">소리</string>
     <string name="danar_pumpalarm_vibrate">진동</string>
     <string name="danar_pumpalarm_both">모두</string>
+    <string name="danar_screentimeout">LCD 시간 [seconds]</string>
+    <string name="danar_backlight">화면조명 시간 [seconds]</string>
     <string name="danar_glucoseunits">혈당 단위</string>
+    <string name="danar_shutdown">종료 [hours]</string>
+    <string name="danar_lowreservoir">낮은 주사기량 [Units]</string>
     <string name="danar_saveuseroptions">펌프로 옵션 저장</string>
     <string name="option_on">켜짐</string>
     <string name="option_off">꺼짐</string>
@@ -1114,6 +1156,8 @@
     <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>
@@ -1137,6 +1181,7 @@
     <string name="running_invalid_version">유효하지 않은 버전을 이용 중입니다. Loop가 비활성화 되었습니다!</string>
     <string name="old_version">오래된 버전</string>
     <string name="very_old_version">아주 오래된 버전</string>
+    <string name="new_version_warning">최소 %1$d일 새버전이 가능합니다! %2$d일 후엔 LGS(저혈당주입중지)으로 복귀되며, %3$d일이후엔 Loop가 비활성화 될 것입니다</string>
     <string name="twohours">2h</string>
     <string name="formatinsulinunits">%1$.2fU</string>
     <string name="dexcom_app_patched">Dexcom 앱(패치버전)</string>
@@ -1164,12 +1209,20 @@
     <string name="longitude_short">경도</string>
     <string name="distance_short">거리 [m]:</string>
     <string name="name_short">이름:</string>
-    <string name="lastboluslabel">마지막 Bolus 전</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">때 </string>
+    <string name="location_inside">당신이 그 지역내에 있을 때</string>
+    <string name="location_outside">당신이 그 지역밖에 있을 때</string>
+    <string name="location_going_in">당신이 다음 이름의 지역에 들어갔을 때</string>
+    <string name="location_going_out">당신이 다음 이름의 지역에서 떠날 때</string>
+    <string name="lastboluslabel">마지막 Bolus</string>
     <string name="lastboluscompared">마지막 Bolus 시간 %1$s %2$s 분 전</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">작업명</string>
     <string name="edit_short">편집</string>
+    <string name="please_choose_an_action_type">실행 유형을 선택하세요</string>
+    <string name="please_choose_a_trigger_type">트리거 유형을 선택하세요</string>
     <string name="triggers">트리거:</string>
     <string name="remove_label">삭제</string>
     <string name="preconditions">전제 조건:</string>
@@ -1197,6 +1250,8 @@
     <string name="medtronic_pump_battery_no">선택되지 않음(심플뷰)</string>
     <string name="medtronic_pump_battery_alkaline">알카라인(확장뷰)</string>
     <string name="medtronic_pump_battery_lithium">리튬(확장뷰)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (확장 뷰)</string>
+    <string name="medtronic_bolus_debugging">Bolus/관리 디버깅</string>
     <!-- RL BLE Scanning -->
     <string name="rileylink_scanner_scan_scan">스캔</string>
     <string name="rileylink_scanner_scan_stop">중지</string>
@@ -1235,6 +1290,7 @@
     <string name="rileylink_state_not_started">시작되지 않았습니다.</string>
     <string name="rileylink_state_rl_init">RileyLink 초기화…</string>
     <string name="rileylink_state_rl_error">RileyLink 에러</string>
+    <string name="rileylink_state_pc_tune_up">RileyLink 와 펌프 튜닝</string>
     <string name="rileylink_state_pc_error">펌프 연결 문제</string>
     <string name="rileylink_state_connected">연결됨</string>
     <!-- RL Errors -->
@@ -1259,6 +1315,7 @@
     <string name="medtronic_error_pump_frequency_invalid">지원되지 않는 펌프 주파수입니다.</string>
     <string name="medtronic_error_rileylink_address_invalid">RileyLink 주소가 유효하지 않습니다.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">감지된 펌프타입이 설정된 타입과 다릅니다.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Basal 프로파일/패턴 설정이 펌프에서 활성화되지 않았습니다. 펌프에서 활성화해주세요.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">펌프에 설정된 Basal 프로파일이 올바르지 않습니다 (STD 이어야 합니다).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">펌프에 잘못된 TBR 유형이 설정되었습니다 (절대값이어야합니다).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">펌프에 잘못된 최대 Bolus가 설정되었습니다 (%1$.2f 이어야 합니다.).</string>
@@ -1303,6 +1360,15 @@
     <string name="medtronic_cmd_desc_get_tbr">임시 Basal 받기</string>
     <string name="medtronic_cmd_desc_set_tbr">임시 Basal 설정</string>
     <string name="medtronic_cmd_desc_set_bolus">Bolus 설정</string>
+    <string name="profilename">프로파일을 변경</string>
+    <string name="changengetoprofilename">프로파일을 %1$s으로 변경</string>
+    <string name="automation_trigger_pump_last_connection_label">펌프와의 마지막 연결</string>
+    <string name="automation_trigger_pump_last_connection_description">펌프와의 마지막 연결 [분 전]</string>
+    <string name="automation_trigger_pump_last_connection_compared">펌프와의 마지막 연결 %1$s %2$s 분 전</string>
+    <string name="sendsmsactionlabel">SMS 전송: %1$s</string>
+    <string name="sendsmsactiondescription">모든 번호에 SMS 전송</string>
+    <string name="sendsmsactiontext">문자 포함된 SMS 보내기</string>
+    <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus 제약 적용: %2$.2fU 에서 %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! 느린 탄수화물 흡수 감지: %2$d%% of time. 계산을 다시 확인하십시오. COB를 과대하게 측정하여 더 많은 인슐린이 주입될 수 있습니다 !!!!!</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
@@ -1310,4 +1376,77 @@
     <string name="deliverpartofboluswizard">Bolus 마법사는 계산을 수행하지만 계산된 인슐린의 이 부분만 주입됩니다. SMB 알고리즘에 유용합니다.</string>
     <string name="loading">불러오는 중…</string>
     <string name="snooze">스누즈</string>
+    <string name="time_range">시간 범위</string>
+    <string name="timerange_value">시간은 %1$s 와 %2$s사이입니다</string>
+    <string name="between">사이 </string>
+    <string name="close">닫기</string>
+    <string name="increasingmaxbasal">설정이 프로파일에서의 최대 Basal보다 낮은 이유로 최대 Basal을 올립니다</string>
+    <string name="smscommunicator_messagebody">잘못된 메시지 내용</string>
+    <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
+    <string name="format_carbs_ic">%1$.0fg IC: %2$.1f</string>
+    <string name="format_cob_ic">%1$.1fg IC: %2$.1f</string>
+    <string name="format_percent">%1$d%%</string>
+    <string name="boluswizard">Bolus 마법사</string>
+    <string name="unit_minute_short">분</string>
+    <string name="profile_name">프로파일명:</string>
+    <string name="selected_profile">선택:</string>
+    <string name="unitsnosemicolon">단위</string>
+    <string name="doyouwantswitchprofile">프로파일을 변경하고 현재 프로파일에 대한 변경 사항을 버리시겠습니까?</string>
+    <string name="format_carbs">%1$dg</string>
+    <string name="common_on">켜기</string>
+    <string name="common_off">끄기</string>
+    <string name="objectives_button_unfinish">완료 초기화</string>
+    <string name="objectives_button_unstart">시작 초기화</string>
+    <string name="timedetection">시간 감지</string>
+    <string name="doyouwantresetstart">목표를 초기화하시겠습니까? 진행상황이 삭제됩니다.</string>
+    <string name="nopumpselected">펌프가 선택되지 않음</string>
+    <string name="setupwizard_units_prompt">사용하시는 혈당 단위를 선택하세요</string>
+    <string name="ns_ploadlocalprofile">로컬 프로파일 변경을 NS에 업로드하기</string>
+    <string name="dia_short">DIA</string>
+    <string name="ic_short">IC</string>
+    <string name="isf_short">ISF</string>
+    <string name="target_short">TARG</string>
+    <string name="clone_label">복사</string>
+    <string name="saveorresetchangesfirst">우선 현재 변경사항을을 저장하거나 재설정하세요</string>
+    <string name="deletecurrentprofile">현재 프로파일을 삭제 하시겠습니까?</string>
+    <string name="copytolocalprofile">이 프로파일 변경을 기반으로 새 로컬 프로파일을 만드시겠습니까?</string>
+    <string name="profilenamecontainsdot">프로파일명에 점을 포함하고 있습니다.\n이는 NS에서 지원하지 않습니다.\n프로파일이 NS에 업로드되지 않습니다.</string>
+    <string name="low_mark_comment">혈당 정상범위의 하한값(표시 전용)</string>
+    <string name="high_mark_comment">혈당 정상범위의 상한값(표시 전용)</string>
+    <string name="reorder_label">정렬</string>
+    <string name="age">나이:</string>
+    <string name="weight">몸무게:</string>
+    <string name="id">ID:</string>
+    <string name="submit">확인</string>
+    <string name="mostcommonprofile">가장 많이 사용된 프로파일:</string>
+    <string name="survey_comment">참고: 이 화면에 보이는 데이터만 익명으로 업로드됩니다. ID는 AndroidAPS 설치에 할당됩니다. 기본 프로파일이 변경되면 데이터를 다시 제출할 수 있지만 어느정도 시간 범위의 결과가 보이도록 최소 1주일 이상 실행하여 주세요. 당신의 도움 감사하겠습니다.</string>
+    <string name="nav_survey">조사</string>
+    <string name="invalidage">유효하지 않은 나이입니다</string>
+    <string name="invalidweight">유효하지 않은 몸무게입니다</string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
+    <string name="tirformat"><![CDATA[<b>%1$s:</b> Low: <b>%2$02d%%</b> In: <b>%3$02d%%</b> High: <b>%4$02d%%</b>]]></string>
+    <string name="average">평균</string>
+    <string name="tdd">TDD</string>
+    <string name="tir">TIR</string>
+    <string name="activitymonitor">활동 모니터</string>
+    <string name="doyouwantresetstats">활동 통계를 초기화하시겠습니까?</string>
+    <string name="statistics">통계</string>
+    <string name="randombg">무작위 혈당</string>
+    <string name="description_source_randombg">무작위로 혈당을 생성합니다(데모 버전 전용)</string>
+    <string name="randombg_short">BG</string>
+    <string name="tools">도구</string>
+    <string name="show_calculation">계산 표시</string>
+    <string name="error">에러</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="automation_event">자동화 이벤트</string>
+    <string name="alreadyset">이미 설정됨</string>
+    <string name="message">메시지</string>
+    <string name="clearqueueconfirm">대기열을 삭제하시겠습니까? 대기열에 있는 모든 데이터가 삭제됩니다!</string>
+    <string name="ebstopsloop">확장 Bolus 기능을 사용하는 동안에는 Closed Loop 모드가 중지됩니다. 정말 원하십니까?</string>
+    <string name="closed_loop_disabled_with_eb">확장 Bolus 사용으로 인해 Closed Loop가 비활성화됨</string>
+    <string name="extended_bolus_short">EB</string>
+    <string name="phonechecker">\"전화확인\"</string>
+    <string name="chartmenu">차트 메뉴</string>
+    <string name="sensitivity_short">AS</string>
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 78b3450504..c717182dc4 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1449,4 +1449,6 @@ Context | Edit Context</string>
     <string name="closed_loop_disabled_with_eb">Замкнутый цикл отключен из-за работы Пролонгированного Болюса</string>
     <string name="extended_bolus_short">ПБ</string>
     <string name="phonechecker">\"PhoneChecker\"</string>
+    <string name="chartmenu">Меню графика</string>
+    <string name="sensitivity_short">Авточувств</string>
 </resources>
diff --git a/wear/src/main/res/values-ko-rKR/strings.xml b/wear/src/main/res/values-ko-rKR/strings.xml
index 70489fbc5e..cc4e5e62be 100644
--- a/wear/src/main/res/values-ko-rKR/strings.xml
+++ b/wear/src/main/res/values-ko-rKR/strings.xml
@@ -1,3 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="app_name">AAPS</string>
+    <string name="label_actions_activity">AAPS</string>
+    <string name="label_xdrip">AAPS</string>
+    <string name="label_xdrip_large">AAPS(대)</string>
+    <string name="label_xdrip_big_chart">AAPS(큰차트)</string>
+    <string name="label_xdrip_no_chart">AAPS(차트없음)</string>
+    <string name="label_xdrip_circle">AAPS(원형)</string>
+    <string name="label_xdrip_v2">AAPSv2</string>
+    <string name="label_xdrip_cockpit">AAPS(조종석)</string>
+    <string name="label_xdrip_steampunk">AAPS(스팀펑크)</string>
+    <string name="label_warning_sync">데이터없음!</string>
+    <string name="label_warning_old">오래된 데이터!</string>
+    <string name="label_warning_since">%1$s 이후</string>
+    <string name="label_warning_sync_aaps">AAPS와 연결!</string>
+    <string name="msg_warning_sync">%1$s 이후 받은 데이터가 없습니다! 폰에서 AAPS가 워치로 데이터를 보냈는지 확인하세요</string>
+    <string name="msg_warning_old">AAPS 데이터가 %1$s 오래되었습니다! 센서, xDrip+, NS, AAPS 설정 또는 기타사항을 확인하세요!</string>
+    <string name="pref_on">켜기</string>
+    <string name="pref_off">끄기</string>
+    <string name="pref_vibrate_on_bolus">Bolus 주입시 진동</string>
+    <string name="pref_units_for_actions">단위</string>
+    <string name="pref_show_date">날짜 표시</string>
+    <string name="pref_show_iob">IOB 표시</string>
+    <string name="pref_show_cob">COB 표시</string>
+    <string name="pref_show_delta">증분 표시</string>
+    <string name="pref_show_avgdelta">평균증분 표시</string>
+    <string name="pref_show_phone_battery">폰배터리 표시</string>
+    <string name="pref_show_rig_battery">종합 배터리 표시</string>
+    <string name="pref_show_basal_rate">Basal 값 표시</string>
+    <string name="pref_show_loop_status">Loog 상태 표시</string>
+    <string name="pref_show_bg">혈당 표시</string>
+    <string name="pref_show_direction_arrow">화살표 표시</string>
+    <string name="pref_show_ago">\'분전\' 표시</string>
+    <string name="pref_dark" comment="Enables dark visual theme">어두움</string>
+    <string name="pref_highlight_basals">Basal 강조</string>
+    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">경계선 색상매칭</string>
+    <string name="pref_chart_timeframe">차트 기간</string>
+    <string name="pref_1_hour">1시간</string>
+    <string name="pref_2_hours">2시간</string>
+    <string name="pref_3_hours">3시간</string>
+    <string name="pref_4_hours">4시간</string>
+    <string name="pref_5_hours">5시간</string>
+    <string name="pref_input_design">입력 형태</string>
+    <string name="pref_default">기본</string>
+    <string name="pref_quick_righty">오른손잡이</string>
+    <string name="pref_quick_lefty">왼손잡이</string>
+    <string name="pref_modern_sparse">모던스타일</string>
+    <string name="pref_delta_granularity">증분 밀도(스팀펑크)</string>
+    <string name="pref_low">저</string>
+    <string name="pref_medium">중</string>
+    <string name="pref_high">고</string>
+    <string name="pref_auto">자동</string>
+    <string name="pref_big_numbers">큰 숫자</string>
+    <string name="pref_ring_history">원형 이력</string>
+    <string name="pref_light_ring_history">연한 원형 이력</string>
+    <string name="pref_animations">애니메이션</string>
+    <string name="pref_wizard_in_menu">메뉴에서 마법사</string>
+    <string name="pref_prime_in_menu">메뉴에서 교체</string>
+    <string name="pref_single_target">단일 목표</string>
+    <string name="pref_wizard_percentage">마법사 퍼센트</string>
+    <string name="pref_complication_tap_action">컴플리케이션 탭 동작</string>
+    <string name="pref_unicode_in_complications">컴플리케이션에서 유니코드 사용</string>
+    <string name="pref_version">버전:</string>
+    <string name="menu_tempt">임시목표</string>
+    <string name="menu_wizard">마법사</string>
+    <string name="menu_bolus">Bolus</string>
+    <string name="menu_ecarb">확장탄수화물</string>
+    <string name="menu_settings">설정</string>
+    <string name="menu_status">상태</string>
+    <string name="menu_prime_fill">교체/채움</string>
+    <string name="menu_none">없음</string>
+    <string name="menu_default">기본</string>
+    <string name="menu_menu">메뉴</string>
+    <string name="action_duration">기간</string>
+    <string name="action_target" comment="In temp target menu, single target value">목표</string>
+    <string name="action_low" comment="In temp target menu, lower value from range">하한값</string>
+    <string name="action_high" comment="In temp target menu, higher value from range">상한값</string>
+    <string name="action_carbs">탄수화물</string>
+    <string name="action_percentage">퍼센트</string>
+    <string name="action_start_min">시작 [min]</string>
+    <string name="action_duration_h">기간 [h]</string>
+    <string name="action_insulin">인슐린</string>
+    <string name="action_preset_1">프리셋 1</string>
+    <string name="action_preset_2">프리셋 2</string>
+    <string name="action_preset_3">프리셋 3</string>
+    <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">양 제한없음</string>
+    <string name="action_confirm">확인</string>
+    <string name="action_status_pump">상태 펌프</string>
+    <string name="action_status_loop">상태 LOOP</string>
+    <string name="action_timeshift">시간이동</string>
+    <string name="action_tdd_weighted">TDD 가중</string>
+    <string name="action_bolus">Bolus</string>
+    <string name="status_pump">펌프</string>
+    <string name="status_loop">Loop</string>
+    <string name="status_cpp">CPP</string>
+    <string name="status_tdd">TDD</string>
+    <string name="activity_carb">Carb</string>
+    <string name="activity_IOB">IOB</string>
+    <string name="activity_no_status">상태 없음</string>
+    <string name="unit_mg_dl">mg/dl</string>
+    <string name="unit_mmol_l">mmol/l</string>
+    <string name="unit_g" comment="Shortcut for ISO unit: gram">g</string>
+    <string name="unit_u" comment="Shortcut for: insulin Unit">U</string>
+    <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">U/h</string>
+    <string name="unit_h" comment="One letter shortcut for: Hour" maxLength="1">h</string>
+    <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">d</string>
+    <string name="unit_w" comment="One letter shortcut for: Week" maxLength="1">w</string>
+</resources>

From b5a64f4d859d579bd3d2f77f223945e366daf15f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 2 Feb 2020 22:12:54 +0100
Subject: [PATCH 06/56] better timestamps on Loop tab

---
 .../plugins/aps/loop/LoopFragment.kt          |  12 +-
 .../plugins/aps/loop/LoopPlugin.java          |  30 ++-
 .../general/overview/OverviewFragment.java    |   2 +-
 .../general/wear/ActionStringHandler.java     |   4 +-
 .../wearintegration/WatchUpdaterService.java  |   2 +-
 .../nightscout/androidaps/utils/DateUtil.java |  13 +
 app/src/main/res/layout/loop_fragment.xml     | 225 ++++++++++++++----
 app/src/main/res/values/strings.xml           |   4 +
 8 files changed, 231 insertions(+), 61 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
index e7dbacb891..5625fd978f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
@@ -77,8 +77,11 @@ class LoopFragment : Fragment() {
             loop_source?.text = it.source ?: ""
             loop_lastrun?.text = it.lastAPSRun?.let { lastRun -> DateUtil.dateAndTimeString(lastRun.time) }
                 ?: ""
-            loop_lastenact?.text = it.lastAPSRun?.let { lastEnact -> DateUtil.dateAndTimeString(lastEnact.time) }
-                ?: ""
+            loop_smbrequest_time?.text = DateUtil.dateAndTimeAndSecondsString(it.lastSMBRequest)
+            loop_smbexecution_time?.text = DateUtil.dateAndTimeAndSecondsString(it.lastSMBEnact)
+            loop_tbrrequest_time?.text = DateUtil.dateAndTimeAndSecondsString(it.lastTBRRequest)
+            loop_tbrexecution_time?.text = DateUtil.dateAndTimeAndSecondsString(it.lastTBREnact)
+
             loop_tbrsetbypump?.text = it.tbrSetByPump?.let { tbrSetByPump -> HtmlHelper.fromHtml(tbrSetByPump.toHtml()) }
                 ?: ""
             loop_smbsetbypump?.text = it.smbSetByPump?.let { smbSetByPump -> HtmlHelper.fromHtml(smbSetByPump.toHtml()) }
@@ -102,7 +105,10 @@ class LoopFragment : Fragment() {
         loop_constraintsprocessed?.text = ""
         loop_source?.text = ""
         loop_lastrun?.text = ""
-        loop_lastenact?.text = ""
+        loop_smbrequest_time?.text = ""
+        loop_smbexecution_time?.text = ""
+        loop_tbrrequest_time?.text = ""
+        loop_tbrexecution_time?.text = ""
         loop_tbrsetbypump?.text = ""
         loop_smbsetbypump?.text = ""
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index 7492dc64dd..b0d6f89065 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -57,6 +57,7 @@ import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.T;
@@ -84,9 +85,9 @@ public class LoopPlugin extends PluginBase {
         return loopPlugin;
     }
 
-    private long loopSuspendedTill = 0L; // end of manual loop suspend
-    private boolean isSuperBolus = false;
-    private boolean isDisconnected = false;
+    private long loopSuspendedTill; // end of manual loop suspend
+    private boolean isSuperBolus;
+    private boolean isDisconnected;
 
     public class LastRun {
         public APSResult request = null;
@@ -95,8 +96,11 @@ public class LoopPlugin extends PluginBase {
         public PumpEnactResult smbSetByPump = null;
         public String source = null;
         public Date lastAPSRun = null;
-        public Date lastEnact = null;
-        public Date lastOpenModeAccept;
+        public long lastTBREnact = 0;
+        public long lastSMBEnact = 0;
+        public long lastTBRRequest = 0;
+        public long lastSMBRequest = 0;
+        public long lastOpenModeAccept;
     }
 
     static public LastRun lastRun = null;
@@ -342,6 +346,10 @@ public class LoopPlugin extends PluginBase {
             lastRun.source = ((PluginBase) usedAPS).getName();
             lastRun.tbrSetByPump = null;
             lastRun.smbSetByPump = null;
+            lastRun.lastTBREnact = 0;
+            lastRun.lastTBRRequest = 0;
+            lastRun.lastSMBEnact = 0;
+            lastRun.lastSMBRequest = 0;
 
             NSUpload.uploadDeviceStatus();
 
@@ -378,14 +386,17 @@ public class LoopPlugin extends PluginBase {
                         public void run() {
                             if (result.enacted || result.success) {
                                 lastRun.tbrSetByPump = result;
-                                lastRun.lastEnact = lastRun.lastAPSRun;
+                                lastRun.lastTBRRequest = lastRun.lastAPSRun.getTime();
+                                lastRun.lastTBREnact = DateUtil.now();
+                                RxBus.INSTANCE.send(new EventLoopUpdateGui());
                                 applySMBRequest(resultAfterConstraints, new Callback() {
                                     @Override
                                     public void run() {
                                         //Callback is only called if a bolus was acutally requested
                                         if (result.enacted || result.success) {
                                             lastRun.smbSetByPump = result;
-                                            lastRun.lastEnact = lastRun.lastAPSRun;
+                                            lastRun.lastSMBRequest = lastRun.lastAPSRun.getTime();
+                                            lastRun.lastSMBEnact = DateUtil.now();
                                         } else {
                                             new Thread(() -> {
                                                 SystemClock.sleep(1000);
@@ -465,8 +476,9 @@ public class LoopPlugin extends PluginBase {
             public void run() {
                 if (result.enacted) {
                     lastRun.tbrSetByPump = result;
-                    lastRun.lastEnact = new Date();
-                    lastRun.lastOpenModeAccept = new Date();
+                    lastRun.lastTBRRequest = lastRun.lastAPSRun.getTime();
+                    lastRun.lastTBREnact = DateUtil.now();
+                    lastRun.lastOpenModeAccept = DateUtil.now();
                     NSUpload.uploadDeviceStatus();
                     SP.incInt(R.string.key_ObjectivesmanualEnacts);
                 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
index dcce040759..be963d7a9a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
@@ -1113,7 +1113,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         if (acceptTempButton != null) {
             boolean showAcceptButton = !closedLoopEnabled.value(); // Open mode needed
             showAcceptButton = showAcceptButton && finalLastRun != null && finalLastRun.lastAPSRun != null; // aps result must exist
-            showAcceptButton = showAcceptButton && (finalLastRun.lastOpenModeAccept == null || finalLastRun.lastOpenModeAccept.getTime() < finalLastRun.lastAPSRun.getTime()); // never accepted or before last result
+            showAcceptButton = showAcceptButton && (finalLastRun.lastOpenModeAccept == 0 || finalLastRun.lastOpenModeAccept < finalLastRun.lastAPSRun.getTime()); // never accepted or before last result
             showAcceptButton = showAcceptButton && finalLastRun.constraintsProcessed.isChangeRequested(); // change is requested
 
             if (showAcceptButton && pump.isInitialized() && !pump.isSuspended() && LoopPlugin.getPlugin().isEnabled(PluginType.LOOP)) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.java
index cae9817a55..0fd820a4da 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.java
@@ -502,8 +502,8 @@ public class ActionStringHandler {
                 if (LoopPlugin.lastRun.lastAPSRun != null)
                     ret += "\nLast Run: " + DateUtil.timeString(LoopPlugin.lastRun.lastAPSRun);
 
-                if (LoopPlugin.lastRun.lastEnact != null)
-                    ret += "\nLast Enact: " + DateUtil.timeString(LoopPlugin.lastRun.lastEnact);
+                if (LoopPlugin.lastRun.lastTBREnact != 0)
+                    ret += "\nLast Enact: " + DateUtil.timeString(LoopPlugin.lastRun.lastTBREnact);
 
             }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
index 39676f17b4..2293473338 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
@@ -735,7 +735,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
             //OpenAPS status
             if (Config.APS) {
                 //we are AndroidAPS
-                openApsStatus = LoopPlugin.lastRun != null && LoopPlugin.lastRun.lastEnact != null && LoopPlugin.lastRun.lastEnact.getTime() != 0 ? LoopPlugin.lastRun.lastEnact.getTime() : -1;
+                openApsStatus = LoopPlugin.lastRun != null && LoopPlugin.lastRun.lastTBREnact != 0 ? LoopPlugin.lastRun.lastTBREnact : -1;
             } else {
                 //NSClient or remote
                 openApsStatus = NSDeviceStatus.getOpenApsTimestamp();
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java b/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
index b03d8cb43f..aa228b96ca 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
@@ -141,6 +141,14 @@ public class DateUtil {
         return new DateTime(mills).toString(DateTimeFormat.forPattern(format));
     }
 
+    public static String timeStringWithSeconds(long mills) {
+        String format = "hh:mm:ssa";
+        if (android.text.format.DateFormat.is24HourFormat(MainApp.instance())) {
+            format = "HH:mm:ss";
+        }
+        return new DateTime(mills).toString(DateTimeFormat.forPattern(format));
+    }
+
     public static String timeFullString(long mills) {
         return new DateTime(mills).toString(DateTimeFormat.fullTime());
     }
@@ -158,6 +166,11 @@ public class DateUtil {
         return dateString(mills) + " " + timeString(mills);
     }
 
+    public static String dateAndTimeAndSecondsString(long mills) {
+        if (mills == 0) return "";
+        return dateString(mills) + " " + timeStringWithSeconds(mills);
+    }
+
     public static String dateAndTimeFullString(long mills) {
         return dateString(mills) + " " + timeFullString(mills);
     }
diff --git a/app/src/main/res/layout/loop_fragment.xml b/app/src/main/res/layout/loop_fragment.xml
index ef24280345..3b5066e533 100644
--- a/app/src/main/res/layout/loop_fragment.xml
+++ b/app/src/main/res/layout/loop_fragment.xml
@@ -57,51 +57,6 @@
 
             </LinearLayout>
 
-            <View
-                android:layout_width="fill_parent"
-                android:layout_height="2dip"
-                android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginTop="5dp"
-                android:background="@color/listdelimiter" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="2"
-                    android:gravity="end"
-                    android:paddingRight="5dp"
-                    android:text="@string/openapsma_lastenact_label"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:layout_width="5dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:gravity="center_horizontal"
-                    android:paddingEnd="2dp"
-                    android:paddingStart="2dp"
-                    android:text=":"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:id="@+id/loop_lastenact"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="start"
-                    android:paddingLeft="5dp"
-                    android:textColor="@android:color/white"
-                    android:textSize="14sp" />
-
-            </LinearLayout>
-
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
@@ -282,6 +237,96 @@
 
             </LinearLayout>
 
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/loop_tbrrequest_time_label"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/loop_tbrrequest_time"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/loop_tbrexecution_time_label"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/loop_tbrexecution_time"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
@@ -327,6 +372,96 @@
 
             </LinearLayout>
 
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/loop_smbrequest_time_label"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/loop_smbrequest_time"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/loop_smbexecution_time_label"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/loop_smbexecution_time"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 16783a882b..071021fa54 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1693,5 +1693,9 @@
     <string name="phonechecker">\"PhoneChecker\"</string>
     <string name="chartmenu">Chart menu</string>
     <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">SMB request time</string>
+    <string name="loop_smbexecution_time_label">SMB execution time</string>
+    <string name="loop_tbrrequest_time_label">Temp basal request time</string>
+    <string name="loop_tbrexecution_time_label">Temp basal execution time</string>
 
 </resources>

From db47cd6fe9f52398380acdce94af9d0fde7570f4 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 3 Feb 2020 18:23:20 +0100
Subject: [PATCH 07/56] Android 10 permission

---
 .../nightscout/androidaps/MainActivity.java   |  2 ++
 .../overview/notifications/Notification.java  |  1 +
 .../androidaps/utils/AndroidPermission.java   | 19 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 23 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.java b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
index 8fa855cd7b..f74a58856f 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
@@ -147,6 +147,7 @@ public class MainActivity extends NoSplashAppCompatActivity {
         if (Config.PUMPDRIVERS) {
             AndroidPermission.notifyForLocationPermissions(this);
             AndroidPermission.notifyForSMSPermissions(this);
+            AndroidPermission.notifyForSystemWindowPermissions(this);
         }
     }
 
@@ -245,6 +246,7 @@ public class MainActivity extends NoSplashAppCompatActivity {
                     case AndroidPermission.CASE_SMS:
                     case AndroidPermission.CASE_BATTERY:
                     case AndroidPermission.CASE_PHONE_STATE:
+                    case AndroidPermission.CASE_SYSTEM_WINDOW:
                         break;
                 }
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
index 28b0abd33d..dde005ba20 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
@@ -78,6 +78,7 @@ public class Notification {
     public static final int USERMESSAGE = 53;
     public static final int OVER_24H_TIME_CHANGE_REQUESTED = 54;
     public static final int INVALID_VERSION = 55;
+    public static final int PERMISSION_SYSTEM_WINDOW = 56;
 
 
     public int id;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java
index fdee5417a3..d884552ac4 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java
@@ -32,6 +32,7 @@ public class AndroidPermission {
     public static final int CASE_LOCATION = 0x3;
     public static final int CASE_BATTERY = 0x4;
     public static final int CASE_PHONE_STATE = 0x5;
+    public static final int CASE_SYSTEM_WINDOW = 0x6;
 
     private static boolean permission_battery_optimization_failed = false;
 
@@ -130,4 +131,22 @@ public class AndroidPermission {
         } else
             RxBus.INSTANCE.send(new EventDismissNotification(Notification.PERMISSION_LOCATION));
     }
+
+    public static synchronized void notifyForSystemWindowPermissions(Activity activity) {
+        if (!Settings.canDrawOverlays(activity)) {
+            NotificationWithAction notification = new NotificationWithAction(Notification.PERMISSION_SYSTEM_WINDOW, MainApp.gs(R.string.needsystemwindowpermission), Notification.URGENT);
+            notification.action(R.string.request, () -> {
+                        // Check if Android Q or higher
+                        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
+                            // Show alert dialog to the user saying a separate permission is needed
+                            // Launch the settings activity if the user prefers
+                            Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                                    Uri.parse("package:" + activity.getPackageName()));
+                            activity.startActivity(intent);
+                        }
+                    });
+            RxBus.INSTANCE.send(new EventNewNotification(notification));
+        } else
+            RxBus.INSTANCE.send(new EventDismissNotification(Notification.PERMISSION_SYSTEM_WINDOW));
+    }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 071021fa54..2e06c2a027 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1102,6 +1102,7 @@
     <string name="startobjective">Start your first objective</string>
     <string name="permission">Permission</string>
     <string name="askforpermission">Ask for permission</string>
+    <string name="needsystemwindowpermission">Application needs system window permission for notifications</string>
     <string name="needlocationpermission">Application needs location permission for BT scan</string>
     <string name="needstoragepermission">Application needs storage permission to be able store log files</string>
     <string name="request">Request</string>

From aaf66efa640d6ab1ea49f8667d455baab1364acd Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 3 Feb 2020 22:05:48 +0100
Subject: [PATCH 08/56] write offline events directly to DB

---
 .../plugins/aps/loop/LoopPlugin.java          | 22 +++++++++++++++++--
 .../automation/actions/ActionLoopResume.java  |  2 +-
 .../plugins/general/nsclient/NSUpload.java    |  8 +++----
 .../general/overview/OverviewFragment.java    |  6 ++---
 .../smsCommunicator/SmsCommunicatorPlugin.kt  |  4 ++--
 5 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index b0d6f89065..4710cf9b64 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -14,6 +14,8 @@ import android.os.SystemClock;
 import androidx.annotation.NonNull;
 import androidx.core.app.NotificationCompat;
 
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -697,7 +699,7 @@ public class LoopPlugin extends PluginBase {
                 }
             });
         }
-        NSUpload.uploadOpenAPSOffline(durationInMinutes);
+        createOfflineEvent(durationInMinutes);
     }
 
     public void suspendLoop(int durationInMinutes) {
@@ -715,7 +717,23 @@ public class LoopPlugin extends PluginBase {
                 }
             }
         });
-        NSUpload.uploadOpenAPSOffline(durationInMinutes);
+        createOfflineEvent(durationInMinutes);
     }
 
+    public void createOfflineEvent(int durationInMinutes) {
+        JSONObject data = new JSONObject();
+        try {
+            data.put("eventType", CareportalEvent.OPENAPSOFFLINE);
+            data.put("duration", durationInMinutes);
+        } catch (JSONException e) {
+            log.error("Unhandled exception", e);
+        }
+        CareportalEvent event = new CareportalEvent();
+        event.date = DateUtil.now();
+        event.source = Source.USER;
+        event.eventType = CareportalEvent.OPENAPSOFFLINE;
+        event.json = data.toString();
+        MainApp.getDbHelper().createOrUpdate(event);
+        NSUpload.uploadOpenAPSOffline(event);
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.java
index 38e5dee33a..16b478bbc2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.java
@@ -28,7 +28,7 @@ public class ActionLoopResume extends Action {
         if (LoopPlugin.getPlugin().isSuspended()) {
             LoopPlugin.getPlugin().suspendTo(0);
             ConfigBuilderPlugin.getPlugin().storeSettings("ActionLoopResume");
-            NSUpload.uploadOpenAPSOffline(0);
+            LoopPlugin.getPlugin().createOfflineEvent(0);
             RxBus.INSTANCE.send(new EventRefreshOverview("ActionLoopResume"));
             if (callback != null)
                 callback.result(new PumpEnactResult().success(true).comment(R.string.ok)).run();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
index 7fd6694481..0bc15d1d45 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
@@ -336,12 +336,10 @@ public class NSUpload {
         UploadQueue.add(new DbRequest("dbRemove", "treatments", _id));
     }
 
-    public static void uploadOpenAPSOffline(double durationInMinutes) {
+    public static void uploadOpenAPSOffline(CareportalEvent event) {
         try {
-            JSONObject data = new JSONObject();
-            data.put("eventType", "OpenAPS Offline");
-            data.put("duration", durationInMinutes);
-            data.put("created_at", DateUtil.toISOString(new Date()));
+            JSONObject data = new JSONObject(event.json);
+            data.put("created_at", DateUtil.toISOString(event.date));
             data.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
             UploadQueue.add(new DbRequest("dbAdd", "treatments", data));
         } catch (JSONException e) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
index be963d7a9a..931cca544b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
@@ -679,14 +679,14 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                     }
                 }
             });
-            NSUpload.uploadOpenAPSOffline(24 * 60); // upload 24h, we don't know real duration
+            LoopPlugin.getPlugin().createOfflineEvent(24 * 60); // upload 24h, we don't know real duration
             return true;
         } else if (item.getTitle().equals(MainApp.gs(R.string.enableloop))) {
             loopPlugin.setPluginEnabled(PluginType.LOOP, true);
             loopPlugin.setFragmentVisible(PluginType.LOOP, true);
             ConfigBuilderPlugin.getPlugin().storeSettings("EnablingLoop");
             updateGUI("suspendmenu");
-            NSUpload.uploadOpenAPSOffline(0);
+            LoopPlugin.getPlugin().createOfflineEvent(0);
             return true;
         } else if (item.getTitle().equals(MainApp.gs(R.string.resume)) ||
                 item.getTitle().equals(MainApp.gs(R.string.reconnect))) {
@@ -701,7 +701,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 }
             });
             SP.putBoolean(R.string.key_objectiveusereconnect, true);
-            NSUpload.uploadOpenAPSOffline(0);
+            LoopPlugin.getPlugin().createOfflineEvent(0);
             return true;
         } else if (item.getTitle().equals(MainApp.gs(R.string.suspendloopfor1h))) {
             LoopPlugin.getPlugin().suspendLoop(60);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
index c180dffe83..0021574812 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@@ -330,7 +330,7 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
             "RESUME" -> {
                 LoopPlugin.getPlugin().suspendTo(0)
                 send(EventRefreshOverview("SMS_LOOP_RESUME"))
-                NSUpload.uploadOpenAPSOffline(0.0)
+                LoopPlugin.getPlugin().createOfflineEvent(0)
                 sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, R.string.smscommunicator_loopresumed))
             }
             "SUSPEND" -> {
@@ -352,7 +352,7 @@ object SmsCommunicatorPlugin : PluginBase(PluginDescription()
                                 override fun run() {
                                     if (result.success) {
                                         LoopPlugin.getPlugin().suspendTo(System.currentTimeMillis() + anInteger() * 60L * 1000)
-                                        NSUpload.uploadOpenAPSOffline(anInteger() * 60.toDouble())
+                                        LoopPlugin.getPlugin().createOfflineEvent(anInteger() * 60)
                                         send(EventRefreshOverview("SMS_LOOP_SUSPENDED"))
                                         val replyText = MainApp.gs(R.string.smscommunicator_loopsuspended) + " " +
                                                 MainApp.gs(if (result.success) R.string.smscommunicator_tempbasalcanceled else R.string.smscommunicator_tempbasalcancelfailed)

From 850e79a068fbffa9f0c1fd885e528da9beba9f6c Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 3 Feb 2020 22:42:13 +0100
Subject: [PATCH 09/56] fix tests

---
 .../plugins/general/automation/actions/ActionLoopResumeTest.java | 1 +
 .../general/automation/actions/ActionLoopSuspendTest.java        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.java
index c690681513..5e367942ea 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.java
@@ -62,6 +62,7 @@ public class ActionLoopResumeTest {
     public void prepareTest() {
         AAPSMocker.mockMainApp();
         AAPSMocker.mockApplicationContext();
+        AAPSMocker.mockDatabaseHelper();
         AAPSMocker.mockStrings();
         AAPSMocker.mockSP();
         AAPSMocker.mockConfigBuilder();
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.java
index 67e22b0d5b..142536681d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.java
@@ -79,6 +79,7 @@ public class ActionLoopSuspendTest {
     public void prepareTest() {
         AAPSMocker.mockMainApp();
         AAPSMocker.mockApplicationContext();
+        AAPSMocker.mockDatabaseHelper();
         AAPSMocker.mockStrings();
         AAPSMocker.mockSP();
         AAPSMocker.mockConfigBuilder();

From a79393c65a7f0d9861e3ee66f7537cc2b598a931 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 4 Feb 2020 22:25:07 +0100
Subject: [PATCH 10/56] Log user actions

---
 .../androidaps/dialogs/CalibrationDialog.kt     |  1 +
 .../androidaps/dialogs/CarbsDialog.kt           |  5 +++++
 .../nightscout/androidaps/dialogs/CareDialog.kt |  1 +
 .../dialogs/DialogFragmentWithDate.kt           |  2 +-
 .../androidaps/dialogs/ErrorDialog.kt           |  5 +++--
 .../androidaps/dialogs/ExtendedBolusDialog.kt   |  1 +
 .../nightscout/androidaps/dialogs/FillDialog.kt |  3 +++
 .../androidaps/dialogs/InsulinDialog.kt         |  3 +++
 .../androidaps/dialogs/ProfileSwitchDialog.kt   |  1 +
 .../androidaps/dialogs/TempBasalDialog.kt       |  2 ++
 .../androidaps/dialogs/TempTargetDialog.kt      |  1 +
 .../androidaps/dialogs/TreatmentDialog.kt       |  1 +
 .../plugins/general/actions/ActionsFragment.kt  |  5 +++++
 .../general/overview/OverviewFragment.java      | 17 +++++++++++++++++
 .../nightscout/androidaps/utils/BolusWizard.kt  |  2 ++
 15 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
index 949e4e5fef..9503988dce 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
@@ -56,6 +56,7 @@ class CalibrationDialog : DialogFragmentWithDate() {
         if (bg > 0) {
             activity?.let { activity ->
                 OKDialog.showConfirmation(activity, MainApp.gs(R.string.overview_calibration), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+                    log.debug("USER ENTRY: CALIBRATION $bg")
                     XdripCalibrations.confirmAndSendCalibration(bg, context)
                 })
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
index de457068c5..1f0c6643c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
@@ -177,6 +177,7 @@ class CarbsDialog : DialogFragmentWithDate() {
             activity?.let { activity ->
                 OKDialog.showConfirmation(activity, MainApp.gs(R.string.carbs), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
                     if (activitySelected) {
+                        log.debug("USER ENTRY: TEMPTARGET ACTIVITY $activityTT duration: $activityTTDuration")
                         val tempTarget = TempTarget()
                             .date(eventTime)
                             .duration(activityTTDuration)
@@ -186,6 +187,7 @@ class CarbsDialog : DialogFragmentWithDate() {
                             .high(Profile.toMgdl(activityTT, ProfileFunctions.getSystemUnits()))
                         TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget)
                     } else if (eatingSoonSelected) {
+                        log.debug("USER ENTRY: TEMPTARGET EATING SOON $eatingSoonTT duration: $eatingSoonTTDuration")
                         val tempTarget = TempTarget()
                             .date(eventTime)
                             .duration(eatingSoonTTDuration)
@@ -195,6 +197,7 @@ class CarbsDialog : DialogFragmentWithDate() {
                             .high(Profile.toMgdl(eatingSoonTT, ProfileFunctions.getSystemUnits()))
                         TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget)
                     } else if (hypoSelected) {
+                        log.debug("USER ENTRY: TEMPTARGET HYPO $hypoTT duration: $hypoTTDuration")
                         val tempTarget = TempTarget()
                             .date(eventTime)
                             .duration(hypoTTDuration)
@@ -206,8 +209,10 @@ class CarbsDialog : DialogFragmentWithDate() {
                     }
                     if (carbsAfterConstraints > 0) {
                         if (duration == 0) {
+                            log.debug("USER ENTRY: CARBS $carbsAfterConstraints time: $time")
                             CarbsGenerator.createCarb(carbsAfterConstraints, time, CareportalEvent.CARBCORRECTION, notes)
                         } else {
+                            log.debug("USER ENTRY: CARBS $carbsAfterConstraints time: $time duration: $duration")
                             CarbsGenerator.generateCarbs(carbsAfterConstraints, time, duration, notes)
                             NSUpload.uploadEvent(CareportalEvent.NOTE, time - 2000, MainApp.gs(R.string.generated_ecarbs_note, carbsAfterConstraints, duration, timeOffset))
                         }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
index 0e47049cf1..da4a091b1d 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
@@ -180,6 +180,7 @@ class CareDialog : DialogFragmentWithDate() {
                     EventType.EXERCISE       -> CareportalEvent.EXERCISE
                 }
                 careportalEvent.json = json.toString()
+                log.debug("USER ENTRY: CAREPORTAL ${careportalEvent.eventType} json: ${careportalEvent.json}")
                 MainApp.getDbHelper().createOrUpdate(careportalEvent)
                 NSUpload.uploadCareportalEntryToNS(json)
             }, null)
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
index da45e77990..ecaea0bc81 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
@@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory
 import java.util.*
 
 abstract class DialogFragmentWithDate : DialogFragment() {
-    private val log = LoggerFactory.getLogger(DialogFragmentWithDate::class.java)
+    val log = LoggerFactory.getLogger(DialogFragmentWithDate::class.java)
 
     var eventTime = DateUtil.now()
     var eventTimeChanged = false
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt
index 538a2ca483..c084df7bf3 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt
@@ -36,6 +36,7 @@ class ErrorDialog : DialogFragment() {
             bundle.getString("title")?.let { title = it }
             sound = bundle.getInt("sound", R.raw.error)
         }
+        log.debug("Error dialog displayed")
         return inflater.inflate(R.layout.dialog_error, container, false)
     }
 
@@ -44,11 +45,11 @@ class ErrorDialog : DialogFragment() {
 
         error_title.text = title
         overview_error_ok.setOnClickListener {
-            log.debug("Error dialog ok button pressed")
+            log.debug("USER ENTRY: Error dialog ok button pressed")
             dismiss()
         }
         overview_error_mute.setOnClickListener {
-            log.debug("Error dialog mute button pressed")
+            log.debug("USER ENTRY: Error dialog mute button pressed")
             stopAlarm()
         }
         startAlarm()
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
index a717e79b49..dee77051fd 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
@@ -63,6 +63,7 @@ class ExtendedBolusDialog : DialogFragmentWithDate() {
 
         activity?.let { activity ->
             OKDialog.showConfirmation(activity, MainApp.gs(R.string.extended_bolus), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+                log.debug("USER ENTRY: EXTENDED BOLUS $insulinAfterConstraint duration: $durationInMinutes")
                 ConfigBuilderPlugin.getPlugin().commandQueue.extendedBolus(insulinAfterConstraint, durationInMinutes, object : Callback() {
                     override fun run() {
                         if (!result.success) {
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
index 273d0b800d..a840384de0 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
@@ -102,13 +102,16 @@ class FillDialog : DialogFragmentWithDate() {
             activity?.let { activity ->
                 OKDialog.showConfirmation(activity, MainApp.gs(R.string.primefill), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
                     if (insulinAfterConstraints > 0) {
+                        log.debug("USER ENTRY: PRIME BOLUS $insulinAfterConstraints")
                         requestPrimeBolus(insulinAfterConstraints, notes)
                     }
                     if (siteChange) {
+                        log.debug("USER ENTRY: SITE CHANGE")
                         generateCareportalEvent(CareportalEvent.SITECHANGE, eventTime, notes)
                     }
                     if (insulinChange) {
                         // add a second for case of both checked
+                        log.debug("USER ENTRY: INSULIN CHANGE")
                         generateCareportalEvent(CareportalEvent.INSULINCHANGE, eventTime + 1000, notes)
                     }
                 }, null)
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
index d6f64d87f1..42bc395b8b 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
@@ -147,6 +147,7 @@ class InsulinDialog : DialogFragmentWithDate() {
             activity?.let { activity ->
                 OKDialog.showConfirmation(activity, MainApp.gs(R.string.bolus), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
                     if (eatingSoonChecked) {
+                        log.debug("USER ENTRY: TEMPTARGET EATING SOON $eatingSoonTT duration: $eatingSoonTTDuration")
                         val tempTarget = TempTarget()
                             .date(System.currentTimeMillis())
                             .duration(eatingSoonTTDuration)
@@ -164,9 +165,11 @@ class InsulinDialog : DialogFragmentWithDate() {
                         detailedBolusInfo.source = Source.USER
                         detailedBolusInfo.notes = notes
                         if (recordOnlyChecked) {
+                            log.debug("USER ENTRY: BOLUS RECORD ONLY $insulinAfterConstraints")
                             detailedBolusInfo.date = time
                             TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, false)
                         } else {
+                            log.debug("USER ENTRY: BOLUS $insulinAfterConstraints")
                             detailedBolusInfo.date = DateUtil.now()
                             ConfigBuilderPlugin.getPlugin().commandQueue.bolus(detailedBolusInfo, object : Callback() {
                                 override fun run() {
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
index 5df248593c..f594564a78 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
@@ -97,6 +97,7 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
 
         activity?.let { activity ->
             OKDialog.showConfirmation(activity, MainApp.gs(R.string.careportal_profileswitch), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+                log.debug("USER ENTRY: PROFILE SWITCH $profile percent: $percent timeshift: $timeShift duration: $duration")
                 ProfileFunctions.doProfileSwitch(profileStore, profile, duration.toInt(), percent, timeShift, eventTime)
             })
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
index dc31349650..d821aec56b 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
@@ -104,8 +104,10 @@ class TempBasalDialog : DialogFragmentWithDate() {
                     }
                 }
                 if (isPercentPump) {
+                    log.debug("USER ENTRY: TEMP BASAL $percent% duration: $durationInMinutes")
                     ConfigBuilderPlugin.getPlugin().commandQueue.tempBasalPercent(percent, durationInMinutes, true, profile, callback)
                 } else {
+                    log.debug("USER ENTRY: TEMP BASAL $absolute duration: $durationInMinutes")
                     ConfigBuilderPlugin.getPlugin().commandQueue.tempBasalAbsolute(absolute, durationInMinutes, true, profile, callback)
                 }
             })
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
index 5408105a71..77cb0b6823 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
@@ -127,6 +127,7 @@ class TempTargetDialog : DialogFragmentWithDate() {
 
         activity?.let { activity ->
             OKDialog.showConfirmation(activity, MainApp.gs(R.string.careportal_temporarytarget), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+                log.debug("USER ENTRY: TEMP TARGET $target duration: $duration")
                 if (target == 0.0 || duration == 0.0) {
                     val tempTarget = TempTarget()
                         .date(eventTime)
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
index 8667befaf2..565a65f54f 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
@@ -99,6 +99,7 @@ class TreatmentDialog : DialogFragmentWithDate() {
         if (insulinAfterConstraints > 0 || carbsAfterConstraints > 0) {
             activity?.let { activity ->
                 OKDialog.showConfirmation(activity, MainApp.gs(R.string.overview_treatment_label), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+                    log.debug("USER ENTRY: BOLUS insulin $insulin carbs: $carbs")
                     val detailedBolusInfo = DetailedBolusInfo()
                     if (insulinAfterConstraints == 0.0) detailedBolusInfo.eventType = CareportalEvent.CARBCORRECTION
                     if (carbsAfterConstraints == 0) detailedBolusInfo.eventType = CareportalEvent.CORRECTIONBOLUS
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
index 4977cd6f9f..e68df84fdf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
@@ -27,6 +27,7 @@ import info.nightscout.androidaps.plugins.general.careportal.CareportalFragment
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.dialogs.ProfileSwitchDialog
 import info.nightscout.androidaps.dialogs.TempTargetDialog
+import info.nightscout.androidaps.logging.L
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.*
@@ -34,9 +35,11 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.actions_fragment.*
 import kotlinx.android.synthetic.main.careportal_stats_fragment.*
+import org.slf4j.LoggerFactory
 import java.util.*
 
 class ActionsFragment : Fragment() {
+    private val log = LoggerFactory.getLogger(L.CORE)
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -67,6 +70,7 @@ class ActionsFragment : Fragment() {
         }
         actions_extendedbolus_cancel.setOnClickListener {
             if (TreatmentsPlugin.getPlugin().isInHistoryExtendedBoluslInProgress) {
+                log.debug("USER ENTRY: CANCEL EXTENDED BOLUS")
                 ConfigBuilderPlugin.getPlugin().commandQueue.cancelExtended(object : Callback() {
                     override fun run() {
                         if (!result.success) {
@@ -86,6 +90,7 @@ class ActionsFragment : Fragment() {
         }
         actions_canceltempbasal.setOnClickListener {
             if (TreatmentsPlugin.getPlugin().isTempBasalInProgress) {
+                log.debug("USER ENTRY: CANCEL TEMP BASAL")
                 ConfigBuilderPlugin.getPlugin().commandQueue.cancelTempBasal(true, object : Callback() {
                     override fun run() {
                         if (!result.success) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
index 931cca544b..0976755f06 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
@@ -667,6 +667,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             return true;
         final LoopPlugin loopPlugin = LoopPlugin.getPlugin();
         if (item.getTitle().equals(MainApp.gs(R.string.disableloop))) {
+            log.debug("USER ENTRY: LOOP DISABLED");
             loopPlugin.setPluginEnabled(PluginType.LOOP, false);
             loopPlugin.setFragmentVisible(PluginType.LOOP, false);
             ConfigBuilderPlugin.getPlugin().storeSettings("DisablingLoop");
@@ -682,6 +683,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             LoopPlugin.getPlugin().createOfflineEvent(24 * 60); // upload 24h, we don't know real duration
             return true;
         } else if (item.getTitle().equals(MainApp.gs(R.string.enableloop))) {
+            log.debug("USER ENTRY: LOOP ENABLED");
             loopPlugin.setPluginEnabled(PluginType.LOOP, true);
             loopPlugin.setFragmentVisible(PluginType.LOOP, true);
             ConfigBuilderPlugin.getPlugin().storeSettings("EnablingLoop");
@@ -690,6 +692,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             return true;
         } else if (item.getTitle().equals(MainApp.gs(R.string.resume)) ||
                 item.getTitle().equals(MainApp.gs(R.string.reconnect))) {
+            log.debug("USER ENTRY: RESUME");
             loopPlugin.suspendTo(0L);
             updateGUI("suspendmenu");
             ConfigBuilderPlugin.getPlugin().getCommandQueue().cancelTempBasal(true, new Callback() {
@@ -704,39 +707,48 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             LoopPlugin.getPlugin().createOfflineEvent(0);
             return true;
         } else if (item.getTitle().equals(MainApp.gs(R.string.suspendloopfor1h))) {
+            log.debug("USER ENTRY: SUSPEND 1h");
             LoopPlugin.getPlugin().suspendLoop(60);
             updateGUI("suspendmenu");
             return true;
         } else if (item.getTitle().equals(MainApp.gs(R.string.suspendloopfor2h))) {
+            log.debug("USER ENTRY: SUSPEND 2h");
             LoopPlugin.getPlugin().suspendLoop(120);
             updateGUI("suspendmenu");
             return true;
         } else if (item.getTitle().equals(MainApp.gs(R.string.suspendloopfor3h))) {
+            log.debug("USER ENTRY: SUSPEND 3h");
             LoopPlugin.getPlugin().suspendLoop(180);
             updateGUI("suspendmenu");
             return true;
         } else if (item.getTitle().equals(MainApp.gs(R.string.suspendloopfor10h))) {
+            log.debug("USER ENTRY: SUSPEND 10h");
             LoopPlugin.getPlugin().suspendLoop(600);
             updateGUI("suspendmenu");
             return true;
         } else if (item.getTitle().equals(MainApp.gs(R.string.disconnectpumpfor15m))) {
+            log.debug("USER ENTRY: DISCONNECT 15m");
             LoopPlugin.getPlugin().disconnectPump(15, profile);
             updateGUI("suspendmenu");
             return true;
         } else if (item.getTitle().equals(MainApp.gs(R.string.disconnectpumpfor30m))) {
+            log.debug("USER ENTRY: DISCONNECT 30m");
             LoopPlugin.getPlugin().disconnectPump(30, profile);
             updateGUI("suspendmenu");
             return true;
         } else if (item.getTitle().equals(MainApp.gs(R.string.disconnectpumpfor1h))) {
+            log.debug("USER ENTRY: DISCONNECT 1h");
             LoopPlugin.getPlugin().disconnectPump(60, profile);
             SP.putBoolean(R.string.key_objectiveusedisconnect, true);
             updateGUI("suspendmenu");
             return true;
         } else if (item.getTitle().equals(MainApp.gs(R.string.disconnectpumpfor2h))) {
+            log.debug("USER ENTRY: DISCONNECT 2h");
             LoopPlugin.getPlugin().disconnectPump(120, profile);
             updateGUI("suspendmenu");
             return true;
         } else if (item.getTitle().equals(MainApp.gs(R.string.disconnectpumpfor3h))) {
+            log.debug("USER ENTRY: DISCONNECT 3h");
             LoopPlugin.getPlugin().disconnectPump(180, profile);
             updateGUI("suspendmenu");
             return true;
@@ -754,6 +766,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             if (manager != null)
                 pvd.show(manager, "ProfileViewDialog");
         } else if (item.getTitle().equals(MainApp.gs(R.string.eatingsoon))) {
+            log.debug("USER ENTRY: TEMP TARGET EATING SOON");
             double target = Profile.toMgdl(DefaultValueHelper.determineEatingSoonTT(), ProfileFunctions.getSystemUnits());
             TempTarget tempTarget = new TempTarget()
                     .date(System.currentTimeMillis())
@@ -764,6 +777,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                     .high(target);
             TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget);
         } else if (item.getTitle().equals(MainApp.gs(R.string.activity))) {
+            log.debug("USER ENTRY: TEMP TARGET ACTIVITY");
             double target = Profile.toMgdl(DefaultValueHelper.determineActivityTT(), ProfileFunctions.getSystemUnits());
             TempTarget tempTarget = new TempTarget()
                     .date(now())
@@ -774,6 +788,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                     .high(target);
             TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget);
         } else if (item.getTitle().equals(MainApp.gs(R.string.hypo))) {
+            log.debug("USER ENTRY: TEMP TARGET HYPO");
             double target = Profile.toMgdl(DefaultValueHelper.determineHypoTT(), ProfileFunctions.getSystemUnits());
             TempTarget tempTarget = new TempTarget()
                     .date(now())
@@ -788,6 +803,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             if (manager != null)
                 new TempTargetDialog().show(manager, "Overview");
         } else if (item.getTitle().equals(MainApp.gs(R.string.cancel))) {
+            log.debug("USER ENTRY: TEMP TARGET CANCEL");
             TempTarget tempTarget = new TempTarget()
                     .source(Source.USER)
                     .date(now())
@@ -907,6 +923,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             final LoopPlugin.LastRun finalLastRun = LoopPlugin.lastRun;
             if (finalLastRun != null && finalLastRun.lastAPSRun != null && finalLastRun.constraintsProcessed.isChangeRequested()) {
                 OKDialog.showConfirmation(context, MainApp.gs(R.string.pump_tempbasal_label), finalLastRun.constraintsProcessed.toSpanned(), () -> {
+                    log.debug("USER ENTRY: ACCEPT TEMP BASAL");
                     hideTempRecommendation();
                     clearNotification();
                     LoopPlugin.getPlugin().acceptChangeRequest();
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.kt b/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.kt
index 6d71a80ba1..ea4da238cb 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.kt
@@ -277,6 +277,7 @@ class BolusWizard @JvmOverloads constructor(val profile: Profile,
             OKDialog.showConfirmation(context, MainApp.gs(R.string.boluswizard), HtmlHelper.fromHtml(confirmMessage), Runnable {
                 if (insulinAfterConstraints > 0 || carbs > 0) {
                     if (useSuperBolus) {
+                        log.debug("USER ENTRY: SUPERBOLUS TBR")
                         val loopPlugin = LoopPlugin.getPlugin()
                         if (loopPlugin.isEnabled(PluginType.LOOP)) {
                             loopPlugin.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000)
@@ -325,6 +326,7 @@ class BolusWizard @JvmOverloads constructor(val profile: Profile,
                     detailedBolusInfo.boluscalc = nsJSON()
                     detailedBolusInfo.source = Source.USER
                     detailedBolusInfo.notes = notes
+                    log.debug("USER ENTRY: BOLUS insulin $insulinAfterConstraints carbs: $carbs")
                     if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getPlugin().activePump?.pumpDescription?.storesCarbInfo == true) {
                         ConfigBuilderPlugin.getPlugin().commandQueue.bolus(detailedBolusInfo, object : Callback() {
                             override fun run() {

From d5a7db8be73ff6ad9df33136c33d0ef827c39f00 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 4 Feb 2020 22:25:58 +0100
Subject: [PATCH 11/56] 2.6-dev-a

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index b5e47ec4ae..53b0398a43 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -109,7 +109,7 @@ android {
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.6-dev"
+        version "2.6-dev-a"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'

From 7b984550ea198ebc4f052ed03cf227783965c04b Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 4 Feb 2020 22:25:28 +0100
Subject: [PATCH 12/56] New Crowdin translations (#2423)

* New translations strings.xml (Korean)

* New translations objectives.xml (Korean)

* New translations objectives.xml (Korean)

* New translations strings.xml (Slovenian)

* New translations insight_alert_codes.xml (Slovenian)

* New translations insight_alert_descriptions.xml (Slovenian)

* New translations insight_alert_titles.xml (Slovenian)

* New translations insight_exceptions.xml (Slovenian)

* New translations exam.xml (Slovenian)

* New translations objectives.xml (Slovenian)

* New translations strings.xml (Slovenian)

* New translations strings.xml (French)

* New translations strings.xml (Korean)

* New translations exam.xml (Korean)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Russian)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (German)

* New translations strings.xml (Italian)
---
 app/src/main/res/values-de-rDE/strings.xml    |  5 +++++
 app/src/main/res/values-it-rIT/strings.xml    |  4 ++++
 app/src/main/res/values-ko-rKR/exam.xml       |  6 +++---
 app/src/main/res/values-ko-rKR/objectives.xml |  8 ++++----
 app/src/main/res/values-ko-rKR/strings.xml    | 15 +++++++++-----
 app/src/main/res/values-pt-rBR/strings.xml    |  2 ++
 app/src/main/res/values-ru-rRU/strings.xml    |  5 +++++
 app/src/main/res/values-sl-rSI/exam.xml       |  3 +++
 .../res/values-sl-rSI/insight_alert_codes.xml |  3 +++
 .../insight_alert_descriptions.xml            |  3 +++
 .../values-sl-rSI/insight_alert_titles.xml    |  3 +++
 .../res/values-sl-rSI/insight_exceptions.xml  |  3 +++
 app/src/main/res/values-sl-rSI/objectives.xml |  3 +++
 app/src/main/res/values-sl-rSI/strings.xml    | 20 +++++++++++++++++++
 wear/src/main/res/values-fr-rFR/strings.xml   |  2 +-
 wear/src/main/res/values-sl-rSI/strings.xml   |  3 +++
 16 files changed, 75 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/values-sl-rSI/exam.xml
 create mode 100644 app/src/main/res/values-sl-rSI/insight_alert_codes.xml
 create mode 100644 app/src/main/res/values-sl-rSI/insight_alert_descriptions.xml
 create mode 100644 app/src/main/res/values-sl-rSI/insight_alert_titles.xml
 create mode 100644 app/src/main/res/values-sl-rSI/insight_exceptions.xml
 create mode 100644 app/src/main/res/values-sl-rSI/objectives.xml
 create mode 100644 app/src/main/res/values-sl-rSI/strings.xml
 create mode 100644 wear/src/main/res/values-sl-rSI/strings.xml

diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index ad2e7a7629..8673afb35a 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -946,6 +946,7 @@
     <string name="startobjective">Starte deine erste Zielsetzung</string>
     <string name="permission">Berechtigung</string>
     <string name="askforpermission">Nach Berechtigung fragen</string>
+    <string name="needsystemwindowpermission">Die App benötigt die Systemberechtigung für App-Benachrichtigungen</string>
     <string name="needlocationpermission">AndroidAPS benötigt die Standortfreigabe für den BT-Scan.</string>
     <string name="needstoragepermission">AndroidAPS benötigt Zugriff auf den Speicher, um Log-Dateien speichern zu können.</string>
     <string name="request">Anfordern</string>
@@ -1450,4 +1451,8 @@ Unerwartetes Verhalten.</string>
     <string name="phonechecker">\"PhoneChecker\"</string>
     <string name="chartmenu">Diagrammmenü</string>
     <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">SMB Anfragezeit</string>
+    <string name="loop_smbexecution_time_label">SMB Ausführungszeit</string>
+    <string name="loop_tbrrequest_time_label">Temp. BR Anfragezeit</string>
+    <string name="loop_tbrexecution_time_label">Temp. BR Ausführungszeit</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 8f8afcf3b8..cbf0f50945 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -1449,4 +1449,8 @@
     <string name="phonechecker">\"PhoneChecker\"</string>
     <string name="chartmenu">Menu grafico</string>
     <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Tempo richiesta SMB</string>
+    <string name="loop_smbexecution_time_label">Tempo esecuzione SMB</string>
+    <string name="loop_tbrrequest_time_label">Tempo richiesta basale temporanea</string>
+    <string name="loop_tbrexecution_time_label">Tempo esecuzione basale temporanea</string>
 </resources>
diff --git a/app/src/main/res/values-ko-rKR/exam.xml b/app/src/main/res/values-ko-rKR/exam.xml
index 2b76f2c396..dfdfb154d8 100644
--- a/app/src/main/res/values-ko-rKR/exam.xml
+++ b/app/src/main/res/values-ko-rKR/exam.xml
@@ -131,12 +131,12 @@
     <string name="isf_profile">변경사항을 적용하는데 프로파일에서 ISF 값 변경하는 것으로 충분합니다.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Profiles.html</string>
-    <string name="ic_label">Topic: IC(인슐린 대 탄수화물) 비율</string>
+    <string name="ic_label">주제: IC(인슐린-탄수화물 비)</string>
     <string name="ic_increasingvalue">높은 IC 비율은 탄수화물 섭취시 인슐린이 보다 덜 주입되게 합니다.</string>
     <string name="ic_decreasingvalue">낮은 IC 비율은 탄수화물 섭취시 인슐린이 보다 덜 주입되게 합니다.</string>
     <string name="ic_noeffect">COB가 0 인 경우 IC 비율을 변경하면 혈당을 교정하기 위해 다른 양의 인슐린이 주입됩니다.</string>
-    <string name="ic_different">Bread Unit을 10g 혹은 12g으로 계산한다면 IC 값도 달라집니다.</string>
-    <string name="ic_meaning">IC의 의미는 다음과 같습니다: 1U의 인슐린에 대한 적정 Bread Unit 양</string>
+    <string name="ic_different">빵유닛(Bread Unit)을 10g 혹은 12g으로 계산한다면 IC 값도 달라집니다.</string>
+    <string name="ic_meaning">IC의 의미는 다음과 같습니다: 1U의 인슐린으로 얼마나 많은 빵유닛(Bread Units)이 처리되는지.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
     <string name="profileswitch_label">주제: 프로파일 변경</string>
     <string name="profileswitch_pctwillchange">프로파일을 90%로 설정하면 어떻게 됩니까?</string>
diff --git a/app/src/main/res/values-ko-rKR/objectives.xml b/app/src/main/res/values-ko-rKR/objectives.xml
index 4bc1ebbb35..08c2a7f8d8 100644
--- a/app/src/main/res/values-ko-rKR/objectives.xml
+++ b/app/src/main/res/values-ko-rKR/objectives.xml
@@ -28,13 +28,13 @@
     <string name="accomplished">완료: %1$s</string>
     <string name="objectives_usage_objective">AndroidAPS를 사용하는 방법을 배워봅니다</string>
     <string name="objectives_usage_gate">AndroidAPS에서 다양한 작업을 수행해보세요</string>
-    <string name="objectives_useprofileswitch">10분동안 프로파일 90%를 설정해보세요(개요에서 프로파일명을 길게 눌러보세요)</string>
-    <string name="objectives_usedisconnectpump">샤워한다고 가정하고 펌프를 1시간 동안 펌프를 일시중지하세요 (개요에서 Open Loop를 길게 눌러보세요)</string>
+    <string name="objectives_useprofileswitch">10분동안 프로파일 90%를 설정해보세요(홈에서 프로파일명을 길게 눌러보세요)</string>
+    <string name="objectives_usedisconnectpump">샤워한다고 가정하고 펌프를 1시간 동안 펌프를 일시중지하세요 (홈에서 Open Loop를 길게 눌러보세요)</string>
     <string name="objectives_usereconnectpump">... 그리고 같은 방법으로 펌프를 재연결하세요</string>
-    <string name="objectives_usetemptarget">10분의 사용자정의 임시 목표를 생성해 보세요 (개요에서 본인의 현재 목표혈당을 길게 눌러보세요)</string>
+    <string name="objectives_usetemptarget">사용자정의 임시 목표를 10분동안 실행해보세요 (홈에서 본인의 현재 목표혈당을 길게 눌러보세요)</string>
     <string name="objectives_useactions">구성관리자에서 실행 플러그인을 활성화하고 메뉴에서 표시되게 합니다</string>
     <string name="objectives_useloop">Loop 플러그인 내용을 표시합니다</string>
-    <string name="objectives_usescale">개요의 혈당 차트를 길게 눌러 차트 시간을 변경하세요</string>
+    <string name="objectives_usescale">홈의 혈당 차트를 길게 눌러 차트 시간을 변경하세요</string>
     <string name="objectives_button_enter">입력</string>
     <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">당신이 OpenAPS 사용자였고 당신의 NS가 최소 3개월의 Loop 데이터가 저장되어 있다면, objectives@androidaps.org로 메일을 보내 당신의 NS주소를 알려주시고 목표를 건너뛸 수 있는 코드를 요청하세요. 그리고 개발자로 부터 받은 코드를 입력하세요.</string>
     <string name="codeaccepted">코드 인증</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index e4ecfc6ed9..066b4aee6b 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -273,7 +273,7 @@
     <string name="smscommunicator_tt_canceled">임시 목표 취소가 완료되었습니다</string>
     <string name="bolusdelivering">%1$.2fU 주입중</string>
     <string name="smscommunicator_remotecommandsallowed">SMS 원격 명령 사용하기</string>
-    <string name="glucosetype_finger">체혈</string>
+    <string name="glucosetype_finger">채혈</string>
     <string name="glucosetype_sensor">센서</string>
     <string name="manual">수동</string>
     <string name="careportal_temporarytarget">임시 목표</string>
@@ -641,7 +641,7 @@
     <string name="enableuam_summary">알리지 않은 식사 감지</string>
     <string name="insulin_oref_peak">IOB 커브 피크 시간</string>
     <string name="insulin_peak_time">피크 시간 [min]</string>
-    <string name="free_peak_oref">자유-피크 Oref</string>
+    <string name="free_peak_oref">사용자지정-피크 Oref</string>
     <string name="rapid_acting_oref">초속효성 Oref</string>
     <string name="ultrarapid_oref">초-초속효성 Oref</string>
     <string name="dia_too_short">DIA %1$f는 너무 짧습니다. 대신 %2$f을 사용하세요!</string>
@@ -783,15 +783,15 @@
     <string name="ago">전</string>
     <string name="format_hours">%1$.2f 시간</string>
     <string name="format_mins">%1$d 분</string>
-    <string name="enablesmbalways">항상 SMB를 사용합니다.</string>
+    <string name="enablesmbalways">항상 SMB 사용하기</string>
     <string name="enablesmbalways_summary">Bolus와 독립적으로 항상 SMB를 사용합니다. G5처럼 잘 필터된 혈당소스와만 사용이 가능합니다.</string>
     <string name="enablesmbaftercarbs">탄수화물 이후 SMB를 사용합니다.</string>
     <string name="enablesmbaftercarbs_summary">탄수화물 이후 6시간동안 SMB를 사용합니다, 0 COB이라도 적용됩니다. G5처럼 잘 필터된 혈당소스와만 사용이 가능합니다.</string>
     <string name="enablesmbwithcob">COB와 SMB를 사용합니다.</string>
     <string name="enablesmbwithcob_summary">활성화된 COB가 있으면 SMB를 사용합니다.</string>
-    <string name="enablesmbwithtemptarget">임시 목표와 SMB를 사용합니다.</string>
+    <string name="enablesmbwithtemptarget">임시 목표에서 SMB 사용하기</string>
     <string name="enablesmbwithtemptarget_summary">활성화된 임시 목표(식사직전, 운동)가 있으면 SMB를 사용합니다.</string>
-    <string name="enablesmbwithhightemptarget">높은임시 목표와 SMB를 사용합니다.</string>
+    <string name="enablesmbwithhightemptarget">높은 임시 목표에서 SMB 사용하기</string>
     <string name="enablesmbwithhightemptarget_summary">활성화된 높은 임시 목표(운동)가 있으면 SMB를 사용합니다.</string>
     <string name="let_temp_basal_run">임시Basal 허용</string>
     <string name="mute">음소거</string>
@@ -946,6 +946,7 @@
     <string name="startobjective">첫번째 목표를 시작하세요.</string>
     <string name="permission">권한</string>
     <string name="askforpermission">권한 요청하기</string>
+    <string name="needsystemwindowpermission">알림에 대한 시스템 창 권한이 필요합니다</string>
     <string name="needlocationpermission">블루투스 스캔을 위해 위치 권한이 필요로 합니다.</string>
     <string name="needstoragepermission">로그 파일을 저장하기 위해 저장공간 권한이 필요로 합니다.</string>
     <string name="request">요청</string>
@@ -1449,4 +1450,8 @@
     <string name="phonechecker">\"전화확인\"</string>
     <string name="chartmenu">차트 메뉴</string>
     <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">SMB 요청시간</string>
+    <string name="loop_smbexecution_time_label">SMB 실행시간</string>
+    <string name="loop_tbrrequest_time_label">임시 Basal 요청시간</string>
+    <string name="loop_tbrexecution_time_label">임시 Basal 실행시간</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index aecda3ee0e..1e7dd42d16 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1447,4 +1447,6 @@
     <string name="closed_loop_disabled_with_eb">Closed Loop desabilitado por causa da execução do Bólus Estendido</string>
     <string name="extended_bolus_short">BE</string>
     <string name="phonechecker">\"VerificadorTelefone\"</string>
+    <string name="chartmenu">Menu do Gráfico</string>
+    <string name="sensitivity_short">AS</string>
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index c717182dc4..860db5a999 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -948,6 +948,7 @@ Context | Edit Context</string>
     <string name="startobjective">Начните первую Цель</string>
     <string name="permission">Права доступа</string>
     <string name="askforpermission">Запросить права доступа</string>
+    <string name="needsystemwindowpermission">Приложению требуется разрешение системного окна для уведомлений</string>
     <string name="needlocationpermission">Приложение нуждается в разрешении на доступ к определению местоположения для сканирования bluetooth</string>
     <string name="needstoragepermission">Приложение нуждается в разрешении доступа к хранению данных для хранения лог-файлов</string>
     <string name="request">Запрос</string>
@@ -1451,4 +1452,8 @@ Context | Edit Context</string>
     <string name="phonechecker">\"PhoneChecker\"</string>
     <string name="chartmenu">Меню графика</string>
     <string name="sensitivity_short">Авточувств</string>
+    <string name="loop_smbrequest_time_label">Время запроса микроболюса SMB</string>
+    <string name="loop_smbexecution_time_label">Время выполнения микроболюса SMB</string>
+    <string name="loop_tbrrequest_time_label">Время запроса временной базальной скорости</string>
+    <string name="loop_tbrexecution_time_label">Время выполнения временной базальной скорости</string>
 </resources>
diff --git a/app/src/main/res/values-sl-rSI/exam.xml b/app/src/main/res/values-sl-rSI/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-sl-rSI/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-sl-rSI/insight_alert_codes.xml b/app/src/main/res/values-sl-rSI/insight_alert_codes.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-sl-rSI/insight_alert_codes.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-sl-rSI/insight_alert_descriptions.xml b/app/src/main/res/values-sl-rSI/insight_alert_descriptions.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-sl-rSI/insight_alert_descriptions.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-sl-rSI/insight_alert_titles.xml b/app/src/main/res/values-sl-rSI/insight_alert_titles.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-sl-rSI/insight_alert_titles.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-sl-rSI/insight_exceptions.xml b/app/src/main/res/values-sl-rSI/insight_exceptions.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-sl-rSI/insight_exceptions.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-sl-rSI/objectives.xml b/app/src/main/res/values-sl-rSI/objectives.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-sl-rSI/objectives.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
new file mode 100644
index 0000000000..df88c88e20
--- /dev/null
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
+    <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
+    <!--    <string name="ga_lang" translatable="false">Irish</string> -->
+    <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
+    <!-- Pump Abstract -->
+    <!-- Medtronic (MDT) - Base -->
+    <!-- MDT Configuration -->
+    <!-- RL BLE Scanning -->
+    <!-- RL Status Page -->
+    <!-- RL State -->
+    <!-- RL Errors -->
+    <!-- RL Target Device -->
+    <!-- MDT Errors -->
+    <!-- MDT History -->
+    <!-- MDT Pump Status -->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+</resources>
diff --git a/wear/src/main/res/values-fr-rFR/strings.xml b/wear/src/main/res/values-fr-rFR/strings.xml
index 8318132564..27b90d0687 100644
--- a/wear/src/main/res/values-fr-rFR/strings.xml
+++ b/wear/src/main/res/values-fr-rFR/strings.xml
@@ -35,7 +35,7 @@
     <string name="pref_show_ago">Afficher Min Passées</string>
     <string name="pref_dark" comment="Enables dark visual theme">Sombre</string>
     <string name="pref_highlight_basals">Surbrillance Basale</string>
-    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Séparateur Noir</string>
+    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Séparateur Invisible</string>
     <string name="pref_chart_timeframe">Echelle Graphique</string>
     <string name="pref_1_hour">1 heure</string>
     <string name="pref_2_hours">2 heures</string>
diff --git a/wear/src/main/res/values-sl-rSI/strings.xml b/wear/src/main/res/values-sl-rSI/strings.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/wear/src/main/res/values-sl-rSI/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>

From 42c2d89f987c8819c369940fad89d15568ade9db Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 6 Feb 2020 21:24:19 +0100
Subject: [PATCH 13/56] ask for overlay permission on android 10 only

---
 .../androidaps/utils/AndroidPermission.java   | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java
index d884552ac4..41e26e8e3b 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.java
@@ -133,20 +133,20 @@ public class AndroidPermission {
     }
 
     public static synchronized void notifyForSystemWindowPermissions(Activity activity) {
-        if (!Settings.canDrawOverlays(activity)) {
-            NotificationWithAction notification = new NotificationWithAction(Notification.PERMISSION_SYSTEM_WINDOW, MainApp.gs(R.string.needsystemwindowpermission), Notification.URGENT);
-            notification.action(R.string.request, () -> {
-                        // Check if Android Q or higher
-                        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
-                            // Show alert dialog to the user saying a separate permission is needed
-                            // Launch the settings activity if the user prefers
-                            Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
-                                    Uri.parse("package:" + activity.getPackageName()));
-                            activity.startActivity(intent);
-                        }
-                    });
-            RxBus.INSTANCE.send(new EventNewNotification(notification));
-        } else
-            RxBus.INSTANCE.send(new EventDismissNotification(Notification.PERMISSION_SYSTEM_WINDOW));
+        // Check if Android Q or higher
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
+            if (!Settings.canDrawOverlays(activity)) {
+                NotificationWithAction notification = new NotificationWithAction(Notification.PERMISSION_SYSTEM_WINDOW, MainApp.gs(R.string.needsystemwindowpermission), Notification.URGENT);
+                notification.action(R.string.request, () -> {
+                    // Show alert dialog to the user saying a separate permission is needed
+                    // Launch the settings activity if the user prefers
+                    Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                            Uri.parse("package:" + activity.getPackageName()));
+                    activity.startActivity(intent);
+                });
+                RxBus.INSTANCE.send(new EventNewNotification(notification));
+            } else
+                RxBus.INSTANCE.send(new EventDismissNotification(Notification.PERMISSION_SYSTEM_WINDOW));
+        }
     }
 }

From 9098eb2da0661a6dc3e01341aa47884b208b9356 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 9 Feb 2020 13:04:49 +0100
Subject: [PATCH 14/56] save Careportal events directly to DB

---
 .../plugins/pump/insight/LocalInsightPlugin.java  | 12 ++++++++++++
 .../pump/medtronic/data/MedtronicHistoryData.java |  6 ++++++
 .../plugins/source/SourceDexcomPlugin.kt          | 15 +++++++++++++++
 .../plugins/source/SourceEversensePlugin.java     |  7 +++++++
 4 files changed, 40 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index 5104e70fe8..afca125092 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -1524,6 +1524,12 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             data.put("created_at", DateUtil.toISOString(date));
             data.put("eventType", CareportalEvent.NOTE);
             data.put("notes", note);
+            CareportalEvent careportalEvent = new CareportalEvent();
+            careportalEvent.date = date;
+            careportalEvent.source = Source.USER;
+            careportalEvent.eventType = CareportalEvent.NOTE;
+            careportalEvent.json = data.toString();
+            MainApp.getDbHelper().createOrUpdate(careportalEvent);
             NSUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
             log.error("Unhandled exception", e);
@@ -1552,6 +1558,12 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
             if (!enteredBy.equals("")) data.put("enteredBy", enteredBy);
             data.put("created_at", DateUtil.toISOString(date));
             data.put("eventType", event);
+            CareportalEvent careportalEvent = new CareportalEvent();
+            careportalEvent.date = date;
+            careportalEvent.source = Source.USER;
+            careportalEvent.eventType = event;
+            careportalEvent.json = data.toString();
+            MainApp.getDbHelper().createOrUpdate(careportalEvent);
             NSUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
             log.error("Unhandled exception", e);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
index 11d1bad3d9..39c44167a2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
@@ -528,6 +528,12 @@ public class MedtronicHistoryData {
             if (!enteredBy.equals("")) data.put("enteredBy", enteredBy);
             data.put("created_at", DateUtil.toISOString(date));
             data.put("eventType", event);
+            CareportalEvent careportalEvent = new CareportalEvent();
+            careportalEvent.date = date;
+            careportalEvent.source = Source.USER;
+            careportalEvent.eventType = event;
+            careportalEvent.json = data.toString();
+            MainApp.getDbHelper().createOrUpdate(careportalEvent);
             NSUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
             LOG.error("Unhandled exception", e);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt
index 633f16cf10..bf5661ad00 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt
@@ -9,6 +9,8 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.RequestDexcomPermissionActivity
 import info.nightscout.androidaps.db.BgReading
 import info.nightscout.androidaps.db.CareportalEvent
+import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.dialogs.CareDialog
 import info.nightscout.androidaps.interfaces.BgSourceInterface
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
@@ -96,6 +98,13 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
                             jsonObject.put("glucoseType", "Finger")
                             jsonObject.put("glucose", meter.getInt("meterValue"))
                             jsonObject.put("units", Constants.MGDL)
+
+                            val careportalEvent = CareportalEvent()
+                            careportalEvent.date = timestamp
+                            careportalEvent.source = Source.USER
+                            careportalEvent.eventType = CareportalEvent.BGCHECK
+                            careportalEvent.json = jsonObject.toString()
+                            MainApp.getDbHelper().createOrUpdate(careportalEvent)
                             NSUpload.uploadCareportalEntryToNS(jsonObject)
                         }
                 }
@@ -110,6 +119,12 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
                             jsonObject.put("enteredBy", "AndroidAPS-Dexcom$sensorType")
                             jsonObject.put("created_at", DateUtil.toISOString(sensorInsertionTime))
                             jsonObject.put("eventType", CareportalEvent.SENSORCHANGE)
+                            val careportalEvent = CareportalEvent()
+                            careportalEvent.date = sensorInsertionTime
+                            careportalEvent.source = Source.USER
+                            careportalEvent.eventType = CareportalEvent.SENSORCHANGE
+                            careportalEvent.json = jsonObject.toString()
+                            MainApp.getDbHelper().createOrUpdate(careportalEvent)
                             NSUpload.uploadCareportalEntryToNS(jsonObject)
                         }
                 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceEversensePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceEversensePlugin.java
index 6f39e3d762..6d0067414a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceEversensePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/SourceEversensePlugin.java
@@ -15,6 +15,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.CareportalEvent;
+import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.interfaces.BgSourceInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginDescription;
@@ -143,6 +144,12 @@ public class SourceEversensePlugin extends PluginBase implements BgSourceInterfa
                         data.put("glucoseType", "Finger");
                         data.put("glucose", calibrationGlucoseLevels[i]);
                         data.put("units", Constants.MGDL);
+                        CareportalEvent careportalEvent = new CareportalEvent();
+                        careportalEvent.date = calibrationTimestamps[i];
+                        careportalEvent.source = Source.USER;
+                        careportalEvent.eventType = CareportalEvent.BGCHECK;
+                        careportalEvent.json = data.toString();
+                        MainApp.getDbHelper().createOrUpdate(careportalEvent);
                         NSUpload.uploadCareportalEntryToNS(data);
                     }
                 } catch (JSONException e) {

From f111b731e75a86edafd2ddb8424a01b718691ab8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 9 Feb 2020 22:16:48 +0100
Subject: [PATCH 15/56] Improve SetupWizardTest to be runnable on real device

---
 app/build.gradle                              |  1 +
 .../nightscout/androidaps/EspressoHelper.kt   |  8 +++
 .../androidaps/SetupWizardActivityTest.kt     | 61 +++++++++++--------
 3 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 53b0398a43..69ae9369cb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -315,6 +315,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test:rules:1.3.0-alpha03'
     androidTestImplementation 'com.google.code.findbugs:jsr305:3.0.2'
+    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
 }
 
 
diff --git a/app/src/androidTest/java/info/nightscout/androidaps/EspressoHelper.kt b/app/src/androidTest/java/info/nightscout/androidaps/EspressoHelper.kt
index b50bb746fb..cf7118ebd2 100644
--- a/app/src/androidTest/java/info/nightscout/androidaps/EspressoHelper.kt
+++ b/app/src/androidTest/java/info/nightscout/androidaps/EspressoHelper.kt
@@ -4,6 +4,9 @@ import androidx.test.espresso.ViewAction
 import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiSelector
 
 fun ViewInteraction.isDisplayed(): Boolean {
     try {
@@ -25,3 +28,8 @@ fun ViewInteraction.waitAndPerform(viewActions: ViewAction): ViewInteraction? {
     return perform(viewActions)
 }
 
+fun clickOkInDialog() {
+    val uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+    val button = uiDevice.findObject(UiSelector().clickable(true).checkable(false).index(1))
+    if (button.exists() && button.isEnabled) button.click()
+}
diff --git a/app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt b/app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt
index dd1c0b12bc..a2742c2a34 100644
--- a/app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt
+++ b/app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps
 
-
 import android.os.SystemClock
 import android.view.View
 import android.view.ViewGroup
@@ -9,12 +8,15 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.scrollTo
-import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withClassName
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withTagValue
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.test.rule.ActivityTestRule
 import androidx.test.rule.GrantPermissionRule
-import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
@@ -39,7 +41,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
 @LargeTest
 @RunWith(AndroidJUnit4::class)
 class SetupWizardActivityTest {
@@ -50,12 +51,12 @@ class SetupWizardActivityTest {
 
     @Rule
     @JvmField
-    var mGrantPermissionRule =
-            GrantPermissionRule.grant(
-                    android.Manifest.permission.ACCESS_FINE_LOCATION,
-                    android.Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
-                    android.Manifest.permission.WRITE_EXTERNAL_STORAGE
-            )
+    var mGrantPermissionRule: GrantPermissionRule =
+        GrantPermissionRule.grant(
+            android.Manifest.permission.ACCESS_FINE_LOCATION,
+            android.Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
+            android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+        )
 
     @Before
     fun clear() {
@@ -74,9 +75,9 @@ adb shell settings put global transition_animation_scale 0 &
 adb shell settings put global animator_duration_scale 0 &
  */
 
-
     @Test
     fun setupWizardActivityTest() {
+        SP.clear()
         Assert.assertTrue(isRunningTest())
         // Welcome page
         onView(withId(R.id.next_button)).perform(click())
@@ -86,7 +87,7 @@ adb shell settings put global animator_duration_scale 0 &
         // Agreement page
         onView(withText("I UNDERSTAND AND AGREE")).perform(scrollTo(), click())
         onView(withId(R.id.next_button)).waitAndPerform(click())
-        // Loction permission
+        // Location permission
         var askButton = onView(withText("Ask for permission"))
         if (askButton.isDisplayed()) {
             askButton.perform(scrollTo(), click())
@@ -99,6 +100,11 @@ adb shell settings put global animator_duration_scale 0 &
             onView(withText("OK")).perform(click())
             onView(withId(R.id.next_button)).waitAndPerform(click())
         }
+        // Import settings : skip of found
+        askButton = onView(withText("IMPORT SETTINGS"))
+        if (askButton.isDisplayed()) {
+            onView(withId(R.id.next_button)).waitAndPerform(click())
+        }
         // Units selection
         onView(withText("mmol/L")).perform(scrollTo(), click())
         onView(withId(R.id.next_button)).perform(click())
@@ -125,41 +131,44 @@ adb shell settings put global animator_duration_scale 0 &
         // Local profile - IC
         onView(withId(R.id.ic_tab)).perform(scrollTo(), click())
         onView(Matchers.allOf(withTagValue(Matchers.`is`("IC-1-0")), isDisplayed()))
-                .perform(ViewActions.replaceText("2"), ViewActions.closeSoftKeyboard())
+            .perform(ViewActions.replaceText("2"), ViewActions.closeSoftKeyboard())
         // Local profile - ISF
         onView(withId(R.id.isf_tab)).perform(scrollTo(), click())
         onView(Matchers.allOf(withTagValue(Matchers.`is`("ISF-1-0")), isDisplayed()))
-                .perform(ViewActions.replaceText("3"), ViewActions.closeSoftKeyboard())
+            .perform(ViewActions.replaceText("3"), ViewActions.closeSoftKeyboard())
         // Local profile - BAS
         onView(withId(R.id.basal_tab)).perform(scrollTo(), click())
         onView(childAtPosition(Matchers.allOf(withId(R.id.localprofile_basal), childAtPosition(withClassName(Matchers.`is`("android.widget.LinearLayout")), 6)), 2))
-                .perform(scrollTo(), click())
+            .perform(scrollTo(), click())
         onView(Matchers.allOf(withTagValue(Matchers.`is`("BASAL-1-0")), isDisplayed()))
-                .perform(ViewActions.replaceText("1.1"), ViewActions.closeSoftKeyboard())
+            .perform(ViewActions.replaceText("1.1"), ViewActions.closeSoftKeyboard())
         onView(Matchers.allOf(withTagValue(Matchers.`is`("BASAL-1-1")), isDisplayed()))
-                .perform(ViewActions.replaceText("1.2"), ViewActions.closeSoftKeyboard())
+            .perform(ViewActions.replaceText("1.2"), ViewActions.closeSoftKeyboard())
         onView(Matchers.allOf(withId(R.id.timelistedit_time), childAtPosition(childAtPosition(withId(R.id.localprofile_basal), 2), 0)))
-                .perform(scrollTo(), click())
+            .perform(scrollTo(), click())
         onData(Matchers.anything()).inAdapterView(childAtPosition(withClassName(Matchers.`is`("android.widget.PopupWindow\$PopupBackgroundView")), 0)).atPosition(13)
-                .perform(click())
+            .perform(click())
         // Local profile - TARGET
         onView(withId(R.id.target_tab)).perform(scrollTo(), click())
         onView(Matchers.allOf(withTagValue(Matchers.`is`("TARGET-1-0")), isDisplayed()))
-                .perform(ViewActions.replaceText("6"), ViewActions.closeSoftKeyboard())
+            .perform(ViewActions.replaceText("6"), ViewActions.closeSoftKeyboard())
         onView(Matchers.allOf(withTagValue(Matchers.`is`("TARGET-2-0")), isDisplayed()))
-                .perform(ViewActions.replaceText("6.5"), ViewActions.closeSoftKeyboard())
+            .perform(ViewActions.replaceText("6.5"), ViewActions.closeSoftKeyboard())
         onView(withText("Save")).perform(scrollTo(), click())
         onView(Matchers.allOf(withId(R.id.localprofile_profileswitch), isDisplayed()))
-                .perform(scrollTo(), click())
+            .perform(scrollTo(), click())
         onView(allOf(withId(R.id.ok), isDisplayed())).perform(click())
-        onView(Matchers.allOf(withText("OK"), isDisplayed())).perform(click())
+        // confirm dialog
+        //onView(Matchers.allOf(withText("OK"), isDisplayed())).perform(click()) not working on real phone
+        clickOkInDialog()
         onView(withId(R.id.next_button)).waitAndPerform(click())
         // Profile switch
         askButton = onView(withText("Do Profile Switch"))
         if (askButton.isDisplayed()) {
             askButton.perform(scrollTo(), click())
             onView(allOf(withId(R.id.ok), isDisplayed())).perform(click())
-            onView(Matchers.allOf(withText("OK"), isDisplayed())).perform(click())
+            // onView(Matchers.allOf(withText("OK"), isDisplayed())).perform(click()) not working on real phone
+            clickOkInDialog()
             while (ProfileFunctions.getInstance().profile == null) SystemClock.sleep(100)
             onView(withId(R.id.next_button)).waitAndPerform(click())
         }
@@ -204,7 +213,7 @@ adb shell settings put global animator_duration_scale 0 &
     }
 
     private fun childAtPosition(
-            parentMatcher: Matcher<View>, position: Int): Matcher<View> {
+        parentMatcher: Matcher<View>, position: Int): Matcher<View> {
 
         return object : TypeSafeMatcher<View>() {
             override fun describeTo(description: Description) {
@@ -215,7 +224,7 @@ adb shell settings put global animator_duration_scale 0 &
             public override fun matchesSafely(view: View): Boolean {
                 val parent = view.parent
                 return parent is ViewGroup && parentMatcher.matches(parent)
-                        && view == parent.getChildAt(position)
+                    && view == parent.getChildAt(position)
             }
         }
     }

From 0ff7702b1a29fa6016e3b3e9011094fc17e9b396 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 11 Feb 2020 17:06:30 +0100
Subject: [PATCH 16/56] RealPumpTest|

---
 app/build.gradle                              |  30 +++++
 .../nightscout/androidaps/RealPumpTest.kt     | 116 ++++++++++++++++++
 .../nightscout/androidaps/MainActivity.java   |   4 +-
 .../androidaps/interfaces/PluginBase.java     |   2 +-
 .../plugins/source/RandomBgPlugin.kt          |   6 +-
 .../androidaps/utils/EspressoTestHelper.kt    |  10 ++
 6 files changed, 163 insertions(+), 5 deletions(-)
 create mode 100644 app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt

diff --git a/app/build.gradle b/app/build.gradle
index 69ae9369cb..7d622ed56f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -343,6 +343,36 @@ task full_clean(type: Delete) {
     delete file("src/main/jniLibs")
 }
 
+// Run 'adb' shell command to clear application data of main app for 'debug' variant
+task clearMainAppData(type: Exec) {
+    // we have to iterate to find the 'debug' variant to obtain a variant reference
+    android.applicationVariants.all { variant ->
+        if (variant.name == "fullDebug") {
+            def applicationId = [variant.mergedFlavor.applicationId, variant.buildType.applicationIdSuffix].findAll().join()
+            def clearDataCommand = ['adb', 'shell', 'pm', 'clear', applicationId]
+            println "Clearing application data of ${variant.name} variant: [${clearDataCommand}]"
+            def stdout = new ByteArrayOutputStream()
+            exec {
+                commandLine clearDataCommand
+                standardOutput = stdout
+            }
+            String result = stdout.toString().trim()
+            if (!result.startsWith("Success")) {
+                println result
+                throw new GradleException(clearDataCommand.join(" "))
+            }
+        }
+    }
+}
+// Clear Application Data (once) before running instrumentation test
+tasks.whenTaskAdded { task ->
+    // Both of these targets are equivalent today, although in future connectedCheck
+    // will also include connectedUiAutomatorTest (not implemented yet)
+    if(task.name == "connectedAndroidTest" || task.name == "connectedCheck"){
+        task.dependsOn(clearMainAppData)
+    }
+}
+
 clean.dependsOn full_clean
 preBuild.dependsOn copyLibs
 
diff --git a/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt b/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt
new file mode 100644
index 0000000000..5463fbcd26
--- /dev/null
+++ b/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt
@@ -0,0 +1,116 @@
+package info.nightscout.androidaps
+
+import android.os.SystemClock
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import androidx.test.rule.ActivityTestRule
+import androidx.test.rule.GrantPermissionRule
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.interfaces.PumpInterface
+import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
+import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions
+import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
+import info.nightscout.androidaps.plugins.general.actions.ActionsPlugin
+import info.nightscout.androidaps.plugins.insulin.InsulinOrefUltraRapidActingPlugin
+import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
+import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
+import info.nightscout.androidaps.plugins.source.RandomBgPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.SP
+import info.nightscout.androidaps.utils.isRunningTest
+import org.json.JSONObject
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.slf4j.LoggerFactory
+
+@LargeTest
+@RunWith(AndroidJUnit4::class)
+class RealPumpTest {
+
+    private val log = LoggerFactory.getLogger(L.CORE)
+
+    companion object {
+        val pump: PumpInterface = DanaRv2Plugin.getPlugin()
+        const val R_PASSWORD = 1234
+        const val R_SERIAL = "PBB00013LR_P"
+    }
+
+    private val validProfile = "{\"dia\":\"6\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"10\"},{\"time\":\"2:00\",\"value\":\"11\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+
+    @Rule
+    @JvmField
+    var mActivityTestRule = ActivityTestRule(MainActivity::class.java)
+
+    @Rule
+    @JvmField
+    var mGrantPermissionRule: GrantPermissionRule =
+        GrantPermissionRule.grant(
+            android.Manifest.permission.ACCESS_FINE_LOCATION,
+            android.Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
+            android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+        )
+
+    @Before
+    fun clear() {
+        SP.clear()
+        SP.putBoolean(R.string.key_setupwizard_processed, true)
+        SP.putString(R.string.key_aps_mode, "closed")
+        MainApp.getDbHelper().resetDatabases()
+        MainApp.devBranch = false
+    }
+
+    private fun preparePlugins() {
+        // Source
+        RandomBgPlugin.performPluginSwitch(true, PluginType.BGSOURCE)
+        // Profile
+        LocalProfilePlugin.performPluginSwitch(true, PluginType.PROFILE)
+        val profile = Profile(JSONObject(validProfile), Constants.MGDL)
+        Assert.assertTrue(profile.isValid("Test"))
+        LocalProfilePlugin.profiles.clear()
+        LocalProfilePlugin.numOfProfiles = 0
+        val singleProfile = LocalProfilePlugin.SingleProfile().copyFrom(profile, "TestProfile")
+        LocalProfilePlugin.addProfile(singleProfile)
+        ProfileFunctions.doProfileSwitch(LocalProfilePlugin.createProfileStore(), "TestProfile", 0, 100, 0, DateUtil.now())
+        // Insulin
+        InsulinOrefUltraRapidActingPlugin.getPlugin().performPluginSwitch(true, PluginType.INSULIN)
+        // Pump
+        SP.putInt(R.string.key_danar_password, R_PASSWORD)
+        SP.putString(R.string.key_danar_bt_name, R_SERIAL)
+        (pump as PluginBase).performPluginSwitch(true, PluginType.PUMP)
+        // Sensitivity
+        SensitivityOref1Plugin.getPlugin().performPluginSwitch(true, PluginType.SENSITIVITY)
+        // APS
+        OpenAPSSMBPlugin.getPlugin().performPluginSwitch(true, PluginType.APS)
+        LoopPlugin.getPlugin().performPluginSwitch(true, PluginType.LOOP)
+
+        // Enable common
+        ActionsPlugin.performPluginSwitch(true, PluginType.GENERAL)
+
+        // Disable unneeded
+        MainApp.getPluginsList().remove(ObjectivesPlugin)
+    }
+
+    @Test
+    fun doTest() {
+        Assert.assertTrue(isRunningTest())
+        preparePlugins()
+
+        while (!pump.isInitialized) {
+            log.debug("Waiting for initialization")
+            SystemClock.sleep(1000)
+        }
+
+        while (true) {
+            log.debug("Tick")
+            SystemClock.sleep(1000)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.java b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
index f74a58856f..c152c415cb 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
@@ -63,6 +63,8 @@ import info.nightscout.androidaps.utils.SP;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 
+import static info.nightscout.androidaps.utils.EspressoTestHelperKt.isRunningRealPumpTest;
+
 public class MainActivity extends NoSplashAppCompatActivity {
     private static Logger log = LoggerFactory.getLogger(L.CORE);
     private CompositeDisposable disposable = new CompositeDisposable();
@@ -137,7 +139,7 @@ public class MainActivity extends NoSplashAppCompatActivity {
                 .subscribe(this::processPreferenceChange, FabricPrivacy::logException)
         );
 
-        if (!SP.getBoolean(R.string.key_setupwizard_processed, false)) {
+        if (!SP.getBoolean(R.string.key_setupwizard_processed, false) && !isRunningRealPumpTest()) {
             Intent intent = new Intent(this, SetupWizardActivity.class);
             startActivity(intent);
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java b/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java
index e236125255..5d4ec01fd9 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.java
@@ -74,7 +74,7 @@ public abstract class PluginBase {
         }
     }
 
-    private void performPluginSwitch(boolean enabled, PluginType type) {
+    public void performPluginSwitch(boolean enabled, PluginType type) {
         setPluginEnabled(type, enabled);
         setFragmentVisible(type, enabled);
         ConfigBuilderPlugin.getPlugin().processOnEnabledCategoryChanged(this, getType());
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
index ea6731ca60..1f79b82bc6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
@@ -31,7 +31,7 @@ object RandomBgPlugin : PluginBase(PluginDescription()
     private val loopHandler = Handler()
     private lateinit var refreshLoop: Runnable
 
-    const val interval = 5L // minutes
+    const val interval = 1L // minutes
 
     init {
         refreshLoop = Runnable {
@@ -55,7 +55,7 @@ object RandomBgPlugin : PluginBase(PluginDescription()
     }
 
     override fun specialEnableCondition(): Boolean {
-        return VirtualPumpPlugin.getPlugin().isEnabled(PluginType.PUMP) && (MainApp.engineeringMode || isRunningTest())
+        return isRunningTest() || VirtualPumpPlugin.getPlugin().isEnabled(PluginType.PUMP) && MainApp.engineeringMode
     }
 
     override fun handleNewData(intent: Intent) {
@@ -65,7 +65,7 @@ object RandomBgPlugin : PluginBase(PluginDescription()
 
         val cal = GregorianCalendar()
         val currentMinute = cal.get(Calendar.MINUTE) + (cal.get(Calendar.HOUR_OF_DAY) % 2) * 60
-        val bgMgdl = min + (max - min) * sin(currentMinute / 120.0 * 2 * PI)
+        val bgMgdl = min + (max - min) + (max - min) * sin(currentMinute / 120.0 * 2 * PI)
 
         val bgReading = BgReading()
         bgReading.value = bgMgdl
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/EspressoTestHelper.kt b/app/src/main/java/info/nightscout/androidaps/utils/EspressoTestHelper.kt
index 7288e6679f..0cddcc0792 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/EspressoTestHelper.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/EspressoTestHelper.kt
@@ -9,3 +9,13 @@ fun isRunningTest(): Boolean {
         false
     }
 }
+
+@Synchronized
+fun isRunningRealPumpTest(): Boolean {
+    return try {
+        Class.forName("info.nightscout.androidaps.RealPumpTest")
+        true
+    } catch (e: ClassNotFoundException) {
+        false
+    }
+}

From 7b0ea23b40fc2fb880fa24e42f963cb893110525 Mon Sep 17 00:00:00 2001
From: Brian Quinion <git@brian.quinion.co.uk>
Date: Thu, 20 Feb 2020 16:08:51 +0000
Subject: [PATCH 17/56] Require the connection to NS to be encrypted (unless in
 engineering mode)

---
 .../plugins/general/nsclient/services/NSClientService.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
index e1c57cc7c2..4c5b9f36bb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
@@ -274,7 +274,7 @@ public class NSClientService extends Service {
         } else if (!nsEnabled) {
             RxBus.INSTANCE.send(new EventNSClientNewLog("NSCLIENT", "disabled"));
             RxBus.INSTANCE.send(new EventNSClientStatus("Disabled"));
-        } else if (!nsURL.equals("")) {
+        } else if (!nsURL.equals("") && (MainApp.engineeringMode || nsURL.toLowerCase().startsWith("https://"))) {
             try {
                 RxBus.INSTANCE.send(new EventNSClientStatus("Connecting ..."));
                 IO.Options opt = new IO.Options();
@@ -295,6 +295,9 @@ public class NSClientService extends Service {
                 RxBus.INSTANCE.send(new EventNSClientNewLog("NSCLIENT", "Wrong URL syntax"));
                 RxBus.INSTANCE.send(new EventNSClientStatus("Wrong URL syntax"));
             }
+        } else if (nsURL.toLowerCase().startsWith("http://")) {
+            RxBus.INSTANCE.send(new EventNSClientNewLog("NSCLIENT", "NS URL not encrypted"));
+            RxBus.INSTANCE.send(new EventNSClientStatus("Not encrypted"));
         } else {
             RxBus.INSTANCE.send(new EventNSClientNewLog("NSCLIENT", "No NS URL specified"));
             RxBus.INSTANCE.send(new EventNSClientStatus("Not configured"));

From 43495e2565d5bd809ae6a133379e2aa863d06508 Mon Sep 17 00:00:00 2001
From: Brian Quinion <git@brian.quinion.co.uk>
Date: Thu, 20 Feb 2020 16:38:41 +0000
Subject: [PATCH 18/56] Expose error messages where NS connection fails

---
 .../general/nsclient/services/NSClientService.java     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
index 4c5b9f36bb..3a38e15ec4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
@@ -283,6 +283,9 @@ public class NSClientService extends Service {
                 mSocket = IO.socket(nsURL, opt);
                 mSocket.on(Socket.EVENT_CONNECT, onConnect);
                 mSocket.on(Socket.EVENT_DISCONNECT, onDisconnect);
+                mSocket.on(Socket.EVENT_ERROR, onError);
+                mSocket.on(Socket.EVENT_CONNECT_ERROR, onError);
+                mSocket.on(Socket.EVENT_CONNECT_TIMEOUT, onError);
                 mSocket.on(Socket.EVENT_PING, onPing);
                 RxBus.INSTANCE.send(new EventNSClientNewLog("NSCLIENT", "do connect"));
                 mSocket.connect();
@@ -395,6 +398,13 @@ public class NSClientService extends Service {
         nsDevice = SP.getString("careportal_enteredby", "");
     }
 
+    private Emitter.Listener onError = new Emitter.Listener() {
+        @Override
+        public void call(final Object... args) {
+            RxBus.INSTANCE.send(new EventNSClientNewLog("ERROR", args[0].toString()));
+        }
+    };
+
     private Emitter.Listener onPing = new Emitter.Listener() {
         @Override
         public void call(final Object... args) {

From 385781de2381b93165f65096b01b82953bf61400 Mon Sep 17 00:00:00 2001
From: Brian Quinion <git@brian.quinion.co.uk>
Date: Thu, 20 Feb 2020 16:56:56 +0000
Subject: [PATCH 19/56] Validate paramaters in onError in NS Client

---
 .../plugins/general/nsclient/services/NSClientService.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
index 3a38e15ec4..565399dd59 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
@@ -401,7 +401,11 @@ public class NSClientService extends Service {
     private Emitter.Listener onError = new Emitter.Listener() {
         @Override
         public void call(final Object... args) {
-            RxBus.INSTANCE.send(new EventNSClientNewLog("ERROR", args[0].toString()));
+            String msg = "Unknown Error";
+            if (args.length > 0 && args[0] != null) {
+                msg = args[0].toString();
+            }
+            RxBus.INSTANCE.send(new EventNSClientNewLog("ERROR", msg));
         }
     };
 

From b11707b5d44c12756138e73f43a5130fb5b4d3e4 Mon Sep 17 00:00:00 2001
From: sabsoubi <bastie.wagner@gmail.com>
Date: Fri, 21 Feb 2020 11:04:59 +0100
Subject: [PATCH 20/56] Fixed Bug that doesn't show COB if BGI disabled.

---
 .../general/xdripStatusline/StatuslinePlugin.java      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatuslinePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatuslinePlugin.java
index da61b83b98..bd5b7e4eab 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatuslinePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatuslinePlugin.java
@@ -202,13 +202,13 @@ public class StatuslinePlugin extends PluginBase {
                     + DecimalFormatter.to2Decimal(basalIob.basaliob) + ")";
         }
 
-        if (!mPrefs.getBoolean("xdripstatus_showbgi", false)) {
-            return status;
+        // BGI
+        if (mPrefs.getBoolean("xdripstatus_showbgi", true)) {
+            double bgi = -(bolusIob.activity + basalIob.activity) * 5 * profile.getIsf();
+            status += " " + ((bgi >= 0) ? "+" : "") + DecimalFormatter.to2Decimal(bgi);
         }
 
-        double bgi = -(bolusIob.activity + basalIob.activity) * 5 * profile.getIsf();
-
-        status += " " + ((bgi >= 0) ? "+" : "") + DecimalFormatter.to2Decimal(bgi);
+        /* COB */
         status += " " + IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "StatuslinePlugin").generateCOBString();
 
         return status;

From 3b9ea53cc4f0f65eec3c698afe3e8a3e6f075432 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 25 Feb 2020 20:46:04 +0100
Subject: [PATCH 21/56] Fix TempTarget confirm dialog

---
 .../nightscout/androidaps/dialogs/TempTargetDialog.kt  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
index 77cb0b6823..5b1dd48692 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
@@ -114,11 +114,11 @@ class TempTargetDialog : DialogFragmentWithDate() {
         val reason = overview_temptarget_reason.selectedItem.toString()
         val unitResId = if (ProfileFunctions.getSystemUnits() == Constants.MGDL) R.string.mgdl else R.string.mmol
         val target = overview_temptarget_temptarget.value
-        val duration = overview_temptarget_duration.value
-        if (target != 0.0 && duration != 0.0) {
+        val duration = overview_temptarget_duration.value.toInt()
+        if (target != 0.0 && duration != 0) {
             actions.add(MainApp.gs(R.string.reason) + ": " + reason)
             actions.add(MainApp.gs(R.string.nsprofileview_target_label) + ": " + Profile.toCurrentUnitsString(target) + " " + MainApp.gs(unitResId))
-            actions.add(MainApp.gs(R.string.duration) + ": " + MainApp.gs(R.string.format_hours, duration))
+            actions.add(MainApp.gs(R.string.duration) + ": " + MainApp.gs(R.string.format_mins, duration))
         } else {
             actions.add(MainApp.gs(R.string.stoptemptarget))
         }
@@ -128,7 +128,7 @@ class TempTargetDialog : DialogFragmentWithDate() {
         activity?.let { activity ->
             OKDialog.showConfirmation(activity, MainApp.gs(R.string.careportal_temporarytarget), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
                 log.debug("USER ENTRY: TEMP TARGET $target duration: $duration")
-                if (target == 0.0 || duration == 0.0) {
+                if (target == 0.0 || duration == 0) {
                     val tempTarget = TempTarget()
                         .date(eventTime)
                         .duration(0)
@@ -145,7 +145,7 @@ class TempTargetDialog : DialogFragmentWithDate() {
                         .high(Profile.toMgdl(target, ProfileFunctions.getSystemUnits()))
                     TreatmentsPlugin.getPlugin().addToHistoryTempTarget(tempTarget)
                 }
-                if (duration == 10.0) SP.putBoolean(R.string.key_objectiveusetemptarget, true)
+                if (duration == 10) SP.putBoolean(R.string.key_objectiveusetemptarget, true)
             })
         }
         return true

From 832663081101188d20c3380cc8818d5f6fc7ec35 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 25 Feb 2020 21:30:44 +0100
Subject: [PATCH 22/56] Revert gradle changes for UI tests

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7d622ed56f..0dd80641bf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -342,7 +342,7 @@ task copyLibs(dependsOn: downloadAndUnzipFile, type: Copy) {
 task full_clean(type: Delete) {
     delete file("src/main/jniLibs")
 }
-
+/*
 // Run 'adb' shell command to clear application data of main app for 'debug' variant
 task clearMainAppData(type: Exec) {
     // we have to iterate to find the 'debug' variant to obtain a variant reference
@@ -372,7 +372,7 @@ tasks.whenTaskAdded { task ->
         task.dependsOn(clearMainAppData)
     }
 }
-
+*/
 clean.dependsOn full_clean
 preBuild.dependsOn copyLibs
 

From 26170ddea55401a2a15c60140365d40551b61b51 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 25 Feb 2020 21:54:14 +0100
Subject: [PATCH 23/56] New Crowdin translations (#2429)

* New translations strings.xml (Swedish)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (German)

* New translations strings.xml (Slovak)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations exam.xml (Dutch)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Korean)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)
---
 app/src/main/res/values-bg-rBG/strings.xml  |  6 ++-
 app/src/main/res/values-de-rDE/strings.xml  |  4 +-
 app/src/main/res/values-es-rES/strings.xml  |  5 ++-
 app/src/main/res/values-fr-rFR/strings.xml  | 42 ++++++++++++---------
 app/src/main/res/values-it-rIT/strings.xml  |  1 +
 app/src/main/res/values-ko-rKR/strings.xml  | 37 +++++++++---------
 app/src/main/res/values-nl-rNL/exam.xml     |  4 +-
 app/src/main/res/values-pt-rPT/strings.xml  |  5 +++
 app/src/main/res/values-sk-rSK/strings.xml  |  5 +++
 app/src/main/res/values-sv-rSE/strings.xml  |  7 ++++
 wear/src/main/res/values-es-rES/strings.xml |  2 +-
 11 files changed, 74 insertions(+), 44 deletions(-)

diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index d3a01e2d86..78b71447fb 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -946,6 +945,7 @@
     <string name="startobjective">Започнете първа цел</string>
     <string name="permission">Разрешение</string>
     <string name="askforpermission">Питане за разрешение</string>
+    <string name="needsystemwindowpermission">ААПС изисква разрешение за да може да Ви уведомява</string>
     <string name="needlocationpermission">Приложението се нуждае от достъп до вашето местоположение за да активира BT сканиране</string>
     <string name="needstoragepermission">Приложението се нуждае от разрешение да съхранява данни за да може съхранява лог файлове</string>
     <string name="request">Искане</string>
@@ -1449,4 +1449,8 @@
     <string name="phonechecker">\"PhoneChecker\"</string>
     <string name="chartmenu">Меню на графиката</string>
     <string name="sensitivity_short">АS</string>
+    <string name="loop_smbrequest_time_label">Диапазон между изпълнение на SMB</string>
+    <string name="loop_smbexecution_time_label">Макс. време за изпълнение за SMB</string>
+    <string name="loop_tbrrequest_time_label">Диапазон между временни базали</string>
+    <string name="loop_tbrexecution_time_label">Продължителност на временни базали</string>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 8673afb35a..3ccf637260 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -846,7 +846,7 @@
     <string name="combo_error_failure_reading_changed_basal_rate">Das Einlesen der geänderten Basalrate in der Pumpe schlug fehl</string>
     <string name="combo_activity_checking_for_history_changes">Änderungen der Historie werden gesucht</string>
     <string name="combo_error_multiple_boluses_with_identical_timestamp">Der Import mehrerer Boli der gleichen Menge, abgegeben in der gleichen Minute, ist gescheitert: Nur ein Datensatz konnte den Behandlungen hinzugefügt werden. Bitte überprüfe die Pumpe und verwende das Careportal, um fehlende Einträge hinzuzufügen. Stelle sicher, dass keine Einträge für genau dieselbe Minute mit derselben  Menge hinzugefügt werden.</string>
-    <string name="about_link_urls">\n\nhttp://www.androidaps.org\nhttp://www.androidaps.de (de)\n\nSupport:\nhttps://de.loopercommunity.org/ (de)\nhttp://facebook.androidaps.org</string>
+    <string name="about_link_urls">\n\nhttp://www.androidaps.org\nhttp://www.androidaps.de (de)\n\nSupport:\nhttps://de.loopercommunity.org/\nhttp://facebook.androidaps.org</string>
     <string name="combo_check_date">Der letzte Bolus liegt mehr als 24 Stunden zurück oder liegt in der Zukunft. Prüfe bitte das Datum auf der Pumpe.</string>
     <string name="combo_suspious_bolus_time">Zeit/Datum des abgegebenen Boluses auf der Pumpe erscheint falsch, IOB ist wahrscheinlich nicht korrekt. Bitte prüfe Zeit/Datum der Pumpe.</string>
     <string name="profileswitch_ismissing">Profil-Wechsel fehlt, bitte nimm einen Profil-Wechsel vor oder drücke \"AKTIVIERE PROFIL\" im lokalen Profil.</string>
@@ -1447,7 +1447,7 @@ Unerwartetes Verhalten.</string>
     <string name="clearqueueconfirm">Warteschlange löschen? Alle Daten in der Warteschlange gehen verloren!</string>
     <string name="ebstopsloop">Die Verwendung eines Verzögerungsbolus unterbricht dem Closed Loop Modus für die Dauer des Verzögerungsbolus. Willst Du das wirklich?</string>
     <string name="closed_loop_disabled_with_eb">Closed Loop wegen Verzögerungsbolus unterbrochen</string>
-    <string name="extended_bolus_short">VB</string>
+    <string name="extended_bolus_short">VerzB</string>
     <string name="phonechecker">\"PhoneChecker\"</string>
     <string name="chartmenu">Diagrammmenü</string>
     <string name="sensitivity_short">AS</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 48e69e0564..9c4bd4d36a 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -1446,4 +1445,8 @@
     <string name="ebstopsloop">El uso de la función de bolo extendido detendrá el modo de bucle cerrado durante el tiempo de ejecución del bolo extendido. ¿Realmente quieres esto?</string>
     <string name="closed_loop_disabled_with_eb">Bucle cerrado inhabilitado debido a la ejecución del bolo extendido</string>
     <string name="extended_bolus_short">EB</string>
+    <string name="chartmenu">Menú gráfico</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Tiempo requerido de SMB</string>
+    <string name="loop_smbexecution_time_label">Tiempo de ejecución de SMB</string>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 2437913625..c398fc1990 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -157,7 +156,7 @@
     <string name="changeyourinput">Changez vos entrées !</string>
     <string name="configbuilder_bgsource">Source des glycémies</string>
     <string name="configbuilder_bgsource_description">Quelle source de données doit être utilisée par AndroidAPS ?</string>
-    <string name="xdrip">xDrip</string>
+    <string name="xdrip">xDrip+</string>
     <string name="apsmode_title">Mode APS</string>
     <string name="closedloop">Boucle Fermée</string>
     <string name="openloop">Boucle Ouverte</string>
@@ -196,7 +195,7 @@
     <string name="careportal_newnstreatment_sensor">Capteur</string>
     <string name="careportal_newnstreatment_carbs_label">Glucides</string>
     <string name="careportal_newnstreatment_insulin_label">Insuline</string>
-    <string name="careportal_newnstreatment_carbtime_label">Heure glucides</string>
+    <string name="careportal_newnstreatment_carbtime_label">Décalage horaire</string>
     <string name="careportal_newnstreatment_split_label">Diviser</string>
     <string name="careportal_newnstreatment_duration_label">Durée</string>
     <string name="careportal_newnstreatment_percent_label">Pourcentage</string>
@@ -220,7 +219,7 @@
     <string name="nav_import">Importer les paramètres</string>
     <string name="openapsma_maxbasal_title">Max. U/hr pour le débit temp Basal</string>
     <string name="openapsma_maxbasal_summary">Cette valeur est appelée Basal Maximum dans le contexte OpenAPS</string>
-    <string name="openapsma_maxiob_title">Le Basal IA maximum que l\'OpenAPS pourra délivrer [U]</string>
+    <string name="openapsma_maxiob_title">IA basale max que OpenAPS pourra délivrer [U]</string>
     <string name="openapsma_maxiob_summary">Cette valeur est appelée Max IA (Insuline Active) dans le contexte OpenAPS\nC\'estlle maximum d\'insuline en [U] que APS peut délivrer en une seule fois.</string>
     <string name="dismiss">FERMER</string>
     <string name="danarpump">DanaR</string>
@@ -385,7 +384,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="resend_all_data">Renvoyer toutes les données</string>
     <string name="open_settings_on_wear">Afficher les Paramètres sur la Montre</string>
     <string name="pumperror">Erreur Pompe</string>
-    <string name="lowbattery">Niveau Batterie Bas</string>
+    <string name="lowbattery">Piles Faibles</string>
     <string name="pumpshutdown">Arrêt de la Pompe</string>
     <string name="batterydischarged">Batterie Pompe Déchargée</string>
     <string name="danarkoreanpump">DanaR Coréenne</string>
@@ -644,7 +643,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="insulin_peak_time">Temps du Pic [min]</string>
     <string name="free_peak_oref">Profil d\'insuline ajustable Oref</string>
     <string name="rapid_acting_oref">Insuline à Action Rapide Oref </string>
-    <string name="ultrarapid_oref">Insuline à Action Ultra Rapide Oref</string>
+    <string name="ultrarapid_oref">Insuline Ultra Rapide Oref</string>
     <string name="dia_too_short">Durée d’Action pour %1$f trop courte - utiliser %2$f à la place !</string>
     <string name="activate_profile">Activer le profil</string>
     <string name="date"> Date</string>
@@ -701,7 +700,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="pumpdrivercorrected">Pilote pompe corrigé</string>
     <string name="pump_unreachable">Pompe hors de portée</string>
     <string name="missed_bg_readings">Valeurs de glycémie manquantes</string>
-    <string name="raise_notifications_as_android_notifications">Utiliser le système des notifications</string>
+    <string name="raise_notifications_as_android_notifications">Utiliser les notifications système pour les alertes et notifications</string>
     <string name="localalertsettings_title">Alertes locales</string>
     <string name="enable_missed_bg_readings_alert">Alerte pas nouvelle donnée glycémique</string>
     <string name="enable_pump_unreachable_alert">Alerte si la pompe est hors de portée</string>
@@ -766,7 +765,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="danar_history">Historique pompe</string>
     <string name="combo_activity_setting_basal_profile">Définir le profil basal</string>
     <string name="combo_pump_cartridge_low_warrning">Niveau réservoir pompe bas</string>
-    <string name="combo_pump_battery_low_warrning">Niveau batterie pompe bas</string>
+    <string name="combo_pump_battery_low_warrning">Pile pompe faible</string>
     <string name="combo_is_in_error_state">La pompe affiche l’erreur E%1$d: %2$s</string>
     <string name="combo_reservoir_low">Bas</string>
     <string name="combo_reservoir_empty">Vide</string>
@@ -885,7 +884,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="reset">réinitialiser</string>
     <string name="waitingfortimesynchronization">En attente de synchronisation de l\'heure (%1$d sec)</string>
     <string name="loopdisconnectedfor">Déconnecté (%1$d m)</string>
-    <string name="openapssmb_maxiob_title">Maximum Insuline Active IA pour OpenAPS [U]</string>
+    <string name="openapssmb_maxiob_title">IA totale maximale pour OpenAPS [U]</string>
     <string name="openapssmb_maxiob_summary">Cette valeur est appelée Max IA (Insuline Active) dans le contaxte OpenAPS\nOpenAPS n’ajoutera pas plus d’insuline si l\'IA (Insuline Active) actuelle est supérieure à cette valeur</string>
     <string name="pump_stopped">Pompe arrêtée</string>
     <string name="pump_started">Pompe démarrée</string>
@@ -909,15 +908,15 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="cgm">MGC</string>
     <string name="ns_wifionly">Utilisez uniquement connexion Wi-fi</string>
     <string name="ns_wifi_ssids">Wi-fi SSID</string>
-    <string name="ns_chargingonly">Wi-fi uniquement pendant la charge</string>
+    <string name="ns_chargingonly">Uniquement si en charge</string>
     <string name="connectionsettings_title">Paramètres de connexion</string>
     <string name="ns_wifi_allowedssids">SSIDs autorisés (séparés par point-virgule)</string>
     <string name="ns_allowroaming">Autoriser connexion données itinérance</string>
     <string name="openapsama_autosens_max">Maximum Ratio Autosens</string>
     <string name="openapsama_autosens_min">Minimum Ratio Autosens</string>
-    <string name="openapsama_bolussnooze_dia_divisor">Diviseur de Bolus snooze DIA</string>
-    <string name="openapsama_max_daily_safety_multiplier">Maximum multiplicateur quotidien de sécurité</string>
-    <string name="openapsama_current_basal_safety_multiplier">Multiplicateur actuel de sécurité du Basal</string>
+    <string name="openapsama_bolussnooze_dia_divisor">Snooze bolus Diviseur de DAI</string>
+    <string name="openapsama_max_daily_safety_multiplier">Multiplicateur max quotidien de sécurité</string>
+    <string name="openapsama_current_basal_safety_multiplier">Multiplicateur de sécurité basale courante</string>
     <string name="value_unavailable_short">ND</string>
     <string name="virtualpump_type">Type de pompe virtuelle</string>
     <string name="virtualpump_definition">Définition de pompe</string>
@@ -947,6 +946,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="startobjective">Démarrez votre premier objectif</string>
     <string name="permission">Autorisation</string>
     <string name="askforpermission">Demande d\'autorisation</string>
+    <string name="needsystemwindowpermission">L\'application a besoin de l\'autorisation d\'accès à la fenêtre système pour les notifications</string>
     <string name="needlocationpermission">L\'application requiert l\'autorisation de localisation pour le balayage Bluetooth</string>
     <string name="needstoragepermission">L\'application requiert une autorisation de stockage de données afin de pouvoir sauvegarder les fichiers journaux</string>
     <string name="request">Demande</string>
@@ -1015,7 +1015,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="commanderror">Erreur de commande</string>
     <string name="speederror">Erreur de vitesse</string>
     <string name="insulinlimitviolation">Violation d\'une limite d\'insuline</string>
-    <string name="loop_openmode_min_change">Changement minimum possible [%]</string>
+    <string name="loop_openmode_min_change">Changement minimum [%]</string>
     <string name="loop_openmode_min_change_summary">Le fonctionnement de la Boucle demandera une confirmation uniquement si le changement est supérieur à cette valeur en %. Par défaut, la valeur est 20%</string>
     <string name="pairfirst">Appairez SVP votre pompe avec votre téléphone !</string>
     <string name="searching_for_devices">Recherche d\'appareils en cours…</string>
@@ -1244,7 +1244,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="medtronic_pump_frequency_worldwide">Mondial (868 Mhz)</string>
     <string name="medtronic_pump_encoding_4b6b_local">Encodage logiciel 4b6b</string>
     <string name="medtronic_pump_encoding_4b6b_rileylink">Encodage matériel 4b6b</string>
-    <string name="medtronic_custom_action_wake_and_tune">Réveil et mise au point</string>
+    <string name="medtronic_custom_action_wake_and_tune">Réveil et Réglage</string>
     <string name="medtronic_custom_action_clear_bolus_block">Effacer le bloc Bolus</string>
     <string name="medtronic_custom_action_reset_rileylink">Réinitialiser la config. RileyLink</string>
     <string name="medtronic_pump_battery_select">Type de batterie (vue d\'alimentation)</string>
@@ -1270,8 +1270,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Paramètres</string>
     <string name="rileylink_settings_tab2">Historique</string>
-    <string name="rileylink_status">Statut du RileyLink</string>
-    <string name="medtronic_pump_status">Statut de la pompe</string>
+    <string name="rileylink_status">État du RileyLink</string>
+    <string name="medtronic_pump_status">État de la pompe</string>
     <string name="title_activity_rileylink_settings">Paramètres RileyLink</string>
     <string name="rileylink_title">RileyLink</string>
     <string name="rileylink_configured_address">Adresse configurée</string>
@@ -1300,7 +1300,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="rileylink_error_bt_disabled">Bluetooth est désactivé</string>
     <string name="rileylink_error_no_bt_adapter">Aucun adaptateur Bluetooth</string>
     <string name="rileylink_error_tuneup_failed">Échec du réglage</string>
-    <string name="rileylink_error_pump_unreachable">Pompe inaccessible</string>
+    <string name="rileylink_error_pump_unreachable">Pompe hors de portée</string>
     <string name="rileylink_error_pod_unreachable">Pod inaccessible</string>
     <string name="rileylink_error_address_not_set_short">Non configuré</string>
     <!-- RL Target Device -->
@@ -1448,4 +1448,10 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="closed_loop_disabled_with_eb">Boucle fermée désactivée à cause du bolus étendu</string>
     <string name="extended_bolus_short">EB</string>
     <string name="phonechecker">\"Vérif. du téléphone\"</string>
+    <string name="chartmenu">Menu Graph</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Heure de demande SMB</string>
+    <string name="loop_smbexecution_time_label">Heure d\'exécution SMB</string>
+    <string name="loop_tbrrequest_time_label">Heure de demande basal temp</string>
+    <string name="loop_tbrexecution_time_label">Heure d\'exécution basal temp</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index cbf0f50945..952633064b 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -946,6 +946,7 @@
     <string name="startobjective">Avvia il tuo primo obiettivo</string>
     <string name="permission">Permesso</string>
     <string name="askforpermission">Chiedi il permesso</string>
+    <string name="needsystemwindowpermission">L\'applicazione richiede il permesso finestra di sistema per le notifiche</string>
     <string name="needlocationpermission">L\'applicazione richiede l\'accesso alla posizione per eseguire lo scan bluetooth</string>
     <string name="needstoragepermission">L\'applicazione richiede l\'accesso alla memoria per salvare i file di log</string>
     <string name="request">Richiesta</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 066b4aee6b..66e4215fe6 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -105,7 +104,7 @@
     <string name="reason">근거</string>
     <string name="glucose">혈당</string>
     <string name="delta">증분</string>
-    <string name="sms_delta">증분:</string>
+    <string name="sms_delta">Delta:</string>
     <string name="configbuilder">구성 관리자</string>
     <string name="objectives">목표</string>
     <string name="openapsma">OpenAPS MA</string>
@@ -155,7 +154,7 @@
     <string name="sms_basal">Basal:</string>
     <string name="carbs">탄수화물</string>
     <string name="changeyourinput">입력값을 변경하세요!</string>
-    <string name="configbuilder_bgsource">혈당 소스</string>
+    <string name="configbuilder_bgsource">혈당 출처</string>
     <string name="configbuilder_bgsource_description">AndroidAPS가 어디에서 데이터를 가져옵니까?</string>
     <string name="xdrip">xDrip</string>
     <string name="apsmode_title">APS 모드</string>
@@ -183,7 +182,7 @@
     <string name="careportal_insulincartridgechange">인슐린 카트리지 교체</string>
     <string name="careportal_profileswitch">프로파일 변경</string>
     <string name="careportal_snackbolus">간식Bolus</string>
-    <string name="careportal_mealbolus">식사Bolus</string>
+    <string name="careportal_mealbolus">Meal Bolus</string>
     <string name="careportal_correctionbolus">교정Bolus</string>
     <string name="careportal_combobolus">콤보Bolus</string>
     <string name="careportal_tempbasalstart">임시Basal 시작</string>
@@ -254,7 +253,7 @@
     <string name="smscommunicator_allowednumbers">허가된 전화번호</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Bolus %1$.2fU 을 주입하려면 %2$s 를 입력하고 답장하세요</string>
-    <string name="smscommunicator_mealbolusreplywithcode">식사Bolus %1$.2f을 주입하려면 %2$s를 입력하고 답장하세요</string>
+    <string name="smscommunicator_mealbolusreplywithcode">MEAL Bolus %1$.2f을 주입하려면 %2$s를 입력하고 답장하세요</string>
     <string name="smscommunicator_temptargetwithcode">임시목표 %1$s를 설정하려면 %2$s를 입력하고 답장하세요</string>
     <string name="smscommunicator_temptargetcancel">임시목표를 취소하려면 %1$s를 입력하고 답장하세요</string>
     <string name="smscommunicator_stopsmswithcode">SMS 원격 기능을 비활성화려면 %1$s를 입력하고 답장하세요.\n\nAAPS 마스터폰을 통해서만 다시 활성화할 수 있습니다.</string>
@@ -267,7 +266,7 @@
     <string name="bolusdelivered">Bolus %1$.2fU이 주입 완료되었습니다.</string>
     <string name="bolusrequested">%1$.2fU을 주입합니다</string>
     <string name="smscommunicator_bolusdelivered">Bolus %1$.2fU이 주입 완료되었습니다</string>
-    <string name="smscommunicator_mealbolusdelivered">식사Bolus %1$.2f이 주입 완료되었습니다</string>
+    <string name="smscommunicator_mealbolusdelivered">Meal Bolus %1$.2f이 주입 완료되었습니다</string>
     <string name="smscommunicator_mealbolusdelivered_tt">%2$d 분 동안 목표 %1$s</string>
     <string name="smscommunicator_tt_set">%2$d 분 동안 목표 %1$s 설정이 완료되었습니다</string>
     <string name="smscommunicator_tt_canceled">임시 목표 취소가 완료되었습니다</string>
@@ -328,24 +327,24 @@
     <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_profilereplywithcode">프로파일 %1$s %2$d%%로 변경하려면 %3$s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_extendedreplywithcode">%2$d분 동안 확장 Bolus %1$.2fU 주입하려면 %3$s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_carbsreplywithcode">%2$s에 %1$dg을 입력하려면 %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_extendedset">Extended bolus %1$.2fU for %2$d min started successfully</string>
     <string name="smscommunicator_carbsset">탄수화물 %1$dg 입력이 완료되었습니다</string>
     <string name="smscommunicator_carbsfailed">탄수화물 %1$dg 입력이 실패하였습니다</string>
-    <string name="smscommunicator_tempbasalset_percent">%2$d분 동안 임시Basal %1$d%%주입이 성공적으로 시작되었습니다</string>
+    <string name="smscommunicator_tempbasalset_percent">Temp basal %1$d%% for %2$d min started successfully</string>
     <string name="smscommunicator_tempbasalfailed">Temp Basal start failed</string>
-    <string name="smscommunicator_extendedfailed">확장 Bolus 실행 실패</string>
+    <string name="smscommunicator_extendedfailed">Extended bolus start failed</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_extendedcanceled">Extended bolus canceled</string>
     <string name="smscommunicator_tempbasalcancelfailed">Canceling Temp Basal failed</string>
-    <string name="smscommunicator_extendedcancelfailed">확장 Bolus 취소가 실패하였습니다.</string>
+    <string name="smscommunicator_extendedcancelfailed">Canceling extended bolus failed</string>
     <string name="smscommunicator_unknowncommand">알려지지 않은 명령이거나 잘못된 답장입니다</string>
     <string name="quickwizard">빠른마법사</string>
     <string name="quickwizardsettings">빠른마법사 설정</string>
@@ -355,12 +354,12 @@
     <string name="overview_editquickwizardlistactivity_add">추가</string>
     <string name="overview_quickwizard_item_edit_button">수정</string>
     <string name="overview_quickwizard_item_remove_button">삭제</string>
-    <string name="mealbolus">식사</string>
+    <string name="mealbolus">Meal</string>
     <string name="correctionbous">교정주입</string>
     <string name="actions">실행</string>
     <string name="androidaps_start">AndroidAPS 시작</string>
     <string name="ns_upload_only">NS에 업로드만 하기(동기화 안됨)</string>
-    <string name="ns_upload_only_summary">NS에 업로드만 하기. 로컬소스(xDrip)가 선택되지 않으면 SGV에는 효력이 없습니다. NS프로파일이 사용중이라면 프로파일에는 효력이 없습니다.</string>
+    <string name="ns_upload_only_summary">NS에 업로드만 하기. xDrip같은 로컬 혈당 출처가 선택되지 않다면 SGV에는 효력이 없습니다. NS프로파일이 사용중이라면 프로파일에는 효력이 없습니다.</string>
     <string name="pumpNotInitialized">펌프가 초기화 되지 않았습니다!</string>
     <string name="pumpNotInitializedProfileNotSet">펌프가 초기화와 프로파일 설정이 되지 않았습니다!</string>
     <string name="primefill">교체/채움</string>
@@ -668,7 +667,7 @@
     <string name="default_temptargets">임시목표 기본값</string>
     <string name="eatingsoon_duration">식사직전 기간</string>
     <string name="eatingsoon_target">식사직전 목표</string>
-    <string name="activity_duration">activity 기간</string>
+    <string name="activity_duration">활동 기간</string>
     <string name="activity_target">활동 목표</string>
     <string name="hypo_duration">저혈당 기간</string>
     <string name="hypo_target">저혈당 목표</string>
@@ -784,9 +783,9 @@
     <string name="format_hours">%1$.2f 시간</string>
     <string name="format_mins">%1$d 분</string>
     <string name="enablesmbalways">항상 SMB 사용하기</string>
-    <string name="enablesmbalways_summary">Bolus와 독립적으로 항상 SMB를 사용합니다. G5처럼 잘 필터된 혈당소스와만 사용이 가능합니다.</string>
+    <string name="enablesmbalways_summary">Bolus와 독립적으로 항상 SMB를 사용합니다. G5처럼 잘 필터된 혈당출처와만 사용이 가능합니다.</string>
     <string name="enablesmbaftercarbs">탄수화물 이후 SMB를 사용합니다.</string>
-    <string name="enablesmbaftercarbs_summary">탄수화물 이후 6시간동안 SMB를 사용합니다, 0 COB이라도 적용됩니다. G5처럼 잘 필터된 혈당소스와만 사용이 가능합니다.</string>
+    <string name="enablesmbaftercarbs_summary">탄수화물 이후 6시간동안 SMB를 사용합니다, 0 COB이라도 적용됩니다. G5처럼 잘 필터된 혈당출처와만 사용이 가능합니다.</string>
     <string name="enablesmbwithcob">COB와 SMB를 사용합니다.</string>
     <string name="enablesmbwithcob_summary">활성화된 COB가 있으면 SMB를 사용합니다.</string>
     <string name="enablesmbwithtemptarget">임시 목표에서 SMB 사용하기</string>
@@ -878,7 +877,7 @@
     <string name="readstatusfailed">상태를 읽지 못했습니다.</string>
     <string name="record_pump_site_change">펌프 위치 변경 기록</string>
     <string name="record_insulin_cartridge_change">인슐린 카트리지 변경 기록</string>
-    <string name="smbalwaysdisabled">선택한 BG 소스가 고급 필터링을 지원하지 않기 때문에 SMB가 항상 비활성화됩니다.</string>
+    <string name="smbalwaysdisabled">선택한 혈당 출처가 고급 필터링을 지원하지 않기 때문에 SMB가 항상 비활성화됩니다.</string>
     <string name="smbnotallowedinopenloopmode">Open Loop모드에선 SMB가 허용되지 않습니다.</string>
     <string name="food_short">Food</string>
     <string name="reset">재설정</string>
@@ -940,7 +939,7 @@
     <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
     <string name="nsclientinfotext">NSClient는 Nightscout와의 연결을 처리합니다. 이 부분을 건너뛸 수 있지만 설정하기 전엔 목적을 수행할 수 없습니다.</string>
     <string name="diawarning">새로운 인슐린 프로파일은 최소 5시간의 DIA가 요구됩니다. 새로운 프로파일의 DIA 5-6시간은 구식 인슐린 프로파일의 DIA 3시간과 동일합니다.</string>
-    <string name="bgsourcesetup">혈당소스 설정하기</string>
+    <string name="bgsourcesetup">혈당 출처 설정하기</string>
     <string name="setupwizard_profile_description">프로파일 소스를 선택해주세요. 당뇨인이 어린이라면 NS 프로파일을 선택하여야 합니다. Nightscout으로 관리해줄 사람이 없다면 당신은 로컬 프로파일을 선호할 수도 있습니다. 여기선 프로파일의 소스를 선택할 뿐이라는 것을 명심하세요. 그 프로파일을 실제 사용하려면 \"프로파일 변경\"을 실행하여 프로파일을 활성화 시켜야합니다.</string>
     <string name="setupwizard_aps_description">사용 가능한 알고리즘 중 하나를 선택하세요. 과거부터 최신의 순으로 정렬이 되어 있습니다. 일반적으로 새로운 알고리즘은 보다 강력하고 공격적입니다. 따라서 당신이 신규 사용자라면 최신의 알고리즘보단 AMA로 시작하는것이 나을 수 있습니다. 사용 전에 OpenAPS 문서를 읽어보고 설정하는 것을 잊지마세요.</string>
     <string name="startobjective">첫번째 목표를 시작하세요.</string>
diff --git a/app/src/main/res/values-nl-rNL/exam.xml b/app/src/main/res/values-nl-rNL/exam.xml
index 9768183305..eefa78bba3 100644
--- a/app/src/main/res/values-nl-rNL/exam.xml
+++ b/app/src/main/res/values-nl-rNL/exam.xml
@@ -122,7 +122,7 @@
     <string name="nsclient_xdripfollower">xDrip app in volg-modus.</string>
     <string name="nsclient_looponiphone">Loop app op de iPhone.</string>
     <string name="nsclient_spikeiphone">Spike app op de iPhone.</string>
-    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Children/kinderen.html</string>
+    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Children/Children.html</string>
     <string name="isf_label">Onderwerp: Insulinegevoeligheidsfactor</string>
     <string name="isf_increasingvalue">Hogere ISF-waarden leiden tot minder insulineafgifte wanneer AAPS voor hoge BG corrigeert.</string>
     <string name="isf_decreasingvalue">Lagere ISF-waarden leiden tot minder insulineafgifte wanneer AAPS voor hoge BG corrigeert.</string>
@@ -130,7 +130,7 @@
     <string name="isf_preferences">U moet ISF invoeren in Instellingen.</string>
     <string name="isf_profile">Het wijzigen van de ISF-waarde in uw profiel is voldoende om de wijziging toe te passen.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Getting-Started/FAQ.html#insuline-gevoeligheids-factor-insulin-sensitivity-factor-ISF-mmol-l-E-of-mg-dl-E</string>
-    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Usage/Profielen.html</string>
+    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Usage/Profiles.html</string>
     <string name="ic_label">Onderwerp: De KH ratio</string>
     <string name="ic_increasingvalue">Hogere KH ratios leiden tot minder insuline afgifte voor een bepaalde hoeveelheid koolhydraten.</string>
     <string name="ic_decreasingvalue">Lagere KH ratios leiden tot minder insuline afgifte voor een bepaalde hoeveelheid koolhydraten.</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index d2c3a9d519..313f6c6658 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -946,6 +946,7 @@
     <string name="startobjective">Iniciar primeiro objectivo</string>
     <string name="permission">Permissão</string>
     <string name="askforpermission">Pedir permissão</string>
+    <string name="needsystemwindowpermission">Aplicação precisa de permissão de janela do sistema para notificações</string>
     <string name="needlocationpermission">Aplicação requer permissão de localização para pesquisa BT</string>
     <string name="needstoragepermission">Aplicação necessita da permissão de armazenamento para ser capaz de armazenar ficheiros de registo</string>
     <string name="request">Pedido</string>
@@ -1449,4 +1450,8 @@
     <string name="phonechecker">\"VerificadorTelefone\"</string>
     <string name="chartmenu">Menu do Gráfico</string>
     <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Hora de solicitação SMB</string>
+    <string name="loop_smbexecution_time_label">Hora de execução do SMB</string>
+    <string name="loop_tbrrequest_time_label">Hora de solicitação Basal Temp</string>
+    <string name="loop_tbrexecution_time_label">Hora de execução Basal Temp</string>
 </resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 38500ca8a2..0b8fdca2e3 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -946,6 +946,7 @@
     <string name="startobjective">Spusťte prvý cieľ</string>
     <string name="permission">Povolenie</string>
     <string name="askforpermission">Vyžiadať si povolenie</string>
+    <string name="needsystemwindowpermission">Aplikácia vyžaduje pre oznámenia systémové oprávnenie</string>
     <string name="needlocationpermission">Aplikácia vyžaduje povolenie \"polohy\", aby mohla vyhľadávať BT zariadenia</string>
     <string name="needstoragepermission">Aplikácia vyžaduje prístup k úložisku, aby mohla ukladať logy</string>
     <string name="request">Požiadavka</string>
@@ -1449,4 +1450,8 @@
     <string name="phonechecker">PhoneChecker</string>
     <string name="chartmenu">Grafové menu</string>
     <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Čas požiadavky SMB</string>
+    <string name="loop_smbexecution_time_label">Čas aplikácie SMB</string>
+    <string name="loop_tbrrequest_time_label">Čas požiadavky dočasného bazálu</string>
+    <string name="loop_tbrexecution_time_label">Čas spustenia dočasného bazálu</string>
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index ec0e76b738..96b45303a9 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -947,6 +947,7 @@ Eversense-appen.</string>
     <string name="startobjective">Påbörja ditt första mål</string>
     <string name="permission">Behörighet</string>
     <string name="askforpermission">Be om behörighet</string>
+    <string name="needsystemwindowpermission">Applikationen behöver förhöjd behörighet för aviseringar</string>
     <string name="needlocationpermission">Appen behöver behörighet att använda Platsinfo för att kunna söka efter Bluetooth-enheter</string>
     <string name="needstoragepermission">Appen behöver behörighet att använda Lagring för att kunna spara loggfiler</string>
     <string name="request">Begäran</string>
@@ -1448,4 +1449,10 @@ Eversense-appen.</string>
     <string name="closed_loop_disabled_with_eb">Closed Loop-läget inaktiverat pga att en förlängd bolus är aktiv</string>
     <string name="extended_bolus_short">FB</string>
     <string name="phonechecker">Telefonkontroll</string>
+    <string name="chartmenu">Diagrammeny</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">SMB begärd</string>
+    <string name="loop_smbexecution_time_label">SMB utförd</string>
+    <string name="loop_tbrrequest_time_label">Basalförändring begärd</string>
+    <string name="loop_tbrexecution_time_label">Basalförändring utförd</string>
 </resources>
diff --git a/wear/src/main/res/values-es-rES/strings.xml b/wear/src/main/res/values-es-rES/strings.xml
index af200da3fb..6e65157335 100644
--- a/wear/src/main/res/values-es-rES/strings.xml
+++ b/wear/src/main/res/values-es-rES/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="app_name">AAPS</string>
     <string name="label_actions_activity">AAPS</string>
@@ -51,6 +50,7 @@
     <string name="pref_low">Bajo</string>
     <string name="pref_medium">Medio</string>
     <string name="pref_high">Alto</string>
+    <string name="pref_auto">Auto</string>
     <string name="pref_big_numbers">Números grandes</string>
     <string name="pref_ring_history">Historial de Ring</string>
     <string name="pref_light_ring_history">Historial de Ring Light</string>

From dfd3115b590262a6183bd0ec92c1c8ffd426ac5e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 29 Feb 2020 21:32:06 +0100
Subject: [PATCH 24/56] gradle update

---
 .idea/codeStyles/Project.xml             | 3 ---
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 48bbf82e58..d1c3d63de5 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,9 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="AUTODETECT_INDENTS" value="false" />
-    <AndroidXmlCodeStyleSettings>
-      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="6" />
diff --git a/build.gradle b/build.gradle
index 3327014f1f..8e59090d9d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.0'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath 'io.fabric.tools:gradle:1.31.2'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 008330001c..dc6471224f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 21 10:14:00 CEST 2019
+#Sat Feb 29 21:28:06 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

From ca000a5f3322889dcf93b6d2467b9fadf2fa4d7e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 29 Feb 2020 21:33:50 +0100
Subject: [PATCH 25/56] key_ns_upload_only true by default

---
 .../plugins/treatments/fragments/TreatmentsBolusFragment.java   | 2 +-
 .../treatments/fragments/TreatmentsCareportalFragment.java      | 2 +-
 .../treatments/fragments/TreatmentsProfileSwitchFragment.kt     | 2 +-
 .../treatments/fragments/TreatmentsTempTargetFragment.java      | 2 +-
 .../java/info/nightscout/androidaps/services/DataService.java   | 2 +-
 app/src/main/res/xml/pref_nsclientinternal.xml                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.java
index 27e35ed456..3c1d56afb7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.java
@@ -221,7 +221,7 @@ public class TreatmentsBolusFragment extends Fragment {
             });
         });
 
-        boolean nsUploadOnly = SP.getBoolean(R.string.key_ns_upload_only, false);
+        boolean nsUploadOnly = SP.getBoolean(R.string.key_ns_upload_only, true);
         if (nsUploadOnly)
             refreshFromNS.setVisibility(View.GONE);
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.java
index 5aa4f091d8..11b0c3a105 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.java
@@ -136,7 +136,7 @@ public class TreatmentsCareportalFragment extends Fragment {
         view.findViewById(R.id.careportal_removeandroidapsstartedevents).setOnClickListener(v ->
                 OKDialog.showConfirmation(getContext(), MainApp.gs(R.string.careportal), MainApp.gs(R.string.careportal_removestartedevents), this::removeAndroidAPSStatedEvents));
 
-        boolean nsUploadOnly = SP.getBoolean(R.string.key_ns_upload_only, false);
+        boolean nsUploadOnly = SP.getBoolean(R.string.key_ns_upload_only, true);
         if (nsUploadOnly)
             refreshFromNS.setVisibility(View.GONE);
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
index 45d25124de..c2b16f5d13 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
@@ -51,7 +51,7 @@ class TreatmentsProfileSwitchFragment : Fragment() {
                 })
             }
         }
-        if (SP.getBoolean(R.string.key_ns_upload_only, false)) profileswitch_refreshfromnightscout.visibility = View.GONE
+        if (SP.getBoolean(R.string.key_ns_upload_only, true)) profileswitch_refreshfromnightscout.visibility = View.GONE
 
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
index 8b73ec8ed2..f42f59a527 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
@@ -168,7 +168,7 @@ public class TreatmentsTempTargetFragment extends Fragment {
                     RxBus.INSTANCE.send(new EventNSClientRestart());
                 }));
 
-        boolean nsUploadOnly = SP.getBoolean(R.string.key_ns_upload_only, false);
+        boolean nsUploadOnly = SP.getBoolean(R.string.key_ns_upload_only, true);
         if (nsUploadOnly)
             refreshFromNS.setVisibility(View.GONE);
 
diff --git a/app/src/main/java/info/nightscout/androidaps/services/DataService.java b/app/src/main/java/info/nightscout/androidaps/services/DataService.java
index 5907ac8392..b31ef78e7d 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/DataService.java
+++ b/app/src/main/java/info/nightscout/androidaps/services/DataService.java
@@ -54,7 +54,7 @@ public class DataService extends IntentService {
             log.debug("onHandleIntent " + BundleLogger.log(intent.getExtras()));
         }
 
-        boolean acceptNSData = !SP.getBoolean(R.string.key_ns_upload_only, false);
+        boolean acceptNSData = !SP.getBoolean(R.string.key_ns_upload_only, true);
         Bundle bundles = intent.getExtras();
 
         final String action = intent.getAction();
diff --git a/app/src/main/res/xml/pref_nsclientinternal.xml b/app/src/main/res/xml/pref_nsclientinternal.xml
index b27759f627..cbe9b25f93 100644
--- a/app/src/main/res/xml/pref_nsclientinternal.xml
+++ b/app/src/main/res/xml/pref_nsclientinternal.xml
@@ -138,7 +138,7 @@
                 android:title="@string/ns_localbroadcasts_title" />
 
             <SwitchPreference
-                android:defaultValue="false"
+                android:defaultValue="true"
                 android:key="@string/key_ns_upload_only"
                 android:summary="@string/ns_upload_only_summary"
                 android:title="@string/ns_upload_only" />

From 9067c7cedc2a313861db63fb7eb1543d52b21a48 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 29 Feb 2020 22:37:42 +0100
Subject: [PATCH 26/56] fix wear library

---
 app/libs/ustwo-clockwise-debug.aar | Bin 0 -> 90266 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/libs/ustwo-clockwise-debug.aar

diff --git a/app/libs/ustwo-clockwise-debug.aar b/app/libs/ustwo-clockwise-debug.aar
new file mode 100644
index 0000000000000000000000000000000000000000..8257a991be6e1ff5490cafa8f66372d72b49e003
GIT binary patch
literal 90266
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
U0-rk*OpE&|;B3@zHvoYD10>zvIRF3v

literal 0
HcmV?d00001


From aa6e1d5af6a69045e62e2efba24df7f0bd4fbadc Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 29 Feb 2020 22:49:46 +0100
Subject: [PATCH 27/56] New Crowdin translations (#2460)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)
---
 app/src/main/res/values-cs-rCZ/strings.xml  |  8 +++++++-
 app/src/main/res/values-fr-rFR/strings.xml  |  4 ++--
 app/src/main/res/values-lt-rLT/strings.xml  |  1 -
 wear/src/main/res/values-cs-rCZ/strings.xml | 15 ++++++++++++++-
 wear/src/main/res/values-lt-rLT/strings.xml |  4 +++-
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 27b740f305..23a29a18b6 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -946,6 +945,7 @@
     <string name="startobjective">Spusťte první cíl</string>
     <string name="permission">Povolení</string>
     <string name="askforpermission">Získat povolení</string>
+    <string name="needsystemwindowpermission">Pro oznámení vyžaduje aplikace oprávnění systémového okna</string>
     <string name="needlocationpermission">Aplikace vyžaduje povolení \"umístění\", aby mohla vyhledávat BT zařízení</string>
     <string name="needstoragepermission">Aplikace vyžaduje přístup k úložišti, aby mohla ukládat logy</string>
     <string name="request">Požadavek</string>
@@ -1447,4 +1447,10 @@
     <string name="closed_loop_disabled_with_eb">Uzavřená smyčka je zastavena kvůli běžícímu rozloženému bolusu</string>
     <string name="extended_bolus_short">EB</string>
     <string name="phonechecker">PhoneChecker</string>
+    <string name="chartmenu">Možnosti grafu</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Čas požadavku SMB</string>
+    <string name="loop_smbexecution_time_label">Čas provedení SMB</string>
+    <string name="loop_tbrrequest_time_label">Čas požadavku dočasného bazálu</string>
+    <string name="loop_tbrexecution_time_label">Čas provedení dočasného bazálu</string>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index c398fc1990..1ff963cf88 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -437,7 +437,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="loop_shortname">BOUCLE</string>
     <string name="simpleprofile_shortname">P.S.</string>
     <string name="oaps_shortname">OAPS</string>
-    <string name="localprofile_shortname">P.L.</string>
+    <string name="localprofile_shortname">PL</string>
     <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">ACCUEIL</string>
     <string name="virtualpump_shortname">POMPEV</string>
@@ -1396,7 +1396,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="format_carbs">%1$dg</string>
     <string name="common_on">On</string>
     <string name="common_off">Off</string>
-    <string name="objectives_button_unfinish">Suppression terminée</string>
+    <string name="objectives_button_unfinish">Refaire l\'objectif</string>
     <string name="objectives_button_unstart">Suppression démarrée</string>
     <string name="timedetection">Détection de temps</string>
     <string name="doyouwantresetstart">Voulez-vous réinitialiser le début de l\'objectif ? Vous risquez de perdre vos progrès.</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 4b6fac99cb..98a261b098 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/wear/src/main/res/values-cs-rCZ/strings.xml b/wear/src/main/res/values-cs-rCZ/strings.xml
index 9b7c4d66de..d231921014 100644
--- a/wear/src/main/res/values-cs-rCZ/strings.xml
+++ b/wear/src/main/res/values-cs-rCZ/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="app_name">AAPS</string>
     <string name="label_actions_activity">AAPS</string>
@@ -20,12 +19,14 @@
     <string name="pref_on">Zap.</string>
     <string name="pref_off">Vyp.</string>
     <string name="pref_vibrate_on_bolus">Vibrovat při bolusu</string>
+    <string name="pref_units_for_actions">Jednotky pro akce</string>
     <string name="pref_show_date">Zobrazit datum</string>
     <string name="pref_show_iob">Zobrazit IOB</string>
     <string name="pref_show_cob">Zobrazit COB</string>
     <string name="pref_show_delta">Zobrazit deltu</string>
     <string name="pref_show_avgdelta">Zobrazit průměrnou deltu</string>
     <string name="pref_show_phone_battery">Zobrazit stav baterie telefonu</string>
+    <string name="pref_show_rig_battery">Zobrazovat kruhový graf baterie</string>
     <string name="pref_show_basal_rate">Zobrazit bazál</string>
     <string name="pref_show_loop_status">Zobrazovat stav smyčky</string>
     <string name="pref_show_bg">Zobrazovat glykemii</string>
@@ -40,14 +41,24 @@
     <string name="pref_3_hours">3 hodiny</string>
     <string name="pref_4_hours">4 hodiny</string>
     <string name="pref_5_hours">5 hodin</string>
+    <string name="pref_input_design">Design zadávání</string>
     <string name="pref_default">Výchozí</string>
+    <string name="pref_quick_righty">Rychle zprava</string>
+    <string name="pref_quick_lefty">Rychle zleva</string>
+    <string name="pref_modern_sparse">Modern Sparse</string>
+    <string name="pref_delta_granularity">Míra podrobnosti delty (Steampunk)</string>
     <string name="pref_low">Nízká</string>
     <string name="pref_medium">Střední</string>
     <string name="pref_high">Vysoká</string>
+    <string name="pref_auto">Auto</string>
+    <string name="pref_big_numbers">Velké číslice</string>
     <string name="pref_animations">Animace</string>
     <string name="pref_wizard_in_menu">Kalkulačka v nabídce</string>
     <string name="pref_prime_in_menu">Plnění v nabídce</string>
     <string name="pref_single_target">Jeden cíl</string>
+    <string name="pref_wizard_percentage">Procenta z kalkulátoru</string>
+    <string name="pref_complication_tap_action">Akce po klepnutí na komplikaci</string>
+    <string name="pref_unicode_in_complications">Znaky Unicode v komplikacích</string>
     <string name="pref_version">Verze:</string>
     <string name="menu_tempt">TempT</string>
     <string name="menu_wizard">Kalkulačka</string>
@@ -64,6 +75,7 @@
     <string name="action_low" comment="In temp target menu, lower value from range">nízká</string>
     <string name="action_high" comment="In temp target menu, higher value from range">vysoká</string>
     <string name="action_carbs">sacharidy</string>
+    <string name="action_percentage">procento</string>
     <string name="action_start_min">začátek [min]</string>
     <string name="action_duration_h">trvání [h]</string>
     <string name="action_insulin">inzulín</string>
@@ -79,6 +91,7 @@
     <string name="action_bolus">bolus</string>
     <string name="status_pump">Pumpa</string>
     <string name="status_loop">Smyčka</string>
+    <string name="status_cpp">CPP</string>
     <string name="status_tdd">TDD</string>
     <string name="activity_carb">Sacharidy</string>
     <string name="activity_IOB">IOB</string>
diff --git a/wear/src/main/res/values-lt-rLT/strings.xml b/wear/src/main/res/values-lt-rLT/strings.xml
index 8d2fb735dd..7fb7d68629 100644
--- a/wear/src/main/res/values-lt-rLT/strings.xml
+++ b/wear/src/main/res/values-lt-rLT/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="app_name">AAPS</string>
     <string name="label_actions_activity">AAPS</string>
@@ -60,6 +59,8 @@
     <string name="pref_prime_in_menu">Užpildyti per meniu</string>
     <string name="pref_single_target">Pavienis tikslas</string>
     <string name="pref_wizard_percentage">Vedlys su %</string>
+    <string name="pref_complication_tap_action">Elementų skirtuko veiksmai</string>
+    <string name="pref_unicode_in_complications">Unikodas elementuose</string>
     <string name="pref_version">Versija:</string>
     <string name="menu_tempt">LaikinasTikslas</string>
     <string name="menu_wizard">Vedlys</string>
@@ -104,4 +105,5 @@
     <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">Vv/val</string>
     <string name="unit_h" comment="One letter shortcut for: Hour" maxLength="1">val</string>
     <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">d.</string>
+    <string name="unit_w" comment="One letter shortcut for: Week" maxLength="1">s</string>
 </resources>

From 35096288e2e1e2b974a4bc47afe16d210a802614 Mon Sep 17 00:00:00 2001
From: Tebbe Ubben <tebbe@ubben.eu>
Date: Sun, 1 Mar 2020 09:28:57 +0100
Subject: [PATCH 28/56] Insight fix issues

---
 .../plugins/pump/insight/LocalInsightPlugin.java      | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index afca125092..8dd425b12c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -507,7 +507,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                 nextValue = profile.getBasalValues()[i + 1];
             if (profileBlock.getDuration() * 60 != (nextValue != null ? nextValue.timeAsSeconds : 24 * 60 * 60) - basalValue.timeAsSeconds)
                 return false;
-            if (Math.abs(profileBlock.getBasalAmount() - basalValue.value) > (basalValue.value > 5 ? 0.05 : 0.005))
+            if (Math.abs(profileBlock.getBasalAmount() - basalValue.value) > (basalValue.value > 5 ? 0.051 : 0.0051))
                 return false;
         }
         return true;
@@ -571,6 +571,15 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                 detailedBolusInfo.date = insightBolusID.timestamp;
                 detailedBolusInfo.source = Source.PUMP;
                 detailedBolusInfo.pumpId = insightBolusID.id;
+                if (detailedBolusInfo.carbs > 0 && detailedBolusInfo.carbTime != 0) {
+                    DetailedBolusInfo carbInfo = new DetailedBolusInfo();
+                    carbInfo.carbs = detailedBolusInfo.carbs;
+                    carbInfo.date = detailedBolusInfo.date + detailedBolusInfo.carbTime * 60L * 1000L;
+                    carbInfo.source = Source.USER;
+                    TreatmentsPlugin.getPlugin().addToHistoryTreatment(carbInfo, false);
+                    detailedBolusInfo.carbTime = 0;
+                    detailedBolusInfo.carbs = 0;
+                }
                 TreatmentsPlugin.getPlugin().addToHistoryTreatment(detailedBolusInfo, true);
                 while (true) {
                     synchronized ($bolusLock) {

From f550b91b7e8bf9a39e7e98945b31f12a57f8cb53 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 1 Mar 2020 10:07:00 +0100
Subject: [PATCH 29/56] bump 2.6.0

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0dd80641bf..b7815678f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -109,7 +109,7 @@ android {
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.6-dev-a"
+        version "2.6.0"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'

From c30674036db65d7c633b7dfc340d5327d0e30e7f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 4 Mar 2020 22:38:41 +0100
Subject: [PATCH 30/56] bump 2.6.1-dev

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index b7815678f1..9add15b6d6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -109,7 +109,7 @@ android {
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.6.0"
+        version "2.6.1-dev"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'

From a8e8659e18cb01f1b79321ac9cd4a91f9db72a9f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 4 Mar 2020 22:51:50 +0100
Subject: [PATCH 31/56] fix CareDialog rotation

---
 .../java/info/nightscout/androidaps/dialogs/CareDialog.kt  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
index da4a091b1d..be9a48ad77 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
@@ -54,6 +54,8 @@ class CareDialog : DialogFragmentWithDate() {
         super.onSaveInstanceState(savedInstanceState)
         savedInstanceState.putDouble("actions_care_bg", actions_care_bg.value)
         savedInstanceState.putDouble("actions_care_duration", actions_care_duration.value)
+        savedInstanceState.putInt("event", event)
+        savedInstanceState.putInt("options", options.ordinal)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -65,6 +67,11 @@ class CareDialog : DialogFragmentWithDate() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        savedInstanceState?.let {
+            event = savedInstanceState.getInt("event", R.string.error)
+            options = EventType.values()[savedInstanceState.getInt("options", 0)]
+        }
+
         actions_care_icon.setImageResource(when (options) {
             EventType.BGCHECK        -> R.drawable.icon_cp_bgcheck
             EventType.SENSOR_INSERT  -> R.drawable.icon_cp_cgm_insert

From 90a9b09395214cfdaebe49e8b6eb815862285801 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 4 Mar 2020 23:33:34 +0100
Subject: [PATCH 32/56] fix BolusProgressDialog rotation

---
 .../nightscout/androidaps/dialogs/BolusProgressDialog.kt    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
index 3f629add06..ffb8db4b11 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
@@ -30,8 +30,10 @@ class BolusProgressDialog : DialogFragment() {
 
     companion object {
         private val DEFAULT_STATE = MainApp.gs(R.string.waitingforpump)
+
         @JvmField
         var bolusEnded = false
+
         @JvmField
         var stopPressed = false
     }
@@ -62,6 +64,9 @@ class BolusProgressDialog : DialogFragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        savedInstanceState?.let {
+            amount = it.getDouble("amount")
+        }
         overview_bolusprogress_title.text = String.format(MainApp.gs(R.string.overview_bolusprogress_goingtodeliver), amount)
         overview_bolusprogress_stop.setOnClickListener {
             if (L.isEnabled(L.UI)) log.debug("Stop bolus delivery button pressed")
@@ -136,6 +141,7 @@ class BolusProgressDialog : DialogFragment() {
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putString("state", state)
+        outState.putDouble("amount", amount)
     }
 
     private fun scheduleDismiss() {

From 7412f67528134d5dd94af2c3b5b9a58af1c41c0d Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 6 Mar 2020 11:35:03 +0100
Subject: [PATCH 33/56] New Crowdin translations (#2464)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations strings.xml (Irish)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations insight_alert_titles.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations objectives.xml (Italian)

* New translations strings.xml (Italian)

* New translations objectives.xml (Italian)

* New translations strings.xml (Italian)

* New translations exam.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)
---
 app/src/main/res/values-fr-rFR/strings.xml    |  2 +-
 app/src/main/res/values-ga-rIE/strings.xml    |  1 -
 app/src/main/res/values-it-rIT/exam.xml       |  5 +-
 .../values-it-rIT/insight_alert_titles.xml    |  1 -
 app/src/main/res/values-it-rIT/objectives.xml |  5 +-
 app/src/main/res/values-it-rIT/strings.xml    | 71 +++++++-------
 app/src/main/res/values-nl-rNL/strings.xml    | 57 +++++++++++-
 wear/src/main/res/values-it-rIT/strings.xml   |  3 +-
 wear/src/main/res/values-nl-rNL/strings.xml   | 93 ++++++++++++++++++-
 9 files changed, 188 insertions(+), 50 deletions(-)

diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 1ff963cf88..269ec85497 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -565,7 +565,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="pump_lastconnection_label">Dernière connexion</string>
     <string name="danar_bluetooth_status">État Bluetooth</string>
-    <string name="nav_about">À propos de</string>
+    <string name="nav_about">À propos</string>
     <string name="smscommunicator_missingsmspermission">Autorisation SMS manquante</string>
     <string name="smscommunicator_missingphonestatepermission">Autorisation du téléphone manquante</string>
     <string name="xdripstatus_settings">état Xdrip (montre)</string>
diff --git a/app/src/main/res/values-ga-rIE/strings.xml b/app/src/main/res/values-ga-rIE/strings.xml
index d4b0807169..b3e84cab92 100644
--- a/app/src/main/res/values-ga-rIE/strings.xml
+++ b/app/src/main/res/values-ga-rIE/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-it-rIT/exam.xml b/app/src/main/res/values-it-rIT/exam.xml
index 4b9047c775..62abcc22bc 100644
--- a/app/src/main/res/values-it-rIT/exam.xml
+++ b/app/src/main/res/values-it-rIT/exam.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="dia_whatmeansdia">Cosa è vero riguardo DIA?</string>
     <string name="dia_label">Argomento: Durata dell\'Azione dell\'Insulina</string>
@@ -47,8 +46,8 @@
     <string name="exercise_switchprofilebelow100">Fare un cambio profilo sotto il 100%.</string>
     <string name="exercise_switchprofileabove100">Fare un cambio profilo sopra il 100%.</string>
     <string name="exercise_stoploop">Stoppare il loop.</string>
-    <string name="exercise_doitbeforestart">Impostare un temp-target \"attività\" prima dell\'inizio dell\'esercizio fisico.</string>
-    <string name="exercise_afterstart">L\'impostazione di un temp-target \"attività\" dopo l\'inizio dell\'esercizio fisico porta a risultati peggiori rispetto all\'avviarlo prima dell\'inizio dell\'esercizio.</string>
+    <string name="exercise_doitbeforestart">Impostare un temp-target \"attività fisica\" prima dell\'inizio dell\'esercizio fisico.</string>
+    <string name="exercise_afterstart">L\'impostazione di un temp-target \"attività fisica\" dopo l\'inizio dell\'esercizio fisico porta a risultati peggiori rispetto all\'avviarlo prima dell\'inizio dell\'esercizio.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
     <string name="suspendloop_label">Argomento: Loop Disabilitato/Sospeso</string>
     <string name="suspendloop_doigetinsulin">Ricevo insulina quando il loop è disabilitato/sospeso?</string>
diff --git a/app/src/main/res/values-it-rIT/insight_alert_titles.xml b/app/src/main/res/values-it-rIT/insight_alert_titles.xml
index d510f14df2..0e3e09339f 100644
--- a/app/src/main/res/values-it-rIT/insight_alert_titles.xml
+++ b/app/src/main/res/values-it-rIT/insight_alert_titles.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="alert_r1_title">Eroga bolo</string>
     <string name="alert_r2_title">Bolo perso</string>
diff --git a/app/src/main/res/values-it-rIT/objectives.xml b/app/src/main/res/values-it-rIT/objectives.xml
index d3cf5f110c..b34fde69ad 100644
--- a/app/src/main/res/values-it-rIT/objectives.xml
+++ b/app/src/main/res/values-it-rIT/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Indietro</string>
     <string name="objectives_button_start">Avvia</string>
@@ -18,7 +17,7 @@
     <string name="objectives_maxiob_objective">Regolazione del loop chiuso, aumentando max IOB al di sopra di 0 e abbassando gradualmente i target glicemici</string>
     <string name="objectives_maxiob_gate">Esegui l\'applicazione per alcuni giorni e almeno una notte senza allarmi di glicemia bassa, prima di abbassare il target glicemico</string>
     <string name="objectives_autosens_objective">Adatta basali e rapporti se necessario, quindi attiva auto-sens</string>
-    <string name="objectives_autosens_gate">1 settimana di looping diurno con dichiarazione regolare dei carboidrati, eseguito con successo</string>
+    <string name="objectives_autosens_gate">1 settimana di looping diurno con inserimento regolare dei carboidrati, eseguito con successo</string>
     <string name="objectives_ama_objective">Abilitazione funzioni aggiuntive per l\'uso diurno, ad esempio AMA (advanced meal assist - assistenza avanzata del pasto)</string>
     <string name="objectives_smb_objective">Abilitazione funzioni aggiuntive per l\'uso diurno, come SMB</string>
     <string name="objectives_smb_gate">È necessario leggere il wiki e aumentare maxIOB affinché le azioni di SMB funzionino adeguatamente! Un buon inizio è maxIOB = media bolo posto + 3 x max basale giornaliera</string>
@@ -51,7 +50,7 @@
     <string name="useaction_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#config-builder</string>
     <string name="usescale_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#the-homescreen</string>
     <string name="notconnected">Non connesso a internet</string>
-    <string name="failedretrievetime">Impossibile recuperare l\'orario</string>
+    <string name="failedretrievetime">Impossibile recuperare l\'ora</string>
     <string name="requirementnotmet">Requisiti obiettivo non soddisfatti</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d giorno</item>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 952633064b..1d1fdc86ed 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -14,7 +13,7 @@
     <string name="reset_db_confirm">Vuoi davvero resettare i database?</string>
     <string name="nav_exit">Esci</string>
     <string name="danar_useextended_title">Usa boli estesi per &gt;200%%</string>
-    <string name="danar_bt_name_title">Dispositivo DanaR Bluetooth</string>
+    <string name="danar_bt_name_title">Dispositivo Bluetooth DanaR</string>
     <string name="ns_sync_use_absolute_title">Utilizza sempre valori basali assoluti</string>
     <string name="alert_dialog_storage_permission_text">Per favore riavvia il tuo telefono oppure fai ripartire AndroidAPS dalle impostazioni di sistema \naltrimenti Android APS non farà il log (è importante monitorare e verificare che gli algoritmi stiano funzionando correttamente)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Questo dispositivo non sembra supportare la whitelist dell\'ottimizzazione della batteria: potrebbero verificarsi problemi di prestazioni.</string>
@@ -25,7 +24,7 @@
     <string name="description_food">Visualizza l\'elenco dei cibi definiti in Nightscout</string>
     <string name="description_insulin_rapid">Preset per insulina Humalog e NovoRapid</string>
     <string name="description_insulin_ultra_rapid">Preset per insulina Fiasp</string>
-    <string name="description_insulin_free_peak">Ti consente di definire il picco dell\'insulina e deve essere utilizzato solo dagli utenti avanzati</string>
+    <string name="description_insulin_free_peak">Ti consente di definire il picco di attività dell\'insulina e deve essere utilizzato solo dagli utenti avanzati</string>
     <string name="description_loop">Attiva o disattiva l\'implementazione del loop.</string>
     <string name="description_ns_client">Sincronizza i tuoi dati con Nightscout</string>
     <string name="description_ma">Stato dell\'algoritmo nel 2016</string>
@@ -42,7 +41,7 @@
     <string name="description_pump_dana_r_v2">Integrazione del microinfusore DANA Diabecare R con firmware aggiornato</string>
     <string name="description_pump_dana_rs">Integrazione del microinfusore DANA Diabecare RS</string>
     <string name="description_pump_mdi">Per le persone in terapia multi-iniettiva</string>
-    <string name="description_pump_virtual">Per microinfusori che non hanno ancora alcun driver (Loop Aperto)</string>
+    <string name="description_pump_virtual">Per microinfusori che non hanno ancora alcun driver (Loop aperto)</string>
     <string name="description_sensitivity_aaps">La sensibilità è calcolata allo stesso modo di Oref0, ma puoi specificare l\'intervallo di tempo al passato. L\'assorbimento minimo dei carboidrati è calcolato da \'max tempo assorbimento pasto\' nelle preferenze.</string>
     <string name="description_sensitivity_oref0">La sensibilità è calcolata dai dati delle ultime 24h e i carboidrati (se non assorbiti) vengono tagliati fuori dopo il tempo specificato nelle preferenze.</string>
     <string name="description_sensitivity_oref1">La sensibilità è calcolata dai dati delle ultime 8h e i carboidrati (se non assorbiti) vengono tagliati fuori dopo il tempo specificato nelle preferenze. Il Plugin calcola anche UAM.</string>
@@ -51,7 +50,7 @@
     <string name="description_source_glimp">Ricevi valori glicemia da Glimp.</string>
     <string name="description_source_mm640g">Ricevi valori glicemia da 600SeriesAndroidUploader.</string>
     <string name="description_source_ns_client">Scarica dati glicemia da Nightscout</string>
-    <string name="description_source_xdrip">Ricevi dati glicemia da xDrip.</string>
+    <string name="description_source_xdrip">Ricevi valori glicemia da xDrip.</string>
     <string name="description_treatments">Salva tutti i trattamenti che sono stati fatti</string>
     <string name="description_wear">Monitora e controlla AndroidAPS usando il tuo smartwatch WearOS.</string>
     <string name="description_xdrip_status_line">Mostra le informazioni del loop sulla watchface di xDrip+.</string>
@@ -196,7 +195,7 @@
     <string name="careportal_newnstreatment_sensor">Sensore</string>
     <string name="careportal_newnstreatment_carbs_label">CHO</string>
     <string name="careportal_newnstreatment_insulin_label">Insulina</string>
-    <string name="careportal_newnstreatment_carbtime_label">Tempo CHO</string>
+    <string name="careportal_newnstreatment_carbtime_label">Offset CHO</string>
     <string name="careportal_newnstreatment_split_label">Frazione</string>
     <string name="careportal_newnstreatment_duration_label">Durata</string>
     <string name="careportal_newnstreatment_percent_label">Percentuale</string>
@@ -265,7 +264,7 @@
     <string name="smscommunicator_remotebolusmindistance">Quanti minuti devono trascorrere, almeno, tra un bolo e il successivo</string>
     <string name="smscommunicator_remotebolusmindistance_caveat">Per la tua sicurezza, per modificare questa preferenza hai bisogno di aggiungere almeno 2 numeri di telefono.</string>
     <string name="bolusdelivered">Bolo di %1$.2fU erogato con successo</string>
-    <string name="bolusrequested">Sto per erogare %1$.2fU</string>
+    <string name="bolusrequested">A erogare %1$.2fU</string>
     <string name="smscommunicator_bolusdelivered">Bolo di %1$.2fU erogato con successo</string>
     <string name="smscommunicator_mealbolusdelivered">Bolo pasto di %1$.2fU erogato con successo</string>
     <string name="smscommunicator_mealbolusdelivered_tt">Target %1$s per %2$d minuti</string>
@@ -415,7 +414,7 @@
     <string name="deletefuturetreatments">Elimina trattamenti nel futuro</string>
     <string name="eatingsoon">Pasto a breve</string>
     <string name="hypo">Ipoglicemia</string>
-    <string name="activity">Attività</string>
+    <string name="activity">Attività fisica</string>
     <string name="removerecord">Rimuovi record</string>
     <string name="danar_stats">Statistiche DanaR</string>
     <string name="danar_stats_cumulative_tdd">TDD cumulativo</string>
@@ -619,7 +618,7 @@
     <string name="basal_short">BAS</string>
     <string name="virtualpump_extendedbolus_label_short">EXT</string>
     <string name="keep_screen_on_title">Mantieni lo schermo acceso</string>
-    <string name="keep_screen_on_summary">Evita che Android disattivi lo schermo. Consumerà molta energia quando non è collegato alla presa di corrente.</string>
+    <string name="keep_screen_on_summary">Evita che Android spenga lo schermo. Consumerà molta energia quando non è collegato alla presa di corrente.</string>
     <string name="sensitivity_warning">Attivando la funzione Autosense, ricorda di inserire tutti i carboidrati assunti. Altrimenti le deviazioni di glicemia dovute ai carboidrati saranno identificate erroneamente come variazione di sensibilità !!</string>
     <string name="sensitivityweightedaverage">Sensibilità WeightedAverage</string>
     <string name="mdtp_ok">OK</string>
@@ -639,8 +638,8 @@
     <string name="enablesmb">Abilita SMB</string>
     <string name="enablesmb_summary">Utilizza Super Micro Boli al posto della basale temporanea per un\'azione più veloce</string>
     <string name="enableuam_summary">Rilevazione dei pasti Non Annunciati</string>
-    <string name="insulin_oref_peak">IOB Curve Peak Time</string>
-    <string name="insulin_peak_time">Peak Time [min]</string>
+    <string name="insulin_oref_peak">Momento picco Curva IOB</string>
+    <string name="insulin_peak_time">Momento del picco [min]</string>
     <string name="free_peak_oref">Free-Peak Oref</string>
     <string name="rapid_acting_oref">Rapid-Acting Oref</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
@@ -650,7 +649,7 @@
     <string name="invalid">NON VALIDO</string>
     <string name="waitingforpairing">In attesa di associare il micro</string>
     <string name="pairingok">Associazione OK</string>
-    <string name="pairingtimedout">Time out associazione micro</string>
+    <string name="pairingtimedout">Time out associazione</string>
     <string name="pairing">Accoppiamento</string>
     <string name="danars_nodeviceavailable">Nessun dispositivo trovato finora</string>
     <string name="emptyreservoir">Serbatoio vuoto</string>
@@ -668,8 +667,8 @@
     <string name="default_temptargets">Temp-Target predefiniti</string>
     <string name="eatingsoon_duration">target \"pasto a breve\" - durata</string>
     <string name="eatingsoon_target">target \"pasto a breve\"</string>
-    <string name="activity_duration">target \"attività\" - durata</string>
-    <string name="activity_target">target \"attività\"</string>
+    <string name="activity_duration">target \"attività fisica\" - durata</string>
+    <string name="activity_target">target \"attività fisica\"</string>
     <string name="hypo_duration">target \"ipoglicemia\" - durata</string>
     <string name="hypo_target">target \"ipoglicemia\"</string>
     <string name="danar_history_prime">Riempimento</string>
@@ -696,7 +695,7 @@
     <string name="waitingforestimatedbolusend">Attesa per la fine del bolo. Rimangono %1$d sec.</string>
     <string name="processinghistory">Evento di elaborazione</string>
     <string name="startingbolus">Avvio erogazione bolo</string>
-    <string name="executingrightnow">Il comando verrà eseguito ora</string>
+    <string name="executingrightnow">Il comando sarà eseguito ora</string>
     <string name="pumpdrivercorrected">Driver del micro corretto</string>
     <string name="pump_unreachable">Micro irraggiungibile</string>
     <string name="missed_bg_readings">Letture BG mancanti</string>
@@ -790,7 +789,7 @@
     <string name="enablesmbwithcob">Abilita SMB con COB</string>
     <string name="enablesmbwithcob_summary">Abilita SMB quando COB è attivo (ci sono carboidrati non assorbiti).</string>
     <string name="enablesmbwithtemptarget">Abilita SMB con target temporanei</string>
-    <string name="enablesmbwithtemptarget_summary">Abilita SMB quando è attivo un target temporaneo (pasto a breve, attività)</string>
+    <string name="enablesmbwithtemptarget_summary">Abilita SMB quando è attivo un target temporaneo (pasto a breve, attività fisica)</string>
     <string name="enablesmbwithhightemptarget">Abilita SMB con target temporanei \"alti\"</string>
     <string name="enablesmbwithhightemptarget_summary">Abilita SMB quando è attivo un target temporaneo \"alto\"</string>
     <string name="let_temp_basal_run">Lascia eseguire la basale temporanea</string>
@@ -816,7 +815,7 @@
     <string name="allow_automated_crash_reporting">Consenti la segnalazione automatica degli errori e l\'invio dei dati di utilizzo delle funzioni dell\'app agli sviluppatori tramite il servizio fabric.io.</string>
     <string name="g5appnotdetected">Aggiorna la tua app Dexcom ad una versione supportata</string>
     <string name="dexcom_app_not_installed">App Dexcom non installata.</string>
-    <string name="start_activity_tt">Avvia TT Attività</string>
+    <string name="start_activity_tt">Avvia TT Attività fisica</string>
     <string name="start_eating_soon_tt">Avvia TT Pasto a breve</string>
     <string name="temptargetshort">TT</string>
     <string name="do_not_bolus_record_only">No bolo, solo record</string>
@@ -839,13 +838,13 @@
     <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="combo_actvity_reading_basal_profile">Lettura profilo basale</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">Lo storico del micro è cambiato dopo il calcolo del bolo. Il bolo non è stato erogato. Ricalcolare se un bolo è ancora necessario.</string>
-    <string name="combo_error_updating_treatment_record">Bolo erogato con successo, ma impossibile aggiungere la voce ai trattamenti. Questo può accadere se due piccoli boli della stessa quantità sono stati somministrati negli ultimi due minuti. Verifica lo storico del micro e le voci della sezione Trattamenti e utilizza la sezione Portale per aggiungere eventuali voci mancanti. Assicurati di non aggiungere voci con lo stesso orario e con la stessa quantità.</string>
+    <string name="combo_error_updating_treatment_record">Bolo erogato con successo, ma non è possibile aggiungere la voce ai trattamenti. Questo può accadere se due piccoli boli della stessa quantità sono stati somministrati negli ultimi due minuti. Verifica lo storico del micro e le voci della sezione Trattamenti e utilizza la sezione Portale per aggiungere eventuali voci mancanti. Assicurati di non aggiungere voci che si riferiscano al medesimo minuto e alla stessa quantità.</string>
     <string name="combo_high_temp_rejected_due_to_pump_history_changes">Rifiuto basale temporanea \"alta\" in quanto il calcolo non ha considerato i cambiamenti recenti allo storico del micro</string>
     <string name="combo_activity_checking_pump_state">Aggiornamento stato micro</string>
     <string name="combo_warning_pump_basal_rate_changed">La velocità basale nel micro è cambiata e verrà aggiornata a breve</string>
     <string name="combo_error_failure_reading_changed_basal_rate">Velocità basale cambiata sul micro, ma la sua lettura è fallita</string>
     <string name="combo_activity_checking_for_history_changes">Controllo modifiche allo storico</string>
-    <string name="combo_error_multiple_boluses_with_identical_timestamp">Sono appena stati importati più boli con la stessa quantità nello stesso minuto. Solo un record può essere aggiunto ai trattamenti. Controlla il micro e aggiungi manualmente un record di bolo utilizzando la sezione Portale. Assicurati di creare un bolo con un orario non utilizzato da nessun altro bolo.</string>
+    <string name="combo_error_multiple_boluses_with_identical_timestamp">Sono appena stati importati più boli con la stessa quantità nello stesso minuto. Solo un record può essere aggiunto ai trattamenti. Controlla il micro e aggiungi manualmente un record di bolo utilizzando la sezione Portale. Assicurati di creare un bolo con un\'ora non utilizzata da nessun altro bolo.</string>
     <string name="about_link_urls">\n\nhttp://www.androidaps.org\nhttp://www.androidaps.de (de)\n\nfacebook:\nhttp://facebook.androidaps.org\nhttp://facebook.androidaps.de (de)</string>
     <string name="combo_check_date">L\'ultimo bolo è più vecchio di 24 ore o ha una data nel futuro. Controlla che la data sul micro sia impostata correttamente.</string>
     <string name="combo_suspious_bolus_time">L\'ora/la data del bolo erogato sul micro sembra errata, IOB probabilmente non è corretto. Controlla l\'ora e/o la data del micro.</string>
@@ -891,7 +890,7 @@
     <string name="pump_paused">Micro in pausa</string>
     <string name="absorption_cutoff_title">Max tempo assorbimento pasto [h]</string>
     <string name="absorption_cutoff_summary">Tempo entro il quale ogni pasto si considera assorbito. Eventuali carboidrati rimanenti verranno tagliati fuori.</string>
-    <string name="time">Tempo</string>
+    <string name="time">Offset</string>
     <string name="overview_show_notes_field_in_dialogs_title">Finestre tratt.nto: mostra campo note</string>
     <string name="next_button">Avanti</string>
     <string name="previous_button">Indietro</string>
@@ -983,8 +982,8 @@
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Riduci la sensibilità per temp-target < 100]]></string>
     <string name="combo_invalid_setup">Configurazione micro non valida, controlla la documentazione e verifica che il menu Quick Info sia denominato QUICK INFO utilizzando \"360 configuration software\".</string>
     <string name="custom">Personalizzato</string>
-    <string name="largetimedifftitle">Grande differenza d\'orario</string>
-    <string name="largetimediff">Grande differenza d\'orario:\nL\'orario nel micro differisce per più di 1h e 30m. \nRegola l\'ora manualmente e assicurati che la lettura dello storico dal micro non causi comportamenti imprevisti.\nSe possibile, cancella la cronologia del micro prima di cambiare l\'orario oppure disabilita il loop chiuso per un tempo corrispondente al tuo valore DIA.</string>
+    <string name="largetimedifftitle">Grande differenza oraria</string>
+    <string name="largetimediff">Grande differenza oraria:\nL\'ora nel micro differisce per più di 1h e 30m. \nRegola l\'ora manualmente e assicurati che la lettura dello storico dal micro non causi comportamenti imprevisti.\nSe possibile, cancella la cronologia del micro prima di cambiare l\'ora oppure disabilita il loop chiuso per un tempo corrispondente al tuo valore DIA.</string>
     <string name="careportal_removestartedevents">Rimuovi gli eventi \"AndroidAPS avviato\"</string>
     <string name="storedsettingsfound">Trovate impostazioni salvate</string>
     <string name="allow_hardware_pump_text">Attenzione: se attivi e connetti un micro, AndroidAPS copierà le impostazioni della basale dal profilo al micro, sovrascrivendo la velocità basale esistente memorizzata sul micro. Assicurati di avere la giusta impostazione della basale in AndroidAPS. Se non sei sicuro o non vuoi sovrascrivere le impostazioni della basale sul micro, premi annulla e ripeti il processo in un altro momento.</string>
@@ -1031,11 +1030,11 @@
     <string name="confirm">Conferma</string>
     <string name="mute_alert">Muto</string>
     <string name="pump_alert">Avviso microinfusore</string>
-    <string name="log_site_changes">Registra cambi posizione cannula</string>
+    <string name="log_site_changes">Registra cambi posizione</string>
     <string name="log_reservoir_changes">Registra cambi serbatoio</string>
     <string name="log_tube_changes">Registra cambi catetere</string>
     <string name="log_battery_changes">Registra cambi batteria</string>
-    <string name="log_operating_mode_changes">Registra cambi modalità di funzionamento</string>
+    <string name="log_operating_mode_changes">Registra cambi modalità operativa</string>
     <string name="log_alerts">Registra avvisi</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>
@@ -1114,9 +1113,9 @@
     <string name="glucosecomparedmmol">Glicemia %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">PCT profilo %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
-    <string name="and">E</string>
-    <string name="or">O</string>
-    <string name="xor">O (esclusivo)</string>
+    <string name="and">E (AND)</string>
+    <string name="or">O (OR)</string>
+    <string name="xor">O (esclusivo - XOR)</string>
     <string name="atspecifiedtime">A %1$s</string>
     <string name="use_network_location">Usa posizione di rete</string>
     <string name="use_gps_location">Usa posizione GPS</string>
@@ -1165,7 +1164,7 @@
     <string name="sms_wrongcode">Codice errato. Comando annullato.</string>
     <string name="notconfigured">Non configurato</string>
     <string name="profileswitchcreated">Cambio profilo creato</string>
-    <string name="recurringTime">Tempo ricorrente</string>
+    <string name="recurringTime">Tempo di ripetizione</string>
     <string name="every">Ogni</string>
     <string name="never">Mai</string>
     <string name="mins">%1$dmin</string>
@@ -1322,7 +1321,7 @@
     <string name="medtronic_error_pump_wrong_max_bolus_set">Max bolo errato impostato nel micro (deve essere %1$.2f).</string>
     <string name="medtronic_error_pump_wrong_max_basal_set">Max basale errata impostata nel micro (deve essere %1$.2f).</string>
     <string name="medtronic_error_operation_not_possible_no_configuration">Operazione non possibile.\n\n Devi prima configurare il micro Medtronic.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">È stata richiesta una modifica d\'orario di oltre 24h.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">È stata richiesta una modifica oraria di oltre 24h.</string>
     <!-- MDT History -->
     <string name="medtronic_history_group_basal">Basali</string>
     <string name="medtronic_history_group_configuration">Configurazioni</string>
@@ -1353,7 +1352,7 @@
     <string name="medtronic_cmd_basal_profile_not_set_is_same">Il profilo basale è lo stesso, non sarà impostato di nuovo.</string>
     <string name="medtronic_cmd_desc_get_history">Ottieni storico - Pagina %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Ottieni storico - Pagina %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Ottieni orario micro</string>
+    <string name="medtronic_cmd_desc_get_time">Ottieni ora micro</string>
     <string name="medtronic_cmd_desc_get_settings">Ottieni impostazioni</string>
     <string name="medtronic_cmd_desc_get_model">Ottieni modello micro</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Ottieni profilo basale</string>
@@ -1378,7 +1377,7 @@
     <string name="loading">Caricamento ...</string>
     <string name="snooze">Posticipa</string>
     <string name="time_range">Intervallo di tempo</string>
-    <string name="timerange_value">Il tempo è compreso tra %1$s e %2$s</string>
+    <string name="timerange_value">L\'intervallo di tempo è compreso tra %1$s e %2$s</string>
     <string name="between">Tra </string>
     <string name="close">Chiudi</string>
     <string name="increasingmaxbasal">Aumento del valore max basale perché l\'impostazione è inferiore alla tua basale massima nel profilo</string>
@@ -1420,7 +1419,7 @@
     <string name="id">ID:</string>
     <string name="submit">Invia</string>
     <string name="mostcommonprofile">Profilo più comune:</string>
-    <string name="survey_comment">Nota: solo i dati visibili su questa schermata verranno caricati (in modo anonimo). Un ID è assegnato a questa installazione di AndroidAPS. Puoi inviare nuovamente i dati se il tuo profilo principale viene modificato, ma lascialo in esecuzione almeno per una settimana per rendere visibili i risultati nel time in range. Il tuo aiuto è apprezzato.</string>
+    <string name="survey_comment">Nota: solo i dati visibili su questa schermata verranno caricati (in modo anonimo). Un ID è assegnato a questa installazione di AndroidAPS. Puoi inviare nuovamente i dati se il tuo profilo principale viene modificato, ma lascialo in esecuzione almeno per una settimana per rendere il risultato visibile nel time in range (TIR). Il tuo aiuto è apprezzato.</string>
     <string name="nav_survey">Sondaggio</string>
     <string name="invalidage">Inserimento età non valido</string>
     <string name="invalidweight">Inserimento peso non valido</string>
@@ -1450,8 +1449,8 @@
     <string name="phonechecker">\"PhoneChecker\"</string>
     <string name="chartmenu">Menu grafico</string>
     <string name="sensitivity_short">AS</string>
-    <string name="loop_smbrequest_time_label">Tempo richiesta SMB</string>
-    <string name="loop_smbexecution_time_label">Tempo esecuzione SMB</string>
-    <string name="loop_tbrrequest_time_label">Tempo richiesta basale temporanea</string>
-    <string name="loop_tbrexecution_time_label">Tempo esecuzione basale temporanea</string>
+    <string name="loop_smbrequest_time_label">Richiesta SMB (momento)</string>
+    <string name="loop_smbexecution_time_label">Esecuzione SMB (momento)</string>
+    <string name="loop_tbrrequest_time_label">Richiesta basale temporanea (momento)</string>
+    <string name="loop_tbrexecution_time_label">Esecuzione basale temporanea (momento)</string>
 </resources>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index e797344f49..b7b391a804 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -143,6 +142,7 @@
     <string name="constraints_violation">In strijd met beperkingen</string>
     <string name="treatmentdeliveryerror">Bolus toedien storing</string>
     <string name="tempbasaldeliveryerror">Tijdelijk basaal toedien storing</string>
+    <string name="overview_newtempbasal_basalpercent">Basaal waarde [%]</string>
     <string name="setbasalquestion">Accepteer nieuw tijdelijk basaal:</string>
     <string name="overview_treatment_label">Bolus</string>
     <string name="overview_calculator_label">Bolus wizard</string>
@@ -180,6 +180,7 @@
     <string name="careportal_cgmsensorinsert">CGM Sens. ingebracht</string>
     <string name="careportal_cgmsensorstart">CGM Sens. Start</string>
     <string name="careportal_insulincartridgechange">Insuline ampul wissel</string>
+    <string name="careportal_profileswitch">Profiel wissel</string>
     <string name="careportal_snackbolus">Snack bolus</string>
     <string name="careportal_mealbolus">Maaltijd bolus</string>
     <string name="careportal_correctionbolus">Correctie bolus</string>
@@ -200,6 +201,7 @@
     <string name="careportal_newnstreatment_percent_label">Procent</string>
     <string name="careportal_newnstreatment_absolute_label">Absoluut</string>
     <string name="careportal_newnstreatment_notes_label">Notities</string>
+    <string name="event_time_label">Tijdstip gebeurtenis</string>
     <string name="careportal_newnstreatment_profile_label">Profiel</string>
     <string name="careportal_newnstreatment_enteredby_title">Ingegeven door</string>
     <string name="careportal_newnstreatment_glucosetype">Glucose type</string>
@@ -224,6 +226,7 @@
     <string name="connecting">Verbinden</string>
     <string name="connected">Verbonden</string>
     <string name="disconnected">Niet verbonden</string>
+    <string name="danar_pump_settings">Dana pomp instellingen</string>
     <string name="end_user_license_agreement">Eind gebruiker overeenkomst</string>
     <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">Begrepen en goedgekeurd</string>
@@ -272,6 +275,8 @@
     <string name="glucosetype_finger">Vingerprik</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="manual">Manueel</string>
+    <string name="careportal_temporarytarget">Tijdelijk streefdoel</string>
+    <string name="careportal_temporarytargetcancel">Tijdelijk streefdoel annuleren</string>
     <string name="danarprofile">DanaR profiel instellingen</string>
     <string name="danarprofile_dia">DIA [uur]</string>
     <string name="danarprofile_dia_summary">Duur van insuline activiteit</string>
@@ -410,6 +415,7 @@
     <string name="eatingsoon">Eet binnenkort</string>
     <string name="hypo">Hypo</string>
     <string name="activity">Activiteit</string>
+    <string name="removerecord">Verwijder record</string>
     <string name="danar_stats">DanaR Statistiek</string>
     <string name="danar_stats_cumulative_tdd">Cumulatieve TDD</string>
     <string name="danar_stats_expweight">Exponentieel verhoogd TDD</string>
@@ -576,6 +582,7 @@
     <string name="careportal_insulinage_label">Ouderdom insuline</string>
     <string name="hours">uren</string>
     <string name="invalidprofile">Ongeldig profiel !!!</string>
+    <string name="doprofileswitch">Profiel wissel uitvoeren</string>
     <string name="careportal_pbage_label">Ouderdom batterij</string>
     <string name="careportal_pumpbatterychange">Pomp bat. wissel</string>
     <string name="ns_alarmoptions">Alarm opties</string>
@@ -643,6 +650,7 @@
     <string name="waitingforpairing">Wachten op koppelen van de pomp</string>
     <string name="pairingok">Koppeling geslaagd</string>
     <string name="pairingtimedout">Koppeling verlopen</string>
+    <string name="pairing">Koppelen</string>
     <string name="danars_nodeviceavailable">Geen toestel gevonden</string>
     <string name="emptyreservoir">Ampul leeg</string>
     <string name="bloodsugarmeasurementalert">Bloed glucose meetpunt alarm</string>
@@ -753,6 +761,7 @@
     <string name="bolus_frequency_exceeded">Een bolus met dezelfde hoeveelheid was gevraagd binnen de afgelopen twee minuten. Om incidentele of door bugs veroorzaakte dubbele bolussen te voorkomen is deze bolus geannuleerd.</string>
     <string name="combo_pump_connected_now">Zojuist</string>
     <string name="combo_activity_reading_pump_history">Lezen van pomp historiek</string>
+    <string name="danar_history">Historiek</string>
     <string name="combo_activity_setting_basal_profile">Instellen van basaal profiel</string>
     <string name="combo_pump_cartridge_low_warrning">Insuline ampul is bijna leeg</string>
     <string name="combo_pump_battery_low_warrning">Batterij pomp is bijna leeg</string>
@@ -772,6 +781,7 @@
     <string name="insightpump_shortname">Insight</string>
     <string name="ago">voorbij</string>
     <string name="format_hours">%1$.2f u</string>
+    <string name="format_mins">%1$d minuten</string>
     <string name="enablesmbalways">Activeer SMB altijd</string>
     <string name="enablesmbalways_summary">SMB altijd aan onafhankelijk van bolussen. Enkel mogelijk met een BG bron met goed gefilterde data zoals de G5</string>
     <string name="enablesmbaftercarbs">Activeer SMB na koolhydraten</string>
@@ -935,6 +945,7 @@
     <string name="startobjective">Start je eerste Doel</string>
     <string name="permission">Toestemming</string>
     <string name="askforpermission">Vragen om toestemming</string>
+    <string name="needsystemwindowpermission">Toepassing vereist systeemvenstermachtiging voor meldingen</string>
     <string name="needlocationpermission">Toepassing heeft toestemming nodig voor bepalen van Locatie (voor BT scan)</string>
     <string name="needstoragepermission">Applicatie heeft toestemming nodig om log bestanden op te kunnen slaan</string>
     <string name="request">Verzoek</string>
@@ -948,7 +959,11 @@
     <string name="danar_pumpalarm_sound">Geluid</string>
     <string name="danar_pumpalarm_vibrate">Trillen</string>
     <string name="danar_pumpalarm_both">Beide</string>
+    <string name="danar_screentimeout">LCD-aan tijd [sec.]</string>
+    <string name="danar_backlight">Achtergrondverlichting-aan tijd [sec.]</string>
     <string name="danar_glucoseunits">Glucose units</string>
+    <string name="danar_shutdown">Afsluiten [uren]</string>
+    <string name="danar_lowreservoir">Laag reservoir (eenheden)</string>
     <string name="danar_saveuseroptions">Opslaan van de opties om de pomp</string>
     <string name="option_on">Aan</string>
     <string name="option_off">Uit</string>
@@ -1206,6 +1221,8 @@
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Taaknaam</string>
     <string name="edit_short">EDIT</string>
+    <string name="please_choose_an_action_type">Kies een actie</string>
+    <string name="please_choose_a_trigger_type">Kies een type trigger</string>
     <string name="triggers">Triggers:</string>
     <string name="remove_label">VERWIJDER</string>
     <string name="preconditions">Voorwaarden:</string>
@@ -1298,6 +1315,7 @@
     <string name="medtronic_error_pump_frequency_invalid">Pomp frequentie niet ondersteund.</string>
     <string name="medtronic_error_rileylink_address_invalid">RileyLink adres ongeldig.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Gedetecteerde pomp type komt niet overeen met ingestelde pomp type.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">De instelling voor basaalprofielen/patronen is niet ingeschakeld op de pomp. Schakel het in op de pomp.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Basaalprofiel ingesteld op pomp is onjuist (moet STD zijn).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Verkeerde Tijdelijk Basaal-type ingesteld op pomp (moet Insulinesnelh (E/H) zijn).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Verkeerde Max Bolus ingesteld op pomp (moet %1$.2f zijn).</string>
@@ -1348,6 +1366,7 @@
     <string name="automation_trigger_pump_last_connection_description">Laatste verbinding met pomp [minuten geleden]</string>
     <string name="automation_trigger_pump_last_connection_compared">Laatste verbinding met pomp %1$s %2$s min geleden</string>
     <string name="sendsmsactionlabel">Stuur SMS: %1$s</string>
+    <string name="sendsmsactiondescription">SMS verzenden naar alle nummers</string>
     <string name="sendsmsactiontext">Stuur SMS met tekst</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus limiet bereikt: %2$.2fU naar %3$.2fU</font>]]></string>
@@ -1376,7 +1395,7 @@
     <string name="format_carbs">%1$dg</string>
     <string name="common_on">Aan</string>
     <string name="common_off">Uit</string>
-    <string name="objectives_button_unfinish">Wissen voltooid</string>
+    <string name="objectives_button_unfinish">Voltooiing wissen</string>
     <string name="objectives_button_unstart">Wissen gestart</string>
     <string name="timedetection">Tijd detectie</string>
     <string name="doyouwantresetstart">Wil je dit leerdoel opnieuw starten? Je kunt je voortgang verliezen.</string>
@@ -1399,5 +1418,39 @@
     <string name="weight">Gewicht:</string>
     <string name="id">ID:</string>
     <string name="submit">Verzenden</string>
+    <string name="mostcommonprofile">Meest voorkomende profiel:</string>
     <string name="survey_comment">Opmerking: Alleen gegevens die zichtbaar zijn op dit scherm worden anoniem geüpload. ID is toegewezen aan deze installatie van AndroidAPS. U kunt gegevens opnieuw indienen als uw hoofdprofiel wordt gewijzigd, maar laat het ten minste een week draaien om resultaat zichtbaar te maken in de tijd in het bereik. Uw hulp wordt gewaardeerd.</string>
+    <string name="nav_survey">Enquête</string>
+    <string name="invalidage">Ongeldige leeftijd invoer</string>
+    <string name="invalidweight">Ongeldige gewicht invoer</string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
+    <string name="tirformat"><![CDATA[<b>%1$s:</b> Laag: <b>%2$02d%%</b> In: <b>%3$02d%%</b> Hoog: <b>%4$02d%%</b>]]></string>
+    <string name="average">Gemiddelde</string>
+    <string name="tdd">TDD</string>
+    <string name="tir">TIR</string>
+    <string name="activitymonitor">Activiteitsmonitor</string>
+    <string name="doyouwantresetstats">Wil je de activiteitenstatistieken resetten?</string>
+    <string name="statistics">Statistieken</string>
+    <string name="randombg">Willekeurige BG</string>
+    <string name="description_source_randombg">Willekeurige BG gegevens genereren (alleen Demo modus)</string>
+    <string name="randombg_short">BG</string>
+    <string name="tools">Hulpmiddelen</string>
+    <string name="show_calculation">Toon berekening</string>
+    <string name="error">Fout</string>
+    <string name="timeformat12h">12u</string>
+    <string name="timeformat24h">24u</string>
+    <string name="automation_event">Automation gebeurtenis</string>
+    <string name="alreadyset">Al ingesteld</string>
+    <string name="message">Bericht</string>
+    <string name="clearqueueconfirm">Wachtrij leegmaken? Alle gegevens in de wachtrij zullen verloren gaan!</string>
+    <string name="ebstopsloop">Gebruik van Vertraagde bolus functie zal de closed loop modus stoppen voor de duur van de vertraagde bolus. Wil je dit toch?</string>
+    <string name="closed_loop_disabled_with_eb">Closed loop modus uitgeschakeld vanwege afgeven Vertraagde bolus</string>
+    <string name="extended_bolus_short">VertrB</string>
+    <string name="phonechecker">\"PhoneChecker\"</string>
+    <string name="chartmenu">Grafiek menu</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">SMB aanvraagtijd</string>
+    <string name="loop_smbexecution_time_label">SMB uitvoeringstijd</string>
+    <string name="loop_tbrrequest_time_label">Tijdelijk basaal aanvraag tijd</string>
+    <string name="loop_tbrexecution_time_label">Tijdelijke basaal uitvoering tijd</string>
 </resources>
diff --git a/wear/src/main/res/values-it-rIT/strings.xml b/wear/src/main/res/values-it-rIT/strings.xml
index 5247ee0674..0f7282e210 100644
--- a/wear/src/main/res/values-it-rIT/strings.xml
+++ b/wear/src/main/res/values-it-rIT/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="app_name">AAPS</string>
     <string name="label_actions_activity">AAPS</string>
@@ -98,7 +97,7 @@
     <string name="status_tdd">TDD</string>
     <string name="activity_carb">CHO</string>
     <string name="activity_IOB">IOB</string>
-    <string name="activity_no_status">no stato</string>
+    <string name="activity_no_status">no status</string>
     <string name="unit_mg_dl">mg/dl</string>
     <string name="unit_mmol_l">mmol/l</string>
     <string name="unit_g" comment="Shortcut for ISO unit: gram">g</string>
diff --git a/wear/src/main/res/values-nl-rNL/strings.xml b/wear/src/main/res/values-nl-rNL/strings.xml
index e1e7c4c3d6..784fdb2f19 100644
--- a/wear/src/main/res/values-nl-rNL/strings.xml
+++ b/wear/src/main/res/values-nl-rNL/strings.xml
@@ -1,18 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
+    <string name="app_name">AAPS</string>
+    <string name="label_actions_activity">AAPS</string>
+    <string name="label_xdrip">AAPS</string>
+    <string name="label_xdrip_large">AAPS(Groot)</string>
+    <string name="label_xdrip_big_chart">AAPS(GroteGrafiek)</string>
+    <string name="label_xdrip_no_chart">AAPS(GeenGrafiek)</string>
+    <string name="label_xdrip_circle">AAPS(Cirkel)</string>
+    <string name="label_xdrip_v2">AAPSv2</string>
+    <string name="label_xdrip_cockpit">AAPS(Cockpit)</string>
+    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
+    <string name="label_warning_sync">Geen gegevens!</string>
+    <string name="label_warning_old">Oude gegevens!</string>
+    <string name="label_warning_since">Sinds %1$s</string>
+    <string name="label_warning_sync_aaps">Synchroniseer met AAPS!</string>
+    <string name="msg_warning_sync">Geen gegevens ontvangen sinds %1$s! Controleer of AAPS op de telefoon gegevens verstuurt naar horloge</string>
     <string name="msg_warning_old">AAPS gegevens zijn %1$s oud! Controleer je sensor, xDrip+, NS, AAPS instellingen of andere!</string>
     <string name="pref_on">Aan</string>
     <string name="pref_off">Uit</string>
     <string name="pref_vibrate_on_bolus">Trillen bij bolus</string>
     <string name="pref_units_for_actions">Eenheden voor acties</string>
     <string name="pref_show_date">Toon datum</string>
+    <string name="pref_show_iob">Toon IOB</string>
+    <string name="pref_show_cob">Toon COB</string>
     <string name="pref_show_delta">Toon Delta</string>
     <string name="pref_show_avgdelta">Toon gemiddelde delta</string>
+    <string name="pref_show_phone_battery">Toon telefoonbatterij</string>
+    <string name="pref_show_rig_battery">Toon rig batterij</string>
+    <string name="pref_show_basal_rate">Toon basaal</string>
+    <string name="pref_show_loop_status">Toon loop status</string>
+    <string name="pref_show_bg">Toon BG</string>
+    <string name="pref_show_direction_arrow">Toon richtingspijl</string>
+    <string name="pref_show_ago">Toon tijd geleden</string>
+    <string name="pref_dark" comment="Enables dark visual theme">Donker</string>
+    <string name="pref_highlight_basals">Markeer basaalstanden</string>
+    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Bijpassende verdeler</string>
+    <string name="pref_chart_timeframe">Tijdsschaal grafiek</string>
     <string name="pref_1_hour">1 uur</string>
     <string name="pref_2_hours">2 uren</string>
     <string name="pref_3_hours">3 uren</string>
     <string name="pref_4_hours">4 uren</string>
     <string name="pref_5_hours">5 uren</string>
+    <string name="pref_input_design">Invoer ontwerp</string>
     <string name="pref_default">Standaard</string>
+    <string name="pref_quick_righty">Snel rechts</string>
+    <string name="pref_quick_lefty">Snel links</string>
+    <string name="pref_modern_sparse">Modern spaarzaam</string>
+    <string name="pref_delta_granularity">Delta schaalverdeling (Steampunk)</string>
+    <string name="pref_low">Laag</string>
+    <string name="pref_medium">Middel</string>
+    <string name="pref_high">Hoog</string>
+    <string name="pref_auto">Automatisch</string>
+    <string name="pref_big_numbers">Grote nummers</string>
+    <string name="pref_ring_history">Ring geschiedenis</string>
+    <string name="pref_light_ring_history">Lichte ring geschiedenis</string>
+    <string name="pref_animations">Animaties</string>
+    <string name="pref_wizard_in_menu">Wizard in menu</string>
+    <string name="pref_prime_in_menu">Ontlucht/vul in menu</string>
+    <string name="pref_single_target">Enkel streefdoel</string>
+    <string name="pref_wizard_percentage">Wizardpercentage</string>
+    <string name="pref_complication_tap_action">Complicatie tik voor actie</string>
+    <string name="pref_unicode_in_complications">Unicode in complicaties</string>
+    <string name="pref_version">Versie:</string>
+    <string name="menu_tempt">TijdStreefd</string>
+    <string name="menu_wizard">Wizard</string>
+    <string name="menu_bolus">Bolus</string>
+    <string name="menu_ecarb">eCarb</string>
+    <string name="menu_settings">Instellingen</string>
+    <string name="menu_status">Status</string>
+    <string name="menu_prime_fill">Ontlucht/vul</string>
+    <string name="menu_none">Geen</string>
+    <string name="menu_default">Standaard</string>
+    <string name="menu_menu">Menu</string>
+    <string name="action_duration">tijdsduur</string>
+    <string name="action_target" comment="In temp target menu, single target value">doel</string>
+    <string name="action_low" comment="In temp target menu, lower value from range">laag</string>
+    <string name="action_high" comment="In temp target menu, higher value from range">hoog</string>
+    <string name="action_carbs">khd</string>
+    <string name="action_percentage">percentage</string>
+    <string name="action_start_min">start [min]</string>
+    <string name="action_duration_h">duur [h]</string>
+    <string name="action_insulin">insuline</string>
+    <string name="action_preset_1">Voorinstelling 1</string>
+    <string name="action_preset_2">Voorinstelling 2</string>
+    <string name="action_preset_3">Voorinstelling 3</string>
+    <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Vrije hoeveelheid</string>
+    <string name="action_confirm">BEVESTIGEN</string>
+    <string name="action_status_pump">STATUS POMP</string>
+    <string name="action_status_loop">STATUS LOOP</string>
+    <string name="action_timeshift">tijdsverschuiving</string>
+    <string name="action_tdd_weighted">Gewogen TDD</string>
+    <string name="action_bolus">bolus</string>
+    <string name="status_pump">Pomp</string>
+    <string name="status_loop">Loop</string>
+    <string name="status_cpp">CPP</string>
+    <string name="status_tdd">TDD</string>
+    <string name="activity_carb">Khd</string>
+    <string name="activity_IOB">IOB</string>
+    <string name="activity_no_status">geen status</string>
+    <string name="unit_mg_dl">mg/dl</string>
+    <string name="unit_mmol_l">mmol/l</string>
+    <string name="unit_g" comment="Shortcut for ISO unit: gram">g</string>
+    <string name="unit_u" comment="Shortcut for: insulin Unit">E</string>
+    <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">E/u</string>
+    <string name="unit_h" comment="One letter shortcut for: Hour" maxLength="1">u</string>
+    <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">d</string>
+    <string name="unit_w" comment="One letter shortcut for: Week" maxLength="1">w</string>
 </resources>

From 6fa05f11c92a3965e0a7d901220163afd4986089 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 6 Mar 2020 19:02:34 +0100
Subject: [PATCH 34/56] LocalInsightPlugin crash fix

---
 .../androidaps/plugins/pump/insight/LocalInsightPlugin.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index 8dd425b12c..2197b48577 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -937,6 +937,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
     @Override
     public JSONObject getJSONStatus(Profile profile, String profileName) {
         long now = System.currentTimeMillis();
+        if (connectionService == null) return null;
         if (System.currentTimeMillis() - connectionService.getLastConnected() > (60 * 60 * 1000)) {
             return null;
         }

From 95394d6cb370fb8f92f81af00b8183e4f269c9c8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 6 Mar 2020 19:13:56 +0100
Subject: [PATCH 35/56] Unregister shared preferences properly

---
 .../androidaps/activities/PreferencesActivity.java          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java
index 328f143836..96a2b23b06 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java
@@ -68,6 +68,12 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
         PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        PreferenceManager.getDefaultSharedPreferences(this).unregisterOnSharedPreferenceChangeListener(this);
+    }
+
     @Override
     public void attachBaseContext(Context newBase) {
         super.attachBaseContext(LocaleHelper.INSTANCE.wrap(newBase));

From 4cca305e1bb9d7cba6f4672ca6e1756e8db5e1ac Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 6 Mar 2020 19:40:29 +0100
Subject: [PATCH 36/56] fix ProfileSwitch confirm dialog

---
 .../nightscout/androidaps/dialogs/ProfileSwitchDialog.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
index f594564a78..a258cbec8a 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
@@ -78,9 +78,9 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
             ?: return false
 
         val actions: LinkedList<String> = LinkedList()
-        val duration = overview_profileswitch_duration.value
+        val duration = overview_profileswitch_duration.value.toInt()
         if (duration > 0)
-            actions.add(MainApp.gs(R.string.duration) + ": " + MainApp.gs(R.string.format_hours, duration))
+            actions.add(MainApp.gs(R.string.duration) + ": " + MainApp.gs(R.string.format_mins, duration))
         val profile = overview_profileswitch_profile.selectedItem.toString()
         actions.add(MainApp.gs(R.string.profile) + ": " + profile)
         val percent = overview_profileswitch_percentage.value.toInt()
@@ -98,7 +98,7 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
         activity?.let { activity ->
             OKDialog.showConfirmation(activity, MainApp.gs(R.string.careportal_profileswitch), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
                 log.debug("USER ENTRY: PROFILE SWITCH $profile percent: $percent timeshift: $timeShift duration: $duration")
-                ProfileFunctions.doProfileSwitch(profileStore, profile, duration.toInt(), percent, timeShift, eventTime)
+                ProfileFunctions.doProfileSwitch(profileStore, profile, duration, percent, timeShift, eventTime)
             })
         }
         return true

From 70053ea61cca3faa2c585b064a8deb477fa469b7 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Fri, 6 Mar 2020 12:33:20 +0100
Subject: [PATCH 37/56] Combo: create separate bolus/carb records at driver
 level.

---
 .../plugins/pump/combo/ComboPlugin.java       | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
index 32a17f8a89..e71a86d91f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
@@ -654,16 +654,29 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint
      * Creates a treatment record based on the request in DetailBolusInfo and the delivered bolus.
      */
     private boolean addBolusToTreatments(DetailedBolusInfo detailedBolusInfo, Bolus lastPumpBolus) {
-        DetailedBolusInfo dbi = detailedBolusInfo.copy();
-        dbi.date = calculateFakeBolusDate(lastPumpBolus);
-        dbi.pumpId = dbi.date;
-        dbi.source = Source.PUMP;
-        dbi.insulin = lastPumpBolus.amount;
+        DetailedBolusInfo bolusInfo = detailedBolusInfo.copy();
+        bolusInfo.date = calculateFakeBolusDate(lastPumpBolus);
+        bolusInfo.pumpId = bolusInfo.date;
+        bolusInfo.source = Source.PUMP;
+        bolusInfo.insulin = lastPumpBolus.amount;
         try {
-            TreatmentsPlugin.getPlugin().addToHistoryTreatment(dbi, true);
+            if (bolusInfo.carbs > 0 && bolusInfo.carbTime != 0) {
+                // split out a separate carbs record without a pumpId
+                DetailedBolusInfo carbInfo = new DetailedBolusInfo();
+                carbInfo.date = bolusInfo.date + bolusInfo.carbTime * 60L * 1000L;
+                carbInfo.carbs = bolusInfo.carbs;
+                carbInfo.source = Source.USER;
+                TreatmentsPlugin.getPlugin().addToHistoryTreatment(carbInfo, true);
+
+                // remove carbs from bolusInfo to not trigger any unwanted code paths in
+                // TreatmentsPlugin.addToHistoryTreatment() method
+                bolusInfo.carbTime = 0;
+                bolusInfo.carbs = 0;
+            }
+            TreatmentsPlugin.getPlugin().addToHistoryTreatment(bolusInfo, true);
         } catch (Exception e) {
             log.error("Adding treatment record failed", e);
-            if (dbi.isSMB) {
+            if (bolusInfo.isSMB) {
                 Notification notification = new Notification(Notification.COMBO_PUMP_ALARM, MainApp.gs(R.string.combo_error_updating_treatment_record), Notification.URGENT);
                 RxBus.INSTANCE.send(new EventNewNotification(notification));
             }

From 1e02773b71d0180bf30b6185c40b718ea268200f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 6 Mar 2020 20:27:39 +0100
Subject: [PATCH 38/56] fire immediatelly TreatmentChange if not from NS

---
 .../plugins/treatments/TreatmentService.java  | 66 ++++++++++++-------
 1 file changed, 41 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
index 1331c8eedf..1b118da1d3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
@@ -160,7 +160,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
-        scheduleTreatmentChange(null);
+        scheduleTreatmentChange(null, true);
     }
 
 
@@ -208,18 +208,30 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
     /**
      * Schedule a foodChange Event.
      */
-    public void scheduleTreatmentChange(@Nullable final Treatment treatment) {
-        this.scheduleEvent(new EventReloadTreatmentData(new EventTreatmentChange(treatment)), treatmentEventWorker, new ICallback() {
-            @Override
-            public void setPost(ScheduledFuture<?> post) {
-                scheduledTreatmentEventPost = post;
+    public void scheduleTreatmentChange(@Nullable final Treatment treatment, boolean runImmediately) {
+        if (runImmediately) {
+            if (L.isEnabled(L.DATATREATMENTS))
+                log.debug("Firing EventReloadTreatmentData");
+            RxBus.INSTANCE.send(new EventReloadTreatmentData(new EventTreatmentChange(treatment)));
+            if (DatabaseHelper.earliestDataChange != null) {
+                if (L.isEnabled(L.DATATREATMENTS))
+                    log.debug("Firing EventNewHistoryData");
+                RxBus.INSTANCE.send(new EventNewHistoryData(DatabaseHelper.earliestDataChange));
             }
+            DatabaseHelper.earliestDataChange = null;
+        } else {
+            this.scheduleEvent(new EventReloadTreatmentData(new EventTreatmentChange(treatment)), treatmentEventWorker, new ICallback() {
+                @Override
+                public void setPost(ScheduledFuture<?> post) {
+                    scheduledTreatmentEventPost = post;
+                }
 
-            @Override
-            public ScheduledFuture<?> getPost() {
-                return scheduledTreatmentEventPost;
-            }
-        });
+                @Override
+                public ScheduledFuture<?> getPost() {
+                    return scheduledTreatmentEventPost;
+                }
+            });
+        }
     }
 
     public List<Treatment> getTreatmentData() {
@@ -294,7 +306,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                         getDao().create(existingTreatment);
                         DatabaseHelper.updateEarliestDataChange(oldDate);
                         DatabaseHelper.updateEarliestDataChange(existingTreatment.date);
-                        scheduleTreatmentChange(treatment);
+                        scheduleTreatmentChange(treatment, true);
                         return new UpdateReturn(sameSource, false); //updating a pump treatment with another one from the pump is not counted as clash
                     }
                     return new UpdateReturn(equalRePumpHistory, false);
@@ -318,14 +330,14 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                     getDao().create(existingTreatment);
                     DatabaseHelper.updateEarliestDataChange(oldDate);
                     DatabaseHelper.updateEarliestDataChange(existingTreatment.date);
-                    scheduleTreatmentChange(treatment);
+                    scheduleTreatmentChange(treatment, true);
                     return new UpdateReturn(equalRePumpHistory || sameSource, false);
                 }
                 getDao().create(treatment);
                 if (L.isEnabled(L.DATATREATMENTS))
                     log.debug("New record from: " + Source.getString(treatment.source) + " " + treatment.toString());
                 DatabaseHelper.updateEarliestDataChange(treatment.date);
-                scheduleTreatmentChange(treatment);
+                scheduleTreatmentChange(treatment, true);
                 return new UpdateReturn(true, true);
             }
             if (treatment.source == Source.NIGHTSCOUT) {
@@ -343,7 +355,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                             DatabaseHelper.updateEarliestDataChange(oldDate);
                             DatabaseHelper.updateEarliestDataChange(old.date);
                         }
-                        scheduleTreatmentChange(treatment);
+                        scheduleTreatmentChange(treatment, false);
                         return new UpdateReturn(true, true);
                     }
                     if (L.isEnabled(L.DATATREATMENTS))
@@ -366,7 +378,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                                 DatabaseHelper.updateEarliestDataChange(oldDate);
                                 DatabaseHelper.updateEarliestDataChange(old.date);
                             }
-                            scheduleTreatmentChange(treatment);
+                            scheduleTreatmentChange(treatment, false);
                             return new UpdateReturn(true, true);
                         }
                         if (L.isEnabled(L.DATATREATMENTS))
@@ -378,7 +390,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                 if (L.isEnabled(L.DATATREATMENTS))
                     log.debug("New record from: " + Source.getString(treatment.source) + " " + treatment.toString());
                 DatabaseHelper.updateEarliestDataChange(treatment.date);
-                scheduleTreatmentChange(treatment);
+                scheduleTreatmentChange(treatment, false);
                 return new UpdateReturn(true, true);
             }
             if (treatment.source == Source.USER) {
@@ -386,7 +398,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                 if (L.isEnabled(L.DATATREATMENTS))
                     log.debug("New record from: " + Source.getString(treatment.source) + " " + treatment.toString());
                 DatabaseHelper.updateEarliestDataChange(treatment.date);
-                scheduleTreatmentChange(treatment);
+                scheduleTreatmentChange(treatment, true);
                 return new UpdateReturn(true, true);
             }
         } catch (SQLException e) {
@@ -414,7 +426,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                 if (L.isEnabled(L.DATATREATMENTS))
                     log.debug("New record from: " + Source.getString(treatment.source) + " " + treatment.toString());
                 DatabaseHelper.updateEarliestDataChange(treatment.date);
-                scheduleTreatmentChange(treatment);
+                scheduleTreatmentChange(treatment, true);
                 return new UpdateReturn(true, true);
             } else {
 
@@ -428,7 +440,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                     }
                     getDao().update(existingTreatment);
                     DatabaseHelper.updateEarliestDataChange(existingTreatment.date);
-                    scheduleTreatmentChange(treatment);
+                    scheduleTreatmentChange(treatment, true);
                     return new UpdateReturn(true, false);
                 } else {
                     if (MedtronicHistoryData.doubleBolusDebug)
@@ -439,7 +451,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                     optionalTreatmentCopy(existingTreatment, treatment, fromNightScout);
                     getDao().create(existingTreatment);
                     DatabaseHelper.updateEarliestDataChange(existingTreatment.date);
-                    scheduleTreatmentChange(treatment);
+                    scheduleTreatmentChange(treatment, true);
                     return new UpdateReturn(true, false); //updating a pump treatment with another one from the pump is not counted as clash
                 }
             }
@@ -626,9 +638,13 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
         if (stored != null) {
             if (L.isEnabled(L.DATATREATMENTS))
                 log.debug("Removing Treatment record from database: " + stored.toString());
-            delete(stored);
+            try {
+                getDao().delete(stored);
+            } catch (SQLException e) {
+                log.error("Unhandled exception", e);
+            }
             DatabaseHelper.updateEarliestDataChange(stored.date);
-            scheduleTreatmentChange(null);
+            this.scheduleTreatmentChange(stored, false);
         }
     }
 
@@ -643,7 +659,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
         try {
             getDao().delete(treatment);
             DatabaseHelper.updateEarliestDataChange(treatment.date);
-            this.scheduleTreatmentChange(treatment);
+            this.scheduleTreatmentChange(treatment, true);
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
@@ -656,7 +672,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
-        scheduleTreatmentChange(treatment);
+        scheduleTreatmentChange(treatment, true);
     }
 
     /**

From a3ee216b215eafe9137bb26ad7c2e9d7057cf3f8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 7 Mar 2020 17:34:39 +0100
Subject: [PATCH 39/56] New Crowdin translations (#2485)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations objectives.xml (Italian)

* New translations strings.xml (Italian)

* New translations insight_alert_titles.xml (Italian)

* New translations insight_exceptions.xml (Italian)

* New translations strings.xml (Italian)
---
 app/src/main/res/values-fr-rFR/strings.xml    |  4 ++--
 .../values-it-rIT/insight_alert_titles.xml    |  4 ++--
 .../res/values-it-rIT/insight_exceptions.xml  |  5 ++--
 app/src/main/res/values-it-rIT/objectives.xml |  2 +-
 app/src/main/res/values-it-rIT/strings.xml    | 24 +++++++++----------
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 269ec85497..5dc5649fca 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1425,10 +1425,10 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="invalidage">Âge invalide</string>
     <string name="invalidweight">Poids invalide</string>
     <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
-    <string name="tirformat"><![CDATA[<b>%1$s:</b> Bas: <b>%2$02d%%</b> Médian: <b>%3$02d%%</b> Haut: <b>%4$02d%%</b>]]></string>
+    <string name="tirformat"><![CDATA[<b>%1$s:</b> Bas: <b>%2$02d%%</b> Cible: <b>%3$02d%%</b> Haut: <b>%4$02d%%</b>]]></string>
     <string name="average">Moyenne</string>
     <string name="tdd">DTI</string>
-    <string name="tir">TIR</string>
+    <string name="tir">Cible Gly</string>
     <string name="activitymonitor">Moniteur d\'activité</string>
     <string name="doyouwantresetstats">Voulez-vous réinitialiser les stats d\'activité ?</string>
     <string name="statistics">Statistiques</string>
diff --git a/app/src/main/res/values-it-rIT/insight_alert_titles.xml b/app/src/main/res/values-it-rIT/insight_alert_titles.xml
index 0e3e09339f..123334b48d 100644
--- a/app/src/main/res/values-it-rIT/insight_alert_titles.xml
+++ b/app/src/main/res/values-it-rIT/insight_alert_titles.xml
@@ -9,8 +9,8 @@
     <string name="alert_w32_title">Batteria quasi 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_w36_title">TBR cancellato</string>
+    <string name="alert_w38_title">Bolo cancellato</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>
diff --git a/app/src/main/res/values-it-rIT/insight_exceptions.xml b/app/src/main/res/values-it-rIT/insight_exceptions.xml
index fa33f5f7f2..fc68ba559f 100644
--- a/app/src/main/res/values-it-rIT/insight_exceptions.xml
+++ b/app/src/main/res/values-it-rIT/insight_exceptions.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="connection_failed">Connessione fallita</string>
     <string name="connection_lost">Connessione persa</string>
@@ -7,9 +6,9 @@
     <string name="socket_creation_failed">Creazione socket fallita</string>
     <string name="timeout">Timeout</string>
     <string name="maximum_number_of_bolus_type_already_running">Numero massimo tipo di bolo già in esecuzione</string>
-    <string name="no_active_tbr_to_cancel">Nessun TBR attivo da annullare</string>
+    <string name="no_active_tbr_to_cancel">Nessun TBR attivo da cancellare</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="no_such_bolus_to_cancel">Nessun bolo da cancellare</string>
     <string name="pump_already_in_that_state_exception">Micro già in questo stato</string>
     <string name="run_mode_not_allowed">Modalità di esecuzione non consentita</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/objectives.xml b/app/src/main/res/values-it-rIT/objectives.xml
index b34fde69ad..d8026431c0 100644
--- a/app/src/main/res/values-it-rIT/objectives.xml
+++ b/app/src/main/res/values-it-rIT/objectives.xml
@@ -24,7 +24,7 @@
     <string name="objectives_bgavailableinns">Glicemia disponibile in NS</string>
     <string name="objectives_pumpstatusavailableinns">Stato micro disponibile in NS</string>
     <string name="objectives_manualenacts">Attivazioni manuali</string>
-    <string name="accomplished">Compiuto: %1$s</string>
+    <string name="accomplished">Completato: %1$s</string>
     <string name="objectives_usage_objective">Impara a controllare AndroidAPS</string>
     <string name="objectives_usage_gate">Esegui varie azioni in AndroidAPS</string>
     <string name="objectives_useprofileswitch">Imposta il profilo \"90%\" per 10 min (premi a lungo sul nome profilo nella sezione Panoramica)</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 1d1fdc86ed..191ec45424 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -119,7 +119,7 @@
     <string name="configbuilder_treatments">Trattamenti</string>
     <string name="configbuilder_treatments_description">Quale plugin dovrebbe essere utilizzato per la gestione del trattamento?</string>
     <string name="configbuilder_profile">Profilo</string>
-    <string name="configbuilder_profile_description">Quale profilo dovrebbe usare AndroidAPS?</string>
+    <string name="configbuilder_profile_description">Quale profilo AndroidAPS dovrebbe usare?</string>
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_aps_description">Quale algoritmo APS dovrebbe apportare aggiustamenti terapeutici?</string>
     <string name="configbuilder_general">Generale</string>
@@ -247,7 +247,7 @@
     <string name="success">OK</string>
     <string name="percent">Percentuale</string>
     <string name="absolute">Assoluto</string>
-    <string name="canceltemp">Cancellare basale temporanea</string>
+    <string name="canceltemp">Cancella basale temporanea</string>
     <string name="smscommunicator">Comunicazioni SMS</string>
     <string name="waitingforpumpresult">In attesa del risultato</string>
     <string name="smscommunicator_allowednumbers">Numeri di telefono consentiti</string>
@@ -343,8 +343,8 @@
     <string name="smscommunicator_extendedstopreplywithcode">Per stoppare il bolo esteso rispondi col codice %1$s</string>
     <string name="smscommunicator_tempbasalcanceled">Basale temporanea cancellata</string>
     <string name="smscommunicator_extendedcanceled">Bolo esteso cancellato</string>
-    <string name="smscommunicator_tempbasalcancelfailed">Cancellazione basale temporanea fallita</string>
-    <string name="smscommunicator_extendedcancelfailed">Cancellazione bolo esteso fallita</string>
+    <string name="smscommunicator_tempbasalcancelfailed">Basale temporanea: cancellazione fallita</string>
+    <string name="smscommunicator_extendedcancelfailed">Bolo esteso: cancellazione fallita</string>
     <string name="smscommunicator_unknowncommand">Comando sconosciuto o risposta errata</string>
     <string name="quickwizard">Calcolatore Rapido</string>
     <string name="quickwizardsettings">Impostazioni Calcolatore Rapido</string>
@@ -638,8 +638,8 @@
     <string name="enablesmb">Abilita SMB</string>
     <string name="enablesmb_summary">Utilizza Super Micro Boli al posto della basale temporanea per un\'azione più veloce</string>
     <string name="enableuam_summary">Rilevazione dei pasti Non Annunciati</string>
-    <string name="insulin_oref_peak">Momento picco Curva IOB</string>
-    <string name="insulin_peak_time">Momento del picco [min]</string>
+    <string name="insulin_oref_peak">Tempo picco Curva IOB</string>
+    <string name="insulin_peak_time">Tempo del picco [min]</string>
     <string name="free_peak_oref">Free-Peak Oref</string>
     <string name="rapid_acting_oref">Rapid-Acting Oref</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
@@ -771,7 +771,7 @@
     <string name="combo_reservoir_normal">Normale</string>
     <string name="combo_notification_check_time_date">Necessario aggiornare orologio micro</string>
     <string name="combo_warning">Attenzione</string>
-    <string name="combo_pump_tbr_cancelled_warrning">Avviso TBR CANCELLATO confermato</string>
+    <string name="combo_pump_tbr_cancelled_warrning">Avviso TBR CANCELLATO: confermato</string>
     <string name="combo_error_no_connection_no_bolus_delivered">Il micro potrebbe non essere raggiungibile. Nessun bolo erogato</string>
     <string name="combo_error_no_bolus_delivered">Erogazione bolo fallita. Sembra che nessun bolo sia stato erogato. Per sicurezza, controlla il micro per evitare un doppio bolo e se è tutto ok, erogalo di nuovo. Come protezione da eventuali \"bug\", i boli non vengono ripetuti automaticamente.</string>
     <string name="combo_error_partial_bolus_delivered">Solo la quantità di %1$.2f U del bolo richiesto di %2$.2f U è stata erogata a causa di un errore. Controlla il micro per verificare quanto accaduto e intraprendi le azioni necessarie.</string>
@@ -890,7 +890,7 @@
     <string name="pump_paused">Micro in pausa</string>
     <string name="absorption_cutoff_title">Max tempo assorbimento pasto [h]</string>
     <string name="absorption_cutoff_summary">Tempo entro il quale ogni pasto si considera assorbito. Eventuali carboidrati rimanenti verranno tagliati fuori.</string>
-    <string name="time">Offset</string>
+    <string name="time">Tempo</string>
     <string name="overview_show_notes_field_in_dialogs_title">Finestre tratt.nto: mostra campo note</string>
     <string name="next_button">Avanti</string>
     <string name="previous_button">Indietro</string>
@@ -1161,10 +1161,10 @@
     <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="sms_wrongcode">Codice errato. Comando cancellato.</string>
     <string name="notconfigured">Non configurato</string>
     <string name="profileswitchcreated">Cambio profilo creato</string>
-    <string name="recurringTime">Tempo di ripetizione</string>
+    <string name="recurringTime">Tempo ricorrente</string>
     <string name="every">Ogni</string>
     <string name="never">Mai</string>
     <string name="mins">%1$dmin</string>
@@ -1395,8 +1395,8 @@
     <string name="format_carbs">%1$dg</string>
     <string name="common_on">On</string>
     <string name="common_off">Off</string>
-    <string name="objectives_button_unfinish">Cancella completato</string>
-    <string name="objectives_button_unstart">Cancella avviato</string>
+    <string name="objectives_button_unfinish">Cancella completamento</string>
+    <string name="objectives_button_unstart">Cancella avvio</string>
     <string name="timedetection">Rilevazione tempo</string>
     <string name="doyouwantresetstart">Vuoi resettare l\'avvio dell\'obiettivo? Potresti perdere i tuoi progressi.</string>
     <string name="nopumpselected">Nessun micro selezionato</string>

From 07aa6f20394d1f8493b7f75020c6b22fc7ed2165 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 7 Mar 2020 20:18:52 +0100
Subject: [PATCH 40/56] fix LocalProfile upload

---
 .../androidaps/plugins/general/nsclient/NSUpload.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
index 0bc15d1d45..ab6cae3e71 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
@@ -396,7 +396,7 @@ public class NSUpload {
 
     public static void uploadProfileStore(JSONObject profileStore) {
         if (SP.getBoolean(R.string.key_ns_uploadlocalprofile, false)) {
-            UploadQueue.add(new DbRequest("dbAdd", "profile", String.valueOf(profileStore)));
+            UploadQueue.add(new DbRequest("dbAdd", "profile", profileStore));
         }
     }
 

From 14bda9cf719770cdd3d638475190482254bfd0a6 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 7 Mar 2020 20:37:08 +0100
Subject: [PATCH 41/56] hide overview_accepttempbutton by default

---
 app/src/main/res/layout/overview_fragment.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index 467c8c171a..35ddd5eed4 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -477,7 +477,8 @@
         app:layout_constraintBottom_toTopOf="@id/overview_buttons_layout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/overview_toppart_scrollbar" />
+        app:layout_constraintTop_toBottomOf="@id/overview_toppart_scrollbar"
+        android:visibility="gone"/>
 
     <LinearLayout
         android:id="@+id/overview_buttons_layout"

From 2467c0bba7b624b91fd8210fe41f53839d6a54d2 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 7 Mar 2020 20:50:49 +0100
Subject: [PATCH 42/56] scrollable buttons in landscape mode

---
 .../general/overview/OverviewFragment.java    |   4 +-
 .../layout/overview_fragment_landscape.xml    | 584 ++++++++++++++++++
 2 files changed, 586 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/layout/overview_fragment_landscape.xml

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
index 0976755f06..a00317eff3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
@@ -221,8 +221,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         } else if (Config.NSCLIENT) {
             view = inflater.inflate(R.layout.overview_fragment_nsclient, container, false);
             shorttextmode = true;
-        } else if (smallHeight || landscape) { // now testing the same layout for small displays as well
-            view = inflater.inflate(R.layout.overview_fragment, container, false);
+        } else if (smallHeight || landscape) {
+            view = inflater.inflate(R.layout.overview_fragment_landscape, container, false);
         } else {
             view = inflater.inflate(R.layout.overview_fragment, container, false);
         }
diff --git a/app/src/main/res/layout/overview_fragment_landscape.xml b/app/src/main/res/layout/overview_fragment_landscape.xml
new file mode 100644
index 0000000000..edaa1df7a5
--- /dev/null
+++ b/app/src/main/res/layout/overview_fragment_landscape.xml
@@ -0,0 +1,584 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".plugins.general.overview.OverviewFragment">
+
+    <ScrollView
+        android:id="@+id/overview_toppart_scrollbar"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/overview_notifications"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toTopOf="@+id/overview_looplayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+            </androidx.recyclerview.widget.RecyclerView>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/overview_looplayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toTopOf="@+id/overview_pumpstatuslayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_notifications">
+
+                <TextView
+                    android:id="@+id/overview_apsmode"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="5dp"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:text="@string/openloop"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_activeprofile"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+
+                <TextView
+                    android:id="@+id/overview_activeprofile"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="5dp"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:text="@string/profile"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_temptarget"
+                    app:layout_constraintStart_toEndOf="@+id/overview_apsmode"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/overview_temptarget"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:text="@string/temptargetshort"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@color/mdtp_white"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/overview_activeprofile"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:id="@+id/overview_pumpstatuslayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintBottom_toTopOf="@+id/bg_tbr_layout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_looplayout">
+
+                <TextView
+                    android:id="@+id/overview_pumpstatus"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:paddingTop="3dp"
+                    android:paddingBottom="3dp"
+                    android:text="@string/initializing"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            </LinearLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/bg_tbr_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintBottom_toTopOf="@+id/overview_statuslights"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_pumpstatuslayout">
+
+                <TextView
+                    android:id="@+id/overview_bg"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="00.0"
+                    android:textSize="42sp"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_arrow"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/overview_arrow"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:paddingStart="-2dp"
+                    android:paddingEnd="0dp"
+                    android:text="→"
+                    android:textSize="28sp"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_bg_guideline"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg"
+                    app:layout_constraintTop_toTopOf="@+id/overview_bg" />
+
+                <TextView
+                    android:id="@+id/overview_hor_space"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="                    "
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_bg_guideline"
+                    app:layout_constraintStart_toEndOf="@+id/overview_arrow"
+                    app:layout_constraintTop_toTopOf="@+id/overview_bg" />
+
+
+                <TextView
+                    android:id="@+id/overview_timeago"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="1 min ago"
+                    android:textSize="14sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_delta"
+                    app:layout_constraintEnd_toEndOf="@+id/overview_arrow"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_bg" />
+
+                <TextView
+                    android:id="@+id/overview_delta"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="delta 15m: 0.3"
+                    android:textSize="14sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_avgdelta"
+                    app:layout_constraintEnd_toEndOf="@+id/overview_arrow"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_timeago" />
+
+                <TextView
+                    android:id="@+id/overview_avgdelta"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="delta 40m: 0.3"
+                    android:textSize="14sp"
+                    app:layout_constraintEnd_toEndOf="@+id/overview_arrow"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_delta" />
+
+
+                <!-- right side -->
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/overview_bg_guideline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/overview_iob_label"
+                    app:layout_constraintGuide_percent="0.40"
+                    app:layout_constraintStart_toEndOf="@+id/overview_hor_space"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <!-- right side IOB -->
+                <TextView
+                    android:id="@+id/overview_iob_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/iob"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_cob_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="parent" />
+
+                <TextView
+                    android:id="@+id/overview_iob_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toEndOf="@+id/overview_iob_label"
+                    app:layout_constraintTop_toTopOf="@+id/overview_iob_label" />
+
+                <TextView
+                    android:id="@+id/overview_iob"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="@string/iob"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_iob_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_iob_colon" />
+
+                <!-- right side COB -->
+                <TextView
+                    android:id="@+id/overview_cob_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/cob"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_basebasal_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_iob_label" />
+
+                <TextView
+                    android:id="@+id/overview_cob_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toEndOf="@+id/overview_cob_label"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_iob_label" />
+
+                <TextView
+                    android:id="@+id/overview_cob"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="@string/cob"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_cob_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_cob_colon" />
+
+                <!-- right side basal -->
+                <TextView
+                    android:id="@+id/overview_basebasal_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/basal_short"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_extendedbolus_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_cob_label" />
+
+                <TextView
+                    android:id="@+id/overview_basebasal_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toEndOf="@+id/overview_basebasal_label"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_cob_label" />
+
+                <TextView
+                    android:id="@+id/overview_basebasal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="0.50U/h @17:35 1/30min"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_basebasal_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_basebasal_colon" />
+
+                <!-- right side extended  -->
+                <TextView
+                    android:id="@+id/overview_extendedbolus_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/extended_bolus_short"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/overview_sensitivity_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_basebasal_label" />
+
+                <TextView
+                    android:id="@+id/overview_extendedbolus_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_extendedbolus_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_extendedbolus_label" />
+
+                <TextView
+                    android:id="@+id/overview_extendedbolus"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="0.50U/h @17:35 1/30min"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_extendedbolus_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_extendedbolus_colon" />
+
+                <!-- right side AS  -->
+                <TextView
+                    android:id="@+id/overview_sensitivity_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/sensitivity_short"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/overview_bg_guideline"
+                    app:layout_constraintTop_toBottomOf="@+id/overview_extendedbolus_label" />
+
+                <TextView
+                    android:id="@+id/overview_sensitivity_colon"
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:text=":"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_sensitivity_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_sensitivity_label" />
+
+                <TextView
+                    android:id="@+id/overview_sensitivity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="100%"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_sensitivity_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_sensitivity_colon" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:id="@+id/overview_statuslights"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:orientation="horizontal"
+                app:layout_constraintBottom_toTopOf="@+id/overview_bggraph"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/bg_tbr_layout">
+
+                <TextView
+                    android:id="@+id/overview_canulaage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text=""
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/overview_insulinage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text=""
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/overview_reservoirlevel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text=""
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/overview_sensorage"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text=""
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/overview_batterylevel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text=""
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+            <com.jjoe64.graphview.GraphView
+                android:id="@+id/overview_bggraph"
+                android:layout_width="0dp"
+                android:layout_height="200dp"
+                app:layout_constraintBottom_toTopOf="@+id/overview_iobgraph"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/overview_statuslights" />
+
+            <ImageButton
+                android:id="@+id/overview_chartMenuButton"
+                android:layout_width="30dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_marginEnd="5dp"
+                android:contentDescription="@string/chartmenu"
+                app:layout_constraintEnd_toEndOf="@+id/overview_bggraph"
+                app:layout_constraintTop_toTopOf="@+id/overview_bggraph"
+                app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
+
+            <TextView
+                android:id="@+id/overview_iobcalculationprogess"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:text=""
+                android:textSize="15sp"
+                app:layout_constraintBottom_toBottomOf="@+id/overview_bggraph"
+                app:layout_constraintEnd_toEndOf="@+id/overview_bggraph"
+                app:layout_constraintStart_toStartOf="@+id/overview_bggraph"
+                app:layout_constraintTop_toTopOf="@+id/overview_bggraph" />
+
+
+            <com.jjoe64.graphview.GraphView
+                android:id="@+id/overview_iobgraph"
+                android:layout_width="0dp"
+                android:layout_height="100dp"
+                app:layout_constraintBottom_toTopOf="@+id/overview_accepttempbutton"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/overview_bggraph" />
+
+            <info.nightscout.androidaps.utils.SingleClickButton
+                android:id="@+id/overview_accepttempbutton"
+                style="?android:attr/buttonStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
+                android:text="@string/setbasalquestion"
+                android:textColor="@color/colorAcceptTempButton"
+                app:layout_constraintBottom_toTopOf="@id/overview_buttons_layout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/overview_iobgraph"
+                android:visibility="gone"/>
+
+            <LinearLayout
+                android:id="@+id/overview_buttons_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingStart="0dp"
+                android:paddingEnd="5dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/overview_accepttempbutton">
+
+                <info.nightscout.androidaps.utils.SingleClickButton
+                    android:id="@+id/overview_treatmentbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_insulin_carbs"
+                    android:text="@string/overview_treatment_label"
+                    android:textColor="@color/colorTreatmentButton"
+                    android:textSize="10sp"
+                    android:visibility="gone" />
+
+                <info.nightscout.androidaps.utils.SingleClickButton
+                    android:id="@+id/overview_insulinbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_bolus"
+                    android:text="@string/overview_insulin_label"
+                    android:textColor="@color/colorInsulinButton"
+                    android:textSize="10sp" />
+
+                <info.nightscout.androidaps.utils.SingleClickButton
+                    android:id="@+id/overview_carbsbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_cp_bolus_carbs"
+                    android:text="@string/overview_carbs_label"
+                    android:textColor="@color/colorCarbsButton"
+                    android:textSize="10sp" />
+
+                <info.nightscout.androidaps.utils.SingleClickButton
+                    android:id="@+id/overview_wizardbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_calculator"
+                    android:text="@string/overview_calculator_label"
+                    android:textColor="@color/colorCalculatorButton"
+                    android:textSize="10sp" />
+
+                <info.nightscout.androidaps.utils.SingleClickButton
+                    android:id="@+id/overview_calibrationbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_calibration"
+                    android:text="@string/overview_calibration"
+                    android:textColor="@color/colorCalibrationButton"
+                    android:textSize="10sp"
+                    android:visibility="gone" />
+
+                <info.nightscout.androidaps.utils.SingleClickButton
+                    android:id="@+id/overview_cgmbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_xdrip"
+                    android:text="@string/overview_cgm"
+                    android:textColor="@color/colorCalibrationButton"
+                    android:textSize="10sp"
+                    android:visibility="gone" />
+
+                <info.nightscout.androidaps.utils.SingleClickButton
+                    android:id="@+id/overview_quickwizardbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginEnd="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_quickwizard"
+                    android:text="@string/quickwizard"
+                    android:textColor="@color/colorQuickWizardButton"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

From a53f173751d06b446dd581202abb02eedfa15869 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 8 Mar 2020 20:49:29 +0100
Subject: [PATCH 43/56] fix some warnings

---
 .../nightscout/androidaps/activities/SurveyActivity.kt    | 2 +-
 .../general/automation/dialogs/EditActionDialog.kt        | 8 ++++----
 .../java/info/nightscout/androidaps/utils/OKDialog.kt     | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
index bf07eda9af..d72e43441e 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
@@ -84,7 +84,7 @@ class SurveyActivity : NoSplashAppCompatActivity() {
                 .addOnCompleteListener(this) { task ->
                     if (task.isSuccessful) {
                         log.debug("signInAnonymously:success")
-                        val user = auth.currentUser // TODO: do we need this, seems unused?
+                        // val user = auth.currentUser // TODO: do we need this, seems unused?
 
                         val database = FirebaseDatabase.getInstance().reference
                         database.child("survey").child(r.id).setValue(r)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.kt
index e738b7f94c..63a053f29f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.kt
@@ -44,11 +44,11 @@ class EditActionDialog : DialogFragmentWithDate() {
         return true
     }
 
-    override fun onSaveInstanceState(bundle: Bundle) {
-        super.onSaveInstanceState(bundle)
+    override fun onSaveInstanceState(savedInstanceState: Bundle) {
+        super.onSaveInstanceState(savedInstanceState)
         action?.let {
-            bundle.putInt("actionPosition", actionPosition)
-            bundle.putString("action", it.toJSON())
+            savedInstanceState.putInt("actionPosition", actionPosition)
+            savedInstanceState.putString("action", it.toJSON())
         }
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/OKDialog.kt b/app/src/main/java/info/nightscout/androidaps/utils/OKDialog.kt
index 1d22c380ca..830053bef0 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/OKDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/OKDialog.kt
@@ -62,13 +62,11 @@ object OKDialog {
     }
 
     @JvmStatic
-    @JvmOverloads
     fun showConfirmation(activity: Activity, message: String, ok: Runnable?) {
         showConfirmation(activity, MainApp.gs(R.string.confirmation), message, ok, null)
     }
 
     @JvmStatic
-    @JvmOverloads
     fun showConfirmation(activity: Activity, message: Spanned, ok: Runnable?) {
         showConfirmation(activity, MainApp.gs(R.string.confirmation), message, ok, null)
     }

From 7d9c1f8af9b60c40e4713fd439d6fdc5eeb00d89 Mon Sep 17 00:00:00 2001
From: TebbeUbben <tebbe@ubben.eu>
Date: Mon, 9 Mar 2020 23:07:55 +0100
Subject: [PATCH 44/56] Use "Display time-sensitive notifications" for Insight
 alerts

---
 app/src/main/AndroidManifest.xml              |   3 +
 .../pump/insight/InsightAlertService.java     | 187 ++++++++++++------
 .../pump/insight/LocalInsightPlugin.java      |  15 ++
 .../activities/InsightAlertActivity.java      | 175 ++--------------
 .../pump/insight/descriptors/Alert.java       |  20 ++
 .../plugins/pump/insight/utils/AlertUtils.kt  | 107 ++++++++++
 app/src/main/res/values/strings.xml           |   1 +
 app/src/main/res/values/styles.xml            |   4 +-
 8 files changed, 286 insertions(+), 226 deletions(-)
 create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b571e247c2..6318d88e46 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="com.dexcom.cgm.EXTERNAL_PERMISSION" />
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
 
     <uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
@@ -264,6 +265,8 @@
         <activity
             android:name=".plugins.pump.insight.activities.InsightAlertActivity"
             android:label="@string/pump_alert"
+            android:excludeFromRecents="true"
+            android:launchMode="singleInstance"
             android:theme="@style/InsightAlertDialog" />
         <activity
             android:name=".plugins.pump.insight.activities.InsightPairingInformationActivity"
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
index 26555898c0..cd9060338a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
@@ -1,25 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.insight;
 
+import android.app.Notification;
+import android.app.PendingIntent;
 import android.app.Service;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.media.AudioAttributes;
-import android.media.AudioManager;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
-import android.net.Uri;
 import android.os.Binder;
-import android.os.Build;
-import android.os.Handler;
 import android.os.IBinder;
-import android.os.Looper;
 import android.os.Vibrator;
+import android.text.Html;
+
 import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.lifecycle.MutableLiveData;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity;
 import info.nightscout.androidaps.plugins.pump.insight.app_layer.remote_control.ConfirmAlertMessage;
@@ -32,19 +33,21 @@ import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertType;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.InsightState;
 import info.nightscout.androidaps.plugins.pump.insight.exceptions.InsightException;
 import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.AppLayerErrorException;
+import info.nightscout.androidaps.plugins.pump.insight.utils.AlertUtilsKt;
 import info.nightscout.androidaps.plugins.pump.insight.utils.ExceptionTranslator;
 
 public class InsightAlertService extends Service implements InsightConnectionService.StateCallback {
 
+    private static final int NOTIFICATION_ID = 31345;
+
     private static Logger log = LoggerFactory.getLogger(L.PUMPCOMM);
 
     private LocalBinder localBinder = new LocalBinder();
     private boolean connectionRequested;
     private final Object $alertLock = new Object[0];
-    private Alert alert;
+    private Alert alert = null;
+    private MutableLiveData<Alert> alertLiveData = new MutableLiveData<>();
     private Thread thread;
-    private InsightAlertActivity alertActivity;
-    private Ringtone ringtone;
     private Vibrator vibrator;
     private boolean vibrating;
     private InsightConnectionService connectionService;
@@ -65,27 +68,6 @@ public class InsightAlertService extends Service implements InsightConnectionSer
         }
     };
 
-    private void retrieveRingtone() {
-        Uri uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE);
-        ringtone = RingtoneManager.getRingtone(this, uri);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            ringtone.setAudioAttributes(new AudioAttributes.Builder()
-                    .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
-                    .setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN)
-                    .setLegacyStreamType(AudioManager.STREAM_RING).build());
-        } else ringtone.setStreamType(AudioManager.STREAM_RING);
-    }
-
-    public Alert getAlert() {
-        synchronized ($alertLock) {
-            return alert;
-        }
-    }
-
-    public void setAlertActivity(InsightAlertActivity alertActivity) {
-        this.alertActivity = alertActivity;
-    }
-
     public void ignore(AlertType alertType) {
         synchronized ($alertLock) {
             if (alertType == null) {
@@ -98,6 +80,10 @@ public class InsightAlertService extends Service implements InsightConnectionSer
         }
     }
 
+    public MutableLiveData<Alert> getAlertLiveData() {
+        return alertLiveData;
+    }
+
     @Nullable
     @Override
     public IBinder onBind(Intent intent) {
@@ -108,6 +94,7 @@ public class InsightAlertService extends Service implements InsightConnectionSer
     public void onCreate() {
         vibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE);
         bindService(new Intent(this, InsightConnectionService.class), serviceConnection, BIND_AUTO_CREATE);
+        alertLiveData.setValue(null);
     }
 
     @Override
@@ -118,6 +105,12 @@ public class InsightAlertService extends Service implements InsightConnectionSer
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+        if ("mute".equals(intent.getStringExtra("command"))) {
+            mute();
+        } else if ("confirm".equals(intent.getStringExtra("command"))) {
+            dismissNotification();
+            confirm();
+        }
         return START_STICKY;
     }
 
@@ -127,25 +120,47 @@ public class InsightAlertService extends Service implements InsightConnectionSer
             thread = new Thread(this::queryActiveAlert);
             thread.start();
 
-        } else if (thread != null) thread.interrupt();
+        } else {
+            dismissNotification();
+            if (thread != null) thread.interrupt();
+        }
     }
 
     private void queryActiveAlert() {
         while (!Thread.currentThread().isInterrupted()) {
             try {
                 Alert alert = connectionService.requestMessage(new GetActiveAlertMessage()).await().getAlert();
-                if (Thread.currentThread().isInterrupted()) {
-                    connectionService.withdrawConnectionRequest(thread);
-                    break;
-                }
                 synchronized ($alertLock) {
-                    if ((this.alert == null && alert != null)
+                    if (alert == null || (alert.getAlertType() == ignoreType && System.currentTimeMillis() - ignoreTimestamp < 10000)) {
+                        if (connectionRequested) {
+                            connectionService.withdrawConnectionRequest(this);
+                            connectionRequested = false;
+                        }
+                        this.alertLiveData.postValue(null);
+                        this.alert = null;
+                        dismissNotification();
+                        stopAlerting();
+                    } else if (!alert.equals(this.alert)) {
+                        if (!connectionRequested) {
+                            connectionService.requestConnection(this);
+                            connectionRequested = true;
+                        }
+                        showNotification(alert);
+                        this.alertLiveData.postValue(alert);
+                        this.alert = alert;
+                        if (alert.getAlertStatus() == AlertStatus.SNOOZED) stopAlerting();
+                        else alert();
+                    }
+                    /*if ((this.alert == null && alert != null)
                             || (this.alert != null && alert == null)
                             || (this.alert != null && alert != null && !this.alert.equals(alert))) {
                         if (this.alert != null && (alert == null || this.alert.getAlertId() != alert.getAlertId())) stopAlerting();
                         this.alert = alert;
-                        if (alertActivity != null && alert != null)
-                            new Handler(Looper.getMainLooper()).post(() -> alertActivity.update(alert));
+                        if (alert != null)
+                            new Handler(Looper.getMainLooper()).post(() -> {
+                                //showNotification(alert);
+                                //alertActivity.update(alert);
+                            });
                     }
                     if (alert == null) {
                         stopAlerting();
@@ -153,8 +168,10 @@ public class InsightAlertService extends Service implements InsightConnectionSer
                             connectionService.withdrawConnectionRequest(this);
                             connectionRequested = false;
                         }
-                        if (alertActivity != null)
-                            new Handler(Looper.getMainLooper()).post(() -> alertActivity.finish());
+                        new Handler(Looper.getMainLooper()).post(() -> {
+                            //dismissNotification();
+                            //alertActivity.finish();
+                        });
                     } else if (!(alert.getAlertType() == ignoreType && System.currentTimeMillis() - ignoreTimestamp < 10000))  {
                         if (alert.getAlertStatus() == AlertStatus.ACTIVE) alert();
                         else stopAlerting();
@@ -162,12 +179,12 @@ public class InsightAlertService extends Service implements InsightConnectionSer
                             connectionService.requestConnection(this);
                             connectionRequested = true;
                         }
-                        if (alertActivity == null) {
+                        /*if (alertActivity == null) {
                             Intent intent = new Intent(InsightAlertService.this, InsightAlertActivity.class);
                             intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
                             new Handler(Looper.getMainLooper()).post(() -> startActivity(intent));
-                        }
-                    }
+                        }*/
+                    //}
                 }
             } catch (InterruptedException ignored) {
                 connectionService.withdrawConnectionRequest(thread);
@@ -189,21 +206,18 @@ public class InsightAlertService extends Service implements InsightConnectionSer
             connectionService.withdrawConnectionRequest(thread);
             connectionRequested = false;
         }
-        if (alertActivity != null)
-            new Handler(Looper.getMainLooper()).post(() -> alertActivity.finish());
         stopAlerting();
+        alertLiveData.postValue(null);
+        this.alert = null;
+        dismissNotification();
         thread = null;
     }
 
     private void alert() {
         if (!vibrating) {
-            vibrator.vibrate(new long[] {0, 1000, 1000}, 0);
+            vibrator.vibrate(new long[]{0, 1000, 1000}, 0);
             vibrating = true;
         }
-        if (ringtone == null || !ringtone.isPlaying()) {
-            retrieveRingtone();
-            ringtone.play();
-        }
     }
 
     private void stopAlerting() {
@@ -211,15 +225,21 @@ public class InsightAlertService extends Service implements InsightConnectionSer
             vibrator.cancel();
             vibrating = false;
         }
-        if (ringtone != null && ringtone.isPlaying()) ringtone.stop();
     }
 
     public void mute() {
         new Thread(() -> {
             try {
-                SnoozeAlertMessage snoozeAlertMessage = new SnoozeAlertMessage();
-                snoozeAlertMessage.setAlertID(alert.getAlertId());
-                connectionService.requestMessage(snoozeAlertMessage).await();
+                synchronized ($alertLock) {
+                    if (alert == null) return;
+                    alert.setAlertStatus(AlertStatus.SNOOZED);
+                    alertLiveData.postValue(alert);
+                    stopAlerting();
+                    showNotification(alert);
+                    SnoozeAlertMessage snoozeAlertMessage = new SnoozeAlertMessage();
+                    snoozeAlertMessage.setAlertID(alertLiveData.getValue().getAlertId());
+                    connectionService.requestMessage(snoozeAlertMessage).await();
+                }
             } catch (AppLayerErrorException e) {
                 log.info("Exception while muting alert: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
                 ExceptionTranslator.makeToast(InsightAlertService.this, e);
@@ -236,9 +256,16 @@ public class InsightAlertService extends Service implements InsightConnectionSer
     public void confirm() {
         new Thread(() -> {
             try {
-                ConfirmAlertMessage confirmAlertMessage = new ConfirmAlertMessage();
-                confirmAlertMessage.setAlertID(alert.getAlertId());
-                connectionService.requestMessage(confirmAlertMessage).await();
+                synchronized ($alertLock) {
+                    if (alert == null) return;
+                    stopAlerting();
+                    alertLiveData.postValue(null);
+                    dismissNotification();
+                    ConfirmAlertMessage confirmAlertMessage = new ConfirmAlertMessage();
+                    confirmAlertMessage.setAlertID(alertLiveData.getValue().getAlertId());
+                    connectionService.requestMessage(confirmAlertMessage).await();
+                    this.alert = null;
+                }
             } catch (AppLayerErrorException e) {
                 log.info("Exception while confirming alert: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
                 ExceptionTranslator.makeToast(InsightAlertService.this, e);
@@ -252,6 +279,48 @@ public class InsightAlertService extends Service implements InsightConnectionSer
         }).start();
     }
 
+    private void showNotification(Alert alert) {
+        NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, LocalInsightPlugin.ALERT_CHANNEL_ID);
+
+        notificationBuilder.setPriority(NotificationCompat.PRIORITY_MAX);
+        notificationBuilder.setCategory(NotificationCompat.CATEGORY_ALARM);
+        notificationBuilder.setVibrate(new long[0]);
+        notificationBuilder.setShowWhen(false);
+        notificationBuilder.setOngoing(true);
+        notificationBuilder.setOnlyAlertOnce(true);
+        notificationBuilder.setAutoCancel(false);
+        notificationBuilder.setSmallIcon(AlertUtilsKt.getAlertIcon(alert.getAlertCategory()));
+
+        notificationBuilder.setContentTitle(AlertUtilsKt.getAlertCode(alert.getAlertType()) + " – " + AlertUtilsKt.getAlertTitle(alert.getAlertType()));
+        String description = AlertUtilsKt.getAlertDescription(alert);
+        if (description != null)
+            notificationBuilder.setContentText(Html.fromHtml(description).toString());
+
+        Intent fullScreenIntent = new Intent(this, InsightAlertActivity.class);
+        PendingIntent fullScreenPendingIntent = PendingIntent.getActivity(this, 0, fullScreenIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        notificationBuilder.setFullScreenIntent(fullScreenPendingIntent, true);
+
+        switch (alert.getAlertStatus()) {
+            case ACTIVE:
+                Intent muteIntent = new Intent(this, InsightAlertService.class).putExtra("command", "mute");
+                PendingIntent mutePendingIntent = PendingIntent.getService(this, 1, muteIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+                notificationBuilder.addAction(0, MainApp.gs(R.string.mute_alert), mutePendingIntent);
+            case SNOOZED:
+                Intent confirmIntent = new Intent(this, InsightAlertService.class).putExtra("command", "confirm");
+                PendingIntent confirmPendingIntent = PendingIntent.getService(this, 2, confirmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+                notificationBuilder.addAction(0, MainApp.gs(R.string.confirm), confirmPendingIntent);
+        }
+
+        Notification notification = notificationBuilder.build();
+        NotificationManagerCompat.from(this).notify(NOTIFICATION_ID, notification);
+        startForeground(NOTIFICATION_ID, notification);
+    }
+
+    private void dismissNotification() {
+        NotificationManagerCompat.from(this).cancel(NOTIFICATION_ID);
+        stopForeground(true);
+    }
+
     public class LocalBinder extends Binder {
         public InsightAlertService getService() {
             return InsightAlertService.this;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index 2197b48577..66ee0bed5a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -1,9 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.insight;
 
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
@@ -132,6 +135,8 @@ import info.nightscout.androidaps.utils.SP;
 
 public class LocalInsightPlugin extends PluginBase implements PumpInterface, ConstraintsInterface, InsightConnectionService.StateCallback {
 
+    public static final String ALERT_CHANNEL_ID = "AndroidAPS-InsightAlert";
+
     private static LocalInsightPlugin instance = null;
 
     private Logger log = LoggerFactory.getLogger(L.PUMP);
@@ -245,6 +250,15 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
         super.onStart();
         MainApp.instance().bindService(new Intent(MainApp.instance(), InsightConnectionService.class), serviceConnection, Context.BIND_AUTO_CREATE);
         MainApp.instance().bindService(new Intent(MainApp.instance(), InsightAlertService.class), serviceConnection, Context.BIND_AUTO_CREATE);
+        createNotificationChannel();
+    }
+
+    private void createNotificationChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            NotificationManager notificationManager = (NotificationManager) MainApp.instance().getSystemService(Context.NOTIFICATION_SERVICE);
+            NotificationChannel channel = new NotificationChannel(ALERT_CHANNEL_ID, MainApp.gs(R.string.insight_alert_notification_channel), NotificationManager.IMPORTANCE_HIGH);
+            notificationManager.createNotificationChannel(channel);
+        }
     }
 
     @Override
@@ -647,6 +661,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                     cancelBolusMessage.setBolusID(bolusID);
                     connectionService.requestMessage(cancelBolusMessage).await();
                     bolusCancelled = true;
+                    alertService.ignore(null);
                 }
                 confirmAlert(AlertType.WARNING_38);
             } catch (AppLayerErrorException e) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
index 77be3ab03a..8ebd05801b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
@@ -12,19 +12,18 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 
-import java.text.DecimalFormat;
-
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
 import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.Alert;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertStatus;
+import info.nightscout.androidaps.plugins.pump.insight.utils.AlertUtilsKt;
 
-public class InsightAlertActivity extends NoSplashAppCompatActivity {
+public class InsightAlertActivity extends AppCompatActivity {
 
-    private Alert alert;
     private InsightAlertService alertService;
 
     private ImageView icon;
@@ -38,10 +37,10 @@ public class InsightAlertActivity extends NoSplashAppCompatActivity {
         @Override
         public void onServiceConnected(ComponentName name, IBinder binder) {
             alertService = ((InsightAlertService.LocalBinder) binder).getService();
-            alertService.setAlertActivity(InsightAlertActivity.this);
-            alert = alertService.getAlert();
-            if (alert == null) finish();
-            else update(alert);
+            alertService.getAlertLiveData().observe(InsightAlertActivity.this, alert -> {
+                if (alert == null) finish();
+                else update(alert);
+            });
         }
 
         @Override
@@ -70,174 +69,22 @@ public class InsightAlertActivity extends NoSplashAppCompatActivity {
                 | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
                 | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
                 | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
-        WindowManager.LayoutParams layoutParams = getWindow().getAttributes();
-        layoutParams.screenBrightness = 1.0F;
-        getWindow().setAttributes(layoutParams);
     }
 
     @Override
     protected void onDestroy() {
-        alertService.setAlertActivity(null);
         unbindService(serviceConnection);
         super.onDestroy();
     }
 
     public void update(Alert alert) {
-        this.alert = alert;
         mute.setEnabled(true);
         mute.setVisibility(alert.getAlertStatus() == AlertStatus.SNOOZED ? View.GONE : View.VISIBLE);
         confirm.setEnabled(true);
-        int icon = 0;
-        int code = 0;
-        int title = 0;
-        String description = null;
-        switch (alert.getAlertCategory()) {
-            case ERROR:
-                icon = R.drawable.ic_error;
-                break;
-            case MAINTENANCE:
-                icon = R.drawable.ic_maintenance;
-                break;
-            case WARNING:
-                icon = R.drawable.ic_warning;
-                break;
-            case REMINDER:
-                icon = R.drawable.ic_reminder;
-                break;
-        }
-        DecimalFormat decimalFormat = new DecimalFormat("##0.00");
-        int hours = alert.getTBRDuration() / 60;
-        int minutes = alert.getTBRDuration() - hours * 60;
-        switch (alert.getAlertType()) {
-            case REMINDER_01:
-                code = R.string.alert_r1_code;
-                title = R.string.alert_r1_title;
-                break;
-            case REMINDER_02:
-                code = R.string.alert_r2_code;
-                title = R.string.alert_r2_title;
-                break;
-            case REMINDER_03:
-                code = R.string.alert_r3_code;
-                title = R.string.alert_r3_title;
-                break;
-            case REMINDER_04:
-                code = R.string.alert_r4_code;
-                title = R.string.alert_r4_title;
-                break;
-            case REMINDER_07:
-                code = R.string.alert_r7_code;
-                title = R.string.alert_r7_title;
-                description = getString(R.string.alert_r7_description, alert.getTBRAmount(), new DecimalFormat("#0").format(hours) + ":" + new DecimalFormat("00").format(minutes));
-                break;
-            case WARNING_31:
-                code = R.string.alert_w31_code;
-                title = R.string.alert_w31_title;
-                description = getString(R.string.alert_w31_description, decimalFormat.format(alert.getCartridgeAmount()));
-                break;
-            case WARNING_32:
-                code = R.string.alert_w32_code;
-                title = R.string.alert_w32_title;
-                description = getString(R.string.alert_w32_description);
-                break;
-            case WARNING_33:
-                code = R.string.alert_w33_code;
-                title = R.string.alert_w33_title;
-                description = getString(R.string.alert_w33_description);
-                break;
-            case WARNING_34:
-                code = R.string.alert_w34_code;
-                title = R.string.alert_w34_title;
-                description = getString(R.string.alert_w34_description);
-                break;
-            case WARNING_36:
-                code = R.string.alert_w36_code;
-                title = R.string.alert_w36_title;
-                description = getString(R.string.alert_w36_description, alert.getTBRAmount(), new DecimalFormat("#0").format(hours) + ":" + new DecimalFormat("00").format(minutes));
-                break;
-            case WARNING_38:
-                code = R.string.alert_w38_code;
-                title = R.string.alert_w38_title;
-                description = getString(R.string.alert_w38_description, decimalFormat.format(alert.getProgrammedBolusAmount()), decimalFormat.format(alert.getDeliveredBolusAmount()));
-                break;
-            case WARNING_39:
-                code = R.string.alert_w39_code;
-                title = R.string.alert_w39_title;
-                break;
-            case MAINTENANCE_20:
-                code = R.string.alert_m20_code;
-                title = R.string.alert_m20_title;
-                description = getString(R.string.alert_m20_description);
-                break;
-            case MAINTENANCE_21:
-                code = R.string.alert_m21_code;
-                title = R.string.alert_m21_title;
-                description = getString(R.string.alert_m21_description);
-                break;
-            case MAINTENANCE_22:
-                code = R.string.alert_m22_code;
-                title = R.string.alert_m22_title;
-                description = getString(R.string.alert_m22_description);
-                break;
-            case MAINTENANCE_23:
-                code = R.string.alert_m23_code;
-                title = R.string.alert_m23_title;
-                description = getString(R.string.alert_m23_description);
-                break;
-            case MAINTENANCE_24:
-                code = R.string.alert_m24_code;
-                title = R.string.alert_m24_title;
-                description = getString(R.string.alert_m24_description);
-                break;
-            case MAINTENANCE_25:
-                code = R.string.alert_m25_code;
-                title = R.string.alert_m25_title;
-                description = getString(R.string.alert_m25_description);
-                break;
-            case MAINTENANCE_26:
-                code = R.string.alert_m26_code;
-                title = R.string.alert_m26_title;
-                description = getString(R.string.alert_m26_description);
-                break;
-            case MAINTENANCE_27:
-                code = R.string.alert_m27_code;
-                title = R.string.alert_m27_title;
-                description = getString(R.string.alert_m27_description);
-                break;
-            case MAINTENANCE_28:
-                code = R.string.alert_m28_code;
-                title = R.string.alert_m28_title;
-                description = getString(R.string.alert_m28_description);
-                break;
-            case MAINTENANCE_29:
-                code = R.string.alert_m29_code;
-                title = R.string.alert_m29_title;
-                description = getString(R.string.alert_m29_description);
-                break;
-            case MAINTENANCE_30:
-                code = R.string.alert_m30_code;
-                title = R.string.alert_m30_title;
-                description = getString(R.string.alert_m30_description);
-                break;
-            case ERROR_6:
-                code = R.string.alert_e6_code;
-                title = R.string.alert_e6_title;
-                description = getString(R.string.alert_e6_description);
-                break;
-            case ERROR_10:
-                code = R.string.alert_e10_code;
-                title = R.string.alert_e10_title;
-                description = getString(R.string.alert_e10_description);
-                break;
-            case ERROR_13:
-                code = R.string.alert_e13_code;
-                title = R.string.alert_e13_title;
-                description = getString(R.string.alert_e13_description);
-                break;
-        }
-        this.icon.setImageDrawable(ContextCompat.getDrawable(this, icon));
-        this.errorCode.setText(code);
-        this.errorTitle.setText(title);
+        this.icon.setImageDrawable(ContextCompat.getDrawable(this, AlertUtilsKt.getAlertIcon(alert.getAlertCategory())));
+        this.errorCode.setText(AlertUtilsKt.getAlertCode(alert.getAlertType()));
+        this.errorTitle.setText(AlertUtilsKt.getAlertTitle(alert.getAlertType()));
+        String description = AlertUtilsKt.getAlertDescription(alert);
         if (description == null) this.errorDescription.setVisibility(View.GONE);
         else {
             this.errorDescription.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/Alert.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/Alert.java
index 8f6668c1ca..028fcb3b71 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/Alert.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/descriptors/Alert.java
@@ -83,4 +83,24 @@ public class Alert {
     public double getCartridgeAmount() {
         return cartridgeAmount;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Alert alert = (Alert) o;
+
+        if (alertId != alert.alertId) return false;
+        if (tbrAmount != alert.tbrAmount) return false;
+        if (tbrDuration != alert.tbrDuration) return false;
+        if (Double.compare(alert.programmedBolusAmount, programmedBolusAmount) != 0)
+            return false;
+        if (Double.compare(alert.deliveredBolusAmount, deliveredBolusAmount) != 0)
+            return false;
+        if (Double.compare(alert.cartridgeAmount, cartridgeAmount) != 0) return false;
+        if (alertCategory != alert.alertCategory) return false;
+        if (alertType != alert.alertType) return false;
+        return alertStatus == alert.alertStatus;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt
new file mode 100644
index 0000000000..7cafb950cc
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt
@@ -0,0 +1,107 @@
+package info.nightscout.androidaps.plugins.pump.insight.utils
+
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.Alert
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertCategory
+import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertType
+import java.text.DecimalFormat
+
+fun getAlertCode(alertType: AlertType) = MainApp.gs(when (alertType) {
+    AlertType.REMINDER_01 -> R.string.alert_r1_code
+    AlertType.REMINDER_02 -> R.string.alert_r2_code
+    AlertType.REMINDER_03 -> R.string.alert_r3_code
+    AlertType.REMINDER_04 -> R.string.alert_r4_code
+    AlertType.REMINDER_07 -> R.string.alert_r7_code
+    AlertType.WARNING_31 -> R.string.alert_w31_code
+    AlertType.WARNING_32 -> R.string.alert_w32_code
+    AlertType.WARNING_33 -> R.string.alert_w33_code
+    AlertType.WARNING_34 -> R.string.alert_w34_code
+    AlertType.WARNING_36 -> R.string.alert_w36_code
+    AlertType.WARNING_38 -> R.string.alert_w38_code
+    AlertType.WARNING_39 -> R.string.alert_w39_code
+    AlertType.MAINTENANCE_20 -> R.string.alert_m20_code
+    AlertType.MAINTENANCE_21 -> R.string.alert_m21_code
+    AlertType.MAINTENANCE_22 -> R.string.alert_m22_code
+    AlertType.MAINTENANCE_23 -> R.string.alert_m23_code
+    AlertType.MAINTENANCE_24 -> R.string.alert_m24_code
+    AlertType.MAINTENANCE_25 -> R.string.alert_m25_code
+    AlertType.MAINTENANCE_26 -> R.string.alert_m26_code
+    AlertType.MAINTENANCE_27 -> R.string.alert_m27_code
+    AlertType.MAINTENANCE_28 -> R.string.alert_m28_code
+    AlertType.MAINTENANCE_29 -> R.string.alert_m29_code
+    AlertType.MAINTENANCE_30 -> R.string.alert_m30_code
+    AlertType.ERROR_6 -> R.string.alert_e6_code
+    AlertType.ERROR_10 -> R.string.alert_e10_code
+    AlertType.ERROR_13 -> R.string.alert_e13_code
+})
+
+fun getAlertTitle(alertType: AlertType) = MainApp.gs(when (alertType) {
+    AlertType.REMINDER_01 -> R.string.alert_r1_title
+    AlertType.REMINDER_02 -> R.string.alert_r2_title
+    AlertType.REMINDER_03 -> R.string.alert_r3_title
+    AlertType.REMINDER_04 -> R.string.alert_r4_title
+    AlertType.REMINDER_07 -> R.string.alert_r7_title
+    AlertType.WARNING_31 -> R.string.alert_w31_title
+    AlertType.WARNING_32 -> R.string.alert_w32_title
+    AlertType.WARNING_33 -> R.string.alert_w33_title
+    AlertType.WARNING_34 -> R.string.alert_w34_title
+    AlertType.WARNING_36 -> R.string.alert_w36_title
+    AlertType.WARNING_38 -> R.string.alert_w38_title
+    AlertType.WARNING_39 -> R.string.alert_w39_title
+    AlertType.MAINTENANCE_20 -> R.string.alert_m20_title
+    AlertType.MAINTENANCE_21 -> R.string.alert_m21_title
+    AlertType.MAINTENANCE_22 -> R.string.alert_m22_title
+    AlertType.MAINTENANCE_23 -> R.string.alert_m23_title
+    AlertType.MAINTENANCE_24 -> R.string.alert_m24_title
+    AlertType.MAINTENANCE_25 -> R.string.alert_m25_title
+    AlertType.MAINTENANCE_26 -> R.string.alert_m26_title
+    AlertType.MAINTENANCE_27 -> R.string.alert_m27_title
+    AlertType.MAINTENANCE_28 -> R.string.alert_m28_title
+    AlertType.MAINTENANCE_29 -> R.string.alert_m29_title
+    AlertType.MAINTENANCE_30 -> R.string.alert_m30_title
+    AlertType.ERROR_6 -> R.string.alert_e6_title
+    AlertType.ERROR_10 -> R.string.alert_e10_title
+    AlertType.ERROR_13 -> R.string.alert_e13_title
+})
+
+fun getAlertDescription(alert: Alert): String? {
+    val decimalFormat = DecimalFormat("##0.00")
+    val hours = alert.tbrDuration / 60
+    val minutes = alert.tbrDuration - hours * 60
+    return when (alert.alertType!!) {
+        AlertType.REMINDER_01 -> null
+        AlertType.REMINDER_02 -> null
+        AlertType.REMINDER_03 -> null
+        AlertType.REMINDER_04 -> null
+        AlertType.REMINDER_07 -> MainApp.gs(R.string.alert_r7_description, alert.tbrAmount, DecimalFormat("#0").format(hours.toLong()) + ":" + DecimalFormat("00").format(minutes.toLong()))
+        AlertType.WARNING_31 -> MainApp.gs(R.string.alert_w31_description, decimalFormat.format(alert.cartridgeAmount))
+        AlertType.WARNING_32 -> MainApp.gs(R.string.alert_w32_description)
+        AlertType.WARNING_33 -> MainApp.gs(R.string.alert_w33_description)
+        AlertType.WARNING_34 -> MainApp.gs(R.string.alert_w34_description)
+        AlertType.WARNING_36 -> MainApp.gs(R.string.alert_w36_description, alert.tbrAmount, DecimalFormat("#0").format(hours.toLong()) + ":" + DecimalFormat("00").format(minutes.toLong()))
+        AlertType.WARNING_38 -> MainApp.gs(R.string.alert_w38_description, decimalFormat.format(alert.programmedBolusAmount), decimalFormat.format(alert.deliveredBolusAmount))
+        AlertType.WARNING_39 -> null
+        AlertType.MAINTENANCE_20 -> MainApp.gs(R.string.alert_m20_description)
+        AlertType.MAINTENANCE_21 -> MainApp.gs(R.string.alert_m21_description)
+        AlertType.MAINTENANCE_22 -> MainApp.gs(R.string.alert_m22_description)
+        AlertType.MAINTENANCE_23 -> MainApp.gs(R.string.alert_m23_description)
+        AlertType.MAINTENANCE_24 -> MainApp.gs(R.string.alert_m24_description)
+        AlertType.MAINTENANCE_25 -> MainApp.gs(R.string.alert_m25_description)
+        AlertType.MAINTENANCE_26 -> MainApp.gs(R.string.alert_m26_description)
+        AlertType.MAINTENANCE_27 -> MainApp.gs(R.string.alert_m27_description)
+        AlertType.MAINTENANCE_28 -> MainApp.gs(R.string.alert_m28_description)
+        AlertType.MAINTENANCE_29 -> MainApp.gs(R.string.alert_m29_description)
+        AlertType.MAINTENANCE_30 -> MainApp.gs(R.string.alert_m30_description)
+        AlertType.ERROR_6 -> MainApp.gs(R.string.alert_e6_description)
+        AlertType.ERROR_10 -> MainApp.gs(R.string.alert_e10_description)
+        AlertType.ERROR_13 -> MainApp.gs(R.string.alert_e13_description)
+    }
+}
+
+fun getAlertIcon(alertCategory: AlertCategory) = when (alertCategory) {
+    AlertCategory.ERROR -> R.drawable.ic_error
+    AlertCategory.MAINTENANCE -> R.drawable.ic_maintenance
+    AlertCategory.WARNING -> R.drawable.ic_warning
+    AlertCategory.REMINDER -> R.drawable.ic_reminder
+}
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2e06c2a027..a4c79cb63b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1698,5 +1698,6 @@
     <string name="loop_smbexecution_time_label">SMB execution time</string>
     <string name="loop_tbrrequest_time_label">Temp basal request time</string>
     <string name="loop_tbrexecution_time_label">Temp basal execution time</string>
+    <string name="insight_alert_notification_channel">Insight Pump Alerts</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d2cacff3b7..d78df37ac4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -27,12 +27,10 @@
         <item name="android:windowAnimationStyle">@android:style/Animation</item>
     </style>
 
-    <style name="InsightAlertDialog" parent="Theme.AppCompat.Dialog">
+    <style name="InsightAlertDialog" parent="Theme.AppCompat.Dialog.MinWidth">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowMinWidthMajor">96%</item>
-        <item name="android:windowMinWidthMinor">96%</item>
     </style>
 
     <style name="Theme.AppCompat.NoTitle" parent="Theme.AppCompat.NoActionBar">

From 5e778f1e76870cc5abce099888bef5466eba2d38 Mon Sep 17 00:00:00 2001
From: TebbeUbben <tebbe@ubben.eu>
Date: Mon, 9 Mar 2020 23:11:14 +0100
Subject: [PATCH 45/56] Fix NullPointerException

---
 .../androidaps/plugins/pump/insight/InsightAlertService.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
index cd9060338a..53ce3a7d5e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
@@ -237,7 +237,7 @@ public class InsightAlertService extends Service implements InsightConnectionSer
                     stopAlerting();
                     showNotification(alert);
                     SnoozeAlertMessage snoozeAlertMessage = new SnoozeAlertMessage();
-                    snoozeAlertMessage.setAlertID(alertLiveData.getValue().getAlertId());
+                    snoozeAlertMessage.setAlertID(alert.getAlertId());
                     connectionService.requestMessage(snoozeAlertMessage).await();
                 }
             } catch (AppLayerErrorException e) {
@@ -262,7 +262,7 @@ public class InsightAlertService extends Service implements InsightConnectionSer
                     alertLiveData.postValue(null);
                     dismissNotification();
                     ConfirmAlertMessage confirmAlertMessage = new ConfirmAlertMessage();
-                    confirmAlertMessage.setAlertID(alertLiveData.getValue().getAlertId());
+                    confirmAlertMessage.setAlertID(alert.getAlertId());
                     connectionService.requestMessage(confirmAlertMessage).await();
                     this.alert = null;
                 }

From 206813ae4b27c7127ee3055a349a263db8615b26 Mon Sep 17 00:00:00 2001
From: TebbeUbben <tebbe@ubben.eu>
Date: Mon, 9 Mar 2020 23:19:16 +0100
Subject: [PATCH 46/56] Remove sound from notification channel

---
 .../androidaps/plugins/pump/insight/InsightAlertService.java   | 2 +-
 .../androidaps/plugins/pump/insight/LocalInsightPlugin.java    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
index 53ce3a7d5e..4a543f27c5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
@@ -129,8 +129,8 @@ public class InsightAlertService extends Service implements InsightConnectionSer
     private void queryActiveAlert() {
         while (!Thread.currentThread().isInterrupted()) {
             try {
-                Alert alert = connectionService.requestMessage(new GetActiveAlertMessage()).await().getAlert();
                 synchronized ($alertLock) {
+                    Alert alert = connectionService.requestMessage(new GetActiveAlertMessage()).await().getAlert();
                     if (alert == null || (alert.getAlertType() == ignoreType && System.currentTimeMillis() - ignoreTimestamp < 10000)) {
                         if (connectionRequested) {
                             connectionService.withdrawConnectionRequest(this);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index 66ee0bed5a..89e20de90e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -257,6 +257,7 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             NotificationManager notificationManager = (NotificationManager) MainApp.instance().getSystemService(Context.NOTIFICATION_SERVICE);
             NotificationChannel channel = new NotificationChannel(ALERT_CHANNEL_ID, MainApp.gs(R.string.insight_alert_notification_channel), NotificationManager.IMPORTANCE_HIGH);
+            channel.setSound(null, null);
             notificationManager.createNotificationChannel(channel);
         }
     }
@@ -661,9 +662,9 @@ public class LocalInsightPlugin extends PluginBase implements PumpInterface, Con
                     cancelBolusMessage.setBolusID(bolusID);
                     connectionService.requestMessage(cancelBolusMessage).await();
                     bolusCancelled = true;
+                    confirmAlert(AlertType.WARNING_38);
                     alertService.ignore(null);
                 }
-                confirmAlert(AlertType.WARNING_38);
             } catch (AppLayerErrorException e) {
                 log.info("Exception while canceling bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")");
             } catch (InsightException e) {

From 625d4f58b6ac9140f7e1a02946a7486a146d6f0f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 10 Mar 2020 09:46:41 +0100
Subject: [PATCH 47/56] gradle update

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8e59090d9d..285afb4fdf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath 'io.fabric.tools:gradle:1.31.2'
 

From c220b49ee757d044c5fbcc3dba7e86552d8267b8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 10 Mar 2020 20:38:34 +0100
Subject: [PATCH 48/56] use last DetailedBolusInfo as failover

---
 .../bolusInfo/DetailedBolusInfoStorage.kt     | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
index d7833a4fe4..daf6c80b2b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
@@ -2,7 +2,6 @@ package info.nightscout.androidaps.plugins.pump.common.bolusInfo
 
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData
 import info.nightscout.androidaps.utils.T
 import org.slf4j.LoggerFactory
 import java.util.*
@@ -20,10 +19,6 @@ object DetailedBolusInfoStorage {
 
     @Synchronized
     fun findDetailedBolusInfo(bolusTime: Long, bolus: Double): DetailedBolusInfo? {
-
-        if (MedtronicHistoryData.doubleBolusDebug)
-            log.debug("DoubleBolusDebug: findDetailedBolusInfo::bolusTime={}, bolus={}", bolusTime, bolus)
-
         // Look for info with bolus
         for (i in store.indices) {
             val d = store[i]
@@ -31,11 +26,8 @@ object DetailedBolusInfoStorage {
                 log.debug("Existing bolus info: " + store[i])
             if (bolusTime > d.date - T.mins(1).msecs() && bolusTime < d.date + T.mins(1).msecs() && abs(store[i].insulin - bolus) < 0.01) {
                 if (L.isEnabled(L.PUMP))
-                    log.debug("Using & removing bolus info: " + store[i])
+                    log.debug("Using & removing bolus info: ${store[i]}")
                 store.removeAt(i)
-                if (MedtronicHistoryData.doubleBolusDebug)
-                    log.debug("DoubleBolusDebug: findDetailedBolusInfo::selectedBolus[DetailedBolusInfo={}]", d)
-
                 return d
             }
         }
@@ -44,13 +36,23 @@ object DetailedBolusInfoStorage {
             val d = store[i]
             if (bolusTime > d.date - T.mins(1).msecs() && bolusTime < d.date + T.mins(1).msecs() && bolus <= store[i].insulin + 0.01) {
                 if (L.isEnabled(L.PUMP))
-                    log.debug("Using & removing bolus info: " + store[i])
+                    log.debug("Using TIME-ONLY & removing bolus info: ${store[i]}")
                 store.removeAt(i)
-                if (MedtronicHistoryData.doubleBolusDebug)
-                    log.debug("DoubleBolusDebug: findDetailedBolusInfo::selectedBolus[DetailedBolusInfo={}]", d)
                 return d
             }
         }
+        // If not found, use last record if amount is the same
+        if (store.size > 0) {
+            val d = store[store.size - 1]
+            if (abs(d.insulin - bolus) < 0.01)
+                if (L.isEnabled(L.PUMP))
+                    log.debug("Using LAST & removing bolus info: $d")
+            store.removeAt(store.size - 1)
+            return d
+        }
+        //Not found
+        if (L.isEnabled(L.PUMP))
+            log.debug("Bolus info not found")
         return null
     }
 }
\ No newline at end of file

From c7c8aea65c8c0b6774a59b47f33c0b390dca3380 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 10 Mar 2020 21:33:52 +0100
Subject: [PATCH 49/56] fix and add test

---
 .../pump/common/bolusInfo/DetailedBolusInfoStorage.kt      | 7 ++++---
 .../pump/common/bolusInfo/DetailedBolusInfoStorageTest.kt  | 5 +++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
index daf6c80b2b..884ba3a46b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
@@ -44,11 +44,12 @@ object DetailedBolusInfoStorage {
         // If not found, use last record if amount is the same
         if (store.size > 0) {
             val d = store[store.size - 1]
-            if (abs(d.insulin - bolus) < 0.01)
+            if (abs(d.insulin - bolus) < 0.01) {
                 if (L.isEnabled(L.PUMP))
                     log.debug("Using LAST & removing bolus info: $d")
-            store.removeAt(store.size - 1)
-            return d
+                store.removeAt(store.size - 1)
+                return d
+            }
         }
         //Not found
         if (L.isEnabled(L.PUMP))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorageTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorageTest.kt
index d0944d23bc..29e945c4bb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorageTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorageTest.kt
@@ -82,6 +82,11 @@ class DetailedBolusInfoStorageTest {
         d = DetailedBolusInfoStorage.findDetailedBolusInfo(1070000, 4.0)
         assertNull(d)
         assertEquals(3, DetailedBolusInfoStorage.store.size)
+        // Use last, if bolus size is the same
+        setUp()
+        d = DetailedBolusInfoStorage.findDetailedBolusInfo(1070000, 5.0)
+        assertEquals(5.0, d!!.insulin, 0.01)
+        assertEquals(2, DetailedBolusInfoStorage.store.size)
 
     }
 

From bec6d9903699e638673a868a77e0b9e19de53969 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 10 Mar 2020 22:20:36 +0100
Subject: [PATCH 50/56] register Network receiver in code (SDK28)

---
 app/src/main/AndroidManifest.xml                          | 8 --------
 app/src/main/java/info/nightscout/androidaps/MainApp.java | 8 ++++++++
 .../androidaps/receivers/NetworkChangeReceiver.java       | 2 --
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6318d88e46..e688720d78 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -124,14 +124,6 @@
             </intent-filter>
         </receiver>
 
-        <!-- Network change local receiver -->
-        <receiver android:name=".receivers.NetworkChangeReceiver">
-            <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-                <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
-            </intent-filter>
-        </receiver>
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 22df82d212..e4401de914 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -3,6 +3,8 @@ package info.nightscout.androidaps;
 import android.app.Application;
 import android.content.IntentFilter;
 import android.content.res.Resources;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiManager;
 import android.os.SystemClock;
 
 import androidx.annotation.ColorRes;
@@ -88,6 +90,7 @@ import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.receivers.DataReceiver;
 import info.nightscout.androidaps.receivers.KeepAliveReceiver;
 import info.nightscout.androidaps.receivers.NSAlarmReceiver;
+import info.nightscout.androidaps.receivers.NetworkChangeReceiver;
 import info.nightscout.androidaps.receivers.TimeDateOrTZChangeReceiver;
 import info.nightscout.androidaps.services.Intents;
 import info.nightscout.androidaps.utils.ActivityMonitor;
@@ -294,6 +297,11 @@ public class MainApp extends Application {
         this.timeDateOrTZChangeReceiver = new TimeDateOrTZChangeReceiver();
         this.timeDateOrTZChangeReceiver.registerBroadcasts(this);
 
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+        intentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+        intentFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION );
+        registerReceiver(new NetworkChangeReceiver(), intentFilter);
     }
 
     public static String gs(@StringRes int id) {
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java
index 19cf12bc8a..a8bad9e676 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java
@@ -24,8 +24,6 @@ public class NetworkChangeReceiver extends BroadcastReceiver {
 
     private static EventNetworkChange lastEvent = null;
 
-    public static final NetworkChangeReceiver instance = new NetworkChangeReceiver();
-
     @Override
     public void onReceive(final Context context, final Intent intent) {
         EventNetworkChange event = grabNetworkStatus(context);

From d6997f819060c5b47bd56ca39889c62ed80fe614 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 15 Mar 2020 12:07:09 +0100
Subject: [PATCH 51/56] Objectives text change

---
 app/src/main/res/values/objectives.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/objectives.xml b/app/src/main/res/values/objectives.xml
index dac9b0234a..7fada71a72 100644
--- a/app/src/main/res/values/objectives.xml
+++ b/app/src/main/res/values/objectives.xml
@@ -47,7 +47,7 @@
     <string name="objectives_useloop">Display content of Loop plugin</string>
     <string name="objectives_usescale">Use scale function by long-pressing BG chart</string>
     <string name="objectives_button_enter">Enter</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">If you were OpenAPS user before and your NS has at least 3 months of looping data, you can send an email to objectives@androidaps.org with your NS address and request code to bypass the rest of objectives. Enter code obtained from developers</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">If you have at least 3 month of closed loop experience with other systems you might qualify for a code to skip objectives. See https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives for details.</string>
     <string name="codeaccepted">Code accepted</string>
     <string name="codeinvalid">Code invalid</string>
     <string name="objectives_exam_objective">Prove your knowledge</string>

From 854d81e8a833b7489bdc7edff78945ed819a880e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 17 Mar 2020 16:32:41 +0100
Subject: [PATCH 52/56] New Crowdin translations (#2488)

* New translations strings.xml (French)

* New translations insight_alert_codes.xml (Finnish)

* New translations exam.xml (Finnish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Polish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Japanese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (German)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Greek)

* New translations strings.xml (Croatian)

* New translations strings.xml (Finnish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (German)

* New translations exam.xml (Lithuanian)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations exam.xml (Czech)

* New translations strings.xml (Czech)

* New translations exam.xml (Czech)

* New translations strings.xml (Russian)

* New translations strings.xml (French)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations objectives.xml (Greek)

* New translations objectives.xml (Afrikaans)

* New translations objectives.xml (Bulgarian)

* New translations objectives.xml (Chinese Simplified)

* New translations objectives.xml (Croatian)

* New translations objectives.xml (Czech)

* New translations objectives.xml (Dutch)

* New translations objectives.xml (Finnish)

* New translations objectives.xml (French)

* New translations objectives.xml (German)

* New translations objectives.xml (Hebrew)

* New translations objectives.xml (Irish)

* New translations objectives.xml (Japanese)

* New translations objectives.xml (Korean)

* New translations objectives.xml (Lithuanian)

* New translations objectives.xml (Polish)

* New translations objectives.xml (Portuguese)

* New translations objectives.xml (Portuguese, Brazilian)

* New translations objectives.xml (Romanian)

* New translations objectives.xml (Russian)

* New translations objectives.xml (Slovak)

* New translations objectives.xml (Slovenian)

* New translations objectives.xml (Spanish)

* New translations objectives.xml (Swedish)

* New translations objectives.xml (Italian)

* New translations objectives.xml (Turkish)

* New translations objectives.xml (Italian)

* New translations objectives.xml (German)

* New translations objectives.xml (Portuguese)

* New translations objectives.xml (Portuguese, Brazilian)

* New translations objectives.xml (Czech)

* New translations objectives.xml (Slovak)

* New translations objectives.xml (Russian)
---
 app/src/main/res/values-af-rZA/objectives.xml   |  1 -
 app/src/main/res/values-af-rZA/strings.xml      |  1 -
 app/src/main/res/values-bg-rBG/objectives.xml   |  2 --
 app/src/main/res/values-cs-rCZ/exam.xml         |  1 -
 app/src/main/res/values-cs-rCZ/objectives.xml   |  3 +--
 app/src/main/res/values-cs-rCZ/strings.xml      |  7 ++++---
 app/src/main/res/values-de-rDE/objectives.xml   |  3 +--
 app/src/main/res/values-de-rDE/strings.xml      |  4 ++--
 app/src/main/res/values-el-rGR/objectives.xml   |  1 -
 app/src/main/res/values-el-rGR/strings.xml      |  1 -
 app/src/main/res/values-es-rES/objectives.xml   |  2 --
 app/src/main/res/values-fi-rFI/exam.xml         |  1 -
 .../res/values-fi-rFI/insight_alert_codes.xml   |  1 -
 app/src/main/res/values-fi-rFI/objectives.xml   |  1 -
 app/src/main/res/values-fi-rFI/strings.xml      |  1 -
 app/src/main/res/values-fr-rFR/objectives.xml   |  2 --
 app/src/main/res/values-fr-rFR/strings.xml      | 17 +++++++++--------
 app/src/main/res/values-ga-rIE/objectives.xml   |  1 -
 app/src/main/res/values-hr-rHR/objectives.xml   |  1 -
 app/src/main/res/values-hr-rHR/strings.xml      |  1 -
 app/src/main/res/values-it-rIT/objectives.xml   |  2 +-
 app/src/main/res/values-it-rIT/strings.xml      |  3 ++-
 app/src/main/res/values-iw-rIL/objectives.xml   |  1 -
 app/src/main/res/values-iw-rIL/strings.xml      |  1 -
 app/src/main/res/values-ja-rJP/objectives.xml   |  1 -
 app/src/main/res/values-ja-rJP/strings.xml      |  1 -
 app/src/main/res/values-ko-rKR/objectives.xml   |  2 --
 app/src/main/res/values-lt-rLT/exam.xml         |  9 ++++-----
 app/src/main/res/values-lt-rLT/objectives.xml   |  2 --
 app/src/main/res/values-nl-rNL/objectives.xml   |  2 --
 app/src/main/res/values-pl-rPL/objectives.xml   |  2 --
 app/src/main/res/values-pl-rPL/strings.xml      |  1 -
 app/src/main/res/values-pt-rBR/objectives.xml   |  3 +--
 app/src/main/res/values-pt-rBR/strings.xml      |  7 ++++++-
 app/src/main/res/values-pt-rPT/objectives.xml   |  3 +--
 app/src/main/res/values-pt-rPT/strings.xml      |  2 +-
 app/src/main/res/values-ro-rRO/objectives.xml   |  1 -
 app/src/main/res/values-ro-rRO/strings.xml      |  1 -
 app/src/main/res/values-ru-rRU/objectives.xml   |  3 +--
 app/src/main/res/values-ru-rRU/strings.xml      |  2 +-
 app/src/main/res/values-sk-rSK/objectives.xml   |  3 +--
 app/src/main/res/values-sk-rSK/strings.xml      |  2 +-
 app/src/main/res/values-sl-rSI/objectives.xml   |  1 -
 app/src/main/res/values-sl-rSI/strings.xml      |  1 -
 app/src/main/res/values-sv-rSE/objectives.xml   |  2 --
 app/src/main/res/values-sv-rSE/strings.xml      |  1 -
 app/src/main/res/values-tr-rTR/objectives.xml   |  1 -
 app/src/main/res/values-tr-rTR/strings.xml      |  1 -
 app/src/main/res/values-zh-rCN/objectives.xml   |  1 -
 app/src/main/res/values-zh-rCN/strings.xml      |  1 -
 50 files changed, 37 insertions(+), 78 deletions(-)

diff --git a/app/src/main/res/values-af-rZA/objectives.xml b/app/src/main/res/values-af-rZA/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-af-rZA/objectives.xml
+++ b/app/src/main/res/values-af-rZA/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index a800677ac4..0497576890 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-bg-rBG/objectives.xml b/app/src/main/res/values-bg-rBG/objectives.xml
index d2e47ec386..5231716d11 100644
--- a/app/src/main/res/values-bg-rBG/objectives.xml
+++ b/app/src/main/res/values-bg-rBG/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Назад</string>
     <string name="objectives_button_start">Старт</string>
@@ -36,7 +35,6 @@
     <string name="objectives_useloop">Отворете съдържанието на Цикъл плъгина.</string>
     <string name="objectives_usescale">Използвайте функцията за удължаване на периода на графиката, като задържите върху нея.</string>
     <string name="objectives_button_enter">Въведи</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Ако сте били потребител на OpenAPS и НС има най-малко 3 месеца цикъл на данни, можете да изпращате по електронна поща objectives@androidaps.org с адрес на НС, за да поискате код за заобикаляне на останалите цели. Въведете кода, получен от разработчици</string>
     <string name="codeaccepted">Код приет!</string>
     <string name="codeinvalid">Неправилен код</string>
     <string name="objectives_exam_objective">Докажете знанията си</string>
diff --git a/app/src/main/res/values-cs-rCZ/exam.xml b/app/src/main/res/values-cs-rCZ/exam.xml
index a65151aee8..5c038e57a4 100644
--- a/app/src/main/res/values-cs-rCZ/exam.xml
+++ b/app/src/main/res/values-cs-rCZ/exam.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="dia_whatmeansdia">Co je pravda o DIA?</string>
     <string name="dia_label">Téma: Doba trvání účinku inzulínu</string>
diff --git a/app/src/main/res/values-cs-rCZ/objectives.xml b/app/src/main/res/values-cs-rCZ/objectives.xml
index 76597c063d..b47865c3ef 100644
--- a/app/src/main/res/values-cs-rCZ/objectives.xml
+++ b/app/src/main/res/values-cs-rCZ/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Zpět</string>
     <string name="objectives_button_start">Začátek</string>
@@ -36,7 +35,7 @@
     <string name="objectives_useloop">Zobrazte obsah modulu Smyčka</string>
     <string name="objectives_usescale">Přepněte režim zobrazení dlouhým stisknutím grafu glykémie</string>
     <string name="objectives_button_enter">Zadat</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Pokud jste byli dříve uživateli OpenAPS a váš NS má alespoň 3 měsíce dat z používání smyčky, můžete poslat e-mail na adresu objectives@androidaps.org s adresou svého NS a požádat o kód, pomocí něhož budete moci obejít zbývající cíle. Zadejte kód získaný od vývojářů.</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Pokud máte alespoň 3 měsíce zkušeností s uzavřenou smyčkou na jiných systémech, můžete získat kód, který vám umožní přeskočit cíle. Více informací najdete na https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Objectives.html#skip-objectives.</string>
     <string name="codeaccepted">Kód přijat</string>
     <string name="codeinvalid">Neplatný kód</string>
     <string name="objectives_exam_objective">Prokažte své znalosti</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 23a29a18b6..b89be5648a 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -340,7 +340,7 @@
     <string name="smscommunicator_tempbasalfailed">Spuštění dočasného bazálu selhalo</string>
     <string name="smscommunicator_extendedfailed">Spuštění prodlouženého bolusu selhalo</string>
     <string name="smscommunicator_basalstopreplywithcode">Na zastavení dočasného bazálu odpovězte SMS s kódem %1$s</string>
-    <string name="smscommunicator_extendedstopreplywithcode">Na zastavení prodlouženého bolusu odpovězte SMS s kódem %1$s</string>
+    <string name="smscommunicator_extendedstopreplywithcode">Pro zastavení prodlouženého bolusu odpovězte SMS s kódem %1$s</string>
     <string name="smscommunicator_tempbasalcanceled">Dočasný bazál zastaven</string>
     <string name="smscommunicator_extendedcanceled">Prodloužený bolus zastaven</string>
     <string name="smscommunicator_tempbasalcancelfailed">Rušení dočasného bazálu selhalo</string>
@@ -1443,8 +1443,8 @@
     <string name="alreadyset">Již nastaveno</string>
     <string name="message">Zpráva</string>
     <string name="clearqueueconfirm">Vymazat frontu? Všechna data ve frontě budou ztracena!</string>
-    <string name="ebstopsloop">Použití funkce rozloženého bolusu zastaví uzavřenou smyčku po dobu trvání rozloženého bolusu. Opravdu to chcete?</string>
-    <string name="closed_loop_disabled_with_eb">Uzavřená smyčka je zastavena kvůli běžícímu rozloženému bolusu</string>
+    <string name="ebstopsloop">Použití funkce prodlouženého bolusu zastaví uzavřenou smyčku po dobu trvání prodlouženého bolusu. Opravdu to chcete?</string>
+    <string name="closed_loop_disabled_with_eb">Uzavřená smyčka je zastavena kvůli běžícímu prodlouženému bolusu</string>
     <string name="extended_bolus_short">EB</string>
     <string name="phonechecker">PhoneChecker</string>
     <string name="chartmenu">Možnosti grafu</string>
@@ -1453,4 +1453,5 @@
     <string name="loop_smbexecution_time_label">Čas provedení SMB</string>
     <string name="loop_tbrrequest_time_label">Čas požadavku dočasného bazálu</string>
     <string name="loop_tbrexecution_time_label">Čas provedení dočasného bazálu</string>
+    <string name="insight_alert_notification_channel">Upozornění pumpy Insight</string>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/objectives.xml b/app/src/main/res/values-de-rDE/objectives.xml
index c2a3fe603e..e094670b18 100644
--- a/app/src/main/res/values-de-rDE/objectives.xml
+++ b/app/src/main/res/values-de-rDE/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Zurück</string>
     <string name="objectives_button_start">Start</string>
@@ -37,7 +36,7 @@ die Formel maxIOB = durchschnittlicher Essensbolus + 3 x höchste Basalrate</str
     <string name="objectives_useloop">Zeige den Inhalt des Loop-Plugins an</string>
     <string name="objectives_usescale">Nutze die Skalierfunktion. Drücke dazu lange auf das BZ-Diagramm</string>
     <string name="objectives_button_enter">OK</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Wenn Du früher bereits OpenAPS genutzt hast und auf Deiner Nightscout-Seite mindestens drei Monate Closed-Loop-Daten ersichtlich sind, kannst Du eine E-Mail an objectives@androidaps.org mit Deiner NS-URL und Deinem Anforderungscode senden, um die restlichen Ziele zu überspringen. Code eingeben, der von den Entwicklern übermittelt wurde:</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Wenn Du mindestens 3 Monate Closed-Loop-Erfahrung mit einem anderen System hast, kannst Du evtl. einen Code zum Überspringen der Objektives erhalten. Weitere Details unter https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Usage/Objectives.html#objectives-ziele-uberspringen.</string>
     <string name="codeaccepted">Code akzeptiert</string>
     <string name="codeinvalid">Code ungültig</string>
     <string name="objectives_exam_objective">Prüfe Dein Wissen</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 3ccf637260..324284d44f 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -686,7 +685,7 @@
     <string name="shortgramm">g</string>
     <string name="shortminute">min</string>
     <string name="shorthour">h</string>
-    <string name="shortday">T</string>
+    <string name="shortday">d</string>
     <string name="none"><![CDATA[<nichts>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
@@ -1455,4 +1454,5 @@ Unerwartetes Verhalten.</string>
     <string name="loop_smbexecution_time_label">SMB Ausführungszeit</string>
     <string name="loop_tbrrequest_time_label">Temp. BR Anfragezeit</string>
     <string name="loop_tbrexecution_time_label">Temp. BR Ausführungszeit</string>
+    <string name="insight_alert_notification_channel">Insight Pumpenalarme</string>
 </resources>
diff --git a/app/src/main/res/values-el-rGR/objectives.xml b/app/src/main/res/values-el-rGR/objectives.xml
index 4a2ce25a1e..3bad200cdb 100644
--- a/app/src/main/res/values-el-rGR/objectives.xml
+++ b/app/src/main/res/values-el-rGR/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Πίσω</string>
     <string name="objectives_button_start">Έναρξη</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index a314644f29..6c5050720e 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-es-rES/objectives.xml b/app/src/main/res/values-es-rES/objectives.xml
index 9f6a95c2b1..047ce04909 100644
--- a/app/src/main/res/values-es-rES/objectives.xml
+++ b/app/src/main/res/values-es-rES/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Atrás</string>
     <string name="objectives_button_start">Inicio</string>
@@ -36,7 +35,6 @@
     <string name="objectives_useloop">Mostrar contenido del plugin Loop</string>
     <string name="objectives_usescale">Usar función de escala mediante un gráfico BG pulsado largo</string>
     <string name="objectives_button_enter">Intro</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Si fuiste usuario de OpenAPS y tu NS tiene al menos 3 meses de datos de lazo cerrado, puedes enviar un correo electrónico a objectives@androidaps.org con tu dirección web de NS y solicitar código para saltarse el resto de objetivos. Ingresa posteriormente el código obtenido de los desarrolladores</string>
     <string name="codeaccepted">Código aceptado</string>
     <string name="codeinvalid">Código no válido</string>
     <string name="objectives_exam_objective">Compruebe su conocimiento</string>
diff --git a/app/src/main/res/values-fi-rFI/exam.xml b/app/src/main/res/values-fi-rFI/exam.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-fi-rFI/exam.xml
+++ b/app/src/main/res/values-fi-rFI/exam.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-fi-rFI/insight_alert_codes.xml b/app/src/main/res/values-fi-rFI/insight_alert_codes.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-fi-rFI/insight_alert_codes.xml
+++ b/app/src/main/res/values-fi-rFI/insight_alert_codes.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-fi-rFI/objectives.xml b/app/src/main/res/values-fi-rFI/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-fi-rFI/objectives.xml
+++ b/app/src/main/res/values-fi-rFI/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index df88c88e20..96062d70ad 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-fr-rFR/objectives.xml b/app/src/main/res/values-fr-rFR/objectives.xml
index 89af39e082..37d434b2d3 100644
--- a/app/src/main/res/values-fr-rFR/objectives.xml
+++ b/app/src/main/res/values-fr-rFR/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Retour</string>
     <string name="objectives_button_start">Départ</string>
@@ -36,7 +35,6 @@
     <string name="objectives_useloop">Affichage du contenu du plugin Boucle</string>
     <string name="objectives_usescale">Modification de l\'échelle du graphique par un appui long sur la courbe de glycémie</string>
     <string name="objectives_button_enter">Entrer</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Si vous étiez avant un utilisateur d\'OpenAPS et que votre NS a au moins 3 mois de données de bouclage, vous pouvez envoyer un e-mail à objectives@androidaps.org avec votre adresse NS et demander un code pour contourner le reste des objectifs. Entrez le code obtenu auprès des développeurs</string>
     <string name="codeaccepted">Code accepté</string>
     <string name="codeinvalid">Code invalide</string>
     <string name="objectives_exam_objective">Prouver ses connaissances</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 5dc5649fca..6f48c43122 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -42,10 +42,10 @@
     <string name="description_pump_dana_rs">Intégration pour les pompes Diabecare DANA RS</string>
     <string name="description_pump_mdi">Intégration pompe pour les personnes qui font des injections quotidiennes multiples pour le traitement de leur diabète</string>
     <string name="description_pump_virtual">Intégration pour les pompes qui n’ont pas encore de pilote (Boucle Ouverte)</string>
-    <string name="description_sensitivity_aaps">La Sensibilité est calculée de la même manière que Oref0, mais vous pouvez spécifier la periode concernée. L\'absorption minimale des glucides est calculée à partir des temps d’absorption max des glucides du menu préférences.</string>
-    <string name="description_sensitivity_oref0">Sensibilité est calculée à partir des données sur les dernières 24h et les glucides (non absorbés) ne sont plus pris en compte après l’heure spécifiée dans les préférences.</string>
-    <string name="description_sensitivity_oref1">Sensibilité est calculée à partir des données des dernières 8 heures et des glucides (si non absorbés) ne sont plus pris en compte après le temps spécifié dans les préférences. Plugin calcule également RNS (UAM).</string>
-    <string name="description_sensitivity_weighted_average">Sensibilité est calculée comme une moyenne pondérée des écarts. Les écarts les plus récents ont un poids plus élevé. L\'absorption minimale des glucides est calculée à partir des temps d’absorption des glucides max du menu préférences. Cet algorithme est le plus rapide pour s\'adapter aux changements de sensibilité.</string>
+    <string name="description_sensitivity_aaps">La sensibilité est calculée de la même manière que Oref0, mais vous pouvez spécifier la période concernée. L\'absorption minimale des glucides est calculée à partir des temps d’absorption max des glucides du menu préférences.</string>
+    <string name="description_sensitivity_oref0">La sensibilité est calculée à partir des données sur les dernières 24h et les glucides (si non absorbés) ne sont plus pris en compte après l’heure spécifiée dans les préférences.</string>
+    <string name="description_sensitivity_oref1">La sensibilité est calculée à partir des données des dernières 8 heures et les glucides (si non absorbés) ne sont plus pris en compte après le temps spécifié dans les préférences. Le plugin calcule également les RNS (UAM).</string>
+    <string name="description_sensitivity_weighted_average">La sensibilité est calculée comme une moyenne pondérée des écarts. Les écarts les plus récents ont un poids plus élevé. L\'absorption minimale des glucides est calculée à partir des temps d’absorption des glucides max du menu préférences. Cet algorithme est le plus rapide pour s\'adapter aux changements de sensibilité.</string>
     <string name="description_source_eversense">Recevoir les valeurs de glycémie de l’app Eversense patchée.</string>
     <string name="description_source_glimp">Recevoir les glycémies depuis Glimp.</string>
     <string name="description_source_mm640g">Recevoir les glycémies depuis le 600SeriesAndroidUploder.</string>
@@ -145,7 +145,7 @@
     <string name="overview_newtempbasal_basalpercent">Valeur Basal [%]</string>
     <string name="setbasalquestion">Accepter nouveau basal temporaire :</string>
     <string name="overview_treatment_label">Traitement</string>
-    <string name="overview_calculator_label">Calculatrice</string>
+    <string name="overview_calculator_label">Assistant</string>
     <string name="constraintapllied">Restriction appliquée !</string>
     <string name="confirmation">Confirmation</string>
     <string name="bolus">Bolus</string>
@@ -456,7 +456,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="openapsama_max_daily_safety_multiplier_summary">Valeur par défaut : 3 Ceci est un paramètre important de sécurité de l’OpenAPS. Ceci va limiter vos débits basal à 3 fois votre débit Basal maximum. Il est probable que vous n’aurez pas besoin de changer cela, mais vous devez être conscient de ce qui est discuté pour les limites de sécurité dans “3x max daily; 4x current”.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Valeur par défaut : 4 Ceci est l’autre moitié des paramètres de sécurité limitant l’OpenAPS, et l’autre moitié de “3x max daily, 4x current” des paramètres de sécurité. Quel que soit le basal maximum prédéfini dans votre pompe, il ne pourra pas être plus haut que ce nombre multiplié par le Basal actuel. Ceci est fait pour ne pas mettre l’utilisateur en danger en programmant des débits Basal maximum trop élevés avant de comprendre comment l’algorithme fonctionne. Encore une fois, la valeur par défaut est 4x, la plupart des gens n’auront jamais besoin d’ajuster ce paramètre, plutôt ils auront tendance à ajuster d’autres paramètres s’ils voient qu’ils atteignent ce paramètre de limite de sécurité.</string>
     <string name="openapsama_autosens_max_summary">Valeur par défaut: 1.2\nCeci est la limite du multiplicateur utilisé par Autosens (et bientôt Autotune) pour définir +20%% en limite maximale du ratio Autosens. En consequence, ceci dit va définir la valeur maximale du Basal pour Autosens, la valeur minimale de la Sensibilité à l\'Insuline (SI, ISF), et la valeur minimale de la cible glycémique.</string>
-    <string name="openapsama_autosens_min_summary">Valeur par défaut: 0.7\nL’autre aspect pour les limites de sécurité pour Autosens. Cette valeur va créer une limite qui définit jusqu\'à quelle valeur minimale Autosens va pouvoir ajuster le basal , et jusqu\'à quelles valeurs maximales Autosens pourra ajuster la Sensibilité à l\'Insuline (SI, ISF) et les cibles glycémiques.</string>
+    <string name="openapsama_autosens_min_summary">Valeur par défaut: 0,7\nL\'autre volet des limites de sécurité de l\'autosens, c\'est de définir une limite basse sur l\'ajustement des débits de basal et une limite haute sur l\'ajustement de la SI et des cibles GLY effectués par l\'autosens.</string>
     <string name="openapsama_autosens_adjusttargets">Autosens ajuste aussi les cibles</string>
     <string name="openapsama_autosens_adjusttargets_summary">Valeur par défaut : true\nCeci est utilisé pour autoriser Autosens à ajuster les cibles de glycémie en plus de SI et les basals.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Valeur par défaut : 2\nBolus snooze est activé apres votre bolus de repas, la boucle ne réagira pas avec des valeurs basses temporaire quand vous venez juste de manger. L’exemple ici et la valeur par défaut est 2 ; donc avec une Durée d\'Action (DIA) de 3 heures signifie que snooze bolus sera graduellement éliminé après 1,5 heures (3DIA/2).</string>
@@ -543,7 +543,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="treatments_wizard_cob_label">GA</string>
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">Démarrage AAPS entré dans NS</string>
-    <string name="restartingapp">Sortie de l’application pour appliquer de nouveaux paramètres.</string>
+    <string name="restartingapp">Sortir de l’application pour appliquer les nouveaux paramètres.</string>
     <string name="danarv2pump">DanaRv2</string>
     <string name="configbuilder_insulin">Insuline</string>
     <string name="configbuilder_insulin_description">Quel type d\'insuline utilisez-vous ?</string>
@@ -984,7 +984,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="combo_invalid_setup">Paramétrage de la pompe invalide. Vérifiez la documentation et le menu QUICK INFO en utilisant le logiciel de configuration 360.</string>
     <string name="custom">Personnalisé</string>
     <string name="largetimedifftitle">Différence horaire importante</string>
-    <string name="largetimediff">La différence horaire importante:\nTime avec la pompe de plus d\'1,5 heure.\nMerci d\'ajuster manuellement l\'heure de la pompe et assurez-vous que la lecture de l\'historique de la pompe ne cause pas de dysfonctionnements.\nSi possible, effacez l\'historique de la pompe avant de modifier l\'heure ou désactivez la Boucle Fermée pour une DIA après la dernière entrée erronée de l\'historique et en tout état de cause au minimum une DIA à partir de maintenant.</string>
+    <string name="largetimediff">Différence horaire importante:\nL\'heure de la pompe est en écart de plus d\'une heure et demi.\nMerci d\'ajuster manuellement l\'heure de la pompe et assurez-vous que la lecture de l\'historique de la pompe ne cause pas de dysfonctionnements.\nSi possible, effacez l\'historique de la pompe avant de modifier l\'heure ou désactivez la Boucle Fermée pour une DAI après la dernière entrée erronée de l\'historique et au minimum une DAI à partir de maintenant.</string>
     <string name="careportal_removestartedevents">Réinitialiser AndroidAPS</string>
     <string name="storedsettingsfound">Paramètres sauvegardés trouvés</string>
     <string name="allow_hardware_pump_text">ATTENTION : Si vous activez et connectez à une vraie pompe, AndroidAPS copiera les paramètres Basals du profil vers la pompe, écrasant le taux basal existant stocké sur la pompe. Assurez-vous d\'avoir correctement saisi et réglé les paramètres Basal dans AndroidAPS. Si vous ne savez pas ou si ne voulez pas écraser les paramètres Basal sur votre pompe, appuyez sur Annuler et reporter le passage à la pompe à une date ultérieure.</string>
@@ -1454,4 +1454,5 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="loop_smbexecution_time_label">Heure d\'exécution SMB</string>
     <string name="loop_tbrrequest_time_label">Heure de demande basal temp</string>
     <string name="loop_tbrexecution_time_label">Heure d\'exécution basal temp</string>
+    <string name="insight_alert_notification_channel">Alertes Pompe Insight</string>
 </resources>
diff --git a/app/src/main/res/values-ga-rIE/objectives.xml b/app/src/main/res/values-ga-rIE/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-ga-rIE/objectives.xml
+++ b/app/src/main/res/values-ga-rIE/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-hr-rHR/objectives.xml b/app/src/main/res/values-hr-rHR/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-hr-rHR/objectives.xml
+++ b/app/src/main/res/values-hr-rHR/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index df88c88e20..96062d70ad 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-it-rIT/objectives.xml b/app/src/main/res/values-it-rIT/objectives.xml
index d8026431c0..84a9152c3d 100644
--- a/app/src/main/res/values-it-rIT/objectives.xml
+++ b/app/src/main/res/values-it-rIT/objectives.xml
@@ -35,7 +35,7 @@
     <string name="objectives_useloop">Visualizza il contenuto del plugin Loop</string>
     <string name="objectives_usescale">Usa la funzione di ridimensionamento premendo a lungo sul grafico delle glicemie</string>
     <string name="objectives_button_enter">Entra</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se prima eri un utente OpenAPS e il tuo NS ha almeno 3 mesi di dati in loop, puoi inviare un\'e-mail a objectives@androidaps.org con il tuo indirizzo NS e richiedere il codice per ignorare il resto degli obiettivi. Inserisci il codice ottenuto dagli sviluppatori</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se hai almeno 3 mesi di esperienza in loop chiuso con altri sistemi potresti beneficiare di un codice per saltare gli obiettivi. Guarda https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives per i dettagli.</string>
     <string name="codeaccepted">Codice accettato</string>
     <string name="codeinvalid">Codice non valido</string>
     <string name="objectives_exam_objective">Dai prova della tua conoscenza</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 191ec45424..c344c3229e 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -175,7 +175,7 @@
     <string name="careportal_announcement">Annuncio</string>
     <string name="careportal_note">Nota</string>
     <string name="careportal_question">Domanda</string>
-    <string name="careportal_exercise">Esercizio</string>
+    <string name="careportal_exercise">Esercizio fisico</string>
     <string name="careportal_pumpsitechange">Cambio posizione cannula</string>
     <string name="careportal_cgmsensorinsert">Inserimento sensore</string>
     <string name="careportal_cgmsensorstart">Avvio Sensore</string>
@@ -1453,4 +1453,5 @@
     <string name="loop_smbexecution_time_label">Esecuzione SMB (momento)</string>
     <string name="loop_tbrrequest_time_label">Richiesta basale temporanea (momento)</string>
     <string name="loop_tbrexecution_time_label">Esecuzione basale temporanea (momento)</string>
+    <string name="insight_alert_notification_channel">Avvisi micro Insight</string>
 </resources>
diff --git a/app/src/main/res/values-iw-rIL/objectives.xml b/app/src/main/res/values-iw-rIL/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-iw-rIL/objectives.xml
+++ b/app/src/main/res/values-iw-rIL/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index d4508abe7a..ac0f8d512e 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-ja-rJP/objectives.xml b/app/src/main/res/values-ja-rJP/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-ja-rJP/objectives.xml
+++ b/app/src/main/res/values-ja-rJP/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index df88c88e20..96062d70ad 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-ko-rKR/objectives.xml b/app/src/main/res/values-ko-rKR/objectives.xml
index 08c2a7f8d8..86f97a4f64 100644
--- a/app/src/main/res/values-ko-rKR/objectives.xml
+++ b/app/src/main/res/values-ko-rKR/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">뒤로</string>
     <string name="objectives_button_start">시작</string>
@@ -36,7 +35,6 @@
     <string name="objectives_useloop">Loop 플러그인 내용을 표시합니다</string>
     <string name="objectives_usescale">홈의 혈당 차트를 길게 눌러 차트 시간을 변경하세요</string>
     <string name="objectives_button_enter">입력</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">당신이 OpenAPS 사용자였고 당신의 NS가 최소 3개월의 Loop 데이터가 저장되어 있다면, objectives@androidaps.org로 메일을 보내 당신의 NS주소를 알려주시고 목표를 건너뛸 수 있는 코드를 요청하세요. 그리고 개발자로 부터 받은 코드를 입력하세요.</string>
     <string name="codeaccepted">코드 인증</string>
     <string name="codeinvalid">잘못된 코드</string>
     <string name="objectives_exam_objective">당신의 지식을 확인해봅니다</string>
diff --git a/app/src/main/res/values-lt-rLT/exam.xml b/app/src/main/res/values-lt-rLT/exam.xml
index 634982d1fc..5cd75c66cf 100644
--- a/app/src/main/res/values-lt-rLT/exam.xml
+++ b/app/src/main/res/values-lt-rLT/exam.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="dia_whatmeansdia">Koks atsakymas apie IVT yra teisingas?</string>
     <string name="dia_label">Tema: Insulino veikimo trukmė</string>
@@ -124,9 +123,9 @@
     <string name="nsclient_spikeiphone">Spike iPhone telefone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
     <string name="isf_label">Tema: Jautrumo Insulinui Faktorius</string>
-    <string name="isf_increasingvalue">Didesnis IVT lemia mažesnį insulino tiekimą, kai AAPS koreguoja aukštą glikemiją.</string>
-    <string name="isf_decreasingvalue">Mažesnis IVT lemia mažesnį insulino tiekimą, kai AAPS koreguoja aukštą glikemiją.</string>
-    <string name="isf_noeffect">IVT reikšmės pakeitimas neturi įtakos AAPS leidžiamo insulino kiekiui koreguojant aukštą glikemiją.</string>
+    <string name="isf_increasingvalue">Didesnė JIF reikšmė lemia mažesnį insulino tiekimą, kai AAPS koreguoja aukštą glikemiją.</string>
+    <string name="isf_decreasingvalue">Mažesnė JIF reikšmė lemia mažesnį insulino tiekimą, kai AAPS koreguoja aukštą glikemiją.</string>
+    <string name="isf_noeffect">JIF reikšmės pakeitimas neturi įtakos AAPS leidžiamo insulino kiekiui koreguojant aukštą glikemiją.</string>
     <string name="isf_preferences">Nustatymuose turite įvesti JIF.</string>
     <string name="isf_profile">Jei profilyje pakeisite JIF vertę, Ciklas į pokytį iškart atsižvelgs.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
@@ -136,7 +135,7 @@
     <string name="ic_decreasingvalue">Mažesnis insulino ir angliavandenių IA santykis reiškia, kad mažiau insulino reikia padengti tam tikram angliavandenių kiekiui.</string>
     <string name="ic_noeffect">Jei turite 0 AAO (aktyvių angliavandenių organizme), pakeitus IA, glikemija bus koreguojama kitokiu insulino kiekiu.</string>
     <string name="ic_different">IA vertė skirsis priklausomai nuo to, ar duonos vienetui skaičiuojate 10g, ar 12g angliavandenių.</string>
-    <string name="ic_meaning">IA reiškia: kiek vienas vienetas insulino dengia angliavandenių (gramais).</string>
+    <string name="ic_meaning">IA reiškia: kiek vienas vienetas insulino dengia duonos vienetų.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
     <string name="profileswitch_label">Tema: Profilio keitimas</string>
     <string name="profileswitch_pctwillchange"> Kai profilio keitime nustatote 90%…</string>
diff --git a/app/src/main/res/values-lt-rLT/objectives.xml b/app/src/main/res/values-lt-rLT/objectives.xml
index bf4a460fae..06357e3814 100644
--- a/app/src/main/res/values-lt-rLT/objectives.xml
+++ b/app/src/main/res/values-lt-rLT/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Atgal</string>
     <string name="objectives_button_start">Pradėti</string>
@@ -36,7 +35,6 @@
     <string name="objectives_useloop">Parodyti Ciklo įskiepio turinį</string>
     <string name="objectives_usescale">Panaudokite vaizdo dydžio keitimo funkciją ilgai spaudžiant ant glikemijos kreivės</string>
     <string name="objectives_button_enter">Įeiti</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Jei anksčiau naudojote OpenAPS ir jūsų Nightscout svetainėje yra bent trijų mėnesių uždaro ciklo duomenų, galite atsiųsti el. laišką objectives@androidaps.org su savo NS svetainės adresu, ir paprašykite kodo, kad praleistumėte likusius tikslus. Įveskite kodą, kurį pateikė kūrėjai</string>
     <string name="codeaccepted">Kodas priimtas</string>
     <string name="codeinvalid">Neteisingas kodas</string>
     <string name="objectives_exam_objective">Patvirtinkite savo žinias</string>
diff --git a/app/src/main/res/values-nl-rNL/objectives.xml b/app/src/main/res/values-nl-rNL/objectives.xml
index bd41e6d26e..c9e23d317a 100644
--- a/app/src/main/res/values-nl-rNL/objectives.xml
+++ b/app/src/main/res/values-nl-rNL/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Terug</string>
     <string name="objectives_button_start">Start</string>
@@ -36,7 +35,6 @@
     <string name="objectives_useloop">Inhoud van loop plugin weergeven</string>
     <string name="objectives_usescale">Gebruik de schaalfunctie: houd de BG grafiek lang ingedrukt</string>
     <string name="objectives_button_enter">Enter</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Als u eerder OpenAPS gebruikte en u NS ten minste 3 maanden aan Loop gegevens heeft kunt u een code aanvragen waarmee u de rest van de doelstellingen kunt omzeilen. U kunt de aanvraag indienen via objectives@androidaps.org, samen met de url van uw NS. Voer de code die u van de ontwikkelaars hebt ontvangen in</string>
     <string name="codeaccepted">Code geaccepteerd</string>
     <string name="codeinvalid">Code ongeldig</string>
     <string name="objectives_exam_objective">Bewijs je kennis</string>
diff --git a/app/src/main/res/values-pl-rPL/objectives.xml b/app/src/main/res/values-pl-rPL/objectives.xml
index 3e529a5c92..a2be1d375e 100644
--- a/app/src/main/res/values-pl-rPL/objectives.xml
+++ b/app/src/main/res/values-pl-rPL/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Wstecz</string>
     <string name="objectives_button_start">Start</string>
@@ -36,7 +35,6 @@
     <string name="objectives_useloop">Wyświetl zawartość wtyczki Pętla (Loop)</string>
     <string name="objectives_usescale">Użyj funkcji skalowania przez dłuższe przytrzymanie wykresu glikemii</string>
     <string name="objectives_button_enter">Wprowadź</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Jeśli używano OpenAPS przez co najmniej 3 miesiące z NS, gromadząc dane z pętli, można wysłać e-mail na adres objectives@androidaps.org podając adres serwera NightScout i kod zapytania aby pominąć resztę zadań. Wprowadź kod odpowiedzi uzyskany od programistów</string>
     <string name="codeaccepted">Kod został zaakceptowany</string>
     <string name="codeinvalid">Niepoprawny kod</string>
     <string name="objectives_exam_objective">Potwierdź swoje umiejętności</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 6260b24658..0152dc7966 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-pt-rBR/objectives.xml b/app/src/main/res/values-pt-rBR/objectives.xml
index 112ee86451..3ff8541944 100644
--- a/app/src/main/res/values-pt-rBR/objectives.xml
+++ b/app/src/main/res/values-pt-rBR/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Voltar</string>
     <string name="objectives_button_start">Iniciar</string>
@@ -36,7 +35,7 @@
     <string name="objectives_useloop">Mostrar conteúdo do plugin Loop</string>
     <string name="objectives_usescale">Utilizar a função de escala premindo longamente gráfico Glic</string>
     <string name="objectives_button_enter">Inserir</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se era utilizador do OpenAPS antes e o seu NS tem pelo menos 3 meses de dados do loop, pode enviar um e-mail para oobjectives@androidaps.org com seu endereço de NS e pedir código para ignorar o resto dos objectivos. Digite o código obtido dos programadores</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se tiver pelo menos 3 meses de experiência com Close Loop com outros sistemas, pode-se qualificar para um código para ignorar objectivos. Ver https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives para mais detalhes.</string>
     <string name="codeaccepted">Código aceite</string>
     <string name="codeinvalid">Código inválido</string>
     <string name="objectives_exam_objective">Prove seu conhecimento</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 1e7dd42d16..c36d378e96 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -946,6 +945,7 @@
     <string name="startobjective">Iniciar primeiro objectivo</string>
     <string name="permission">Permissão</string>
     <string name="askforpermission">Pedir permissão</string>
+    <string name="needsystemwindowpermission">Aplicação precisa de permissão de janela do sistema para notificações</string>
     <string name="needlocationpermission">Aplicação requer permissão de localização para pesquisa BT</string>
     <string name="needstoragepermission">Aplicação necessita da permissão de armazenamento para ser capaz de armazenar ficheiros de registo</string>
     <string name="request">Pedido</string>
@@ -1449,4 +1449,9 @@
     <string name="phonechecker">\"VerificadorTelefone\"</string>
     <string name="chartmenu">Menu do Gráfico</string>
     <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Hora de solicitação SMB</string>
+    <string name="loop_smbexecution_time_label">Hora de execução do SMB</string>
+    <string name="loop_tbrrequest_time_label">Hora de solicitação Basal Temp</string>
+    <string name="loop_tbrexecution_time_label">Hora de execução Basal Temp</string>
+    <string name="insight_alert_notification_channel">Alertas Bomba Insight</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/objectives.xml b/app/src/main/res/values-pt-rPT/objectives.xml
index 875a605631..4722ee8fa8 100644
--- a/app/src/main/res/values-pt-rPT/objectives.xml
+++ b/app/src/main/res/values-pt-rPT/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Voltar</string>
     <string name="objectives_button_start">Iniciar</string>
@@ -36,7 +35,7 @@
     <string name="objectives_useloop">Mostrar conteúdo do plugin Loop</string>
     <string name="objectives_usescale">Utilizar a função de escala premindo longamente gráfico Glic</string>
     <string name="objectives_button_enter">Inserir</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se era utilizador do OpenAPS antes e o seu NS tem pelo menos 3 meses de dados do loop, pode enviar um e-mail para oobjectives@androidaps.org com seu endereço de NS e pedir código para ignorar o resto dos objectivos. Digite o código obtido dos programadores</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se tiver pelo menos 3 meses de experiência com Close Loop com outros sistemas, pode-se qualificar para um código para ignorar objectivos. Ver https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives para mais detalhes.</string>
     <string name="codeaccepted">Código aceite</string>
     <string name="codeinvalid">Código inválido</string>
     <string name="objectives_exam_objective">Prove seu conhecimento</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 313f6c6658..b3abe3dd79 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -1454,4 +1453,5 @@
     <string name="loop_smbexecution_time_label">Hora de execução do SMB</string>
     <string name="loop_tbrrequest_time_label">Hora de solicitação Basal Temp</string>
     <string name="loop_tbrexecution_time_label">Hora de execução Basal Temp</string>
+    <string name="insight_alert_notification_channel">Alertas Bomba Insight</string>
 </resources>
diff --git a/app/src/main/res/values-ro-rRO/objectives.xml b/app/src/main/res/values-ro-rRO/objectives.xml
index c37a61470e..cdf5312139 100644
--- a/app/src/main/res/values-ro-rRO/objectives.xml
+++ b/app/src/main/res/values-ro-rRO/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Înapoi</string>
     <string name="objectives_button_start">Start</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 6bc27065bc..d7fac933c4 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-ru-rRU/objectives.xml b/app/src/main/res/values-ru-rRU/objectives.xml
index 71faff0d36..38c25925e7 100644
--- a/app/src/main/res/values-ru-rRU/objectives.xml
+++ b/app/src/main/res/values-ru-rRU/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Назад</string>
     <string name="objectives_button_start">Старт</string>
@@ -36,7 +35,7 @@
     <string name="objectives_useloop">Просмотр содержимого модуля Цикл Loop</string>
     <string name="objectives_usescale">Применить функцию масштабирования по долгому нажатию на диаграмму ГК</string>
     <string name="objectives_button_enter">Ввод</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Если прежде вы были пользователем OpenAPS и имеете в NS не менее 3 месяцев данных, отправьте электронное письмо на objectives@androidaps.org с вашим адресом NS и запросом кода для обхода остальных целей. Введите код, полученный от разработчиков</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Если у вас есть хотя бы три месяца работы с замкнутым циклом с другими системами, то можно получить код пропуска. Подробности смотрите по адресу https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives.</string>
     <string name="codeaccepted">Код принят</string>
     <string name="codeinvalid">Неверный код</string>
     <string name="objectives_exam_objective">Подтвердите ваши знания</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 860db5a999..f8548845d1 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -1456,4 +1455,5 @@ Context | Edit Context</string>
     <string name="loop_smbexecution_time_label">Время выполнения микроболюса SMB</string>
     <string name="loop_tbrrequest_time_label">Время запроса временной базальной скорости</string>
     <string name="loop_tbrexecution_time_label">Время выполнения временной базальной скорости</string>
+    <string name="insight_alert_notification_channel">Оповещения помпы Insight</string>
 </resources>
diff --git a/app/src/main/res/values-sk-rSK/objectives.xml b/app/src/main/res/values-sk-rSK/objectives.xml
index 467ae4f0de..5da99833ad 100644
--- a/app/src/main/res/values-sk-rSK/objectives.xml
+++ b/app/src/main/res/values-sk-rSK/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Naspäť</string>
     <string name="objectives_button_start">Začiatok</string>
@@ -36,7 +35,7 @@
     <string name="objectives_useloop">Zobrazte obsah modulu uzavretý okruh</string>
     <string name="objectives_usescale">Prepnite režim zobrazenia dlhým stlačením grafu glykémie</string>
     <string name="objectives_button_enter">Zadať</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Ak ste boli používateľom OpenAPS už predtým a Váš NS má dáta uzavretého okruhu za minimálne 3 mesiace, môžete nám zaslať E-mail na adresu objectives@androidaps.org z Vašou adresou NS a požiadať o kód na obídenie zvyšných cieľov. Zadajte kód získaný od vývojárov</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Pokiaľ máte aspoň 3 mesiace skúseností s uzavretým okruhom na iných systémoch, môžete získať kód, ktorý vám umožní preskočiť ciele. Viac informácií nájdete na https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Objectives.html#skip-objectives.</string>
     <string name="codeaccepted">Kód akceptovaný</string>
     <string name="codeinvalid">Neplatný kód</string>
     <string name="objectives_exam_objective">Preukážte svoje znalosti</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 0b8fdca2e3..424955cb09 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
@@ -1454,4 +1453,5 @@
     <string name="loop_smbexecution_time_label">Čas aplikácie SMB</string>
     <string name="loop_tbrrequest_time_label">Čas požiadavky dočasného bazálu</string>
     <string name="loop_tbrexecution_time_label">Čas spustenia dočasného bazálu</string>
+    <string name="insight_alert_notification_channel">Výstrahy pumpy Insight</string>
 </resources>
diff --git a/app/src/main/res/values-sl-rSI/objectives.xml b/app/src/main/res/values-sl-rSI/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-sl-rSI/objectives.xml
+++ b/app/src/main/res/values-sl-rSI/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
index df88c88e20..96062d70ad 100644
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-sv-rSE/objectives.xml b/app/src/main/res/values-sv-rSE/objectives.xml
index f049262c18..f9c5cd13ff 100644
--- a/app/src/main/res/values-sv-rSE/objectives.xml
+++ b/app/src/main/res/values-sv-rSE/objectives.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <string name="objectives_button_back">Tillbaka</string>
     <string name="objectives_button_start">Starta</string>
@@ -36,7 +35,6 @@
     <string name="objectives_useloop">Visa innehållet i insticksprogrammet \"Loop\"</string>
     <string name="objectives_usescale">Testa skala om BG-grafen genom att trycka och hålla in fingret på den</string>
     <string name="objectives_button_enter">Enter</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Om du var OpenAPS-användare innan och din NS har minst 3 månaders APS-data, kan du skicka ett e-postmeddelande till objectives@androidaps.org med din NS-adress och begära kod för att kringgå resten av målen. Ange kod som du fått från utvecklarna</string>
     <string name="codeaccepted">Koden godkänd</string>
     <string name="codeinvalid">Koden är felaktig</string>
     <string name="objectives_exam_objective">Bevisa dina kunskaper</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 96b45303a9..7e1ec0c8ed 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-tr-rTR/objectives.xml b/app/src/main/res/values-tr-rTR/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-tr-rTR/objectives.xml
+++ b/app/src/main/res/values-tr-rTR/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index b14049e2b4..ca73b4490a 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
diff --git a/app/src/main/res/values-zh-rCN/objectives.xml b/app/src/main/res/values-zh-rCN/objectives.xml
index 70489fbc5e..3ea04e700d 100644
--- a/app/src/main/res/values-zh-rCN/objectives.xml
+++ b/app/src/main/res/values-zh-rCN/objectives.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources></resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index be7793e576..1741294a35 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <resources>
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->

From d9e08530fddc8cb9e07bcb3fd115ccb705aa8d94 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 17 Mar 2020 17:58:50 +0100
Subject: [PATCH 53/56] Fix pump unreachable alert

---
 .../nightscout/androidaps/receivers/KeepAliveReceiver.kt   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
index 7ca4f962ae..40a9088497 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
@@ -23,9 +23,6 @@ import org.slf4j.LoggerFactory
 import kotlin.math.abs
 
 class KeepAliveReceiver : BroadcastReceiver() {
-    private var lastReadStatus: Long = 0
-    private var lastRun: Long = 0
-    private var lastIobUpload: Long = 0
 
     override fun onReceive(context: Context, rIntent: Intent) {
         if (L.isEnabled(L.CORE))
@@ -47,6 +44,10 @@ class KeepAliveReceiver : BroadcastReceiver() {
         private val STATUS_UPDATE_FREQUENCY = T.mins(15).msecs()
         private val IOB_UPDATE_FREQUENCY = T.mins(5).msecs()
 
+        private var lastReadStatus: Long = 0
+        private var lastRun: Long = 0
+        private var lastIobUpload: Long = 0
+
         //called by MainApp at first app start
         @JvmStatic
         fun setAlarm(context: Context) {

From 76652d98d7c1ad7516235aa02789ae472edaec72 Mon Sep 17 00:00:00 2001
From: AdrianLxM <AdrianLxM@users.noreply.github.com>
Date: Thu, 19 Mar 2020 19:18:52 +0100
Subject: [PATCH 54/56] No a second time confirmation without context.

---
 .../info/nightscout/androidaps/dialogs/CalibrationDialog.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
index 9503988dce..192f301bf6 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
@@ -57,7 +57,7 @@ class CalibrationDialog : DialogFragmentWithDate() {
             activity?.let { activity ->
                 OKDialog.showConfirmation(activity, MainApp.gs(R.string.overview_calibration), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
                     log.debug("USER ENTRY: CALIBRATION $bg")
-                    XdripCalibrations.confirmAndSendCalibration(bg, context)
+                    XdripCalibrations.sendIntent(bg)
                 })
             }
         } else
@@ -66,4 +66,4 @@ class CalibrationDialog : DialogFragmentWithDate() {
             }
         return true
     }
-}
\ No newline at end of file
+}

From 71de506b79804a994d7f3320e2d10d3f9fa93137 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 20 Mar 2020 17:40:34 +0100
Subject: [PATCH 55/56] New translations strings.xml (Portuguese)

---
 app/src/main/res/values-pt-rPT/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index b3abe3dd79..1990230176 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -827,7 +827,7 @@
     <string name="overview_show_activity">Actividade</string>
     <string name="overview_show_sensitivity">Sensibilidade</string>
     <string name="overview_show_deviations">Desvios</string>
-    <string name="overview_show_cob">Carboidratos a bordo</string>
+    <string name="overview_show_cob">Hidratos a Bordo (COB)</string>
     <string name="overview_show_iob">Insulina a bordo</string>
     <string name="overview_show_basals">Basais</string>
     <string name="no_action_selected">Nenhuma acção seleccionada, nada irá acontecer</string>
@@ -883,7 +883,7 @@
     <string name="reset">repor</string>
     <string name="waitingfortimesynchronization">À espera da sincronização da hora (%1$d sec)</string>
     <string name="loopdisconnectedfor">Desligado (%1$d m)</string>
-    <string name="openapssmb_maxiob_title">Máximo total IOS OpenAPS não pode superar [U]</string>
+    <string name="openapssmb_maxiob_title">Máximo total IOB OpenAPS não pode superar [U]</string>
     <string name="openapssmb_maxiob_summary">Este valor é chamado de Max IOB em contexto de OpenAPS\nOpenAPS não adicionará mais insulina se o IOB atual for maior que este valor</string>
     <string name="pump_stopped">Bomba parada</string>
     <string name="pump_started">Bomba iniciada</string>

From 82ffe0f9ac503dece7045e4304e29dc84e4d3a27 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 21 Mar 2020 17:04:09 +0100
Subject: [PATCH 56/56] Register ChargingStateReceiver properly

---
 app/src/main/java/info/nightscout/androidaps/MainApp.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index e4401de914..b1db737e62 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps;
 
 import android.app.Application;
+import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
@@ -87,6 +88,7 @@ import info.nightscout.androidaps.plugins.source.SourcePoctechPlugin;
 import info.nightscout.androidaps.plugins.source.SourceTomatoPlugin;
 import info.nightscout.androidaps.plugins.source.SourceXdripPlugin;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
+import info.nightscout.androidaps.receivers.ChargingStateReceiver;
 import info.nightscout.androidaps.receivers.DataReceiver;
 import info.nightscout.androidaps.receivers.KeepAliveReceiver;
 import info.nightscout.androidaps.receivers.NSAlarmReceiver;
@@ -302,6 +304,7 @@ public class MainApp extends Application {
         intentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
         intentFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION );
         registerReceiver(new NetworkChangeReceiver(), intentFilter);
+        registerReceiver(new ChargingStateReceiver(), new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
     }
 
     public static String gs(@StringRes int id) {