diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 880752f3a8..b40188688c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -123,15 +123,7 @@
         </receiver>
 
         <!-- NSClient -->
-        <receiver
-            android:name=".plugins.general.nsclient.receivers.RestartReceiver"
-            android:enabled="true"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="info.nightscout.client.RESTART" />
-            </intent-filter>
-        </receiver>
-        <receiver
+         <receiver
             android:name=".plugins.general.nsclient.receivers.DBAccessReceiver"
             android:enabled="true"
             android:exported="true">
@@ -161,7 +153,8 @@
         <!-- Service processing incomming data -->
         <service
             android:name=".services.DataService"
-            android:exported="false" />
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE"/>
         <service
             android:name=".services.LocationService"
             android:exported="false" />
@@ -180,7 +173,7 @@
         <service
             android:name=".plugins.pump.danaRS.services.DanaRSService"
             android:enabled="true"
-            android:exported="true" />
+            android:exported="false" />
         <service
             android:name=".plugins.general.wear.wearintegration.WatchUpdaterService"
             android:exported="true">
@@ -247,11 +240,11 @@
         <service
             android:name=".plugins.general.nsclient.services.NSClientService"
             android:enabled="true"
-            android:exported="true" />
+            android:exported="false" />
         <service
             android:name=".services.AlarmSoundService"
             android:enabled="true"
-            android:exported="true" />
+            android:exported="false" />
         <service
             android:name=".plugins.general.overview.notifications.DismissNotificationService"
             android:exported="false" />
@@ -292,7 +285,7 @@
         <service
             android:name=".plugins.pump.medtronic.service.RileyLinkMedtronicService"
             android:enabled="true"
-            android:exported="true" />
+            android:exported="false" />
         <activity android:name=".plugins.pump.common.dialog.RileyLinkBLEScanActivity">
             <intent-filter>
                 <action android:name="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEScanActivity" />
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/receivers/RestartReceiver.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/receivers/RestartReceiver.java
deleted file mode 100644
index 5024801827..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/receivers/RestartReceiver.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient.receivers;
-
-import android.content.Context;
-import android.content.Intent;
-import androidx.legacy.content.WakefulBroadcastReceiver;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
-import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService;
-
-public class RestartReceiver extends WakefulBroadcastReceiver {
-    public RestartReceiver() {
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        startWakefulService(context, new Intent(context, NSClientService.class)
-                .setAction(intent.getAction())
-                .putExtras(intent));
-
-        MainApp.bus().post(new EventNSClientRestart());
-        completeWakefulIntent(intent);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.java
index 4d6975bb77..14dcb169c4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.java
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.general.smsCommunicator;
 
 import android.content.Intent;
-import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.telephony.SmsManager;
 import android.telephony.SmsMessage;
@@ -20,7 +19,6 @@ import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.ProfileStore;
@@ -40,14 +38,15 @@ import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.services.Intents;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.SP;
@@ -400,12 +399,9 @@ public class SmsCommunicatorPlugin extends PluginBase {
 
     private void processTREATMENTS(String[] splitted, Sms receivedSms) {
         if (splitted[1].toUpperCase().equals("REFRESH")) {
-            Intent restartNSClient = new Intent(Intents.ACTION_RESTART);
             TreatmentsPlugin.getPlugin().getService().resetTreatments();
-            MainApp.instance().getApplicationContext().sendBroadcast(restartNSClient);
-            List<ResolveInfo> q = MainApp.instance().getApplicationContext().getPackageManager().queryBroadcastReceivers(restartNSClient, 0);
-            String reply = "TREATMENTS REFRESH " + q.size() + " receivers";
-            sendSMS(new Sms(receivedSms.phoneNumber, reply));
+            MainApp.bus().post(new EventNSClientRestart());
+            sendSMS(new Sms(receivedSms.phoneNumber, "TREATMENTS REFRESH SENT"));
             receivedSms.processed = true;
         } else
             sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
@@ -413,11 +409,8 @@ public class SmsCommunicatorPlugin extends PluginBase {
 
     private void processNSCLIENT(String[] splitted, Sms receivedSms) {
         if (splitted[1].toUpperCase().equals("RESTART")) {
-            Intent restartNSClient = new Intent(Intents.ACTION_RESTART);
-            MainApp.instance().getApplicationContext().sendBroadcast(restartNSClient);
-            List<ResolveInfo> q = MainApp.instance().getApplicationContext().getPackageManager().queryBroadcastReceivers(restartNSClient, 0);
-            String reply = "NSCLIENT RESTART " + q.size() + " receivers";
-            sendSMS(new Sms(receivedSms.phoneNumber, reply));
+            MainApp.bus().post(new EventNSClientRestart());
+            sendSMS(new Sms(receivedSms.phoneNumber, "NSCLIENT RESTART SENT"));
             receivedSms.processed = true;
         } else
             sendSMS(new Sms(receivedSms.phoneNumber, R.string.wrongformat));
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.java
index 9daad17ef8..88faee377a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.java
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.profile.ns;
 
 import android.content.Intent;
 import android.os.Bundle;
+
 import androidx.annotation.Nullable;
 
 import org.json.JSONException;
@@ -13,15 +14,15 @@ import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.services.Intents;
 import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.events.EventProfileStoreChanged;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
+import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
 import info.nightscout.androidaps.plugins.profile.ns.events.EventNSProfileUpdateGUI;
 import info.nightscout.androidaps.utils.SP;
 
@@ -109,8 +110,7 @@ public class NSProfilePlugin extends PluginBase implements ProfileInterface {
             if (L.isEnabled(L.PROFILE))
                 log.debug("Stored profile not found");
             // force restart of nsclient to fetch profile
-            Intent restartNSClient = new Intent(Intents.ACTION_RESTART);
-            MainApp.instance().getApplicationContext().sendBroadcast(restartNSClient);
+            MainApp.bus().post(new EventNSClientRestart());
         }
     }
 
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 c2320fc3ce..556d80f321 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
@@ -3,21 +3,21 @@ package info.nightscout.androidaps.plugins.treatments.fragments;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.graphics.Paint;
 import android.os.Bundle;
-import androidx.fragment.app.FragmentManager;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.app.AlertDialog;
-import androidx.cardview.widget.CardView;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.cardview.widget.CardView;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.squareup.otto.Subscribe;
 
 import java.util.List;
@@ -32,11 +32,11 @@ import info.nightscout.androidaps.plugins.common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
 import info.nightscout.androidaps.plugins.treatments.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.plugins.treatments.dialogs.WizardInfoDialog;
-import info.nightscout.androidaps.services.Intents;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.SP;
@@ -227,8 +227,7 @@ public class TreatmentsBolusFragment extends SubscriberFragment implements View.
                 builder.setMessage(MainApp.gs(R.string.refresheventsfromnightscout) + "?");
                 builder.setPositiveButton(MainApp.gs(R.string.ok), (dialog, id) -> {
                     TreatmentsPlugin.getPlugin().getService().resetTreatments();
-                    Intent restartNSClient = new Intent(Intents.ACTION_RESTART);
-                    MainApp.instance().getApplicationContext().sendBroadcast(restartNSClient);
+                    MainApp.bus().post(new EventNSClientRestart());
                 });
                 builder.setNegativeButton(MainApp.gs(R.string.cancel), null);
                 builder.show();
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 2ec61597d7..4a0e767cbb 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
@@ -3,32 +3,32 @@ package info.nightscout.androidaps.plugins.treatments.fragments;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.graphics.Paint;
 import android.os.Bundle;
-import androidx.appcompat.app.AlertDialog;
-import androidx.cardview.widget.CardView;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.squareup.otto.Subscribe;
 
 import java.util.List;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.services.Intents;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.events.EventCareportalEventChange;
 import info.nightscout.androidaps.plugins.common.SubscriberFragment;
-import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
-import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
+import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.SP;
 import info.nightscout.androidaps.utils.Translator;
 
@@ -162,8 +162,7 @@ public class TreatmentsCareportalFragment extends SubscriberFragment implements
                 builder.setPositiveButton(MainApp.gs(R.string.ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
                         MainApp.getDbHelper().resetCareportalEvents();
-                        Intent restartNSClient = new Intent(Intents.ACTION_RESTART);
-                        MainApp.instance().getApplicationContext().sendBroadcast(restartNSClient);
+                        MainApp.bus().post(new EventNSClientRestart());
                     }
                 });
                 builder.setNegativeButton(MainApp.gs(R.string.cancel), null);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.java
index 46ee065ed7..71d8eb2b18 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.java
@@ -3,21 +3,21 @@ package info.nightscout.androidaps.plugins.treatments.fragments;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.graphics.Paint;
 import android.os.Bundle;
-import androidx.fragment.app.FragmentManager;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.app.AlertDialog;
-import androidx.cardview.widget.CardView;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.cardview.widget.CardView;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.squareup.otto.Subscribe;
 
 import org.slf4j.Logger;
@@ -27,18 +27,18 @@ import java.util.List;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.services.Intents;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.db.Source;
+import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
+import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.utils.SP;
 
 /**
@@ -209,8 +209,7 @@ public class TreatmentsProfileSwitchFragment extends SubscriberFragment implemen
                 builder.setPositiveButton(MainApp.gs(R.string.ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
                         MainApp.getDbHelper().resetProfileSwitch();
-                        Intent restartNSClient = new Intent(Intents.ACTION_RESTART);
-                        MainApp.instance().getApplicationContext().sendBroadcast(restartNSClient);
+                        MainApp.bus().post(new EventNSClientRestart());
                     }
                 });
                 builder.setNegativeButton(MainApp.gs(R.string.cancel), null);
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 56b887c295..3c17e7b762 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
@@ -3,36 +3,36 @@ package info.nightscout.androidaps.plugins.treatments.fragments;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.graphics.Paint;
 import android.os.Bundle;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.app.AlertDialog;
-import androidx.cardview.widget.CardView;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.cardview.widget.CardView;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.squareup.otto.Subscribe;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
-import info.nightscout.androidaps.services.Intents;
 import info.nightscout.androidaps.data.Intervals;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.events.EventTempTargetChange;
 import info.nightscout.androidaps.plugins.common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
+import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.utils.SP;
 
 /**
@@ -198,8 +198,7 @@ public class TreatmentsTempTargetFragment extends SubscriberFragment implements
                 builder.setPositiveButton(MainApp.gs(R.string.ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
                         MainApp.getDbHelper().resetTempTargets();
-                        Intent restartNSClient = new Intent(Intents.ACTION_RESTART);
-                        MainApp.instance().getApplicationContext().sendBroadcast(restartNSClient);
+                        MainApp.bus().post(new EventNSClientRestart());
                     }
                 });
                 builder.setNegativeButton(MainApp.gs(R.string.cancel), null);
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.java
index 6c2e7c6920..95fd6bfb09 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.java
@@ -1,8 +1,9 @@
 package info.nightscout.androidaps.receivers;
 
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import androidx.legacy.content.WakefulBroadcastReceiver;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,15 +11,16 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.services.DataService;
 
-public class DataReceiver extends WakefulBroadcastReceiver {
+public class DataReceiver extends BroadcastReceiver {
     private static Logger log = LoggerFactory.getLogger(L.DATASERVICE);
 
     @Override
     public void onReceive(Context context, Intent intent) {
         if (L.isEnabled(L.DATASERVICE))
             log.debug("onReceive " + intent);
-        startWakefulService(context, new Intent(context, DataService.class)
-                .setAction(intent.getAction())
-                .putExtras(intent));
+        // Explicitly specify that GcmIntentService will handle the intent.
+        ComponentName comp = new ComponentName(context.getPackageName(),
+                DataService.class.getName());
+        DataService.enqueueWork(context, intent.setComponent(comp));
     }
 }
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 6b8ac46f11..24a7698e9a 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/DataService.java
+++ b/app/src/main/java/info/nightscout/androidaps/services/DataService.java
@@ -1,10 +1,13 @@
 package info.nightscout.androidaps.services;
 
-import android.app.IntentService;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.Telephony;
 
+import androidx.annotation.NonNull;
+import androidx.core.app.JobIntentService;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -16,15 +19,16 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.events.EventNsFood;
 import info.nightscout.androidaps.events.EventNsTreatment;
+import info.nightscout.androidaps.logging.BundleLogger;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSMbg;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
+import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin;
 import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin;
 import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRNSHistorySync;
-import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin;
 import info.nightscout.androidaps.plugins.source.SourceDexcomPlugin;
 import info.nightscout.androidaps.plugins.source.SourceEversensePlugin;
 import info.nightscout.androidaps.plugins.source.SourceGlimpPlugin;
@@ -34,21 +38,30 @@ 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.receivers.DataReceiver;
-import info.nightscout.androidaps.logging.BundleLogger;
 import info.nightscout.androidaps.utils.JsonHelper;
 import info.nightscout.androidaps.utils.SP;
 
 
-public class DataService extends IntentService {
+public class DataService extends JobIntentService {
     private Logger log = LoggerFactory.getLogger(L.DATASERVICE);
 
-    public DataService() {
-        super("DataService");
-        registerBus();
+    // Service unique ID
+    static final int SERVICE_JOB_ID = 4378;
+
+    // Enqueuing work in to this service.
+    public static void enqueueWork(Context context, Intent work) {
+        enqueueWork(context, DataService.class, SERVICE_JOB_ID, work);
     }
 
     @Override
-    protected void onHandleIntent(final Intent intent) {
+    public void onDestroy() {
+        super.onDestroy();
+        if (L.isEnabled(L.DATASERVICE))
+            log.debug("All work complete");
+    }
+
+    @Override
+    protected void onHandleWork(@NonNull Intent intent) {
         if (L.isEnabled(L.DATASERVICE)) {
             log.debug("onHandleIntent " + intent);
             log.debug("onHandleIntent " + BundleLogger.log(intent.getExtras()));
@@ -100,7 +113,7 @@ public class DataService extends IntentService {
                         Intents.ACTION_REMOVED_TREATMENT.equals(action) ||
                         Intents.ACTION_NEW_CAL.equals(action) ||
                         Intents.ACTION_NEW_MBG.equals(action))
-                ) {
+        ) {
             handleNewDataFromNSClient(intent);
         } else if (Telephony.Sms.Intents.SMS_RECEIVED_ACTION.equals(action)) {
             SmsCommunicatorPlugin.getPlugin().handleNewData(intent);
@@ -108,22 +121,6 @@ public class DataService extends IntentService {
 
         if (L.isEnabled(L.DATASERVICE))
             log.debug("onHandleIntent exit " + intent);
-        DataReceiver.completeWakefulIntent(intent);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        MainApp.bus().unregister(this);
-    }
-
-    private void registerBus() {
-        try {
-            MainApp.bus().unregister(this);
-        } catch (RuntimeException x) {
-            // Ignore
-        }
-        MainApp.bus().register(this);
     }
 
     private void handleNewDataFromNSClient(Intent intent) {
diff --git a/app/src/main/java/info/nightscout/androidaps/services/Intents.java b/app/src/main/java/info/nightscout/androidaps/services/Intents.java
index a5b26561b5..98c2355a4f 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/Intents.java
+++ b/app/src/main/java/info/nightscout/androidaps/services/Intents.java
@@ -23,8 +23,6 @@ public interface Intents {
 
     // App -> NSClient
     String ACTION_DATABASE = "info.nightscout.client.DBACCESS";
-    String ACTION_RESTART = "info.nightscout.client.RESTART";
-    String ACTION_RESEND = "info.nightscout.client.RESEND";
     String ACTION_ACK_ALARM = "info.nightscout.client.ACK_ALARM";
 
     // xDrip -> App
diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index d257ea02c8..667df57ed7 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -146,6 +146,7 @@
     <string name="openapsma_lastenact_label">Laaste per hand</string>
     <string name="ok">OK</string>
     <string name="cancel">Kanselleer</string>
+    <string name="close">Sluit</string>
     <string name="noapsselected">GEEN APS GEKIES OF UITSLAG VERSKAF</string>
     <string name="safety">Veiligheid</string>
     <string name="openapsma_disabled">Plugin is gedeaktiveer</string>
@@ -830,6 +831,7 @@
     <string name="insight_incompatible">Onaanpasbaar</string>
     <string name="second">sekonde</string>
     <string name="minute">minuut</string>
+    <string name="format_hours">%1$.2f h</string>
     <string name="hour">uur</string>
     <string name="day">dag</string>
     <string name="week">week</string>
@@ -1079,6 +1081,7 @@
     <string name="speederror">Spoedfout</string>
     <string name="insulinlimitviolation">Insulien limiet skending</string>
     <string name="loop_openmode_min_change">Minimale versoek verandering [%]</string>
+    <string name="loop_openmode_min_change_summary">Oop lus sal nuwe verandering versoek as die %. Verstek waarde is 20%</string>
     <string name="pairfirst">Verbind asseblief jou pomp met jou selfoon!</string>
     <string name="searching_for_devices">Soek vir toestelle…</string>
     <string name="please_wait">Wag asseblief…</string>
@@ -1154,10 +1157,17 @@
     <string name="weekday_wednesday_short">Woens</string>
     <string name="weekday_tuesday_short">Dins</string>
     <string name="weekday_monday_short">Maan</string>
+    <string name="automation_description">Gebruiker outomatiesasie aksies</string>
+    <string name="automation_missing_task_name">Verskaf asb \'n aksie.</string>
     <string name="automation_missing_trigger">Gee asseblief ten minste een sneller.</string>
+    <string name="automation_missing_action">Spesifisieer ten minste een aksie.</string>
     <string name="alreadyenabled">Reeds aangeskakel</string>
     <string name="alreadydisabled">Reeds afgeskakel</string>
+    <string name="alreadysuspended">Alreeds opgeskort</string>
     <string name="resumeloop">Hervat lus</string>
+    <string name="notsuspended">Nie opgeskort</string>
+    <string name="starttemptarget">Tydelike teiken begin</string>
+    <string name="stoptemptarget">Tydelike teiken gestop</string>
     <string name="islesser">is minder as</string>
     <string name="isequalorlesser">is ewe of groter as</string>
     <string name="isequal">is gelyk aan</string>
@@ -1181,7 +1191,7 @@
     <string name="automation_short">Outo</string>
     <string name="automation">Outomatisasie</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hout">U/h</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
     <string name="profile_carbs_per_unit">g/U</string>
     <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Log sensor verander na NS</string>
@@ -1251,23 +1261,41 @@
     <string name="profilepercentage">Profiel persentasie</string>
     <string name="percent_u">Persentasie [%]:</string>
     <string name="startprofile">Begin profiele%1$d%% vir %2$d min</string>
+    <string name="startprofileforever">Begin profiel %1$d%%</string>
     <string name="exists">bestaan</string>
     <string name="notexists">bestaan nie</string>
+    <string name="temptargetcompared">Tydelike teiken %1$s</string>
     <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
+    <string name="autosenscompared">Autosens %1$s %2$s %%</string>
     <string name="autosenslabel">Outosens %</string>
+    <string name="deltacompared">%3$s %1$s %2$s</string>
     <string name="deltalabel">BG verskil</string>
+    <string name="currentlocation">Huidige Ligging</string>
+    <string name="location">Ligging</string>
     <string name="latitude_short">Breedte:</string>
     <string name="longitude_short">Lengte:</string>
     <string name="distance_short">Afst [m]:</string>
     <string name="name_short">Naam:</string>
+    <string name="locationis">Ligging is %1$s</string>
+    <string name="lastboluslabel">Laaste bolus</string>
+    <string name="lastboluscompared">Laaste bolus tyd %1$s %2$s min terug</string>
     <string name="triggercoblabel">KOB</string>
     <string name="cobcompared">KOB %1$s %2$.0f</string>
+    <string name="taskname">Aksie naam</string>
+    <string name="eventname">Gebeurtenis naam</string>
+    <string name="edit_short">WYSIG</string>
+    <string name="please_choose_an_action_type">Kies asb \'n aksie tipe:</string>
+    <string name="please_choose_a_trigger_type">Kies \'n sneller tipe:</string>
     <string name="if_label">As:</string>
     <string name="then_label">Dan:</string>
     <string name="triggers">Snellers:</string>
     <string name="remove_label">VERWYDER</string>
+    <string name="preconditions">Vereistes:</string>
     <!-- Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operasie nie ondersteun deur pomp en/of drywer.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operasie nog nie ondersteun deur pomp.</string>
     <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Pomp integrasie vir Medtronic vereis RileyLink en spesifieke modelle</string>
     <!-- MDT Configuration -->
     <string name="medtronic_serial_number">Pomp Reeks Nommer</string>
     <string name="medtronic_pump_type">Pomp Tipe</string>
@@ -1281,7 +1309,12 @@
     <string name="medtronic_pump_encoding_4b6b_local">Sagteware 4b6b Enkodeerding</string>
     <string name="medtronic_pump_encoding_4b6b_rileylink">Hardeware 4b6b Enkodeerding</string>
     <string name="rileylink_mac_address">RileyLink MAC Adres</string>
+    <string name="medtronic_custom_action_wake_and_tune">Wek en stel in</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Vee Bolus Blok</string>
     <string name="medtronic_custom_action_reset_rileylink">Herstel RileyLink Konfig</string>
+    <string name="medtronic_pump_battery_select">Battery Tipe(Krag Oorsig)</string>
+    <string name="medtronic_pump_battery_no">Nie gekies (Eenvoudige oorsig)</string>
+    <string name="medtronic_pump_battery_alkaline">Alkaliese (Uitgebreide modus)</string>
     <string name="medtronic_pump_battery_lithium">Lithium (Uitgebreide modus)</string>
     <!-- RL BLE Scanning -->
     <string name="rileylink_scanner_scan_scan">SKAN</string>
@@ -1289,9 +1322,16 @@
     <string name="rileylink_scanner_selected_device">Verkose</string>
     <string name="rileylink_scanner_scan">Skan</string>
     <string name="rileylink_scanner_title">RileyLink Skan</string>
+    <string name="rileylink_scanner_scan_menu">Soek RileyLink</string>
+    <string name="rileylink_scanner_ble_not_supported">Bluetooth Low Energy word nie ondersteun.</string>
+    <string name="rileylink_scanner_ble_not_enabled">Bluetooth nie aan.</string>
+    <string name="location_not_found_title">Location nie aan</string>
+    <string name="location_not_found_message">Vir Bluetooth ontdek om te werk op nuwer toestelle, lokaliteit moet aan wees. AAPS speur nie jou lokaliteit en kan afgeskakel na paring.</string>
     <string name="location_yes">Aktiveer</string>
     <string name="location_no">Nee</string>
     <string name="rileylink_scanner_scanning">Skandeer</string>
+    <string name="rileylink_scanner_scanning_finished">Skandering voltooi</string>
+    <string name="rileylink_scanner_scanning_error">Skaderings fout: %1$d</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Instellings</string>
     <string name="rileylink_settings_tab2">Geskiedenis</string>
@@ -1301,6 +1341,7 @@
     <string name="rileylink_settings_title">RileyLink Instellings</string>
     <string name="title_activity_rileylink_settings">RileyLink Instellings</string>
     <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Adres opgestel</string>
     <string name="rileylink_connected_device">Gekoppelde toestel</string>
     <string name="rileylink_connection_status">Verbindingstatus</string>
     <string name="rileylink_connection_error">Verbindingsfout</string>
@@ -1311,9 +1352,23 @@
     <string name="rileylink_last_device_contact">Laaste toestel verbinding</string>
     <string name="rileylink_firmware_version">RL Firmware</string>
     <!-- RL State -->
+    <string name="rileylink_state_bt_init">Bluetooth Inisiasie…</string>
+    <string name="rileylink_state_bt_error">Bluetooth Fout</string>
+    <string name="rileylink_state_bt_ready">Bluetooth Gereed</string>
+    <string name="rileylink_state_not_started">Nie Begin</string>
+    <string name="rileylink_state_rl_init">RileyLink inisiasie…</string>
+    <string name="rileylink_state_rl_error">RileyLink Fout</string>
+    <string name="rileylink_state_pc_tune_up">Stel RileyLink en pomp in</string>
+    <string name="rileylink_state_pc_error">Probleel om met pomp te praat</string>
     <string name="rileylink_state_connected">Gekoppel</string>
     <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Toestel is nie RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink onverkry</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth afgeskakel</string>
     <string name="rileylink_error_no_bt_adapter">Geen Bluetooth Toestel</string>
+    <string name="rileylink_error_tuneup_failed">Opstel het gefaal</string>
+    <string name="rileylink_error_pump_unreachable">Pomp onbereikbaar</string>
+    <string name="rileylink_error_pod_unreachable">Pod onbereikbaar</string>
     <string name="rileylink_error_address_not_set_short">Nie gestel nie</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Medtronic Pomp</string>
@@ -1322,15 +1377,47 @@
     <string name="medtronic_errors">Foute</string>
     <string name="medtronic_error_serial_not_set">Reeksno # nie gestel.</string>
     <string name="medtronic_error_serial_invalid">Reeksno # is ongeldig.</string>
+    <string name="medtronic_error_pump_type_not_set">Pomp tipe nie gestel.</string>
+    <string name="medtronic_error_pump_type_invalid">Pomp tipe word nie ondersteun nie.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Pomp frekwensie nie gestel.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Pomp frekwensie word nie ondersteun.</string>
+    <string name="medtronic_error_rileylink_address_invalid">RileyLink Adres ongeldig.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Pomp tipe bespeur en is nie dieselfde as gestelde.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Basale Profiele is nie aan op pomp.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Basale profiel is verkeerd op pomp (moet STD wees).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Verkeerde TBR op pomp (Moet Absoluut wees).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Verkeerde Maks Bolus gestel op Pomp(moet %1$.2f wees).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Verkeerde Maks Basale op Pomp (moet %1$.2f %1$.2f wees),.</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Operasie nie moontlik.\n\n Jy moet jou Medtronic pomp opstel voordat jy die operasie kan gebruik.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Oor 24h Tyd was versoek.</string>
     <!-- MDT History -->
     <string name="medtronic_history_group_basal">Basale</string>
+    <string name="medtronic_history_group_configuration">Konfigurasies</string>
     <string name="medtronic_history_group_notification">Kennisgewings</string>
     <string name="medtronic_history_group_statistic">Statistiek</string>
+    <string name="medtronic_history_group_unknown">Onbekend</string>
     <string name="medtronic_history_group_all">Alle</string>
+    <string name="medtronic_pump_history">Medtronic Pomp Geskiedenis</string>
     <!-- MDT Pump Status -->
+    <string name="medtronic_pump_status_never_contacted">Nooit gekontak nie</string>
+    <string name="medtronic_pump_status_waking_up">Besig om te wek</string>
+    <string name="medtronic_pump_status_error_comm">Fout met kommunikasie</string>
+    <string name="medtronic_pump_status_timeout_comm">Te lank op kommunikasie gewag</string>
+    <string name="medtronic_pump_status_problem_contacting">Probleem om Pomp te kontak</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pomp onbeskikbaar</string>
+    <string name="medtronic_pump_status_invalid_config">Ongeldige konfigirasie</string>
     <string name="medtronic_pump_status_active">Aktief</string>
     <string name="medtronic_pump_status_sleeping">Slaap</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">U het Bolus gekanselleer nadat dit reeds gestel was op pomp. Aangesien Medtronic pomp nie kansellasie ondesteun sal jy dit self moet kanselleer. Sit pomp in Suspend en hervat(Resume) (as jy steeds wil kanselleer). Spplikasie sal die verandering sppor op volgende opdatering in minder as 5 minute.</string>
+    <string name="medtronic_cmd_cant_read_tbr">Kon nie huidige TBR lees.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Kon nie TBR kanselleer. Operasie is gestaak.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Profiel stel gefaal want die patroon het \'n te groot basale koers: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus kon nie gelewer word nie.</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR Kon nie stel.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Kon nie huidige TBR staak.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Basale profiel kon nie stel.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Basal profiel is dieselfde, so dit is so gelos.</string>
     <string name="medtronic_cmd_desc_get_history">Verkry Geskiedenis - Bladsy %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Verkry Geskiedenis - Bladsy %1$d</string>
     <string name="medtronic_cmd_desc_get_history_base">Verkry Geskiedenis - Bladsy %1$d</string>
@@ -1342,6 +1429,12 @@
     <string name="medtronic_cmd_desc_get_tbr">Verkry Tydelike Basale</string>
     <string name="medtronic_cmd_desc_set_tbr">Stel Tydelike Basale</string>
     <string name="medtronic_cmd_desc_set_bolus">Stel Bolus</string>
+    <string name="pump_no_connection_h">Geen konneksie vir %1$d ure %2$d min</string>
+    <string name="pump_no_connection_d">Geen konneksie na %1$d dae %2$d ure</string>
+    <string name="insulinFromCob"><![CDATA[KOB insulin: <font color=\'%1$s\'>%2$.1fg %3$.2fU</font>]]></string>
+    <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus beperking aangewend: %2$.2fU to %3$.2fU</font>]]></string>
+    <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Stadige Karbs gespeur: %2$d%% van die tyd Gaan u berekeninge na,. KOB Kan verkeerd wees !!!!!</font>]]></string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d dae</item>
         <item quantity="other">%1$d dae</item>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index c9a25c5b18..338945ade3 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -1189,7 +1189,6 @@
     <string name="automation_short">Автом</string>
     <string name="automation">Автоматизация</string>
     <string name="profile_total">Общо  %1$s Е</string>
-    <string name="profile_ins_units_per_hout">Е/ч</string>
     <string name="profile_carbs_per_unit">гр/Е</string>
     <string name="profile_per_unit">/Е</string>
     <string name="dexcom_lognssensorchange_title">Записвай смяната на сензор в NS</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index d5a04781dd..0f48920c7f 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -146,6 +146,7 @@
     <string name="openapsma_lastenact_label">Poslední provedení</string>
     <string name="ok">OK</string>
     <string name="cancel">Zrušit</string>
+    <string name="close">Zavřít</string>
     <string name="noapsselected">ŽÁDNÉ APS NEVYBRÁNO NEBO NEVRÁTILO VÝSLEDEK</string>
     <string name="safety">Bezpečnost</string>
     <string name="openapsma_disabled">Modul zakázán</string>
@@ -830,6 +831,7 @@
     <string name="insight_incompatible">Nekompatibilní</string>
     <string name="second">sekund</string>
     <string name="minute">minut</string>
+    <string name="format_hours">%1$.2f h</string>
     <string name="hour">hodin</string>
     <string name="day">dní</string>
     <string name="week">týdnů</string>
@@ -1189,7 +1191,7 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automatizace</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hout">U/h</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
     <string name="profile_carbs_per_unit">g/U</string>
     <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Zaznamenávat výměnu senzoru do NS</string>
@@ -1432,6 +1434,7 @@
     <string name="insulinFromCob"><![CDATA[Inzulín z COB: <font color=\'%1$s\'>%2$.1fg %3$.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Aplikováno omezení bolusu: %2$.2fU na %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Detekována pomalá absorbce sacharidů: %2$d%% času. Překontrolujte kalkulaci. COB může být o hodně jinak !!!!!</font>]]></string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d den</item>
         <item quantity="few">%1$d dnů</item>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 6f0032a27b..213ea07a79 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -146,6 +146,7 @@
     <string name="openapsma_lastenact_label">Zuletzt abgegeben</string>
     <string name="ok">OK</string>
     <string name="cancel">Abbrechen</string>
+    <string name="close">Schliessen</string>
     <string name="noapsselected">KEIN APS AUSGEWÄHLT ODER KEIN ERGEBNIS VORHANDEN</string>
     <string name="safety">Sicherheit</string>
     <string name="openapsma_disabled">Plugin ist deaktiviert</string>
@@ -831,6 +832,7 @@ maxIOB = durchschnittlicher Essensbolus + 3 x maximale Basalrate</string>
     <string name="insight_incompatible">Inkompatibel</string>
     <string name="second">Sekunde</string>
     <string name="minute">Minute</string>
+    <string name="format_hours">%1$.2f h</string>
     <string name="hour">Stunde</string>
     <string name="day">Tag</string>
     <string name="week">Woche</string>
@@ -1191,7 +1193,7 @@ Unerwartetes Verhalten.</string>
     <string name="automation_short">Automatisch</string>
     <string name="automation">Automatisierung</string>
     <string name="profile_total">== ∑  %1$s IE</string>
-    <string name="profile_ins_units_per_hout">IE/h</string>
+    <string name="profile_ins_units_per_hour">IE/h</string>
     <string name="profile_carbs_per_unit">g/IE</string>
     <string name="profile_per_unit">/IE</string>
     <string name="dexcom_lognssensorchange_title">Speichere Sensor Wechsel in Nightscout</string>
@@ -1434,6 +1436,7 @@ Unerwartetes Verhalten.</string>
     <string name="insulinFromCob"><![CDATA[COB Insulin: <font color=\'%1$s\'>%2$.1fg %3$.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus-Einschränkung angewendet: %2$.2fU zu %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!! Langsamer Kohlyenhydrate-Abbau erkannt: %2$d%% der Zeit. Überprüfe deine Berechnung. COB könnte sehr falsch sein !!!!!</font>]]></string>
+    <string name="reservoirvalue">%1$.0f / %2$d IE</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d Tag</item>
         <item quantity="other">%1$d Tage</item>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 14f978ce10..68e5bf76ed 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -1188,7 +1188,6 @@
     <string name="automation_short">Αυτόματο</string>
     <string name="automation">Αυτοματισμός</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hout">U/h</string>
     <string name="profile_carbs_per_unit">g/U</string>
     <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Αλλαγή αρχείου αισθητήρα σε NS</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index d2fd02e017..630bd6c274 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1143,7 +1143,6 @@
     <string name="recovery_duration">Duración de recuperación</string>
     <string name="timeout_during_handshake">Tiempo excedido durante el sacudido de mano - reiniciar bluetooth</string>
     <string name="profile_total">== ∑%1$s U</string>
-    <string name="profile_ins_units_per_hout">U/h</string>
     <string name="profile_carbs_per_unit">g/U</string>
     <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Registro de cambio de sensor a NS</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 8c58b4c307..fa94aa359b 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -146,6 +146,7 @@
     <string name="openapsma_lastenact_label">Dernière activation</string>
     <string name="ok">OK</string>
     <string name="cancel">Annuler</string>
+    <string name="close">Fermer</string>
     <string name="noapsselected">Pas d\'APS séléctionné ou pas de résultat fourni</string>
     <string name="safety">Sécurité</string>
     <string name="openapsma_disabled">Plugin désactivé</string>
@@ -831,6 +832,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="insight_incompatible">Incompatible</string>
     <string name="second">seconde</string>
     <string name="minute">minute</string>
+    <string name="format_hours">%1$.2f h</string>
     <string name="hour">heure</string>
     <string name="day">jour</string>
     <string name="week">semaine</string>
@@ -1080,6 +1082,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <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_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>
     <string name="please_wait">Merci de patienter...</string>
@@ -1189,7 +1192,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="automation_short">Auto</string>
     <string name="automation">Automatisation</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hout">U/h</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
     <string name="profile_carbs_per_unit">g/U</string>
     <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Enreg. du changement de capteur sur NS</string>
@@ -1432,6 +1435,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="insulinFromCob"><![CDATA[Insuline pour Gluc Actif GA: <font color=\'%1$s\'>%2$.1fg %3$.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Contraintes de Bolus appliquées : %2$.2fU à %3$.2f</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Absorption lente des glucides détectée : %2$d%% du temps. Vérifiez de nouveau votre calcul. COB peut être vraiment désactivé !!!!!</font>]]></string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d jour</item>
         <item quantity="other">%1$d jours</item>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 8d7ebf8c2b..d6b51552c4 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -146,6 +146,7 @@
     <string name="openapsma_lastenact_label">Ultimo attuato</string>
     <string name="ok">OK</string>
     <string name="cancel">Annulla</string>
+    <string name="close">Chiudi</string>
     <string name="noapsselected">NESSUN APS SELEZIONATO O RISULTATO FORNITO</string>
     <string name="safety">Sicurezza</string>
     <string name="openapsma_disabled">Plugin disabilitato</string>
@@ -830,6 +831,7 @@
     <string name="insight_incompatible">Incompatibile</string>
     <string name="second">secondo</string>
     <string name="minute">minuto</string>
+    <string name="format_hours">%1$.2f h</string>
     <string name="hour">ora</string>
     <string name="day">giorno</string>
     <string name="week">settimana</string>
@@ -1189,7 +1191,7 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automazione</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hout">U/h</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
     <string name="profile_carbs_per_unit">g/U</string>
     <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Registra cambio sensore in NS</string>
@@ -1432,6 +1434,7 @@
     <string name="insulinFromCob"><![CDATA[Insulina COB: <font color=\'%1$s\'>%2$.1fg %3$.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Vincolo Bolo applicato: %2$.2fU a %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Rilevato assorbimento lento dei carboidrati: %2$d%% del tempo. Ricontrolla il tuo calcolo. COB può essere davvero fuori !!!!!</font>]]></string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d giorno</item>
         <item quantity="other">%1$d giorni</item>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 1ba4b7cbef..8151f100d6 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -1152,7 +1152,6 @@
     <string name="weekday_tuesday_short">화</string>
     <string name="weekday_monday_short">월</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hout">U/h</string>
     <string name="profile_carbs_per_unit">g/U</string>
     <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">센서 교체 NS에 기록하기</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 0fd261e45e..d392d52cfc 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -1143,7 +1143,6 @@
     <string name="recovery_duration">Atkūrimo trukmė</string>
     <string name="timeout_during_handshake">Ryšio užmezgimui skirtas laikas baigėsi - iš naujo nustatykite bluetooth</string>
     <string name="profile_total">== ∑  %1$s vv</string>
-    <string name="profile_ins_units_per_hout">vv/val</string>
     <string name="profile_carbs_per_unit">g/vv</string>
     <string name="profile_per_unit">/vv</string>
     <string name="dexcom_lognssensorchange_title">Registruoti sensoriaus keitimą NS</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 4f40941ca0..acd31fbd10 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -1190,7 +1190,6 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
     <string name="automation_short">Auto</string>
     <string name="automation">Automatisering</string>
     <string name="profile_total">== ∑  %1$s E</string>
-    <string name="profile_ins_units_per_hout">E/uur</string>
     <string name="profile_carbs_per_unit">g/E</string>
     <string name="profile_per_unit">/E</string>
     <string name="dexcom_lognssensorchange_title">Noteer sensor wissel in NS</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 4c634ec9ce..cf8df22345 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -1190,7 +1190,6 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automatyzacja</string>
     <string name="profile_total">== ∑ %1$s U</string>
-    <string name="profile_ins_units_per_hout">U/h</string>
     <string name="profile_carbs_per_unit">g/U</string>
     <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Prześlij zmianę sensora do NS</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a4848c66fc..367202e02c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -26,16 +26,16 @@
     <string name="description_insulin_rapid">Predefinição de Insulina para Humalog e NovoRapid / NovoLog</string>
     <string name="description_insulin_ultra_rapid">Pré-ajuste de Insulina para Fiasp</string>
     <string name="description_insulin_free_peak">Permite que você defina o pico da atividade de insulina, deve ser usado apenas por usuários avançados</string>
-    <string name="description_loop">Activar ou desactivar a aplicação que desencadeia o loop.</string>
+    <string name="description_loop">Ative ou desative a implementação ativando o loop.</string>
     <string name="description_ns_client">Sincroniza seus dados com o Nightscout</string>
     <string name="description_ma">Estado do algoritmo em 2016</string>
     <string name="description_ama">Estado do algoritmo em 2017</string>
     <string name="description_smb">Algoritmo mais recente para usuários avançados</string>
     <string name="description_overview">Exibe o estado atual do seu loop e botões para ações mais comuns</string>
     <string name="description_persistent_notification">Mostra uma notificação em curso com um breve resumo do que o seu loop está a fazer</string>
-    <string name="description_profile_local">Definir um perfil que está disponível offline.</string>
+    <string name="description_profile_local">Defina um perfil que está disponível offline.</string>
     <string name="description_profile_nightscout">Fornece o perfil definido no Nightscout</string>
-    <string name="description_profile_simple">Definir um perfil com apenas um bloco de tempo.</string>
+    <string name="description_profile_simple">Defina um perfil com apenas um bloco de cada vez.</string>
     <string name="description_pump_combo">Integração para bombas Accu-Chek Combo, requer ter o ruffy instalado</string>
     <string name="description_pump_dana_r">Integração para bombas DANA Diabecare R</string>
     <string name="description_pump_dana_r_korean">Integração para bombas DANA Diabecare R Coreanas</string>
@@ -51,15 +51,15 @@
     <string name="description_source_dexcom_g5">Receber valores de Glucose da aplicação Dexcom G5 modificada.</string>
     <string name="description_source_dexcom_g6">Receber valores de Glicose da aplicação Dexcom G6 modificada.</string>
     <string name="description_source_eversense">Receber valores de Glicose da aplicação Eversense modificada.</string>
-    <string name="description_source_glimp">Receber valores Glucose do Glimp.</string>
+    <string name="description_source_glimp">Receber valores BG do Glimp.</string>
     <string name="description_source_mm640g">Receber valores de Glucose do 600SeriesAndroidUploader.</string>
-    <string name="description_source_ns_client">Descarrega dados de Glucose do Nightscout</string>
-    <string name="description_source_xdrip">Receber valores de Glucose do xDrip.</string>
-    <string name="description_treatments">Guarda todos os tratamentos que foram feitos</string>
-    <string name="description_wear">Monitorizar e controlar o AndroidAPS usando o seu relógio WearOS.</string>
+    <string name="description_source_ns_client">Downloads de dados de Glicose do Nightscout</string>
+    <string name="description_source_xdrip">Receber valores BG de xDrip.</string>
+    <string name="description_treatments">Salva todos os tratamentos que foram feitos</string>
+    <string name="description_wear">Monitore e controle AndroidAPS usando seu relógio WearOS.</string>
     <string name="description_xdrip_status_line">Mostrar informações sobre o loop no watchface do xDrip+.</string>
     <string name="description_sms_communicator">Controlar remotamente o AndroidAPS usando comandos SMS.</string>
-    <string name="objectives_button_back">Anterior</string>
+    <string name="objectives_button_back">Voltar</string>
     <string name="objectives_button_start">Iniciar</string>
     <string name="objectives_button_verify">Verificar</string>
     <string name="nsprofileview_units_label">Unidades</string>
@@ -67,51 +67,51 @@
     <string name="nsprofileview_ic_label">IC</string>
     <string name="nsprofileview_isf_label">ISF</string>
     <string name="nsprofileview_basal_label">Basal</string>
-    <string name="nsprofileview_target_label">Alvo</string>
+    <string name="nsprofileview_target_label">Meta</string>
     <string name="noprofileset">SEM PERFIL DEFINIDO</string>
     <string name="treatments_insulin_label_string">Insulina:</string>
-    <string name="treatments_carbs_label_string">Hidratos de Carbono:</string>
+    <string name="treatments_carbs_label_string">Carboidratos:</string>
     <string name="treatments_iob_label_string">IOB:</string>
     <string name="sms_iob">IOB:</string>
-    <string name="treatments_activity_string">Actividade:</string>
+    <string name="treatments_activity_string">Atividade:</string>
     <string name="treatments_iobtotal_label_string">IOB Total:</string>
-    <string name="treatments_iobactivitytotal_label_string">Actividade Total IOB:</string>
+    <string name="treatments_iobactivitytotal_label_string">Atividade Total IOB:</string>
     <string name="tempbasals_realduration_label_string">Dur:</string>
     <string name="tempbasals_netratio_label_string">Rácio:</string>
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
     <string name="tempbasals_iob_label_string">IOB:</string>
     <string name="tempbasals_iobtotal_label_string">IOB Total:</string>
     <string name="treatments_newtreatment_insulinamount_label">Insulina</string>
-    <string name="treatments_newtreatment_carbsamount_label">Hidratos</string>
-    <string name="treatments_wizard_bg_label">GLIC</string>
+    <string name="treatments_newtreatment_carbsamount_label">Carbos</string>
+    <string name="treatments_wizard_bg_label">BG</string>
     <string name="treatments_wizard_tt_label">TT</string>
-    <string name="treatments_wizard_carbs_label">Hidratos</string>
+    <string name="treatments_wizard_carbs_label">Carbos</string>
     <string name="treatments_wizard_correction_label">Corr</string>
     <string name="insulin_unit_shortname">U</string>
-    <string name="treatments_wizard_bolusiob_label">Bólus IOB</string>
+    <string name="treatments_wizard_bolusiob_label">IOB Bolus</string>
     <string name="openapsma_run">Executar agora</string>
     <string name="vitualpump_label">BOMBA VIRTUAL</string>
     <string name="pump_basebasalrate_label">Taxa Basal de base</string>
-    <string name="pump_tempbasal_label">Basal temp</string>
+    <string name="pump_tempbasal_label">Basal temporaria</string>
     <string name="virtualpump_extendedbolus_label">Bólus estendido</string>
     <string name="pump_battery_label">Bateria</string>
     <string name="pump_reservoir_label">Reservatório</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">Última execução</string>
     <string name="openapsma_inputparameters_label">Parâmetros de entrada</string>
-    <string name="openapsma_glucosestatus_label">Status de Glicose</string>
-    <string name="openapsma_currenttemp_label">Temp actual</string>
+    <string name="openapsma_glucosestatus_label">Status da Glicose</string>
+    <string name="openapsma_currenttemp_label">Temp atual</string>
     <string name="openapsma_iobdata_label">Dados de IOB</string>
     <string name="openapsma_profile_label">Perfil</string>
     <string name="openapsma_mealdata_label">Dados de refeição</string>
     <string name="result">Resultado</string>
-    <string name="openapsma_noglucosedata">Sem dados de glucose disponíveis</string>
+    <string name="openapsma_noglucosedata">Sem dados de glicose disponíveis</string>
     <string name="nochangerequested">Nenhuma alteração solicitada</string>
-    <string name="openapsma_request_label">Pedido</string>
+    <string name="openapsma_request_label">Solicitar</string>
     <string name="rate">Rácio</string>
     <string name="duration">Duração</string>
     <string name="reason">Motivo</string>
-    <string name="glucose">Glucose</string>
+    <string name="glucose">Glicose</string>
     <string name="delta">Delta</string>
     <string name="sms_delta">Delta:</string>
     <string name="configbuilder">Configurador</string>
@@ -120,7 +120,7 @@
     <string name="overview">Visão geral</string>
     <string name="nsprofile">Perfil NS</string>
     <string name="simpleprofile">Perfil simples</string>
-    <string name="tempbasal">Basal Temporária</string>
+    <string name="tempbasal">BasalTemp</string>
     <string name="treatments">Tratamentos</string>
     <string name="virtualpump">Bomba virtual</string>
     <string name="careportal">Careportal</string>
@@ -129,7 +129,7 @@
     <string name="configbuilder_treatments">Tratamentos</string>
     <string name="configbuilder_treatments_description">Qual o plugin que deve ser usado para os tratamentos?</string>
     <string name="configbuilder_profile">Perfil</string>
-    <string name="configbuilder_profile_description">Que perfil deverá ser usado pelo AndroidAPS?</string>
+    <string name="configbuilder_profile_description">Qual perfil o AndroidAPS deve usar?</string>
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_aps_description">Qual é o algoritmo do APS que deve fazer ajustes na terapia?</string>
     <string name="configbuilder_general">Geral</string>
@@ -146,14 +146,15 @@
     <string name="openapsma_lastenact_label">Ultima execução</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancelar</string>
-    <string name="noapsselected">NÃO EXISTE NENHUM APS SELECIONADO OU RESULTADO FORNECIDO</string>
+    <string name="close">Fechar</string>
+    <string name="noapsselected">SEM APS SELECIONADO OU RESULTADO FORNECIDO</string>
     <string name="safety">Segurança</string>
     <string name="openapsma_disabled">Plugin está desativado</string>
     <string name="constraints_violation">Violação das restrições</string>
     <string name="treatmentdeliveryerror">Erro na entrega do bolus</string>
     <string name="tempbasaldeliveryerror">Erro na entrega da basal temporária</string>
     <string name="overview_newtempbasal_basalpercent">Valor da Basal [%%]</string>
-    <string name="overview_newtempbasal_percent_label">%% (100%% = actual)</string>
+    <string name="overview_newtempbasal_percent_label">%% (100%% = atual)</string>
     <string name="setbasalquestion">Aceitar nova basal temporária:</string>
     <string name="overview_treatment_label">Tratamento</string>
     <string name="overview_calculator_label">Calculadora</string>
@@ -164,32 +165,32 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
-    <string name="carbs">Hidratos de Carbono</string>
-    <string name="changeyourinput">Altere o seu input!</string>
-    <string name="setextendedbolusquestion">Configure um novo bolus prolongado:</string>
-    <string name="configbuilder_bgsource">Origem dos valores de Glucose</string>
-    <string name="configbuilder_bgsource_description">De onde deve o AndroidAPS obter os dados?</string>
+    <string name="carbs">Carboidratos</string>
+    <string name="changeyourinput">Altere sua entrada!</string>
+    <string name="setextendedbolusquestion">Definir novo bolus estendido:</string>
+    <string name="configbuilder_bgsource">Fonte de BG</string>
+    <string name="configbuilder_bgsource_description">De onde o AndroidAPS deve obter os dados?</string>
     <string name="xdrip">xDrip</string>
     <string name="apsmode_title">Modo APS</string>
-    <string name="closedloop">Closed Loop</string>
-    <string name="openloop">Open Loop</string>
-    <string name="disabledloop">Loop Desactivado</string>
-    <string name="disableloop">Desactivar Loop</string>
-    <string name="enableloop">Activar Loop</string>
-    <string name="openloop_newsuggestion">Disponível nova sugestão</string>
-    <string name="unsupportedclientver">Versão não suportada do NSCliente</string>
-    <string name="unsupportednsversion">Versão sem suporte do Nightscout</string>
-    <string name="nsclientnotinstalled">NSCliente em falta. Perdido registo!</string>
-    <string name="objectives_bgavailableinns">Glic disponível no NS</string>
+    <string name="closedloop">Loop Fechado</string>
+    <string name="openloop">Loop Aberto</string>
+    <string name="disabledloop">Loop Desativado</string>
+    <string name="disableloop">Desativar loop</string>
+    <string name="enableloop">Ativar loop</string>
+    <string name="openloop_newsuggestion">Nova sugestão disponível</string>
+    <string name="unsupportedclientver">Versão não suportada do NSClient</string>
+    <string name="unsupportednsversion">Versão não suportada do Nightscout</string>
+    <string name="nsclientnotinstalled">NSClient não instalado. Registro perdido!</string>
+    <string name="objectives_bgavailableinns">BG disponível no NS</string>
     <string name="objectives_pumpstatusavailableinns">Status da Bomba está disponível no NS</string>
     <string name="objectives_manualenacts">Execução manual</string>
     <string name="loopdisabled">LOOP DESATIVADO POR RESTRIÇÕES</string>
-    <string name="treatments_wizard_basaliob_label">Basal IOB</string>
+    <string name="treatments_wizard_basaliob_label">IOB Basal</string>
     <string name="bolusconstraintapplied">Restrição de bólus aplicada</string>
-    <string name="carbsconstraintapplied">Restrição de hidratos de carbono aplicada</string>
-    <string name="careportal_bgcheck">Verificar Glic</string>
+    <string name="carbsconstraintapplied">Restrições de carbs aplicada</string>
+    <string name="careportal_bgcheck">Verificação BG</string>
     <string name="careportal_announcement">Anúncio</string>
-    <string name="careportal_note">Nota</string>
+    <string name="careportal_note">Anotação</string>
     <string name="careportal_question">Pergunta</string>
     <string name="careportal_exercise">Exercício</string>
     <string name="careportal_pumpsitechange">Alteração do local do cateter</string>
@@ -201,36 +202,36 @@
     <string name="careportal_mealbolus">Bólus Refeição</string>
     <string name="careportal_correctionbolus">Bólus Correcção</string>
     <string name="careportal_combobolus">Bólus Combo</string>
-    <string name="careportal_tempbasalstart">Início Temp Basal</string>
-    <string name="careportal_tempbasalend">Fim Temp Basal</string>
-    <string name="careportal_carbscorrection">Correcção Hidratos</string>
+    <string name="careportal_tempbasalstart">Início Basal Temp</string>
+    <string name="careportal_tempbasalend">Fim de Basal Temp</string>
+    <string name="careportal_carbscorrection">Correção Carbos</string>
     <string name="careportal_openapsoffline">OpenAPS Offline</string>
     <string name="careportal_newnstreatment_eventtype">Tipo de evento</string>
     <string name="careportal_newnstreatment_other">Outro</string>
     <string name="careportal_newnstreatment_meter">Medidor</string>
     <string name="careportal_newnstreatment_sensor">Sensor</string>
-    <string name="careportal_newnstreatment_carbs_label">Hidratos de Carbono</string>
+    <string name="careportal_newnstreatment_carbs_label">Carboidratos</string>
     <string name="careportal_newnstreatment_insulin_label">Insulina</string>
-    <string name="careportal_newnstreatment_carbtime_label">Tempo Hidratos</string>
+    <string name="careportal_newnstreatment_carbtime_label">Hora do Carbo</string>
     <string name="careportal_newnstreatment_split_label">Dividir</string>
     <string name="careportal_newnstreatment_duration_label">Duração</string>
-    <string name="careportal_newnstreatment_percent_label">Percentagem</string>
+    <string name="careportal_newnstreatment_percent_label">Porcentagem</string>
     <string name="careportal_newnstreatment_absolute_label">Absoluto</string>
     <string name="careportal_newnstreatment_notes_label">Notas</string>
     <string name="careportal_newnstreatment_eventtime_label">Tempo do evento</string>
     <string name="careportal_newnstreatment_profile_label">Perfil</string>
     <string name="careportal_newnstreatment_enteredby_title">Introduzido por</string>
     <string name="careportal_newnstreatment_glucosetype">Tipo de glicose</string>
-    <string name="noprofile">Sem perfil carregado do NS</string>
-    <string name="overview_tempbasal_button">BasalTemp</string>
+    <string name="noprofile">Nenhum perfil carregado de NS ainda</string>
+    <string name="overview_tempbasal_button">Basal Temporária</string>
     <string name="overview_extendedbolus_button">Bólus estendido</string>
-    <string name="configbuilder_nightscoutversion_label">Versão Nightscout:</string>
-    <string name="missing">Em falta</string>
+    <string name="configbuilder_nightscoutversion_label">Versão do Nightscout:</string>
+    <string name="missing">Faltando</string>
     <string name="exported">Preferências exportadas</string>
     <string name="export_to">Exportar configurações para</string>
     <string name="import_from">Importar configurações de</string>
     <string name="setting_imported">Configurações importadas</string>
-    <string name="filenotfound">Ficheiro não encontrado</string>
+    <string name="filenotfound">Arquivo não encontrado</string>
     <string name="nav_export">Exportar configurações</string>
     <string name="nav_import">Importar configurações</string>
     <string name="openapsma_maxbasal_title">Max U/hr em que uma Temp Basal pode ser definida</string>
@@ -239,22 +240,22 @@
     <string name="openapsma_maxiob_summary">Este valor é denominado Max IOB em contexto OpenAPS \nEste é o valor máximo de insulina em [U] que APS pode dar de uma vez.</string>
     <string name="dismiss">Dispensar</string>
     <string name="danarpump">DanaR</string>
-    <string name="connecting">A ligar</string>
-    <string name="connected">Ligado</string>
-    <string name="disconnected">Desligado</string>
+    <string name="connecting">Conectando</string>
+    <string name="connected">Conectado</string>
+    <string name="disconnected">Desconectado</string>
     <string name="danar_pump_settings">Definições bomba DanaR</string>
     <string name="end_user_license_agreement">Condições de Utilização</string>
     <string name="end_user_license_agreement_text">NÃO DEVE SER USADO PARA FAZER DECISÕES MÉDICAS. NÃO HÁ NENHUMA GARANTIA PARA O PROGRAMA, NA EXTENSÃO PERMITIDA PELA LEGISLAÇÃO APLICÁVEL. EXCETO QUANDO DE OUTRA FORMA, POR ESCRITO, OS TITULARES DOS DIREITOS DE AUTOR E / OU OUTRAS PARTES FORNECEM O PROGRAMA “TAL COMO ESTÁ”, SEM GARANTIA DE QUALQUER TIPO, EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO SE LIMITANDO, ÀS GARANTIAS IMPLÍCITAS DE COMERCIALIZAÇÃO E ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. TODO O RISCO QUANTO À QUALIDADE E DESEMPENHO DO PROGRAMA É COM VOCÊ. CASO O PROGRAMA SEJA DEFEITUOSO, VOCÊ ASSUME O CUSTO DE TODOS OS SERVIÇOS, REPAROS OU CORREÇÕES NECESSÁRIOS.</string>
     <string name="end_user_license_agreement_i_understand">EU ENTENDO E CONCORDO</string>
-    <string name="save">Guardar</string>
+    <string name="save">Salvar</string>
     <string name="nobtadapter">Nenhum dispositivo bluetooth encontrado</string>
-    <string name="devicenotfound">Dispositivo seleccionado não foi encontrado</string>
-    <string name="connectionerror">Erro de conexão da bomba</string>
+    <string name="devicenotfound">Dispositivo selecionado não foi encontrado</string>
+    <string name="connectionerror">Erro de conexão com a bomba</string>
     <string name="danar_iob_label">IOB Bomba</string>
     <string name="danar_dailyunits">Unidades diárias</string>
-    <string name="pump_lastbolus_label">Último bólus</string>
+    <string name="pump_lastbolus_label">Último Bolus</string>
     <string name="hoursago">%1$.1fh atrás</string>
-    <string name="danar_invalidinput">Entrada Inválida</string>
+    <string name="danar_invalidinput">Dados de entrada inválidos</string>
     <string name="danar_valuenotsetproperly">Valor não definido corretamente</string>
     <string name="reloadprofile">Recarregar perfil</string>
     <string name="danar_viewprofile">Ver perfil</string>
@@ -263,18 +264,18 @@
     <string name="success">Sucesso</string>
     <string name="percent">Percentagem</string>
     <string name="absolute">Absoluto</string>
-    <string name="canceltemp">Cancelar basal temp</string>
+    <string name="canceltemp">Cancelar basal temporária</string>
     <string name="smscommunicator">Comunicador SMS</string>
-    <string name="waitingforpumpresult">À espera de resultado</string>
-    <string name="smscommunicator_allowednumbers">Número de telefones permitidos</string>
+    <string name="waitingforpumpresult">Aguardando resultados</string>
+    <string name="smscommunicator_allowednumbers">Números de telefone permitidos</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Para dar bolus %1$.2fU responder com código %2$s</string>
     <string name="smscommunicator_calibrationreplywithcode">Para enviar calibração %1$.2f responder com código %2$s</string>
-    <string name="smscommunicator_bolusfailed">Bólus falhado</string>
-    <string name="bolusdelivered">Bólus %1$.2fU enviado com êxito</string>
-    <string name="bolusrequested">Vai ser enviado %1$.2fU</string>
+    <string name="smscommunicator_bolusfailed">Bolus falhou</string>
+    <string name="bolusdelivered">Bolus %1$.2fU entregue com sucesso</string>
+    <string name="bolusrequested">Vão ser administradas %1$.2fU</string>
     <string name="smscommunicator_bolusdelivered">Bólus %1$.2fU enviado com êxito</string>
-    <string name="bolusdelivering">A enviar %1$.2fU</string>
+    <string name="bolusdelivering">Administrando %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Permitir comandos remotos via SMS</string>
     <string name="glucosetype_finger">Dedo</string>
     <string name="glucosetype_sensor">Sensor</string>
@@ -283,47 +284,47 @@
     <string name="careportal_temporarytargetcancel">Cancelar alvo temporário</string>
     <string name="danarprofile">Definições perfil DanaR</string>
     <string name="danarprofile_dia">DIA [h]</string>
-    <string name="danarprofile_dia_summary">Duração da Insulina Activa</string>
-    <string name="failedupdatebasalprofile">Falha a actualizar perfil da basal</string>
+    <string name="danarprofile_dia_summary">Duração da Insulina Ativa</string>
+    <string name="failedupdatebasalprofile">Falha ao atualizar o perfil basal</string>
     <string name="danar_historyreload">Recarregar</string>
-    <string name="uploading">A enviar</string>
-    <string name="danar_ebolus">E bólus</string>
+    <string name="uploading">Enviando</string>
+    <string name="danar_ebolus">E bolus</string>
     <string name="danar_dsbolus">DS Bólus</string>
     <string name="danar_debolus">DE Bólus</string>
     <string name="danar_error">erro</string>
     <string name="danar_refill">recarregar</string>
     <string name="danar_basalhour">hora basal</string>
     <string name="danar_glucose">glicose</string>
-    <string name="danar_carbohydrate">hidratos de carbono</string>
+    <string name="danar_carbohydrate">carboidrato</string>
     <string name="danar_alarm">alarme</string>
-    <string name="danar_totaluploaded">Total de %1$d registos carregados</string>
+    <string name="danar_totaluploaded">Total de %1$d registros enviados</string>
     <string name="danar_sbolus">S bolus</string>
     <string name="danar_history_alarm">Alarmes</string>
     <string name="danar_history_basalhours">Horas de Basal</string>
     <string name="danar_history_bolus">Bolus</string>
-    <string name="danar_history_carbohydrates">Hidratos de Carbono</string>
+    <string name="danar_history_carbohydrates">Carboidratos</string>
     <string name="danar_history_dailyinsulin">Insulina diária</string>
     <string name="danar_history_errors">Erros</string>
     <string name="danar_history_glucose">Glicose</string>
     <string name="danar_history_refill">Reabastecimento</string>
     <string name="danar_history_syspend">Suspender</string>
-    <string name="danar_history_connectingfor">A ligar durante %1$d s</string>
+    <string name="danar_history_connectingfor">Conectando para %1$d</string>
     <string name="danar_password_title">Senha da bomba</string>
     <string name="wrongpumppassword">Senha da bomba incorrecta!</string>
     <string name="pumpbusy">A bomba está ocupada</string>
     <string name="overview_bolusprogress_delivered">Entregue</string>
     <string name="overview_bolusprogress_stoped">Parado</string>
-    <string name="bolusstopped">O bolus parou</string>
-    <string name="bolusstopping">A parar o bolus</string>
+    <string name="bolusstopped">Bolus parado</string>
+    <string name="bolusstopping">Parando o bolus</string>
     <string name="occlusion">Oclusão</string>
     <string name="overview_bolusprogress_stop">Parar</string>
     <string name="overview_bolusprogress_stoppressed">STOP PRESSIONADO</string>
-    <string name="waitingforpump">À espera da bomba</string>
+    <string name="waitingforpump">Aguardando a bomba</string>
     <string name="overview_bolusprogress_goingtodeliver">Vão ser administradas %1$.2fU</string>
     <string name="objectives_0_objective">Configuração da visualização e monitoramento, e análise de rácios e basals</string>
     <string name="objectives_0_gate">Verificar se a BG está disponível no Nightscout, e se os dados de insulina da bomba estão a ser carregados</string>
     <string name="objectives_1_objective">A iniciar um open loop</string>
-    <string name="objectives_1_gate">Utilizar em modo de open loop por alguns dias e dar manualmente muitas basais temporárias. Configurar e usar alvos temporários e alvos padrão temporários (por exemplo, para atividade ou tratamentos de hipo com Hcs)</string>
+    <string name="objectives_1_gate">Execute no Modo de Loop aberto por alguns dias e execute manualmente muitos basais de temp. Configure e use alvos temporários e padrão (por exemplo, para atividades ou tratamento hipos com carboidratos)</string>
     <string name="objectives_2_objective">Compreender o seu open loop, incluindo as suas recomendações de basais temporárias</string>
     <string name="objectives_2_gate">Com base nessa experiência, decidir qual deve ser a basal máxima e configurá-la na bomba e nas preferências</string>
     <string name="objectives_3_objective">Começaro close loop com Suspensão por Baixa Glicose</string>
@@ -336,15 +337,15 @@
     <string name="objectives_7_objective">Ativando recursos adicionais para uso durante o dia, como SMB</string>
     <string name="objectives_7_gate">Deverá ler a wiki e aumentar a IOB máx para que os SMBs funcionem devidamente! Inicialmente poderá considerar maxIOB= média dos bolus + 3 x a basal máxima</string>
     <string name="youareonallowedlimit">Atingiu o limite autorizado</string>
-    <string name="noprofileselected">Nenhum perfil seleccionado</string>
-    <string name="smscommunicator_loophasbeendisabled">Loop foi desactivado</string>
-    <string name="smscommunicator_loophasbeenenabled">Loop foi activado</string>
-    <string name="smscommunicator_loopisdisabled">Loop desactivado</string>
-    <string name="smscommunicator_loopisenabled">Loop activado</string>
+    <string name="noprofileselected">Nenhum perfil selecionado</string>
+    <string name="smscommunicator_loophasbeendisabled">Loop foi desativado</string>
+    <string name="smscommunicator_loophasbeenenabled">Loop foi ativado</string>
+    <string name="smscommunicator_loopisdisabled">Loop Desativado</string>
+    <string name="smscommunicator_loopisenabled">Loop ativado</string>
     <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
     <string name="valueoutofrange">O valor %1$s está fora dos limites permitidos</string>
     <string name="smscommunicator_remotecommandnotallowed">O comando remoto não é permitido</string>
-    <string name="smscommunicator_remotebolusnotallowed">O bólus remoto não está disponível. Tente novamente mais tarde.</string>
+    <string name="smscommunicator_remotebolusnotallowed">O bolus remoto não está disponível. Tente novamente mais tarde.</string>
     <string name="smscommunicator_basalreplywithcode">Para começar a basal %1$.2fU/h durante%2$d min responda com o código %3$s</string>
     <string name="smscommunicator_profilereplywithcode">Para mudar o perfil para %1$s %2$d%% responda com o código %3$s</string>
     <string name="smscommunicator_extendedreplywithcode">Para começar o bólus estendido %1$.2fU/h para %2$d min responda com o código %3$s</string>
@@ -353,28 +354,28 @@
     <string name="smscommunicator_tempbasalset">Basal temporária %1$.2fU/h para %2$d min iniciada com êxito</string>
     <string name="smscommunicator_extendedset">Bólus estendido %1$.2fU/h para %2$d min iniciado com êxito</string>
     <string name="smscommunicator_tempbasalset_percent">Basal temporária %1$d% U/h durante%2$d min iniciada com êxito</string>
-    <string name="smscommunicator_tempbasalfailed">Início basal temp falhou </string>
-    <string name="smscommunicator_extendedfailed">Falha ao iniciar o bólus estendido</string>
+    <string name="smscommunicator_tempbasalfailed">Falha ao iniciar basal temp</string>
+    <string name="smscommunicator_extendedfailed">Falha ao iniciar o bolus estendido</string>
     <string name="smscommunicator_basalstopreplywithcode">Para parar a basal temporária responda com o código %1$s</string>
     <string name="smscommunicator_extendedstopreplywithcode">Para parar o bólus temporário responda com o código %1$s</string>
-    <string name="smscommunicator_tempbasalcanceled">Basal temp cancelada</string>
+    <string name="smscommunicator_tempbasalcanceled">basal temporária cancelada</string>
     <string name="smscommunicator_extendedcanceled">Bólus estendido cancelado</string>
-    <string name="smscommunicator_tempbasalcancelfailed">Não foi possivel cancelar a basal temp</string>
+    <string name="smscommunicator_tempbasalcancelfailed">Cancelamento do basal temporário falhou</string>
     <string name="smscommunicator_extendedcancelfailed">Falhou o cancelamento do bolus extendido</string>
     <string name="smscommunicator_unknowncommand">Comando desconhecido ou resposta errada</string>
     <string name="quickwizard">Assistente Rápido</string>
     <string name="quickwizardsettings">Definições do Assistente Rápido</string>
     <string name="overview_editquickwizard_buttontext">Texto do botão:</string>
-    <string name="overview_editquickwizard_carbs">Hidratos:</string>
+    <string name="overview_editquickwizard_carbs">Carbos:</string>
     <string name="overview_editquickwizard_valid">Válido:</string>
     <string name="overview_editquickwizardlistactivity_add">Adicionar</string>
     <string name="overview_quickwizard_item_edit_button">Editar</string>
     <string name="overview_quickwizard_item_remove_button">Remover</string>
     <string name="mealbolus">Refeição</string>
-    <string name="correctionbous">Corr</string>
-    <string name="actions">Acções</string>
+    <string name="correctionbous">Correção</string>
+    <string name="actions">Ações</string>
     <string name="androidaps_start">AndroidAPS iniciado</string>
-    <string name="ns_upload_only">Envio NS apenas (sincronização desactivada)</string>
+    <string name="ns_upload_only">Envio do NS apenas (sincronização desativada)</string>
     <string name="ns_upload_only_summary">Apenas upload para NS. Não é eficaz em SGV a menos que uma fonte local como xDrip esteja selecionada. Não é eficaz em perfis enquanto NS-Profiles é usado.</string>
     <string name="pumpNotInitialized">Bomba não inicializada!</string>
     <string name="pumpNotInitializedProfileNotSet">Bomba não inicializada, perfil não definido!</string>
@@ -391,15 +392,15 @@
     <string name="dia">DIA:</string>
     <string name="target_range">Intervalo Alvo:</string>
     <string name="prefs_range_title">Intervalo para visualização</string>
-    <string name="prefs_range_summary">Marca Alto e Baixo para os gráficos em Sumário e Smartwatch</string>
+    <string name="prefs_range_summary">Marca alta e baixa para as cartas em Visão geral e Smartwatch</string>
     <string name="low_mark">Marca Baixo</string>
     <string name="high_mark">Marca ALTO</string>
     <string name="wear">Wear</string>
     <string name="resend_all_data">Reenviar Todos os Dados</string>
     <string name="open_settings_on_wear">Abrir Definições em Wear</string>
-    <string name="pumperror">Erro Bomba</string>
+    <string name="pumperror">Erro da Bomba</string>
     <string name="lowbattery">Bateria fraca</string>
-    <string name="pumpshutdown">Encerrar Bomba</string>
+    <string name="pumpshutdown">Bomba desligada</string>
     <string name="batterydischarged">Bateria da Bomba Descarregada</string>
     <string name="danarkoreanpump">DanaR Coreana</string>
     <string name="basal_rate">Valor da Basal:</string>
@@ -409,8 +410,8 @@
     <string name="danar_enableextendedbolus">Habilitar bolus estendido na bomba</string>
     <string name="danar_switchtouhmode">Mudar de modo U/d para U/h na bomba</string>
     <string name="basalvaluebelowminimum">Valor da basal abaixo do mínimo. Perfil não definido!</string>
-    <string name="sms_actualbg">GLIC:</string>
-    <string name="sms_lastbg">Ultima Gli:</string>
+    <string name="sms_actualbg">BG:</string>
+    <string name="sms_lastbg">Último BG:</string>
     <string name="mdi">MDI</string>
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Notificação em curso</string>
@@ -427,25 +428,25 @@
     <string name="openapsama_useautosens">Usar função Autosens</string>
     <string name="refresheventsfromnightscout">Actualizar tratamentos do NS</string>
     <string name="deletefuturetreatments">Apagar tratamentos do futuro</string>
-    <string name="eatingsoon">Comer brevemente</string>
+    <string name="eatingsoon">Comer em breve</string>
     <string name="hypo">Hipo</string>
-    <string name="activity">Actividade</string>
+    <string name="activity">Atividade</string>
     <string name="removerecord">Remover registo:</string>
     <string name="danar_stats">Estatísticas DanaR</string>
     <string name="danar_stats_cumulative_tdd">Dose diária acumulativa</string>
     <string name="danar_stats_expweight">Dose diária exponencialmente ponderada</string>
     <string name="danar_stats_basalrate">Basal</string>
-    <string name="danar_stats_bolus">Bólus</string>
+    <string name="danar_stats_bolus">Bolus</string>
     <string name="danar_stats_tdd">TDD</string>
     <string name="danar_stats_date">Data</string>
-    <string name="danar_stats_ratio">Rácio</string>
+    <string name="danar_stats_ratio">Média</string>
     <string name="danar_stats_amount_days"># Dias</string>
     <string name="danar_stats_weight">Peso</string>
     <string name="danar_stats_warning_Message">Possivelmente impreciso se foram usados bolus para purgar/preencher!</string>
     <string name="danar_stats_olddata_Message">Dados antigos, pressione \"Recarregar\"</string>
     <string name="danar_stats_tbb">Basal Diária Total</string>
     <string name="danar_stats_tbb2">Basal diária * 2</string>
-    <string name="initializing">A inicializar ...</string>
+    <string name="initializing">Inicializando...</string>
     <string name="actions_shortname">ACÇ</string>
     <string name="configbuilder_shortname">CONF</string>
     <string name="loop_shortname">LOOP</string>
@@ -479,7 +480,7 @@
     <string name="error_only_numeric_digits_allowed">Apenas dígitos numéricos são permitidos.</string>
     <string name="error_only_numeric_digits_range_allowed">Apenas são permitidos valores entre %1$s e %2$s.</string>
     <string name="error_field_must_not_be_empty">Este campo não deve estar vazio</string>
-    <string name="error_phone_not_valid">Número de telefone não é válido</string>
+    <string name="error_phone_not_valid">Número de telefone inválido</string>
     <string name="smscommunicator_invalidphonennumber">SMS número de telefone inválido</string>
     <string name="overview_calibration">Calibração</string>
     <string name="send_calibration">Enviar calibração %1$.1f para o xDrip?</string>
@@ -495,7 +496,7 @@
     <string name="stoppingextendedbolus">Parando bolus prolongado</string>
     <string name="updatingbasalrates">Atualizar valores das basais</string>
     <string name="disconnecting">A desligar</string>
-    <string name="executing">A Executar</string>
+    <string name="executing">Executando</string>
     <string name="virtualpump_settings">Definições da bomba virtual</string>
     <string name="virtualpump_uploadstatus_title">Enviar estado para NS</string>
     <string name="wrongpassword">Senha incorrecta</string>
@@ -515,16 +516,16 @@
     <string name="nsclientinternal_secret_dialogmessage">Insira NS API secret (min 12 caract.)</string>
     <string name="deliver_now">Entregar agora</string>
     <string name="clear_queue">Limpar fila de espera</string>
-    <string name="show_queue">Mostrar file de espera</string>
-    <string name="queue">Fila de espera:</string>
-    <string name="status">Estado:</string>
-    <string name="paused">Em pausa</string>
-    <string name="clearlog">Limpar Registo</string>
-    <string name="nowritepermission">Cliente NS sem permissões para alterar dados. Tem a senha API correta?</string>
+    <string name="show_queue">Mostrar fila</string>
+    <string name="queue">Fila:</string>
+    <string name="status">Status:</string>
+    <string name="paused">Pausado</string>
+    <string name="clearlog">Limpar Log</string>
+    <string name="nowritepermission">NSCLIENT não tem permissão de escrita. Senha da API errada?</string>
     <string name="wear_settings">Definições Wear</string>
-    <string name="wear_detailedIOB_title">Mostrar IOB detalhada</string>
+    <string name="wear_detailedIOB_title">Mostrar IOB detalhado</string>
     <string name="wear_detailedIOB_summary">Dividir IOB entre IOB de bolus e de basal na face do relógio</string>
-    <string name="nosuccess">sem efeito - por favor verifique no telemóvel</string>
+    <string name="nosuccess">não foi bem sucedido - por favor, verifique o telefone</string>
     <string name="notavailable">Indisponível</string>
     <string name="patientage">Idade do Paciente</string>
     <string name="child">Criança</string>
@@ -548,8 +549,8 @@
     <string name="disconnectpumpfor1h">Desligar bomba por 1 h</string>
     <string name="disconnectpumpfor2h">Desligar bomba por 2 h</string>
     <string name="disconnectpumpfor3h">Desligar bomba por 3 h</string>
-    <string name="resume">Retomar</string>
-    <string name="reconnect">Re-ligar a Bomba</string>
+    <string name="resume">Continuar</string>
+    <string name="reconnect">Reconectar Bomba</string>
     <string name="smscommunicator_wrongduration">Duração errada</string>
     <string name="smscommunicator_loopsuspended">Loop suspenso</string>
     <string name="smscommunicator_loopresumed">Loop retomado</string>
@@ -593,19 +594,19 @@
     <string name="extendedbolus">BólusEstendido</string>
     <string name="temptarget">AlvoTemp</string>
     <string name="overview_extendedbolus_cancel_button">Cancelar Bólus Estendido</string>
-    <string name="careportal_sensorage_label">Idade Sensor</string>
-    <string name="careportal_canulaage_label">Idade Canula</string>
-    <string name="careportal_insulinage_label">Idade Insulina</string>
+    <string name="careportal_sensorage_label">Idade do sensor</string>
+    <string name="careportal_canulaage_label">Idade da Canula</string>
+    <string name="careportal_insulinage_label">Idade de Insulina</string>
     <string name="hours">horas</string>
     <string name="overview_newtempbasal_basaltype_label">Tipo de Basal</string>
     <string name="invalidprofile">Perfil inválido !!!</string>
-    <string name="profileswitch">TrocaPerfil</string>
+    <string name="profileswitch">TrocarPerfil</string>
     <string name="careportal_pbage_label">Idade bateria bomba</string>
-    <string name="careportal_pumpbatterychange">Troca bateria bomba</string>
+    <string name="careportal_pumpbatterychange">Mudança de Bateria</string>
     <string name="ns_alarmoptions">Opções Alarme</string>
     <string name="nsalarm_urgenthigh">Urgência hiperglicemia</string>
-    <string name="nsalarm_high">Alto</string>
-    <string name="nsalarm_low">Baixo</string>
+    <string name="nsalarm_high">Alta</string>
+    <string name="nsalarm_low">Baixa</string>
     <string name="nsalarm_urgentlow">Urgência hipoglicemia</string>
     <string name="nsalarm_staledata">Dados Obsoletos</string>
     <string name="nsalarm_urgentstaledata">Dados obsoletos urgentes</string>
@@ -634,7 +635,7 @@
     <string name="uploader_short">UPLD</string>
     <string name="basal_short">BAS</string>
     <string name="virtualpump_extendedbolus_label_short">EST</string>
-    <string name="keep_screen_on_title">Manter ecrã ligado</string>
+    <string name="keep_screen_on_title">Manter a tela ligada</string>
     <string name="keep_screen_on_summary">Impedir Android de desligar o ecrã. Isto irá consumir muita bateria quando não ligado ao carregador.</string>
     <string name="sensitivity_warning">Ao activar a função Autosense lembre-se de introduzir todos os hidratos de carbono (carbs) que comeu. Caso contra contrário os desvios de carbs serão erroneamente identificados como uma variação da sensibilidade!!</string>
     <string name="sensitivityweightedaverage">Média ponderada da Sensibilidade</string>
@@ -644,8 +645,8 @@
     <string name="valuesnotstored">Valores não guardados!</string>
     <string name="ns_localbroadcasts">Activar partilha para outras aplicações (como xDrip).</string>
     <string name="ns_localbroadcasts_title">Activar partilha local.</string>
-    <string name="careportal_activity_label">ACTIVIDADE &amp; FEEDBACK</string>
-    <string name="careportal_carbsandbolus_label">HIDRATOS &amp; BÓLUS</string>
+    <string name="careportal_activity_label">ATIVIDADE &amp; FEEDBACK</string>
+    <string name="careportal_carbsandbolus_label">CARBOS &amp; BOLUS</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
     <string name="careportal_pump_label">BOMBA</string>
     <string name="overview_newtempbasal_basalabsolute">Valor da Basal [U/h]</string>
@@ -685,8 +686,8 @@
     <string name="default_temptargets">Alvo-Temp padrão</string>
     <string name="eatingsoon_duration">duração comerbreve</string>
     <string name="eatingsoon_target">alvo comerbreve</string>
-    <string name="activity_duration">duração actividade</string>
-    <string name="activity_target">alvo actividade</string>
+    <string name="activity_duration">duração da atividade</string>
+    <string name="activity_target">alvo da atividade</string>
     <string name="hypo_duration">duração hipo</string>
     <string name="hypo_target">alvo hipo</string>
     <string name="danar_history_prime">Purge/Encha</string>
@@ -762,7 +763,7 @@
     <string name="combo_programming_bolus">A programar a bomba para injectar o bolus</string>
     <string name="combo_refresh">Actualizar</string>
     <string name="combo_pump_state_label">Estado</string>
-    <string name="combo_pump_activity_label">Actividade</string>
+    <string name="combo_pump_activity_label">Atividades</string>
     <string name="combo_no_pump_connection">Sem conexão há %1$d min</string>
     <string name="combo_tbr_remaining">%1$d%% (%2$d min restantes)</string>
     <string name="combo_pump_state_initializing">A iniciar</string>
@@ -778,9 +779,9 @@
     <string name="combo_force_disabled_notification">Utilização insegura: A bomba utiliza uma perfil de basal diferente do primeiro. O loop foi desactivado. Seleccionar o primeiro perfil da bomba e reinicie.</string>
     <string name="bolus_frequency_exceeded">Um bolus com o mesmo valor foi introduzido nos 2 últimos minutos. Para evitar introduções acidentais e segurança contra bugs existentes o bolus foi cancelado.</string>
     <string name="combo_pump_connected_now">Agora</string>
-    <string name="combo_activity_reading_pump_history">A ler histórico bomba</string>
+    <string name="combo_activity_reading_pump_history">Lendo histórico da bomba</string>
     <string name="danar_history">histórico bomba</string>
-    <string name="combo_activity_setting_basal_profile">A definir perfil basal</string>
+    <string name="combo_activity_setting_basal_profile">Configurando perfil basal</string>
     <string name="combo_pump_cartridge_low_warrning">Nível cartucho da bomba está baixo</string>
     <string name="combo_pump_battery_low_warrning">Bateria da bomba está fraca</string>
     <string name="combo_is_in_error_state">A bomba está a dar o erro E%1$d: %2$s</string>
@@ -830,6 +831,7 @@
     <string name="insight_incompatible">Incompativel</string>
     <string name="second">segundo</string>
     <string name="minute">minuto</string>
+    <string name="format_hours">%1$.2f h</string>
     <string name="hour">hora</string>
     <string name="day">dia</string>
     <string name="week">semana</string>
@@ -842,7 +844,7 @@
     <string name="not_recommended_due_to_battery_drain">Não é recomendado devido ao gasto de bateria</string>
     <string name="enablesmbalways">SMB sempre activado</string>
     <string name="enablesmbalways_summary">SMB sempre activo independentemente dos bolus. Possível apenas quando o medidor tive um bom filtro de dados como o G5</string>
-    <string name="enablesmbaftercarbs">Activar SMB após hidratos</string>
+    <string name="enablesmbaftercarbs">Ativar SMB após carbos</string>
     <string name="enablesmbaftercarbs_summary">SMB activo por 6h após carbs, mesmo com 0 COB. Possível apenas quando o medidor tive um bom filtro de dados como o G5</string>
     <string name="enablesmbwithcob">Activar SMB com COB</string>
     <string name="enablesmbwithcob_summary">Activar SMB quando tem COB activo.</string>
@@ -853,7 +855,7 @@
     <string name="let_temp_basal_run">Permitir basal temp correr</string>
     <string name="mute">Silêncio</string>
     <string name="overview_insulin_label">Insulina</string>
-    <string name="overview_carbs_label">Hidratos</string>
+    <string name="overview_carbs_label">Carbos</string>
     <string name="overview_buttons_selection">Botões</string>
     <string name="show_calibration_button_summary">Enviar calibrações para o xDrip+ ou abrir sistema de calibração do G5</string>
     <string name="show_cgm_button_summary">Abre xDrip+, botão retorcer volta ao AAPS</string>
@@ -882,7 +884,7 @@
     <string name="bolusrecordedonly">O bolus apenas será gravado</string>
     <string name="ns_autobackfill_summary">Preencher glicemias em falta com NS</string>
     <string name="loop_smbsetbypump_label">SMB definido pela bomba</string>
-    <string name="overview_show_activity">Actividade</string>
+    <string name="overview_show_activity">Atividade</string>
     <string name="overview_show_sensitivity">Sensibilidade</string>
     <string name="overview_show_deviations">Desvios</string>
     <string name="overview_show_cob">Carboidratos a bordo</string>
@@ -894,14 +896,14 @@
     <string name="engineering_mode_enabled">Modo engenheiro activado</string>
     <string name="not_eng_mode_or_release">Modo de engenharia não habilitado e não no na versão mestra</string>
     <string name="pump_basebasalrate">%1$.2f U/h</string>
-    <string name="combo_actvity_reading_basal_profile">A ler perfil basal</string>
+    <string name="combo_actvity_reading_basal_profile">Lendo perfil basal</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">O histórico da bomba foi alterado após o cálculo do bolo ter sido realizado. O bolus não foi injectado. Por favor, verifique se bolus ainda é necessário.</string>
     <string name="combo_error_updating_treatment_record">O bolus foi injectado, mas não foi possível adicionar ao histórico. Isto é possível se dois bolus do mesmo valor baixo foram administrados nos últimos dois minutos. Por favor verifique o histórico da bomba e use o Careportal para adicionar os dados em falta caso necessário. Cuidado para não adicionar dados com o mesmo valor no mesmo minuto.</string>
     <string name="combo_high_temp_rejected_due_to_pump_history_changes">A rejeitar a temporal alta uma vez que o cálculo não considerou as mudanças do histórico da bomba</string>
-    <string name="combo_activity_checking_pump_state">A actualizar estado bomba</string>
+    <string name="combo_activity_checking_pump_state">Atualizando estado da bomba</string>
     <string name="combo_warning_pump_basal_rate_changed">O rácio da basal foi alterado na bomba e vai ser actualizado em breve</string>
     <string name="combo_error_failure_reading_changed_basal_rate">Rácio da basal foi alterado na bomba, mas a leitura falhou</string>
-    <string name="combo_activity_checking_for_history_changes">A verificar se há alterações de histórico</string>
+    <string name="combo_activity_checking_for_history_changes">Verificando alterações de histórico</string>
     <string name="combo_error_multiple_boluses_with_identical_timestamp">Bólus múltiplos, com a mesma quantidade e no mesmo minuto acabaram de ser importados. Apenas um registo pôde ser adicionado aos tratamentos. Por favor confirma na bomba e adicione o registo de bólus manualmente, utilizando o separador do Careportal. Tenha em atenção que deve criar um bólus com um tempo em que nã oexistem outros registos de bólus.</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">O último bólus tem mais de 24 horas ou está no futuro. Por favor verifique se a data está definida correctamente na bomba.</string>
@@ -963,7 +965,7 @@
     <string name="firstinsulinincrement">Primeiro incremento insulina</string>
     <string name="secondinsulinincrement">Segundo incremento insulina</string>
     <string name="thirdinsulinincrement">Terceiro incremento insulina</string>
-    <string name="firstcarbsincrement">Primeiro incremento hidratos</string>
+    <string name="firstcarbsincrement">Primeiro incremento carbos</string>
     <string name="secondcarbsincrement">Segundo incremento hidratos</string>
     <string name="thirdcarbsincrement">Terceiro incremento hidratos</string>
     <string name="cgm">CGM</string>
@@ -1079,6 +1081,7 @@
     <string name="speederror">Erro velocidade</string>
     <string name="insulinlimitviolation">Transgressão limite insulina</string>
     <string name="loop_openmode_min_change">Pedido de mudança mínima [%]</string>
+    <string name="loop_openmode_min_change_summary">A app mostrará um pedido de alteração apenas se a mudança for superior a este valor em %. O valor padrão é 20%</string>
     <string name="pairfirst">Emparelhe a sua bomba com o seu telefone!</string>
     <string name="searching_for_devices">A pesquisar dispositivos…</string>
     <string name="please_wait">Por favor aguarde…</string>
@@ -1154,6 +1157,7 @@
     <string name="weekday_wednesday_short">Qua</string>
     <string name="weekday_tuesday_short">Ter</string>
     <string name="weekday_monday_short">Seg</string>
+    <string name="automation_description">Tarefas de automação definidas pelo utilizador</string>
     <string name="automation_missing_task_name">Insira um nome da tarefa.</string>
     <string name="automation_missing_trigger">Especifique pelo menos um gatilho.</string>
     <string name="automation_missing_action">Especifique pelo menos uma acção.</string>
@@ -1187,7 +1191,7 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automatização</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hout">U/h</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
     <string name="profile_carbs_per_unit">g/U</string>
     <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Registar mudança de sensor para NS</string>
@@ -1245,7 +1249,7 @@
     <string name="old_version">versão antiga</string>
     <string name="very_old_version">versão muito antiga</string>
     <string name="new_version_warning">Nova versão para pelo menos %1$d dias disponíveis! Voltar para o LGS após 60 dias, o loop será desativado após 90 dias</string>
-    <string name="scale_insulin_activity">Actividade de insulina em escala gráfica [U/min]</string>
+    <string name="scale_insulin_activity">Atividade de insulina em escala gráfica [U/min]</string>
     <string name="twohours">2h</string>
     <string name="formatinsulinunits">%1$.2fU</string>
     <string name="dexcom_app_patched">App Dexcom (com patch)</string>
@@ -1298,7 +1302,7 @@
     <string name="medtronic_pump_frequency">Frequência da Bomba</string>
     <string name="medtronic_pump_bolus_delay">Atraso antes que o Bólus seja iniciado (s)</string>
     <string name="medtronic_pump_max_bolus">Max Bolus na Bomba (U)</string>
-    <string name="medtronic_pump_max_basal">Máx Basal na Bomba (U/h)</string>
+    <string name="medtronic_pump_max_basal">Máxima Basal na Bomba (U/h)</string>
     <string name="medtronic_pump_encoding">Codificação Medtronic</string>
     <string name="medtronic_pump_frequency_us_ca">EUA &amp; Canadá (916 MHz)</string>
     <string name="medtronic_pump_frequency_worldwide">Em todo o Mundo (868 Mhz)</string>
@@ -1322,6 +1326,7 @@
     <string name="rileylink_scanner_ble_not_supported">Bluetooth de energia baixa (LE) não suportado.</string>
     <string name="rileylink_scanner_ble_not_enabled">Bluetooth não está activado.</string>
     <string name="location_not_found_title">Localização Não Está Activada</string>
+    <string name="location_not_found_message">Para que a procura de Bluetooth funcione em aparelhos mais recentes, a localização tem que ser activada. A app não rastreia a sua localização e pode ser desativada depois de um emparelhamento bem sucedido.</string>
     <string name="location_yes">Activar</string>
     <string name="location_no">Não</string>
     <string name="rileylink_scanner_scanning">A procurar</string>
@@ -1334,7 +1339,7 @@
     <string name="rileylink_status">Estado do RileyLink</string>
     <string name="medtronic_pump_status">Estado da Bomba</string>
     <string name="rileylink_settings_title">Definições do RileyLink</string>
-    <string name="title_activity_rileylink_settings">Definições do RileyLink</string>
+    <string name="title_activity_rileylink_settings">Configurações do RileyLink</string>
     <string name="rileylink_title">RileyLink</string>
     <string name="rileylink_configured_address">Endereço Configurado</string>
     <string name="rileylink_connected_device">Dispositivo Ligado</string>
@@ -1377,9 +1382,13 @@
     <string name="medtronic_error_pump_frequency_not_set">Frequência de Bomba não definida.</string>
     <string name="medtronic_error_pump_frequency_invalid">Frequência da Bomba não suportada.</string>
     <string name="medtronic_error_rileylink_address_invalid">Endereço RileyLink inválido.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Perfis de Basal não estão activos na Bomba.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">A bomba detectada não é a mesma que a bomba configurada.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Perfis de Basal não estão ativos na Bomba.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Perfil Basal definido na Bomba está incorrecto (deve ser STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo de DBT errado definido na bomba (deve ser Absoluto).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Máx. Basal definida na Bomba está incorreta (deve ser %1$.2f).</string>
     <string name="medtronic_error_pump_wrong_max_basal_set">Máx. Basal definido errado na Bomba (deve ser %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Operação não é possível.\n\n Você precisa configurar a Bomba Medtronic antes de poder usar esta operação.</string>
     <string name="medtronic_error_pump_24h_time_change_requested">Solicitada uma alteração de tempo de mais de 24h.</string>
     <!-- MDT History -->
     <string name="medtronic_history_group_basal">Basais</string>
@@ -1400,8 +1409,10 @@
     <string name="medtronic_pump_status_active">Activo</string>
     <string name="medtronic_pump_status_sleeping">A dormir</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Cancelou o Bolus, depois de ele já ter sido definido na Bomba. Uma vez que a Bomba Medtronic não suporta cancelamento, precisará de cancelar manualmente. Coloque a Bomba no modo de Suspender e depois Retome (se ainda quiser cancelar). A aplicação irá obter as alterações, na próxima actualização (em menos de 5 minutos).</string>
     <string name="medtronic_cmd_cant_read_tbr">Não foi possível ler a TBR actual.</string>
     <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Não foi possível cancelar a TBR atual. A parar a operação.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Falhou Definir Perfil devido aos seguintes padrões, tem uma taxa de basal muito grande: %1$s</string>
     <string name="medtronic_cmd_bolus_could_not_be_delivered">O bólus não pôde ser entregue.</string>
     <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR não pode ser definida.</string>
     <string name="medtronic_cmd_cant_cancel_tbr">Não foi possível cancelar a TBR atual.</string>
@@ -1415,14 +1426,15 @@
     <string name="medtronic_cmd_desc_get_model">Obter Modelo de Bomba</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Obter Perfil Basal</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Definir Perfil Basal</string>
-    <string name="medtronic_cmd_desc_get_tbr">Obter Basal Temporária</string>
-    <string name="medtronic_cmd_desc_set_tbr">Definir Basal Temporária</string>
+    <string name="medtronic_cmd_desc_get_tbr">Obter Basal temporário</string>
+    <string name="medtronic_cmd_desc_set_tbr">Definir Basal temporário</string>
     <string name="medtronic_cmd_desc_set_bolus">Definir Bólus</string>
     <string name="pump_no_connection_h">Sem ligação por %1$d hora(s) %2$d min</string>
     <string name="pump_no_connection_d">Sem ligação por %1$d dia(s) %2$d horas</string>
     <string name="insulinFromCob"><![CDATA[insulina COB: <font color=\'%1$s\'>%2$.1fg %3$.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Restrição de Bolus aplicada: %2$.2fU para %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Absorção lenta de hidratos detectada: %2$d%% do tempo. Verifique o seu cálculo. COB podem ser estar desajustados !!!</font>]]></string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d dia</item>
         <item quantity="other">%1$d dias</item>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index e80256a092..40d8cbff15 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -146,6 +146,7 @@
     <string name="openapsma_lastenact_label">Ultima execução</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancelar</string>
+    <string name="close">Fechar</string>
     <string name="noapsselected">NÃO EXISTE NENHUM APS SELECIONADO OU RESULTADO FORNECIDO</string>
     <string name="safety">Segurança</string>
     <string name="openapsma_disabled">Plugin está desativado</string>
@@ -326,7 +327,7 @@
     <string name="objectives_1_gate">Utilizar em modo de open loop por alguns dias e dar manualmente muitas basais temporárias. Configurar e usar alvos temporários e alvos padrão temporários (por exemplo, para atividade ou tratamentos de hipo com Hcs)</string>
     <string name="objectives_2_objective">Compreender o seu open loop, incluindo as suas recomendações de basais temporárias</string>
     <string name="objectives_2_gate">Com base nessa experiência, decidir qual deve ser a basal máxima e configurá-la na bomba e nas preferências</string>
-    <string name="objectives_3_objective">Começaro close loop com Suspensão por Baixa Glicose</string>
+    <string name="objectives_3_objective">Começar o close loop com Suspensão por Glicose Baixa.</string>
     <string name="objectives_3_gate">Utilizar em close loop com IOB máx = 0 por alguns dias sem muitas situações de Suspensão por Baixa Glicose</string>
     <string name="objectives_4_objective">Ajustar o close loop, levantar a IOB máxima acima de 0 e reduzir gradualmente os alvos de valor glicémico</string>
     <string name="objectives_4_gate">Utilizar por alguns dias e pelo menos uma noite sem alarmes de valores glicémicos baixos, antes de baixar os valores</string>
@@ -830,6 +831,7 @@
     <string name="insight_incompatible">Incompativel</string>
     <string name="second">segundo</string>
     <string name="minute">minuto</string>
+    <string name="format_hours">%1$.2f h</string>
     <string name="hour">hora</string>
     <string name="day">dia</string>
     <string name="week">semana</string>
@@ -1079,6 +1081,7 @@
     <string name="speederror">Erro velocidade</string>
     <string name="insulinlimitviolation">Transgressão limite insulina</string>
     <string name="loop_openmode_min_change">Pedido de mudança mínima [%]</string>
+    <string name="loop_openmode_min_change_summary">A app mostrará um pedido de alteração apenas se a mudança for superior a este valor em %. O valor padrão é 20%</string>
     <string name="pairfirst">Emparelhe a sua bomba com o seu telefone!</string>
     <string name="searching_for_devices">A pesquisar dispositivos…</string>
     <string name="please_wait">Por favor aguarde…</string>
@@ -1154,6 +1157,7 @@
     <string name="weekday_wednesday_short">Qua</string>
     <string name="weekday_tuesday_short">Ter</string>
     <string name="weekday_monday_short">Seg</string>
+    <string name="automation_description">Tarefas de automação definidas pelo utilizador</string>
     <string name="automation_missing_task_name">Insira um nome da tarefa.</string>
     <string name="automation_missing_trigger">Especifique pelo menos um gatilho.</string>
     <string name="automation_missing_action">Especifique pelo menos uma acção.</string>
@@ -1187,7 +1191,7 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automatização</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hout">U/h</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
     <string name="profile_carbs_per_unit">g/U</string>
     <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Registar mudança de sensor para NS</string>
@@ -1322,6 +1326,7 @@
     <string name="rileylink_scanner_ble_not_supported">Bluetooth de energia baixa (LE) não suportado.</string>
     <string name="rileylink_scanner_ble_not_enabled">Bluetooth não está activado.</string>
     <string name="location_not_found_title">Localização Não Está Activada</string>
+    <string name="location_not_found_message">Para que a procura de Bluetooth funcione em aparelhos mais recentes, a localização tem que ser activada. A app não rastreia a sua localização e pode ser desativada depois de um emparelhamento bem sucedido.</string>
     <string name="location_yes">Activar</string>
     <string name="location_no">Não</string>
     <string name="rileylink_scanner_scanning">A procurar</string>
@@ -1377,9 +1382,13 @@
     <string name="medtronic_error_pump_frequency_not_set">Frequência de Bomba não definida.</string>
     <string name="medtronic_error_pump_frequency_invalid">Frequência da Bomba não suportada.</string>
     <string name="medtronic_error_rileylink_address_invalid">Endereço RileyLink inválido.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">A bomba detectada não é a mesma que a bomba configurada.</string>
     <string name="medtronic_error_pump_basal_profiles_not_enabled">Perfis de Basal não estão activos na Bomba.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Perfil Basal definido na Bomba está incorrecto (deve ser STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo de DBT errado definido na bomba (deve ser Absoluto).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Máx. Basal definida na Bomba está incorreta (deve ser %1$.2f).</string>
     <string name="medtronic_error_pump_wrong_max_basal_set">Máx. Basal definido errado na Bomba (deve ser %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Operação não é possível.\n\n Você precisa configurar a Bomba Medtronic antes de poder usar esta operação.</string>
     <string name="medtronic_error_pump_24h_time_change_requested">Solicitada uma alteração de tempo de mais de 24h.</string>
     <!-- MDT History -->
     <string name="medtronic_history_group_basal">Basais</string>
@@ -1400,8 +1409,10 @@
     <string name="medtronic_pump_status_active">Activo</string>
     <string name="medtronic_pump_status_sleeping">A dormir</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Cancelou o Bolus, depois de ele já ter sido definido na Bomba. Uma vez que a Bomba Medtronic não suporta cancelamento, precisará de cancelar manualmente. Coloque a Bomba no modo de Suspender e depois Retome (se ainda quiser cancelar). A aplicação irá obter as alterações, na próxima actualização (em menos de 5 minutos).</string>
     <string name="medtronic_cmd_cant_read_tbr">Não foi possível ler a TBR actual.</string>
     <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Não foi possível cancelar a TBR atual. A parar a operação.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Falhou Definir Perfil devido aos seguintes padrões, tem uma taxa de basal muito grande: %1$s</string>
     <string name="medtronic_cmd_bolus_could_not_be_delivered">O bólus não pôde ser entregue.</string>
     <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR não pode ser definida.</string>
     <string name="medtronic_cmd_cant_cancel_tbr">Não foi possível cancelar a TBR atual.</string>
@@ -1423,6 +1434,7 @@
     <string name="insulinFromCob"><![CDATA[insulina COB: <font color=\'%1$s\'>%2$.1fg %3$.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Restrição de Bolus aplicada: %2$.2fU para %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Absorção lenta de hidratos detectada: %2$d%% do tempo. Verifique o seu cálculo. COB podem ser estar desajustados !!!</font>]]></string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d dia</item>
         <item quantity="other">%1$d dias</item>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 8258668469..5240568649 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -1143,7 +1143,6 @@
     <string name="recovery_duration">Durata restabilirii</string>
     <string name="timeout_during_handshake">Durată timp expirat pe timpul negocierii - resetare bluetooth</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hout">U/h</string>
     <string name="profile_carbs_per_unit">g/U</string>
     <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Înregistrează schimbarea senzorului în NS</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 9895315ba1..c5a17d45e9 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -146,6 +146,7 @@
     <string name="openapsma_lastenact_label">Последнее предпринятое</string>
     <string name="ok">OK</string>
     <string name="cancel">Отменить</string>
+    <string name="close">Закрыть</string>
     <string name="noapsselected">APS не выбрана или не выдала результат</string>
     <string name="safety">безопасность</string>
     <string name="openapsma_disabled">модуль не активен</string>
@@ -830,6 +831,7 @@
     <string name="insight_incompatible">Несовместима</string>
     <string name="second">сек.</string>
     <string name="minute">мин.</string>
+    <string name="format_hours">%1$.2f ч</string>
     <string name="hour">ч.</string>
     <string name="day">дн.</string>
     <string name="week">нед.</string>
@@ -1191,7 +1193,7 @@ Context | Edit Context</string>
     <string name="automation_short">Авто</string>
     <string name="automation">Автоматизация</string>
     <string name="profile_total">== ∑  %1$s ед</string>
-    <string name="profile_ins_units_per_hout">Ед/ч</string>
+    <string name="profile_ins_units_per_hour">ед/ч</string>
     <string name="profile_carbs_per_unit">г/ед</string>
     <string name="profile_per_unit">/ед</string>
     <string name="dexcom_lognssensorchange_title">Внести замену сенсора в лог NS</string>
@@ -1434,6 +1436,7 @@ Context | Edit Context</string>
     <string name="insulinFromCob"><![CDATA[COB инсулин: <font color=\'%1$s\'>%2$.1fг %3$.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Применено ограничение на болюс: %2$.2fед до %3$.2fед</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Обнаружено медленное всасывание углеводов: %2$d%% времени. Еще раз проверьте свои расчеты. Возможно акт углеводы COB вне диапазона !!!!!</font>]]></string>
+    <string name="reservoirvalue">%1$.0f/%2$d ед</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d день</item>
         <item quantity="few">%1$d дня</item>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index b6675ebb84..eafbba0f3d 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -146,6 +146,7 @@
     <string name="openapsma_lastenact_label">Naposledy podané</string>
     <string name="ok">OK</string>
     <string name="cancel">Zrušiť</string>
+    <string name="close">Zatvoriť</string>
     <string name="noapsselected">NEVYBRANÉ ŽIADNE APS, ALEBO NEVRÁTILO VÝSLEDOK</string>
     <string name="safety">Bezpečnosť</string>
     <string name="openapsma_disabled">Modul je deaktivovaný</string>
@@ -830,6 +831,7 @@
     <string name="insight_incompatible">Nekompatibilný</string>
     <string name="second">sekunda</string>
     <string name="minute">minút</string>
+    <string name="format_hours">%1$.2f h</string>
     <string name="hour">hodín</string>
     <string name="day">dní</string>
     <string name="week">týždňov</string>
@@ -1189,7 +1191,7 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automatika</string>
     <string name="profile_total">== ∑  %1$s JI</string>
-    <string name="profile_ins_units_per_hout">JI/h</string>
+    <string name="profile_ins_units_per_hour">JI/h</string>
     <string name="profile_carbs_per_unit">g/JI</string>
     <string name="profile_per_unit">/JI</string>
     <string name="dexcom_lognssensorchange_title">Ulož výmenu senzora do NS</string>
@@ -1432,6 +1434,7 @@
     <string name="insulinFromCob"><![CDATA[Inzulín z COB: <font color=\'%1$s\'>%2$.1fg %3$.2fJI</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Aplikované obmedzenie bolusu: %2$.2fJI na %3$.2fJI</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Detekovaná pomalá absorbcia sacharidov: %2$d%% času. Prekontrolujte kalkuláciu. COB môže byť úplne iné !!!!!</font>]]></string>
+    <string name="reservoirvalue">%1$.0f / %2$d JI</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d deň</item>
         <item quantity="few">%1$d dní</item>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 9a7d23a66e..13fb071027 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -147,6 +147,7 @@ Eversense-appen.</string>
     <string name="openapsma_lastenact_label">Senaste justering</string>
     <string name="ok">OK</string>
     <string name="cancel">Avbryt</string>
+    <string name="close">Stäng</string>
     <string name="noapsselected">INGEN APS VALD</string>
     <string name="safety">Säkerhet</string>
     <string name="openapsma_disabled">Insticksprogram avaktiverat</string>
@@ -831,6 +832,7 @@ Eversense-appen.</string>
     <string name="insight_incompatible">Inkompatibel</string>
     <string name="second">sek</string>
     <string name="minute">min</string>
+    <string name="format_hours">%1$.2f h</string>
     <string name="hour">tim</string>
     <string name="day">dag</string>
     <string name="week">vecka</string>
@@ -1190,7 +1192,7 @@ Eversense-appen.</string>
     <string name="automation_short">Auto</string>
     <string name="automation">Automation</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hout">U/h</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
     <string name="profile_carbs_per_unit">g/U</string>
     <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Logga sensorbyte till Nightscout</string>
@@ -1433,6 +1435,7 @@ Eversense-appen.</string>
     <string name="insulinFromCob"><![CDATA[COB insulin: <font color=\'%1$s\'>%2$.1fg %3$.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolusbegränsning: %2$.2fU till %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>Varning! Långsam KH-absorption upptäckt %2$d%% av tiden. Dubbelkolla din beräkning. COB kan vara väldigt missvisande!</font>]]></string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dagar</item>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index cc33dce70e..c5cca2711d 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -508,6 +508,7 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="loopsuspended">Döngü durduldu</string>
     <string name="loopsuspendedfor">Askıya alındı (%1$d m)</string>
     <string name="loopsuperbolusfor">Superbolus (%1$d m)</string>
+    <string name="suspendloop">Döngüyü duraklat</string>
     <string name="suspendloopfor1h">Döngü 1s\'liğine askıya alındı</string>
     <string name="suspendloopfor2h">Döngü 2s\'liğine askıya alındı</string>
     <string name="suspendloopfor3h">Döngü 3s\'liğine askıya alındı</string>
@@ -1030,7 +1031,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="loop_openmode_min_change">Minimum istek değişikliği [%]</string>
     <string name="pairfirst">Lütfen pompanızı telefonunuzla bağlayın!</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hout">Ü/s</string>
     <string name="profile_carbs_per_unit">g/U</string>
     <string name="profile_per_unit">/U</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d24cf69716..31ed4b57d4 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1145,7 +1145,6 @@
     <string name="recovery_duration">恢复持续时间</string>
     <string name="timeout_during_handshake">握手时超时-重启蓝牙</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hout">U/h</string>
     <string name="profile_carbs_per_unit">克/U</string>
     <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">记录传感器更换至NS服务器</string>