diff --git a/app/build.gradle b/app/build.gradle
index fdc2d5ebc9..396bc79b12 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -109,7 +109,7 @@ android {
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.4-dev-f"
+        version "2.4-dev-g"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
@@ -225,12 +225,12 @@ dependencies {
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.google.android.gms:play-services-wearable:17.0.0'
-    implementation 'com.google.firebase:firebase-core:17.1.0'
+    implementation 'com.google.firebase:firebase-core:17.2.0'
     implementation("com.crashlytics.sdk.android:crashlytics:2.9.9@aar") {
         transitive = true;
     }
 
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.java b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
index 47cf8ba1ae..83dab8130d 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
@@ -199,7 +199,7 @@ public class MainActivity extends NoSplashAppCompatActivity {
             } else {
                 try { // activity may be destroyed
                     setupTabs();
-                    setupViews(true);
+                    setupViews(false);
                 } catch (IllegalStateException e) {
                     log.error("Unhandled exception", e);
                 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
index f011ac57cf..059bec1444 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
@@ -68,6 +68,7 @@ class ConfigBuilderFragment : Fragment() {
 
     @Synchronized
     private fun updateGUI() {
+        configbuilder_categories.removeAllViews()
         createViewsForPlugins(R.string.configbuilder_profile, R.string.configbuilder_profile_description, PluginType.PROFILE, MainApp.getSpecificPluginsVisibleInListByInterface(ProfileInterface::class.java, PluginType.PROFILE))
         createViewsForPlugins(R.string.configbuilder_insulin, R.string.configbuilder_insulin_description, PluginType.INSULIN, MainApp.getSpecificPluginsVisibleInListByInterface(InsulinInterface::class.java, PluginType.INSULIN))
         createViewsForPlugins(R.string.configbuilder_bgsource, R.string.configbuilder_bgsource_description, PluginType.BGSOURCE, MainApp.getSpecificPluginsVisibleInListByInterface(BgSourceInterface::class.java, PluginType.BGSOURCE))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
index 63f522da8d..ac2bf50cc4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
@@ -168,10 +168,17 @@ class ObjectivesFragment : Fragment() {
                 holder.progress.removeAllViews()
                 for (task in objective.tasks) {
                     if (task.shouldBeIgnored()) continue
+                    // name
                     val name = TextView(holder.progress.context)
                     name.text = MainApp.gs(task.task) + ":"
                     name.setTextColor(-0x1)
                     holder.progress.addView(name, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)
+                    // hint
+                    task.hints.forEach { h ->
+                        if (!task.isCompleted)
+                            holder.progress.addView(h.generate(context))
+                    }
+                    // state
                     val state = TextView(holder.progress.context)
                     state.setTextColor(-0x1)
                     val basicHTML = "<font color=\"%1\$s\"><b>%2\$s</b></font>"
@@ -183,13 +190,14 @@ class ObjectivesFragment : Fragment() {
                         state.setOnClickListener {
                             val dialog = ObjectivesExamDialog()
                             val bundle = Bundle()
-                            val position = objective.tasks.indexOf(task)
-                            bundle.putInt("currentTask", position)
+                            val taskPosition = objective.tasks.indexOf(task)
+                            bundle.putInt("currentTask", taskPosition)
                             dialog.arguments = bundle
                             ObjectivesExamDialog.objective = objective
                             fragmentManager?.let { dialog.show(it, "ObjectivesFragment") }
                         }
                     }
+                    // horizontal line
                     val separator = View(holder.progress.context)
                     separator.setBackgroundColor(Color.DKGRAY)
                     holder.progress.addView(separator, LinearLayout.LayoutParams.MATCH_PARENT, 2)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt
index a0d6f6cedf..30ab4b500b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt
@@ -36,8 +36,8 @@ class ObjectivesExamDialog : DialogFragment() {
 
     override fun onStart() {
         super.onStart()
-        dialog.setCanceledOnTouchOutside(false)
-        dialog.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        dialog?.setCanceledOnTouchOutside(false)
+        dialog?.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
     }
 
     override fun onResume() {
@@ -70,8 +70,7 @@ class ObjectivesExamDialog : DialogFragment() {
             // Hints
             objectives_exam_hints.removeAllViews()
             for (h in task.hints) {
-                val hint: Hint = h as Hint;
-                objectives_exam_hints.addView(hint.generate(context))
+                objectives_exam_hints.addView(h.generate(context))
             }
             // Disabled to
             objectives_exam_disabledto.text = MainApp.gs(R.string.answerdisabledto, DateUtil.timeString(task.disabledTo))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.java
index f58d469fa2..a59a33454d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.java
@@ -100,6 +100,7 @@ public abstract class Objective {
         @StringRes
         private int task;
         private Objective objective;
+        ArrayList<Hint> hints = new ArrayList<>();
 
         public Task(@StringRes int task) {
             this.task = task;
@@ -119,6 +120,15 @@ public abstract class Objective {
             return MainApp.gs(isCompleted() ? R.string.completed_well_done : R.string.not_completed_yet);
         }
 
+        Task hint(Hint hint) {
+            hints.add(hint);
+            return this;
+        }
+
+        public ArrayList<Hint> getHints() {
+            return hints;
+        }
+
         public boolean shouldBeIgnored() {
             return false;
         }
@@ -157,8 +167,7 @@ public abstract class Objective {
     public class ExamTask extends Task {
         @StringRes
         int question;
-        List hints = new ArrayList<>();
-        List options = new ArrayList<>();
+        ArrayList<Option> options = new ArrayList<>();
         private String spIdentifier;
         private boolean answered;
         private long disabledTo;
@@ -198,11 +207,6 @@ public abstract class Objective {
             return this;
         }
 
-        ExamTask hint(Hint hint) {
-            hints.add(hint);
-            return this;
-        }
-
         public @StringRes int getQuestion() {
             return question;
         }
@@ -211,10 +215,6 @@ public abstract class Objective {
             return options;
         }
 
-        public List getHints() {
-            return hints;
-        }
-
         @Override
         public boolean isCompleted() {
             return answered;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective1.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective1.java
index 22ff17331e..1687b56987 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective1.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective1.java
@@ -4,7 +4,6 @@ import java.util.List;
 
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin;
 import info.nightscout.androidaps.plugins.general.actions.ActionsPlugin;
 import info.nightscout.androidaps.utils.SP;
 
@@ -28,36 +27,36 @@ public class Objective1 extends Objective {
             public boolean isCompleted() {
                 return SP.getBoolean(R.string.key_objectiveusedisconnect, false);
             }
-        });
+        }.hint(new Hint(R.string.disconnectpump_hint)));
         tasks.add(new Task(R.string.objectives_usereconnectpump) {
             @Override
             public boolean isCompleted() {
                 return SP.getBoolean(R.string.key_objectiveusereconnect, false);
             }
-        });
+        }.hint(new Hint(R.string.disconnectpump_hint)));
         tasks.add(new Task(R.string.objectives_usetemptarget) {
             @Override
             public boolean isCompleted() {
                 return SP.getBoolean(R.string.key_objectiveusetemptarget, false);
             }
-        });
+        }.hint(new Hint(R.string.usetemptarget_hint)));
         tasks.add(new Task(R.string.objectives_useactions) {
             @Override
             public boolean isCompleted() {
                 return SP.getBoolean(R.string.key_objectiveuseactions, false) && ActionsPlugin.INSTANCE.isEnabled(PluginType.GENERAL) && ActionsPlugin.INSTANCE.isFragmentVisible();
             }
-        });
+        }.hint(new Hint(R.string.useaction_hint)));
         tasks.add(new Task(R.string.objectives_useloop) {
             @Override
             public boolean isCompleted() {
                 return SP.getBoolean(R.string.key_objectiveuseloop, false);
             }
-        });
+        }.hint(new Hint(R.string.useaction_hint)));
         tasks.add(new Task(R.string.objectives_usescale) {
             @Override
             public boolean isCompleted() {
                 return SP.getBoolean(R.string.key_objectiveusescale, false);
             }
-        });
+        }.hint(new Hint(R.string.usescale_hint)));
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
index 9780691a62..6e0039aac4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
@@ -17,32 +17,30 @@ public class Objective2 extends Objective {
 
     @Override
     protected void setupTasks(List<Task> tasks) {
-        tasks.add(new ExamTask(R.string.dia_meaningofdia, R.string.dia_whatmeansdia,"dia")
+        tasks.add(new ExamTask(R.string.dia_label, R.string.dia_whatmeansdia,"dia")
                 .option(new Option(R.string.dia_minimumis3h, false))
                 .option(new Option(R.string.dia_minimumis5h, true))
                 .option(new Option(R.string.dia_meaningisequaltodiapump, false))
                 .option(new Option(R.string.dia_valuemustbedetermined, true))
                 .hint(new Hint(R.string.dia_hint1))
         );
-        tasks.add(new ExamTask(R.string.hypott, R.string.hypott_whenhypott,"hypott")
+        tasks.add(new ExamTask(R.string.hypott_label, R.string.hypott_whenhypott,"hypott")
                 .option(new Option(R.string.hypott_goinglow, false))
-                .option(new Option(R.string.hypott_havinglow, false))
                 .option(new Option(R.string.hypott_preventoversmb, true))
                 .hint(new Hint(R.string.hypott_hint1))
         );
-        tasks.add(new ExamTask(R.string.offlineprofile, R.string.offlineprofile_whatprofile,"offlineprofile")
+        tasks.add(new ExamTask(R.string.offlineprofile_label, R.string.offlineprofile_whatprofile,"offlineprofile")
                 .option(new Option(R.string.localprofile, true))
                 .option(new Option(R.string.nsprofile, false))
                 .option(new Option(R.string.offlineprofile_nsprofile, true))
                 .hint(new Hint(R.string.offlineprofile_hint1))
         );
-        tasks.add(new ExamTask(R.string.pumpdisconnect, R.string.pumpdisconnect_whattodo,"pumpdisconnect")
+        tasks.add(new ExamTask(R.string.pumpdisconnect_label, R.string.pumpdisconnect_label,"pumpdisconnect")
                 .option(new Option(R.string.pumpdisconnect_letknow, true))
                 .option(new Option(R.string.pumpdisconnect_dontchnage, false))
                 .hint(new Hint(R.string.pumpdisconnect_hint1))
         );
-        tasks.add(new ExamTask(R.string.objectives, R.string.objectives_howtosave,"objectives")
-                .option(new Option(R.string.objectives_writetopaper, false))
+        tasks.add(new ExamTask(R.string.objectives_label, R.string.objectives_howtosave,"objectives")
                 .option(new Option(R.string.objectives_exportsettings, true))
                 .option(new Option(R.string.objectives_storeelsewhere, true))
                 .option(new Option(R.string.objectives_doexportonstart, false))
@@ -51,37 +49,41 @@ public class Objective2 extends Objective {
                 .hint(new Hint(R.string.objectives_hint1))
                 .hint(new Hint(R.string.objectives_hint2))
         );
-        tasks.add(new ExamTask(R.string.noisycgm, R.string.noisycgm_whattodo,"noisycgm")
+        tasks.add(new ExamTask(R.string.noisycgm_label, R.string.noisycgm_whattodo,"noisycgm")
                 .option(new Option(R.string.nothing, false))
                 .option(new Option(R.string.disconnectpumpfor1h, false))
                 .option(new Option(R.string.noisycgm_pause, true))
                 .option(new Option(R.string.noisycgm_replacesensor, true))
-                .option(new Option(R.string.noisycgm_turnoffcgmreceiver, false))
+                .option(new Option(R.string.noisycgm_turnoffphone, false))
                 .option(new Option(R.string.noisycgm_checksmoothing, true))
                 .hint(new Hint(R.string.noisycgm_hint1))
         );
-        tasks.add(new ExamTask(R.string.exercise, R.string.exercise_whattodo,"exercise")
+        tasks.add(new ExamTask(R.string.exercise_label, R.string.exercise_whattodo,"exercise")
                 .option(new Option(R.string.nothing, false))
                 .option(new Option(R.string.exercise_setactivitytt, true))
                 .option(new Option(R.string.exercise_switchprofilebelow100, true))
                 .option(new Option(R.string.exercise_switchprofileabove100, false))
                 .option(new Option(R.string.exercise_stoploop, false))
                 .option(new Option(R.string.exercise_doitbeforestart, true))
-                .option(new Option(R.string.exercise_doitafterstart, false))
                 .hint(new Hint(R.string.exercise_hint1))
         );
-       tasks.add(new ExamTask(R.string.suspendloop, R.string.suspendloop_doigetinsulin,"suspendloop")
+       tasks.add(new ExamTask(R.string.suspendloop_label, R.string.suspendloop_doigetinsulin,"suspendloop")
                 .option(new Option(R.string.suspendloop_yes, true))
                 .option(new Option(R.string.suspendloop_no, false))
-                 .hint(new Hint(R.string.exercise_hint1))
         );
-       tasks.add(new ExamTask(R.string.basaltest, R.string.basaltest_when,"basaltest")
+       tasks.add(new ExamTask(R.string.basaltest_label, R.string.basaltest_when,"basaltest")
                 .option(new Option(R.string.basaltest_beforeloop, true))
                 .option(new Option(R.string.basaltest_havingregularhypo, true))
                 .option(new Option(R.string.basaltest_havingregularhyper, true))
                  .hint(new Hint(R.string.basaltest_hint1))
         );
-       tasks.add(new ExamTask(R.string.prerequisites, R.string.prerequisites_what, "prerequisites")
+       tasks.add(new ExamTask(R.string.basalhelp_label, R.string.basalhelp_where,"basalhelp")
+                .option(new Option(R.string.basalhelp_diabetesteam, true))
+                .option(new Option(R.string.basalhelp_google, false))
+                .option(new Option(R.string.basalhelp_facebook, false))
+                 .hint(new Hint(R.string.basalhelp_hint1))
+        );
+       tasks.add(new ExamTask(R.string.prerequisites_label, R.string.prerequisites_what, "prerequisites")
                 .option(new Option(R.string.prerequisites_determinedcorrectprofile, true))
                 .option(new Option(R.string.prerequisites_computer, true))
                 .option(new Option(R.string.prerequisites_phone, true))
@@ -96,7 +98,7 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.prerequisites_supportedcgm, true))
                 .hint(new Hint(R.string.prerequisites_hint1))
         );
-        tasks.add(new ExamTask(R.string.update_update, R.string.whatistrue,"update")
+        tasks.add(new ExamTask(R.string.update_label, R.string.whatistrue,"update")
                 .option(new Option(R.string.update_git, true))
                 .option(new Option(R.string.update_asap, true))
                 .option(new Option(R.string.update_keys, true))
@@ -104,7 +106,7 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.update_askfriend, false))
                 .hint(new Hint(R.string.update_hint1))
         );
-        tasks.add(new ExamTask(R.string.troubleshooting, R.string.troubleshooting_wheretoask,"troubleshooting")
+        tasks.add(new ExamTask(R.string.troubleshooting_label, R.string.troubleshooting_wheretoask,"troubleshooting")
                 .option(new Option(R.string.troubleshooting_fb, true))
                 .option(new Option(R.string.troubleshooting_wiki, true))
                 .option(new Option(R.string.troubleshooting_gitter, true))
@@ -114,49 +116,48 @@ public class Objective2 extends Objective {
                 .hint(new Hint(R.string.troubleshooting_hint2))
                 .hint(new Hint(R.string.troubleshooting_hint3))
         );
-        tasks.add(new ExamTask(R.string.insulin, R.string.insulin_ultrarapid,"insulin")
+        tasks.add(new ExamTask(R.string.insulin_label, R.string.insulin_ultrarapid,"insulin")
                 .option(new Option(R.string.insulin_fiasp, true))
                 .option(new Option(R.string.insulin_novorapid, false))
                 .option(new Option(R.string.insulin_humalog, false))
                 .option(new Option(R.string.insulin_actrapid, false))
                 .hint(new Hint(R.string.insulin_hint1))
         );
-        tasks.add(new ExamTask(R.string.sensitivity, R.string.sensitivity_which,"sensitivity")
+        tasks.add(new ExamTask(R.string.sensitivity_label, R.string.sensitivity_which,"sensitivity")
                 .option(new Option(R.string.sensitivityweightedaverage, true))
                 .option(new Option(R.string.sensitivityoref0, false))
                 .option(new Option(R.string.sensitivityoref1, false))
                 .option(new Option(R.string.sensitivityaaps, true))
                 .hint(new Hint(R.string.sensitivity_hint1))
         );
-        tasks.add(new ExamTask(R.string.sensitivity, R.string.sensitivityuam_which,"sensitivityuam")
+        tasks.add(new ExamTask(R.string.sensitivity_label, R.string.sensitivityuam_which,"sensitivityuam")
                 .option(new Option(R.string.sensitivityweightedaverage, false))
                 .option(new Option(R.string.sensitivityoref0, false))
                 .option(new Option(R.string.sensitivityoref1, true))
                 .option(new Option(R.string.sensitivityaaps, false))
                 .hint(new Hint(R.string.sensitivity_hint1))
         );
-        tasks.add(new ExamTask(R.string.wrongcarbs, R.string.wrongcarbs_whattodo,"wrongcarbs")
-                .option(new Option(R.string.disableloop, false))
+        tasks.add(new ExamTask(R.string.wrongcarbs_label, R.string.wrongcarbs_whattodo,"wrongcarbs")
+                .option(new Option(R.string.wrongcarbs_addfakeinsulin, false))
                 .option(new Option(R.string.wrongcarbs_treatmentstab, true))
-                .hint(new Hint(R.string.sensitivity_hint1))
         );
-        tasks.add(new ExamTask(R.string.extendedcarbs, R.string.extendedcarbs_handling,"extendedcarbs")
+        tasks.add(new ExamTask(R.string.extendedcarbs_label, R.string.extendedcarbs_handling,"extendedcarbs")
                 .option(new Option(R.string.extendedcarbs_useextendedcarbs, true))
                 .option(new Option(R.string.extendedcarbs_add, false))
                 .option(new Option(R.string.extendedcarbs_useextendedbolus, false))
-                .hint(new Hint(R.string.sensitivity_hint1))
+                .hint(new Hint(R.string.extendedcarbs_hint1))
         );
-        tasks.add(new ExamTask(R.string.nsclient_monitoring, R.string.nsclient_howcanyou,"nsclient")
-                .option(new Option(R.string.nightscout, true))
+        tasks.add(new ExamTask(R.string.nsclient_label, R.string.nsclient_howcanyou,"nsclient")
+                .option(new Option(R.string.nsclient_nightscout, true))
                 .option(new Option(R.string.nsclientinternal, true))
-                .option(new Option(R.string.dexcomfollow, true))
-                .option(new Option(R.string.dexcomfollowxdrip, false))
-                .option(new Option(R.string.xdripfollower, true))
-                .option(new Option(R.string.looponiphone, false))
-                .option(new Option(R.string.spikeiphone, true))
-                .hint(new Hint(R.string.sensitivity_hint1))
+                .option(new Option(R.string.nsclient_dexcomfollow, true))
+                .option(new Option(R.string.nsclient_dexcomfollowxdrip, false))
+                .option(new Option(R.string.nsclient_xdripfollower, true))
+                .option(new Option(R.string.nsclient_looponiphone, false))
+                .option(new Option(R.string.nsclient_spikeiphone, true))
+                .hint(new Hint(R.string.nsclient_hint1))
         );
-        tasks.add(new ExamTask(R.string.nsprofileview_isf_label, R.string.whatistrue,"isf")
+        tasks.add(new ExamTask(R.string.isf_label, R.string.whatistrue,"isf")
                 .option(new Option(R.string.isf_increasingvalue, true))
                 .option(new Option(R.string.isf_decreasingvalue, false))
                 .option(new Option(R.string.isf_noeffect, false))
@@ -165,7 +166,7 @@ public class Objective2 extends Objective {
                 .hint(new Hint(R.string.isf_hint1))
                 .hint(new Hint(R.string.isf_hint2))
         );
-        tasks.add(new ExamTask(R.string.nsprofileview_ic_label, R.string.whatistrue,"ic")
+        tasks.add(new ExamTask(R.string.ic_label, R.string.whatistrue,"ic")
                 .option(new Option(R.string.ic_increasingvalue, true))
                 .option(new Option(R.string.ic_decreasingvalue, false))
                 .option(new Option(R.string.ic_noeffect, false))
@@ -173,7 +174,7 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.ic_meaning, false))
                 .hint(new Hint(R.string.ic_hint1))
         );
-        tasks.add(new ExamTask(R.string.profileswitch, R.string.profileswitch_pctwillchange,"profileswitch")
+        tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitch_pctwillchange,"profileswitch")
                 .option(new Option(R.string.profileswitch_basalhigher, false))
                 .option(new Option(R.string.profileswitch_basallower, true))
                 .option(new Option(R.string.profileswitch_ichigher, true))
@@ -187,6 +188,14 @@ public class Objective2 extends Objective {
                 .hint(new Hint(R.string.profileswitch_hint1))
         );
 
+        tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitchtime_iwant,"profileswitchtime")
+                .option(new Option(R.string.profileswitchtime_1, false))
+                .option(new Option(R.string.profileswitchtime__1, true))
+                .option(new Option(R.string.profileswitchtime_60, false))
+                .option(new Option(R.string.profileswitchtime__60, false))
+                .hint(new Hint(R.string.profileswitchtime_hint1))
+        );
+
         for (Task task : tasks)
             Collections.shuffle(((ExamTask)task).options);
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.kt
index 079858ce43..094cae54c9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.kt
@@ -26,7 +26,7 @@ class ChooseActionDialog : DialogFragment() {
             checkedIndex = bundle.getInt("checkedIndex")
         }
 
-        dialog.setCanceledOnTouchOutside(false)
+        dialog?.setCanceledOnTouchOutside(false)
         return inflater.inflate(R.layout.automation_dialog_choose_action, container, false)
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseTriggerDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseTriggerDialog.kt
index b77c0f4a40..6ccc1ebb6f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseTriggerDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseTriggerDialog.kt
@@ -29,7 +29,7 @@ class ChooseTriggerDialog : DialogFragment() {
             checkedIndex = bundle.getInt("checkedIndex")
         }
 
-        dialog.setCanceledOnTouchOutside(false)
+        dialog?.setCanceledOnTouchOutside(false)
         return inflater.inflate(R.layout.automation_dialog_choose_trigger, container, false)
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.kt
index 48669c9ed8..dd082eabae 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditActionDialog.kt
@@ -26,7 +26,7 @@ class EditActionDialog : DialogFragment() {
             bundle.getString("action")?.let { action = Action.instantiate(JSONObject(it)) }
         }
 
-        dialog.setCanceledOnTouchOutside(false)
+        dialog?.setCanceledOnTouchOutside(false)
         return inflater.inflate(R.layout.automation_dialog_action, container, false)
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt
index 1f5725335e..a55f29d639 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt
@@ -35,7 +35,7 @@ class EditEventDialog : DialogFragment() {
             bundle.getString("event")?.let { event = AutomationEvent().fromJSON(it) }
         }
 
-        dialog.setCanceledOnTouchOutside(false)
+        dialog?.setCanceledOnTouchOutside(false)
         return inflater.inflate(R.layout.automation_dialog_event, container, false)
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.kt
index e0aa80e24b..4013acd5c5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.kt
@@ -23,7 +23,7 @@ class EditTriggerDialog : DialogFragment() {
             bundle.getString("trigger")?.let { trigger = Trigger.instantiate(it) }
         }
 
-        dialog.setCanceledOnTouchOutside(false)
+        dialog?.setCanceledOnTouchOutside(false)
         return inflater.inflate(R.layout.automation_dialog_edit_trigger, container, false)
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
index b1909ba2f0..93f499c8ca 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
@@ -1323,23 +1323,19 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             cobView.setText(cobText);
         }
 
-        if (statuslightsLayout != null && SP.getBoolean(R.string.key_show_statuslights, false)) {
-            StatuslightHandler handler = new StatuslightHandler();
-
-            if (SP.getBoolean(R.string.key_show_statuslights_easy, false)) {
-                handler.statuslight(cageView, iageView, reservoirView, sageView, batteryView);
-
-                statuslightsLayout.setVisibility(View.VISIBLE);
-            } else if (SP.getBoolean(R.string.key_show_statuslights_extended, false)) {
-                handler.extendedStatuslight(cageView, iageView, reservoirView, sageView, batteryView);
-
-                statuslightsLayout.setVisibility(View.VISIBLE);
+        if (statuslightsLayout != null)
+            if (SP.getBoolean(R.string.key_show_statuslights, false)) {
+                StatuslightHandler handler = new StatuslightHandler();
+                if (SP.getBoolean(R.string.key_show_statuslights_extended, false)) {
+                    handler.extendedStatuslight(cageView, iageView, reservoirView, sageView, batteryView);
+                    statuslightsLayout.setVisibility(View.VISIBLE);
+                } else {
+                    handler.statuslight(cageView, iageView, reservoirView, sageView, batteryView);
+                    statuslightsLayout.setVisibility(View.VISIBLE);
+                }
             } else {
                 statuslightsLayout.setVisibility(View.GONE);
             }
-        } else if (statuslightsLayout != null) {
-            statuslightsLayout.setVisibility(View.GONE);
-        }
 
         boolean predictionsAvailable;
         if (Config.APS)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/ErrorDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/ErrorDialog.kt
index d9d7c74542..8ea499d4ef 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/ErrorDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/ErrorDialog.kt
@@ -24,7 +24,7 @@ class ErrorDialog : DialogFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
-        dialog.setTitle(title)
+        dialog?.setTitle(title)
         isCancelable = false
 
         savedInstanceState?.let { bundle ->
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/WizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/WizardDialog.kt
index 1b54b0c69c..1b52e5f3ff 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/WizardDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/WizardDialog.kt
@@ -53,7 +53,7 @@ class WizardDialog : DialogFragment() {
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
-    override fun onAttach(context: Context?) {
+    override fun onAttach(context: Context) {
         super.onAttach(context)
         this.parentContext = context
     }
@@ -78,10 +78,10 @@ class WizardDialog : DialogFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
-        dialog.window?.requestFeature(Window.FEATURE_NO_TITLE)
-        dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
+        dialog?.window?.requestFeature(Window.FEATURE_NO_TITLE)
+        dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
         isCancelable = true
-        dialog.setCanceledOnTouchOutside(false)
+        dialog?.setCanceledOnTouchOutside(false)
 
         return inflater.inflate(R.layout.overview_wizard_dialog, container, false)
     }
@@ -107,6 +107,7 @@ class WizardDialog : DialogFragment() {
                 ?: 0.0, -60.0, 60.0, 5.0, DecimalFormat("0"), false, ok, textWatcher)
         initDialog()
 
+        treatments_wizard_percent_used.text = SP.getInt(R.string.key_boluswizard_percentage, 100).toString() + "%"
         // ok button
         ok.setOnClickListener {
             if (okClicked) {
@@ -128,6 +129,7 @@ class WizardDialog : DialogFragment() {
         treatments_wizard_basaliobcheckbox.setOnCheckedChangeListener { buttonView, _ -> onCheckedChanged(buttonView) }
         treatments_wizard_bolusiobcheckbox.setOnCheckedChangeListener { buttonView, _ -> onCheckedChanged(buttonView) }
         treatments_wizard_bgtrendcheckbox.setOnCheckedChangeListener { buttonView, _ -> onCheckedChanged(buttonView) }
+        treatments_wizard_sbcheckbox.setOnCheckedChangeListener { buttonView, _ -> onCheckedChanged(buttonView) }
         // profile spinner
         treatments_wizard_profile.onItemSelectedListener = object : OnItemSelectedListener {
             override fun onNothingSelected(parent: AdapterView<*>?) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
index 601826893d..61cc3d2bc7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
@@ -481,7 +481,6 @@ public abstract class AbstractDanaRPlugin extends PluginBase implements PumpInte
         if (!veryShort) {
             ret += "TDD: " + DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U\n";
         }
-        ret += "IOB: " + pump.iob + "U\n";
         ret += "Reserv: " + DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits) + "U\n";
         ret += "Batt: " + pump.batteryRemaining + "\n";
         return ret;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
index c8141d1265..782ec42eed 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
@@ -12,7 +12,7 @@ import java.io.OutputStream;
 
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageHashTable;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageHashTableBase;
 import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractSerialIOThread;
 import info.nightscout.androidaps.utils.CRC;
 
@@ -30,9 +30,11 @@ public class SerialIOThread extends AbstractSerialIOThread {
     private byte[] mReadBuff = new byte[0];
 
     private MessageBase processedMessage;
+    private MessageHashTableBase hashTable;
 
-    public SerialIOThread(BluetoothSocket rfcommSocket) {
+    public SerialIOThread(BluetoothSocket rfcommSocket, MessageHashTableBase hashTable) {
         super();
+        this.hashTable = hashTable;
 
         mRfCommSocket = rfcommSocket;
         try {
@@ -68,11 +70,11 @@ public class SerialIOThread extends AbstractSerialIOThread {
                         message = processedMessage;
                     } else {
                         // get it from hash table
-                        message = MessageHashTable.findMessage(command);
+                        message = hashTable.findMessage(command);
                     }
 
                     if (L.isEnabled(L.PUMPBTCOMM))
-                        log.debug("<<<<< " + message.getMessageName() + " " + message.toHexString(extractedBuff));
+                        log.debug("<<<<< " + message.getMessageName() + " " + MessageBase.toHexString(extractedBuff));
 
                     // process the message content
                     message.received = true;
@@ -83,14 +85,14 @@ public class SerialIOThread extends AbstractSerialIOThread {
                 }
             }
         } catch (Exception e) {
-            if (e.getMessage().indexOf("bt socket closed") < 0)
+            if (!e.getMessage().contains("bt socket closed"))
                 log.error("Thread exception: ", e);
             mKeepRunning = false;
         }
         disconnect("EndOfLoop");
     }
 
-    void appendToBuffer(byte[] newData, int gotBytes) {
+    private void appendToBuffer(byte[] newData, int gotBytes) {
         // add newData to mReadBuff
         byte[] newReadBuff = new byte[mReadBuff.length + gotBytes];
         System.arraycopy(mReadBuff, 0, newReadBuff, 0, mReadBuff.length);
@@ -98,7 +100,7 @@ public class SerialIOThread extends AbstractSerialIOThread {
         mReadBuff = newReadBuff;
     }
 
-    byte[] cutMessageFromBuffer() {
+    private byte[] cutMessageFromBuffer() {
         if (mReadBuff[0] == (byte) 0x7E && mReadBuff[1] == (byte) 0x7E) {
             int length = (mReadBuff[2] & 0xFF) + 7;
             // Check if we have enough data
@@ -148,7 +150,7 @@ public class SerialIOThread extends AbstractSerialIOThread {
 
         byte[] messageBytes = message.getRawMessageBytes();
         if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug(">>>>> " + message.getMessageName() + " " + message.toHexString(messageBytes));
+            log.debug(">>>>> " + message.getMessageName() + " " + MessageBase.toHexString(messageBytes));
 
         try {
             mOutputStream.write(messageBytes);
@@ -165,8 +167,10 @@ public class SerialIOThread extends AbstractSerialIOThread {
         }
 
         SystemClock.sleep(200);
-        if (!message.received) {
-            log.warn("Reply not received " + message.getMessageName());
+        if (!message.isReceived()) {
+            message.handleMessageNotReceived();
+            if (L.isEnabled(L.PUMPBTCOMM))
+                log.error("Reply not received " + message.getMessageName());
             if (message.getCommand() == 0xF0F1) {
                 DanaRPump.getInstance().isNewPump = false;
                 if (L.isEnabled(L.PUMPCOMM))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
index 57244ecc20..bf2ca4b83b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
@@ -105,6 +105,9 @@ public class MessageBase {
         }
     }
 
+    public void handleMessageNotReceived() {
+    }
+
     public int getCommand() {
         int command = byteFromRawBuff(buffer, 5) | (byteFromRawBuff(buffer, 4) << 8);
         return command;
@@ -189,4 +192,8 @@ public class MessageBase {
 
         return sb.toString();
     }
+
+    public boolean isReceived() {
+        return received;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTable.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTable.java
deleted file mode 100644
index d7ec39f6b7..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTable.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import java.util.HashMap;
-
-/**
- * Created by mike on 28.05.2016.
- */
-public class MessageHashTable {
-    public static HashMap<Integer, MessageBase> messages = null;
-
-    static {
-        if (messages == null) {
-            messages = new HashMap<Integer, MessageBase>();
-            put(new MsgBolusStop());                 // 0x0101 CMD_MEALINS_STOP
-            put(new MsgBolusStart());                // 0x0102 CMD_MEALINS_START_DATA
-            put(new MsgBolusStartWithSpeed());       // 0x0104 CMD_MEALINS_START_DATA_SPEED
-            put(new MsgBolusProgress());             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
-            put(new MsgStatusProfile());             // 0x0204 CMD_PUMP_CALCULATION_SETTING
-            put(new MsgStatusTempBasal());           // 0x0205 CMD_PUMP_EXERCISE_MODE
-            put(new MsgStatusBolusExtended());       // 0x0207 CMD_PUMP_EXPANS_INS_I
-            put(new MsgStatusBasic());               // 0x020A CMD_PUMP_INITVIEW_I
-            put(new MsgStatus());                    // 0x020B CMD_PUMP_STATUS
-            put(new MsgInitConnStatusTime());        // 0x0301 CMD_PUMPINIT_TIME_INFO
-            put(new MsgInitConnStatusBolus());       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
-            put(new MsgInitConnStatusBasic());       // 0x0303 CMD_PUMPINIT_INIT_INFO
-            put(new MsgInitConnStatusOption());      // 0x0304 CMD_PUMPINIT_OPTION
-            put(new MsgSetTempBasalStart());         // 0x0401 CMD_PUMPSET_EXERCISE_S
-            put(new MsgSetCarbsEntry());             // 0x0402 CMD_PUMPSET_HIS_S
-            put(new MsgSetTempBasalStop());          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
-            put(new MsgSetExtendedBolusStop());      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
-            put(new MsgSetExtendedBolusStart());     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-            put(new MsgError());                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
-            put(new MsgPCCommStart());               // 0x3001 CMD_CONNECT
-            put(new MsgPCCommStop());                // 0x3002 CMD_DISCONNECT
-            put(new MsgHistoryBolus());              // 0x3101 CMD_HISTORY_MEAL_INS
-            put(new MsgHistoryDailyInsulin());       // 0x3102 CMD_HISTORY_DAY_INS
-            put(new MsgHistoryGlucose());            // 0x3104 CMD_HISTORY_GLUCOSE
-            put(new MsgHistoryAlarm());              // 0x3105 CMD_HISTORY_ALARM
-            put(new MsgHistoryError());              // 0x3106 CMD_HISTORY_ERROR
-            put(new MsgHistoryCarbo());              // 0x3107 CMD_HISTORY_CARBOHY
-            put(new MsgHistoryRefill());             // 0x3108 CMD_HISTORY_REFILL
-            put(new MsgHistorySuspend());            // 0x3109 CMD_HISTORY_SUSPEND
-            put(new MsgHistoryBasalHour());          // 0x310A CMD_HISTORY_BASAL_HOUR
-            put(new MsgHistoryDone());               // 0x31F1 CMD_HISTORY_DONT_USED
-            put(new MsgSettingBasal());              // 0x3202 CMD_SETTING_V_BASAL_INS_I
-            put(new MsgSettingMeal());               // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
-            put(new MsgSettingProfileRatios());      // 0x3204 CMD_SETTING_V_CCC_I
-            put(new MsgSettingMaxValues());          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
-            put(new MsgSettingBasalProfileAll());    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
-            put(new MsgSettingShippingInfo());       // 0x3207 CMD_SETTING_V_SHIPPING_I
-            put(new MsgSettingGlucose());            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-            put(new MsgSettingPumpTime());           // 0x320A CMD_SETTING_V_TIME_I
-            put(new MsgSettingUserOptions());        // 0x320B CMD_SETTING_V_USER_OPTIONS
-            put(new MsgSettingActiveProfile());      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
-            put(new MsgSettingProfileRatiosAll());   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
-            put(new MsgSetSingleBasalProfile());     // 0x3302 CMD_SETTING_BASAL_INS_S
-            put(new MsgSetBasalProfile());           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
-            put(new MsgSetUserOptions());            // 0x330B CMD_SETTING_USER_OPTIONS_S
-            put(new MsgSetActivateBasalProfile());   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
-            put(new MsgHistoryAllDone());            // 0x41F1 CMD_HISTORY_ALL_DONE
-            put(new MsgHistoryAll());                // 0x41F2 CMD_HISTORY_ALL
-            put(new MsgHistoryNewDone());            // 0x42F1 CMD_HISTORY_NEW_DONE
-            put(new MsgHistoryNew());                // 0x42F2 CMD_HISTORY_NEW
-            put(new MsgCheckValue());                // 0xF0F1 CMD_PUMP_CHECK_VALUE
-        }
-    }
-
-    public static void put(MessageBase message) {
-        int command = message.getCommand();
-        //String name = MessageOriginalNames.getName(command);
-        messages.put(command, message);
-        //log.debug(String.format("%04x ", command) + " " + name);
-    }
-
-    public static MessageBase findMessage(Integer command) {
-        if (messages.containsKey(command)) {
-            return messages.get(command);
-        } else {
-            return new MessageBase();
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableBase.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableBase.kt
new file mode 100644
index 0000000000..9c524e02a6
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableBase.kt
@@ -0,0 +1,6 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+interface MessageHashTableBase {
+    fun put(message: MessageBase)
+    fun findMessage(command: Int): MessageBase
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt
new file mode 100644
index 0000000000..6d3129f5ba
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt
@@ -0,0 +1,69 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import java.util.*
+
+object MessageHashTableR : MessageHashTableBase {
+    var messages: HashMap<Int, MessageBase> = HashMap()
+
+    init {
+        put(MsgBolusStop())                 // 0x0101 CMD_MEALINS_STOP
+        put(MsgBolusStart())                // 0x0102 CMD_MEALINS_START_DATA
+        put(MsgBolusStartWithSpeed())       // 0x0104 CMD_MEALINS_START_DATA_SPEED
+        put(MsgBolusProgress())             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
+        put(MsgStatusProfile())             // 0x0204 CMD_PUMP_CALCULATION_SETTING
+        put(MsgStatusTempBasal())           // 0x0205 CMD_PUMP_EXERCISE_MODE
+        put(MsgStatusBolusExtended())       // 0x0207 CMD_PUMP_EXPANS_INS_I
+        put(MsgStatusBasic())               // 0x020A CMD_PUMP_INITVIEW_I
+        put(MsgStatus())                    // 0x020B CMD_PUMP_STATUS
+        put(MsgInitConnStatusTime())        // 0x0301 CMD_PUMPINIT_TIME_INFO
+        put(MsgInitConnStatusBolus())       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
+        put(MsgInitConnStatusBasic())       // 0x0303 CMD_PUMPINIT_INIT_INFO
+        put(MsgInitConnStatusOption())      // 0x0304 CMD_PUMPINIT_OPTION
+        put(MsgSetTempBasalStart())         // 0x0401 CMD_PUMPSET_EXERCISE_S
+        put(MsgSetCarbsEntry())             // 0x0402 CMD_PUMPSET_HIS_S
+        put(MsgSetTempBasalStop())          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
+        put(MsgSetExtendedBolusStop())      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
+        put(MsgSetExtendedBolusStart())     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
+        put(MsgError())                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgPCCommStart())               // 0x3001 CMD_CONNECT
+        put(MsgPCCommStop())                // 0x3002 CMD_DISCONNECT
+        put(MsgHistoryBolus())              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin())       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose())            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm())              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryError())              // 0x3106 CMD_HISTORY_ERROR
+        put(MsgHistoryCarbo())              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgHistoryRefill())             // 0x3108 CMD_HISTORY_REFILL
+        put(MsgHistorySuspend())            // 0x3109 CMD_HISTORY_SUSPEND
+        put(MsgHistoryBasalHour())          // 0x310A CMD_HISTORY_BASAL_HOUR
+        put(MsgHistoryDone())               // 0x31F1 CMD_HISTORY_DONT_USED
+        put(MsgSettingBasal())              // 0x3202 CMD_SETTING_V_BASAL_INS_I
+        put(MsgSettingMeal())               // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
+        put(MsgSettingProfileRatios())      // 0x3204 CMD_SETTING_V_CCC_I
+        put(MsgSettingMaxValues())          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
+        put(MsgSettingBasalProfileAll())    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
+        put(MsgSettingShippingInfo())       // 0x3207 CMD_SETTING_V_SHIPPING_I
+        put(MsgSettingGlucose())            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
+        put(MsgSettingPumpTime())           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSettingUserOptions())        // 0x320B CMD_SETTING_V_USER_OPTIONS
+        put(MsgSettingActiveProfile())      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
+        put(MsgSettingProfileRatiosAll())   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
+        put(MsgSetSingleBasalProfile())     // 0x3302 CMD_SETTING_BASAL_INS_S
+        put(MsgSetBasalProfile())           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
+        put(MsgSetUserOptions())            // 0x330B CMD_SETTING_USER_OPTIONS_S
+        put(MsgSetActivateBasalProfile())   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
+        put(MsgHistoryAllDone())            // 0x41F1 CMD_HISTORY_ALL_DONE
+        put(MsgHistoryAll())                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryNewDone())            // 0x42F1 CMD_HISTORY_NEW_DONE
+        put(MsgHistoryNew())                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgCheckValue())                // 0xF0F1 CMD_PUMP_CHECK_VALUE
+    }
+
+    override fun put(message: MessageBase) {
+        messages[message.command] = message
+    }
+
+    override fun findMessage(command: Int): MessageBase {
+        return messages[command] ?: MessageBase()
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.java
index d22352e69f..23a6ba6f75 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.java
@@ -34,4 +34,10 @@ public class MsgSettingPumpTime extends MessageBase {
 
         DanaRPump.getInstance().pumpTime = time;
     }
+
+    @Override
+    public void handleMessageNotReceived() {
+        DanaRPump.getInstance().pumpTime = 0;
+    }
+
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
index 0f46448aee..38957fe34c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
@@ -33,6 +33,7 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Notific
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaR.SerialIOThread;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageHashTableR;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusProgress;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStart;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStartWithSpeed;
@@ -124,7 +125,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                 if (mSerialIOThread != null) {
                     mSerialIOThread.disconnect("Recreate SerialIOThread");
                 }
-                mSerialIOThread = new SerialIOThread(mRfcommSocket);
+                mSerialIOThread = new SerialIOThread(mRfcommSocket, MessageHashTableR.INSTANCE);
                 mHandshakeInProgress = true;
                 MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.HANDSHAKING, 0));
             }
@@ -186,6 +187,15 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                 mSerialIOThread.sendMessage(new MsgSettingUserOptions());
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumptime)));
                 mSerialIOThread.sendMessage(new MsgSettingPumpTime());
+                if (danaRPump.pumpTime == 0) {
+                    // initial handshake was not successfull
+                    // deinitialize pump
+                    danaRPump.lastConnection = 0;
+                    danaRPump.lastSettingsRead = 0;
+                    RxBus.INSTANCE.send(new EventDanaRNewStatus());
+                    MainApp.bus().post(new EventInitializationChanged());
+                    return;
+                }
                 long timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
                 if (L.isEnabled(L.PUMP))
                     log.debug("Pump time difference: " + timeDiff + " seconds");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/SerialIOThread.java
deleted file mode 100644
index 5c47d7c7d1..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/SerialIOThread.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean;
-
-import android.bluetooth.BluetoothSocket;
-import android.os.SystemClock;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractSerialIOThread;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MessageHashTable_k;
-import info.nightscout.androidaps.utils.CRC;
-
-/**
- * Created by mike on 17.07.2016.
- */
-public class SerialIOThread extends AbstractSerialIOThread {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPBTCOMM);
-
-    private InputStream mInputStream = null;
-    private OutputStream mOutputStream = null;
-    private BluetoothSocket mRfCommSocket;
-
-    private boolean mKeepRunning = true;
-    private byte[] mReadBuff = new byte[0];
-
-    private MessageBase processedMessage;
-
-    public SerialIOThread(BluetoothSocket rfcommSocket) {
-        super();
-
-        mRfCommSocket = rfcommSocket;
-        try {
-            mOutputStream = mRfCommSocket.getOutputStream();
-            mInputStream = mRfCommSocket.getInputStream();
-        } catch (IOException e) {
-            log.error("Unhandled exception", e);
-        }
-        this.start();
-    }
-
-    @Override
-    public final void run() {
-        try {
-            while (mKeepRunning) {
-                int availableBytes = mInputStream.available();
-                // Ask for 1024 byte (or more if available)
-                byte[] newData = new byte[Math.max(1024, availableBytes)];
-                int gotBytes = mInputStream.read(newData);
-                // When we are here there is some new data available
-                appendToBuffer(newData, gotBytes);
-
-                // process all messages we already got
-                while (mReadBuff.length > 3) { // 3rd byte is packet size. continue only if we an determine packet size
-                    byte[] extractedBuff = cutMessageFromBuffer();
-                    if (extractedBuff == null)
-                        break; // message is not complete in buffer (wrong packet calls disconnection)
-
-                    int command = (extractedBuff[5] & 0xFF) | ((extractedBuff[4] << 8) & 0xFF00);
-
-                    MessageBase message;
-                    if (processedMessage != null && processedMessage.getCommand() == command) {
-                        message = processedMessage;
-                    } else {
-                        // get it from hash table
-                        message = MessageHashTable_k.findMessage(command);
-                    }
-
-                    if (L.isEnabled(L.PUMPBTCOMM))
-                        log.debug("<<<<< " + message.getMessageName() + " " + message.toHexString(extractedBuff));
-
-                    // process the message content
-                    message.received = true;
-                    message.handleMessage(extractedBuff);
-                    synchronized (message) {
-                        message.notify();
-                    }
-                }
-            }
-        } catch (Exception e) {
-            if (e.getMessage().indexOf("bt socket closed") < 0)
-                log.error("Thread exception: ", e);
-            mKeepRunning = false;
-        }
-        disconnect("EndOfLoop");
-    }
-
-    void appendToBuffer(byte[] newData, int gotBytes) {
-        // add newData to mReadBuff
-        byte[] newReadBuff = new byte[mReadBuff.length + gotBytes];
-        System.arraycopy(mReadBuff, 0, newReadBuff, 0, mReadBuff.length);
-        System.arraycopy(newData, 0, newReadBuff, mReadBuff.length, gotBytes);
-        mReadBuff = newReadBuff;
-    }
-
-    byte[] cutMessageFromBuffer() {
-        if (mReadBuff[0] == (byte) 0x7E && mReadBuff[1] == (byte) 0x7E) {
-            int length = (mReadBuff[2] & 0xFF) + 7;
-            // Check if we have enough data
-            if (mReadBuff.length < length) {
-                return null;
-            }
-            if (mReadBuff[length - 2] != (byte) 0x2E || mReadBuff[length - 1] != (byte) 0x2E) {
-                log.error("wrong packet lenght=" + length + " data " + MessageBase.toHexString(mReadBuff));
-                disconnect("wrong packet");
-                return null;
-            }
-
-            short crc = CRC.getCrc16(mReadBuff, 3, length - 7);
-            byte crcByte0 = (byte) (crc >> 8 & 0xFF);
-            byte crcByte1 = (byte) (crc & 0xFF);
-
-            byte crcByte0received = mReadBuff[length - 4];
-            byte crcByte1received = mReadBuff[length - 3];
-
-            if (crcByte0 != crcByte0received || crcByte1 != crcByte1received) {
-                log.error("CRC Error" + String.format("%02x ", crcByte0) + String.format("%02x ", crcByte1) + String.format("%02x ", crcByte0received) + String.format("%02x ", crcByte1received));
-                disconnect("crc error");
-                return null;
-            }
-            // Packet is verified here. extract data
-            byte[] extractedBuff = new byte[length];
-            System.arraycopy(mReadBuff, 0, extractedBuff, 0, length);
-            // remove extracted data from read buffer
-            byte[] unprocessedData = new byte[mReadBuff.length - length];
-            System.arraycopy(mReadBuff, length, unprocessedData, 0, unprocessedData.length);
-            mReadBuff = unprocessedData;
-            return extractedBuff;
-        } else {
-            log.error("Wrong beginning of packet len=" + mReadBuff.length + "    " + MessageBase.toHexString(mReadBuff));
-            disconnect("Wrong beginning of packet");
-            return null;
-        }
-    }
-
-    @Override
-    public synchronized void sendMessage(MessageBase message) {
-        if (!mRfCommSocket.isConnected()) {
-            log.error("Socket not connected on sendMessage");
-            return;
-        }
-        processedMessage = message;
-
-        byte[] messageBytes = message.getRawMessageBytes();
-        if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug(">>>>> " + message.getMessageName() + " " + message.toHexString(messageBytes));
-
-        try {
-            mOutputStream.write(messageBytes);
-        } catch (Exception e) {
-            log.error("sendMessage write exception: ", e);
-        }
-
-        synchronized (message) {
-            try {
-                message.wait(5000);
-            } catch (InterruptedException e) {
-                log.error("sendMessage InterruptedException", e);
-            }
-        }
-
-        SystemClock.sleep(200);
-        if (!message.received) {
-            if (L.isEnabled(L.PUMPBTCOMM))
-                log.warn("Reply not received " + message.getMessageName());
-            if (message.getCommand() == 0xF0F1) {
-                DanaRPump.getInstance().isNewPump = false;
-                log.error("Old firmware detected");
-            }
-        }
-    }
-
-    @Override
-    public void disconnect(String reason) {
-        mKeepRunning = false;
-        try {
-            mInputStream.close();
-        } catch (Exception e) {
-            if (L.isEnabled(L.PUMPBTCOMM))
-                log.debug(e.getMessage());
-        }
-        try {
-            mOutputStream.close();
-        } catch (Exception e) {
-            if (L.isEnabled(L.PUMPBTCOMM))
-                log.debug(e.getMessage());
-        }
-        try {
-            mRfCommSocket.close();
-        } catch (Exception e) {
-            if (L.isEnabled(L.PUMPBTCOMM))
-                log.debug(e.getMessage());
-        }
-        try {
-            System.runFinalization();
-        } catch (Exception e) {
-            if (L.isEnabled(L.PUMPBTCOMM))
-                log.debug(e.getMessage());
-        }
-        if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug("Disconnected: " + reason);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRkorean.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRkorean.kt
new file mode 100644
index 0000000000..ffdf9d14c5
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRkorean.kt
@@ -0,0 +1,56 @@
+package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.comm.*
+import java.util.*
+
+object MessageHashTableRkorean : MessageHashTableBase {
+    var messages: HashMap<Int, MessageBase> = HashMap()
+
+    init {
+        put(MsgBolusStop())                 // 0x0101 CMD_MEALINS_STOP
+        put(MsgBolusStart())                // 0x0102 CMD_MEALINS_START_DATA
+        put(MsgBolusProgress())             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
+        put(MsgStatusProfile())             // 0x0204 CMD_PUMP_CALCULATION_SETTING
+        put(MsgStatusTempBasal())           // 0x0205 CMD_PUMP_EXERCISE_MODE
+        put(MsgStatusBolusExtended())       // 0x0207 CMD_PUMP_EXPANS_INS_I
+        put(MsgStatusBasic_k())               // 0x020A CMD_PUMP_INITVIEW_I
+        put(MsgStatus_k())                    // 0x020B CMD_PUMP_STATUS
+        put(MsgInitConnStatusTime_k())        // 0x0301 CMD_PUMPINIT_TIME_INFO
+        put(MsgInitConnStatusBolus_k())       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
+        put(MsgInitConnStatusBasic_k())       // 0x0303 CMD_PUMPINIT_INIT_INFO
+        put(MsgSetTempBasalStart())         // 0x0401 CMD_PUMPSET_EXERCISE_S
+        put(MsgSetCarbsEntry())             // 0x0402 CMD_PUMPSET_HIS_S
+        put(MsgSetTempBasalStop())          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
+        put(MsgSetExtendedBolusStop())      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
+        put(MsgSetExtendedBolusStart())     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
+        put(MsgError())                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgPCCommStart())               // 0x3001 CMD_CONNECT
+        put(MsgPCCommStop())                // 0x3002 CMD_DISCONNECT
+        put(MsgHistoryBolus())              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin())       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose())            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm())              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryCarbo())              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgSettingBasal_k())              // 0x3202 CMD_SETTING_V_BASAL_INS_I
+        put(MsgSettingMeal())               // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
+        put(MsgSettingProfileRatios())      // 0x3204 CMD_SETTING_V_CCC_I
+        put(MsgSettingMaxValues())          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
+        put(MsgSettingBasalProfileAll_k())    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
+        put(MsgSettingShippingInfo())       // 0x3207 CMD_SETTING_V_SHIPPING_I
+        put(MsgSettingGlucose())            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
+        put(MsgSettingPumpTime())           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSetSingleBasalProfile())     // 0x3302 CMD_SETTING_BASAL_INS_S
+        put(MsgHistoryAll())                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryNewDone())            // 0x42F1 CMD_HISTORY_NEW_DONE
+        put(MsgHistoryNew())                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgCheckValue_k())                // 0xF0F1 CMD_PUMP_CHECK_VALUE
+    }
+
+    override fun put(message: MessageBase) {
+        messages[message.command] = message
+    }
+
+    override fun findMessage(command: Int): MessageBase {
+        return messages[command] ?: MessageBase()
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTable_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTable_k.java
deleted file mode 100644
index 30ac710724..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTable_k.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.*;
-
-/**
- * Created by mike on 28.05.2016.
- */
-public class MessageHashTable_k {
-    private static Logger log = LoggerFactory.getLogger(MessageHashTable_k.class);
-
-    public static HashMap<Integer, MessageBase> messages = null;
-
-    static {
-        if (messages == null) {
-            messages = new HashMap<Integer, MessageBase>();
-            put(new MsgBolusStop());                 // 0x0101 CMD_MEALINS_STOP
-            put(new MsgBolusStart());                // 0x0102 CMD_MEALINS_START_DATA
-            put(new MsgBolusProgress());             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
-            put(new MsgStatusProfile());             // 0x0204 CMD_PUMP_CALCULATION_SETTING
-            put(new MsgStatusTempBasal());           // 0x0205 CMD_PUMP_EXERCISE_MODE
-            put(new MsgStatusBolusExtended());       // 0x0207 CMD_PUMP_EXPANS_INS_I
-            put(new MsgStatusBasic_k());               // 0x020A CMD_PUMP_INITVIEW_I
-            put(new MsgStatus_k());                    // 0x020B CMD_PUMP_STATUS
-            put(new MsgInitConnStatusTime_k());        // 0x0301 CMD_PUMPINIT_TIME_INFO
-            put(new MsgInitConnStatusBolus_k());       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
-            put(new MsgInitConnStatusBasic_k());       // 0x0303 CMD_PUMPINIT_INIT_INFO
-            put(new MsgSetTempBasalStart());         // 0x0401 CMD_PUMPSET_EXERCISE_S
-            put(new MsgSetCarbsEntry());             // 0x0402 CMD_PUMPSET_HIS_S
-            put(new MsgSetTempBasalStop());          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
-            put(new MsgSetExtendedBolusStop());      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
-            put(new MsgSetExtendedBolusStart());     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-            put(new MsgError());                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
-            put(new MsgPCCommStart());               // 0x3001 CMD_CONNECT
-            put(new MsgPCCommStop());                // 0x3002 CMD_DISCONNECT
-            put(new MsgHistoryBolus());              // 0x3101 CMD_HISTORY_MEAL_INS
-            put(new MsgHistoryDailyInsulin());       // 0x3102 CMD_HISTORY_DAY_INS
-            put(new MsgHistoryGlucose());            // 0x3104 CMD_HISTORY_GLUCOSE
-            put(new MsgHistoryAlarm());              // 0x3105 CMD_HISTORY_ALARM
-            put(new MsgHistoryCarbo());              // 0x3107 CMD_HISTORY_CARBOHY
-            put(new MsgSettingBasal_k());              // 0x3202 CMD_SETTING_V_BASAL_INS_I
-            put(new MsgSettingMeal());               // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
-            put(new MsgSettingProfileRatios());      // 0x3204 CMD_SETTING_V_CCC_I
-            put(new MsgSettingMaxValues());          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
-            put(new MsgSettingBasalProfileAll_k());    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
-            put(new MsgSettingShippingInfo());       // 0x3207 CMD_SETTING_V_SHIPPING_I
-            put(new MsgSettingGlucose());            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-            put(new MsgSettingPumpTime());           // 0x320A CMD_SETTING_V_TIME_I
-            put(new MsgSetSingleBasalProfile());     // 0x3302 CMD_SETTING_BASAL_INS_S
-            put(new MsgHistoryAll());                // 0x41F2 CMD_HISTORY_ALL
-            put(new MsgHistoryNewDone());            // 0x42F1 CMD_HISTORY_NEW_DONE
-            put(new MsgHistoryNew());                // 0x42F2 CMD_HISTORY_NEW
-            put(new MsgCheckValue_k());                // 0xF0F1 CMD_PUMP_CHECK_VALUE
-        }
-    }
-
-    public static void put(MessageBase message) {
-        int command = message.getCommand();
-        //String name = MessageOriginalNames.getName(command);
-        messages.put(command, message);
-        //log.debug(String.format("%04x ", command) + " " + name);
-    }
-
-    public static MessageBase findMessage(Integer command) {
-        if (messages.containsKey(command)) {
-            return messages.get(command);
-        } else {
-            return new MessageBase();
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
index c61a2ab6a3..2fba40c198 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -30,6 +30,7 @@ import info.nightscout.androidaps.plugins.general.overview.dialogs.BolusProgress
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.SerialIOThread;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusProgress;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStart;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStop;
@@ -51,7 +52,7 @@ import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBolusExtended
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusTempBasal;
 import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.SerialIOThread;
+import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MessageHashTableRkorean;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgCheckValue_k;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgSettingBasal_k;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgStatusBasic_k;
@@ -129,7 +130,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
                 if (mSerialIOThread != null) {
                     mSerialIOThread.disconnect("Recreate SerialIOThread");
                 }
-                mSerialIOThread = new SerialIOThread(mRfcommSocket);
+                mSerialIOThread = new SerialIOThread(mRfcommSocket, MessageHashTableRkorean.INSTANCE);
                 mHandshakeInProgress = true;
                 MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.HANDSHAKING, 0));
             }
@@ -187,6 +188,15 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
                 mSerialIOThread.sendMessage(new MsgSettingProfileRatios());
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumptime)));
                 mSerialIOThread.sendMessage(new MsgSettingPumpTime());
+                if (danaRPump.pumpTime == 0) {
+                    // initial handshake was not successfull
+                    // deinitialize pump
+                    danaRPump.lastConnection = 0;
+                    danaRPump.lastSettingsRead = 0;
+                    RxBus.INSTANCE.send(new EventDanaRNewStatus());
+                    MainApp.bus().post(new EventInitializationChanged());
+                    return;
+                }
                 long timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
                 if (L.isEnabled(L.PUMP))
                     log.debug("Pump time difference: " + timeDiff + " seconds");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
index 19005509cb..463f646cfd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
@@ -794,7 +794,6 @@ public class DanaRSPlugin extends PluginBase implements PumpInterface, DanaRInte
         if (!veryShort) {
             ret += "TDD: " + DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U\n";
         }
-        ret += "IOB: " + pump.iob + "U\n";
         ret += "Reserv: " + DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits) + "U\n";
         ret += "Batt: " + pump.batteryRemaining + "\n";
         return ret;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
index b97509b7b9..3d59b34e16 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
@@ -58,6 +58,9 @@ public class DanaRS_Packet {
     public void handleMessage(byte[] data) {
     }
 
+    public void handleMessageNotReceived() {
+    }
+
     public String getFriendlyName() {
         return "UNKNOWN_PACKET";
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.java
index d12ed52c79..500c1707b6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.java
@@ -58,6 +58,11 @@ public class DanaRS_Packet_Option_Get_Pump_Time extends DanaRS_Packet {
         }
     }
 
+    @Override
+    public void handleMessageNotReceived() {
+        DanaRPump.getInstance().pumpTime = 0;
+    }
+
     @Override
     public String getFriendlyName() {
         return "OPTION__GET_PUMP_TIME";
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
index 69ca9f1901..3eb3a89c79 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
@@ -643,6 +643,7 @@ public class BLEComm {
         //SystemClock.sleep(200);
         if (!message.isReceived()) {
             log.warn("Reply not received " + message.getFriendlyName());
+            message.handleMessageNotReceived();
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
index 1fbcf70dfd..9987c031b2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
@@ -158,6 +158,14 @@ public class DanaRSService extends Service {
             bleComm.sendMessage(new DanaRS_Packet_Option_Get_Pump_Time());
 
             long timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
+            if (danaRPump.pumpTime == 0) {
+                // initial handshake was not successfull
+                // deinitialize pump
+                danaRPump.lastConnection = 0;
+                RxBus.INSTANCE.send(new EventDanaRNewStatus());
+                MainApp.bus().post(new EventInitializationChanged());
+                return;
+            }
             if (L.isEnabled(L.PUMPCOMM))
                 log.debug("Pump time difference: " + timeDiff + " seconds");
             if (Math.abs(timeDiff) > 3) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/SerialIOThread.java
deleted file mode 100644
index ba1fdc5cb2..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/SerialIOThread.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2;
-
-import android.bluetooth.BluetoothSocket;
-import android.os.SystemClock;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractSerialIOThread;
-import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MessageHashTable_v2;
-import info.nightscout.androidaps.utils.CRC;
-
-/**
- * Created by mike on 17.07.2016.
- */
-public class SerialIOThread extends AbstractSerialIOThread {
-    private static Logger log = LoggerFactory.getLogger(L.PUMPBTCOMM);
-
-    private InputStream mInputStream = null;
-    private OutputStream mOutputStream = null;
-    private BluetoothSocket mRfCommSocket;
-
-    private boolean mKeepRunning = true;
-    private byte[] mReadBuff = new byte[0];
-
-    private MessageBase processedMessage;
-
-    public SerialIOThread(BluetoothSocket rfcommSocket) {
-        super();
-
-        mRfCommSocket = rfcommSocket;
-        try {
-            mOutputStream = mRfCommSocket.getOutputStream();
-            mInputStream = mRfCommSocket.getInputStream();
-        } catch (IOException e) {
-            log.error("Unhandled exception", e);
-        }
-        this.start();
-    }
-
-    @Override
-    public final void run() {
-        try {
-            while (mKeepRunning) {
-                int availableBytes = mInputStream.available();
-                // Ask for 1024 byte (or more if available)
-                byte[] newData = new byte[Math.max(1024, availableBytes)];
-                int gotBytes = mInputStream.read(newData);
-                // When we are here there is some new data available
-                appendToBuffer(newData, gotBytes);
-
-                // process all messages we already got
-                while (mReadBuff.length > 3) { // 3rd byte is packet size. continue only if we an determine packet size
-                    byte[] extractedBuff = cutMessageFromBuffer();
-                    if (extractedBuff == null)
-                        break; // message is not complete in buffer (wrong packet calls disconnection)
-
-                    int command = (extractedBuff[5] & 0xFF) | ((extractedBuff[4] << 8) & 0xFF00);
-
-                    MessageBase message;
-                    if (processedMessage != null && processedMessage.getCommand() == command) {
-                        message = processedMessage;
-                    } else {
-                        // get it from hash table
-                        message = MessageHashTable_v2.findMessage(command);
-                    }
-
-                    if (L.isEnabled(L.PUMPBTCOMM))
-                        log.debug("<<<<< " + message.getMessageName() + " " + message.toHexString(extractedBuff));
-
-                    // process the message content
-                    message.received = true;
-                    message.handleMessage(extractedBuff);
-                    synchronized (message) {
-                        message.notify();
-                    }
-                }
-            }
-        } catch (Exception e) {
-            if (e.getMessage().indexOf("bt socket closed") < 0)
-                log.error("Thread exception: ", e);
-            mKeepRunning = false;
-        }
-        disconnect("EndOfLoop");
-    }
-
-    void appendToBuffer(byte[] newData, int gotBytes) {
-        // add newData to mReadBuff
-        byte[] newReadBuff = new byte[mReadBuff.length + gotBytes];
-        System.arraycopy(mReadBuff, 0, newReadBuff, 0, mReadBuff.length);
-        System.arraycopy(newData, 0, newReadBuff, mReadBuff.length, gotBytes);
-        mReadBuff = newReadBuff;
-    }
-
-    byte[] cutMessageFromBuffer() {
-        if (mReadBuff[0] == (byte) 0x7E && mReadBuff[1] == (byte) 0x7E) {
-            int length = (mReadBuff[2] & 0xFF) + 7;
-            // Check if we have enough data
-            if (mReadBuff.length < length) {
-                return null;
-            }
-            if (mReadBuff[length - 2] != (byte) 0x2E || mReadBuff[length - 1] != (byte) 0x2E) {
-                log.error("wrong packet lenght=" + length + " data " + MessageBase.toHexString(mReadBuff));
-                disconnect("wrong packet");
-                return null;
-            }
-
-            short crc = CRC.getCrc16(mReadBuff, 3, length - 7);
-            byte crcByte0 = (byte) (crc >> 8 & 0xFF);
-            byte crcByte1 = (byte) (crc & 0xFF);
-
-            byte crcByte0received = mReadBuff[length - 4];
-            byte crcByte1received = mReadBuff[length - 3];
-
-            if (crcByte0 != crcByte0received || crcByte1 != crcByte1received) {
-                log.error("CRC Error" + String.format("%02x ", crcByte0) + String.format("%02x ", crcByte1) + String.format("%02x ", crcByte0received) + String.format("%02x ", crcByte1received));
-                disconnect("crc error");
-                return null;
-            }
-            // Packet is verified here. extract data
-            byte[] extractedBuff = new byte[length];
-            System.arraycopy(mReadBuff, 0, extractedBuff, 0, length);
-            // remove extracted data from read buffer
-            byte[] unprocessedData = new byte[mReadBuff.length - length];
-            System.arraycopy(mReadBuff, length, unprocessedData, 0, unprocessedData.length);
-            mReadBuff = unprocessedData;
-            return extractedBuff;
-        } else {
-            log.error("Wrong beginning of packet len=" + mReadBuff.length + "    " + MessageBase.toHexString(mReadBuff));
-            disconnect("Wrong beginning of packet");
-            return null;
-        }
-    }
-
-    @Override
-    public synchronized void sendMessage(MessageBase message) {
-        if (!mRfCommSocket.isConnected()) {
-            log.error("Socket not connected on sendMessage");
-            return;
-        }
-        processedMessage = message;
-
-        byte[] messageBytes = message.getRawMessageBytes();
-        if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug(">>>>> " + message.getMessageName() + " " + message.toHexString(messageBytes));
-
-        try {
-            mOutputStream.write(messageBytes);
-        } catch (Exception e) {
-            log.error("sendMessage write exception: ", e);
-        }
-
-        synchronized (message) {
-            try {
-                message.wait(5000);
-            } catch (InterruptedException e) {
-                log.error("sendMessage InterruptedException", e);
-            }
-        }
-
-        SystemClock.sleep(200);
-        if (!message.received) {
-            log.error("Reply not received " + message.getMessageName());
-            if (message.getCommand() == 0xF0F1) {
-                DanaRPump.getInstance().isNewPump = false;
-                log.error("Old firmware detected");
-            }
-        }
-    }
-
-    @Override
-    public void disconnect(String reason) {
-        mKeepRunning = false;
-        try {
-            mInputStream.close();
-        } catch (Exception e) {
-            if (L.isEnabled(L.PUMPBTCOMM))
-                log.debug(e.getMessage());
-        }
-        try {
-            mOutputStream.close();
-        } catch (Exception e) {
-            if (L.isEnabled(L.PUMPBTCOMM))
-                log.debug(e.getMessage());
-        }
-        try {
-            mRfCommSocket.close();
-        } catch (Exception e) {
-            if (L.isEnabled(L.PUMPBTCOMM))
-                log.debug(e.getMessage());
-        }
-        try {
-            System.runFinalization();
-        } catch (Exception e) {
-            if (L.isEnabled(L.PUMPBTCOMM))
-                log.debug(e.getMessage());
-        }
-        if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug("Disconnected: " + reason);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
new file mode 100644
index 0000000000..f22a3cf3fa
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
@@ -0,0 +1,77 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.comm.*
+import java.util.*
+
+
+object MessageHashTableRv2 : MessageHashTableBase {
+    var messages: HashMap<Int, MessageBase> = HashMap()
+
+    init {
+        put(MsgBolusStop())                 // 0x0101 CMD_MEALINS_STOP
+        put(MsgBolusStart())                // 0x0102 CMD_MEALINS_START_DATA
+        put(MsgBolusStartWithSpeed())       // 0x0104 CMD_MEALINS_START_DATA_SPEED
+        put(MsgBolusProgress())             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
+        put(MsgStatusProfile())             // 0x0204 CMD_PUMP_CALCULATION_SETTING
+
+        put(MsgStatusTempBasal_v2())        // 0x0205 CMD_PUMP_EXERCISE_MODE
+        put(MsgStatusBolusExtended_v2())    // 0x0207 CMD_PUMP_EXPANS_INS_I
+
+        put(MsgStatusBasic())               // 0x020A CMD_PUMP_INITVIEW_I
+        put(MsgStatus())                    // 0x020B CMD_PUMP_STATUS
+        put(MsgInitConnStatusTime())        // 0x0301 CMD_PUMPINIT_TIME_INFO
+        put(MsgInitConnStatusBolus())       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
+        put(MsgInitConnStatusBasic())       // 0x0303 CMD_PUMPINIT_INIT_INFO
+        put(MsgInitConnStatusOption())      // 0x0304 CMD_PUMPINIT_OPTION
+        put(MsgSetTempBasalStart())         // 0x0401 CMD_PUMPSET_EXERCISE_S
+        put(MsgSetCarbsEntry())             // 0x0402 CMD_PUMPSET_HIS_S
+        put(MsgSetTempBasalStop())          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
+        put(MsgSetExtendedBolusStop())      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
+        put(MsgSetExtendedBolusStart())     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
+        put(MsgError())                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgPCCommStart())               // 0x3001 CMD_CONNECT
+        put(MsgPCCommStop())                // 0x3002 CMD_DISCONNECT
+        put(MsgHistoryBolus())              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin())       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose())            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm())              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryError())              // 0x3106 CMD_HISTORY_ERROR
+        put(MsgHistoryCarbo())              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgHistoryRefill())             // 0x3108 CMD_HISTORY_REFILL
+        put(MsgHistorySuspend())            // 0x3109 CMD_HISTORY_SUSPEND
+        put(MsgHistoryBasalHour())          // 0x310A CMD_HISTORY_BASAL_HOUR
+        put(MsgHistoryDone())               // 0x31F1 CMD_HISTORY_DONT_USED
+        put(MsgSettingBasal())              // 0x3202 CMD_SETTING_V_BASAL_INS_I
+        put(MsgSettingMeal())               // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
+        put(MsgSettingProfileRatios())      // 0x3204 CMD_SETTING_V_CCC_I
+        put(MsgSettingMaxValues())          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
+        put(MsgSettingBasalProfileAll())    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
+        put(MsgSettingShippingInfo())       // 0x3207 CMD_SETTING_V_SHIPPING_I
+        put(MsgSettingGlucose())            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
+        put(MsgSettingPumpTime())           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSettingUserOptions())        // 0x320B CMD_SETTING_V_USER_OPTIONS
+        put(MsgSettingActiveProfile())      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
+        put(MsgSettingProfileRatiosAll())   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
+        put(MsgSetSingleBasalProfile())     // 0x3302 CMD_SETTING_BASAL_INS_S
+        put(MsgSetBasalProfile())           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
+        put(MsgSetUserOptions())            // 0x330B CMD_SETTING_USER_OPTIONS_S
+        put(MsgSetActivateBasalProfile())   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
+        put(MsgHistoryAllDone())            // 0x41F1 CMD_HISTORY_ALL_DONE
+        put(MsgHistoryAll())                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryNewDone())            // 0x42F1 CMD_HISTORY_NEW_DONE
+        put(MsgHistoryNew())                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgCheckValue_v2())             // 0xF0F1 CMD_PUMP_CHECK_VALUE
+        put(MsgStatusAPS_v2())              // 0xE001 CMD_PUMPSTATUS_APS
+        put(MsgSetAPSTempBasalStart_v2())   // 0xE002 CMD_PUMPSET_APSTEMP
+        put(MsgHistoryEvents_v2())          // 0xE003 CMD_GET_HISTORY
+        put(MsgSetHistoryEntry_v2())        // 0xE004 CMD_SET_HISTORY_ENTRY
+    }
+
+    override fun put(message: MessageBase) {
+        messages[message.command] = message
+    }
+
+    override fun findMessage(command: Int): MessageBase {
+        return messages[command] ?: MessageBase()
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_v2.java
deleted file mode 100644
index 66376290af..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_v2.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import java.util.HashMap;
-
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.*;
-
-
-/**
- * Created by mike on 28.05.2016.
- */
-public class MessageHashTable_v2 {
-    public static HashMap<Integer, MessageBase> messages = null;
-
-    static {
-        if (messages == null) {
-            messages = new HashMap<Integer, MessageBase>();
-            put(new MsgBolusStop());                 // 0x0101 CMD_MEALINS_STOP
-            put(new MsgBolusStart());                // 0x0102 CMD_MEALINS_START_DATA
-            put(new MsgBolusStartWithSpeed());       // 0x0104 CMD_MEALINS_START_DATA_SPEED
-            put(new MsgBolusProgress());             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
-            put(new MsgStatusProfile());             // 0x0204 CMD_PUMP_CALCULATION_SETTING
-
-            put(new MsgStatusTempBasal_v2());        // 0x0205 CMD_PUMP_EXERCISE_MODE
-            put(new MsgStatusBolusExtended_v2());    // 0x0207 CMD_PUMP_EXPANS_INS_I
-
-            put(new MsgStatusBasic());               // 0x020A CMD_PUMP_INITVIEW_I
-            put(new MsgStatus());                    // 0x020B CMD_PUMP_STATUS
-            put(new MsgInitConnStatusTime());        // 0x0301 CMD_PUMPINIT_TIME_INFO
-            put(new MsgInitConnStatusBolus());       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
-            put(new MsgInitConnStatusBasic());       // 0x0303 CMD_PUMPINIT_INIT_INFO
-            put(new MsgInitConnStatusOption());      // 0x0304 CMD_PUMPINIT_OPTION
-            put(new MsgSetTempBasalStart());         // 0x0401 CMD_PUMPSET_EXERCISE_S
-            put(new MsgSetCarbsEntry());             // 0x0402 CMD_PUMPSET_HIS_S
-            put(new MsgSetTempBasalStop());          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
-            put(new MsgSetExtendedBolusStop());      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
-            put(new MsgSetExtendedBolusStart());     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-            put(new MsgError());                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
-            put(new MsgPCCommStart());               // 0x3001 CMD_CONNECT
-            put(new MsgPCCommStop());                // 0x3002 CMD_DISCONNECT
-            put(new MsgHistoryBolus());              // 0x3101 CMD_HISTORY_MEAL_INS
-            put(new MsgHistoryDailyInsulin());       // 0x3102 CMD_HISTORY_DAY_INS
-            put(new MsgHistoryGlucose());            // 0x3104 CMD_HISTORY_GLUCOSE
-            put(new MsgHistoryAlarm());              // 0x3105 CMD_HISTORY_ALARM
-            put(new MsgHistoryError());              // 0x3106 CMD_HISTORY_ERROR
-            put(new MsgHistoryCarbo());              // 0x3107 CMD_HISTORY_CARBOHY
-            put(new MsgHistoryRefill());             // 0x3108 CMD_HISTORY_REFILL
-            put(new MsgHistorySuspend());            // 0x3109 CMD_HISTORY_SUSPEND
-            put(new MsgHistoryBasalHour());          // 0x310A CMD_HISTORY_BASAL_HOUR
-            put(new MsgHistoryDone());               // 0x31F1 CMD_HISTORY_DONT_USED
-            put(new MsgSettingBasal());              // 0x3202 CMD_SETTING_V_BASAL_INS_I
-            put(new MsgSettingMeal());               // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
-            put(new MsgSettingProfileRatios());      // 0x3204 CMD_SETTING_V_CCC_I
-            put(new MsgSettingMaxValues());          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
-            put(new MsgSettingBasalProfileAll());    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
-            put(new MsgSettingShippingInfo());       // 0x3207 CMD_SETTING_V_SHIPPING_I
-            put(new MsgSettingGlucose());            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-            put(new MsgSettingPumpTime());           // 0x320A CMD_SETTING_V_TIME_I
-            put(new MsgSettingUserOptions());        // 0x320B CMD_SETTING_V_USER_OPTIONS
-            put(new MsgSettingActiveProfile());      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
-            put(new MsgSettingProfileRatiosAll());   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
-            put(new MsgSetSingleBasalProfile());     // 0x3302 CMD_SETTING_BASAL_INS_S
-            put(new MsgSetBasalProfile());           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
-            put(new MsgSetUserOptions());            // 0x330B CMD_SETTING_USER_OPTIONS_S
-            put(new MsgSetActivateBasalProfile());   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
-            put(new MsgHistoryAllDone());            // 0x41F1 CMD_HISTORY_ALL_DONE
-            put(new MsgHistoryAll());                // 0x41F2 CMD_HISTORY_ALL
-            put(new MsgHistoryNewDone());            // 0x42F1 CMD_HISTORY_NEW_DONE
-            put(new MsgHistoryNew());                // 0x42F2 CMD_HISTORY_NEW
-            put(new MsgCheckValue_v2());             // 0xF0F1 CMD_PUMP_CHECK_VALUE
-            put(new MsgStatusAPS_v2());              // 0xE001 CMD_PUMPSTATUS_APS
-            put(new MsgSetAPSTempBasalStart_v2());   // 0xE002 CMD_PUMPSET_APSTEMP
-            put(new MsgHistoryEvents_v2());          // 0xE003 CMD_GET_HISTORY
-            put(new MsgSetHistoryEntry_v2());        // 0xE004 CMD_SET_HISTORY_ENTRY
-        }
-    }
-
-    public static void put(MessageBase message) {
-        int command = message.getCommand();
-        //String name = MessageOriginalNames.getName(command);
-        messages.put(command, message);
-        //log.debug(String.format("%04x ", command) + " " + name);
-    }
-
-    public static MessageBase findMessage(Integer command) {
-        if (messages.containsKey(command)) {
-            return messages.get(command);
-        } else {
-            return new MessageBase();
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
index 235e7d3bd3..c6a62ae908 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
@@ -33,6 +33,7 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotifi
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
+import info.nightscout.androidaps.plugins.pump.danaR.SerialIOThread;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusProgress;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStart;
@@ -62,7 +63,7 @@ import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBasic;
 import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService;
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.pump.danaRv2.SerialIOThread;
+import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MessageHashTableRv2;
 import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgCheckValue_v2;
 import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgHistoryEvents_v2;
 import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgSetAPSTempBasalStart_v2;
@@ -147,7 +148,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                 if (mSerialIOThread != null) {
                     mSerialIOThread.disconnect("Recreate SerialIOThread");
                 }
-                mSerialIOThread = new SerialIOThread(mRfcommSocket);
+                mSerialIOThread = new SerialIOThread(mRfcommSocket, MessageHashTableRv2.INSTANCE);
                 mHandshakeInProgress = true;
                 MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.HANDSHAKING, 0));
             }
@@ -195,6 +196,15 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
 
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.gs(R.string.gettingpumptime)));
             mSerialIOThread.sendMessage(new MsgSettingPumpTime());
+            if (danaRPump.pumpTime == 0) {
+                // initial handshake was not successfull
+                // deinitialize pump
+                danaRPump.lastConnection = 0;
+                danaRPump.lastSettingsRead = 0;
+                RxBus.INSTANCE.send(new EventDanaRNewStatus());
+                MainApp.bus().post(new EventInitializationChanged());
+                return;
+            }
             long timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L;
             if (L.isEnabled(L.PUMP))
                 log.debug("Pump time difference: " + timeDiff + " seconds");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
index 27bd436364..2562ac9376 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
@@ -703,7 +703,6 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
                 // create message
                 PumpMessage msg;
 
-                // if (bodyData == null)
                 msg = makePumpMessage(commandType);
 
                 // send and wait for response
@@ -718,8 +717,6 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
 
                 byte[] data = null;
 
-                int runs = 1;
-
                 if (check == null) {
 
                     data = response.getRawContentOfFrame();
@@ -728,24 +725,21 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
 
                     while (checkIfWeHaveMoreData(commandType, response, data)) {
 
-                        runs++;
-
-                        PumpMessage response2 = sendAndListen(ackMsg, DEFAULT_TIMEOUT + (DEFAULT_TIMEOUT * retries));
+                        response = sendAndListen(ackMsg, DEFAULT_TIMEOUT + (DEFAULT_TIMEOUT * retries));
 
 //                        LOG.debug("{} Response: {}", runs, HexDump.toHexStringDisplayable(response2.getRawContent()));
 //                        LOG.debug("{} Response: {}", runs,
 //                            HexDump.toHexStringDisplayable(response2.getMessageBody().getTxData()));
 
-                        String check2 = checkResponseContent(response2, commandType.commandDescription, 1);
+                        String check2 = checkResponseContent(response, commandType.commandDescription, 1);
 
                         if (check2 == null) {
 
-                            data = ByteUtil.concat(data, response2.getRawContentOfFrame());
+                            data = ByteUtil.concat(data, response.getRawContentOfFrame());
 
                         } else {
                             this.errorMessage = check2;
-                            if (isLogEnabled())
-                                LOG.debug("Error message: " + check2);
+                            LOG.error("Error with response got GetProfile: " + check2);
                         }
                     }
 
@@ -784,12 +778,11 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
         if (commandType == MedtronicCommandType.GetBasalProfileSTD || //
                 commandType == MedtronicCommandType.GetBasalProfileA || //
                 commandType == MedtronicCommandType.GetBasalProfileB) {
-            byte[] responseRaw = response.getRawContent();
+            byte[] responseRaw = response.getRawContentOfFrame();
 
             int last = responseRaw.length - 1;
 
-            if (isLogEnabled())
-                LOG.debug("Length: " + data.length);
+            LOG.debug("Length: " + data.length);
 
             if (data.length >= BasalProfile.MAX_RAW_DATA_SIZE) {
                 return false;
@@ -954,7 +947,7 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
                 LOG.warn("Error getting response from RileyLink (error={}, retry={})", e.getMessage(), retries + 1);
             }
 
-            if (responseMessage!=null)
+            if (responseMessage != null)
                 LOG.warn("Set Basal Profile: Invalid response: commandType={},rawData={}", responseMessage.commandType, ByteUtil.shortHexString(responseMessage.getRawContent()));
             else
                 LOG.warn("Set Basal Profile: Null response.");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
index ab61c2f67e..4d81d81bfe 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
@@ -22,6 +22,8 @@ public class PumpMessage implements RLMessage {
     public MessageBody messageBody = new MessageBody();
     public String error = null;
 
+    public static final int FRAME_DATA_LENGTH = 64;
+
 
     public PumpMessage(String error) {
         this.error = error;
@@ -129,9 +131,10 @@ public class PumpMessage implements RLMessage {
         return arrayOut;
     }
 
+
     public byte[] getRawContentOfFrame() {
-        byte[] raw = getRawContent();
-        return ByteUtil.substring(raw, 0, raw.length - 1);
+        byte[] raw = messageBody.getTxData();
+        return ByteUtil.substring(raw, 1, Math.min(FRAME_DATA_LENGTH, raw.length - 1));
     }
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.java
index 174405dc7b..f13974999b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.java
@@ -105,9 +105,9 @@ public enum MedtronicDeviceType {
     }
 
 
-    public static boolean isLargerFormat(MedtronicDeviceType model) {
-        return isSameDevice(model, Medtronic_523andHigher);
-    }
+//    public static boolean isLargerFormat(MedtronicDeviceType model) {
+//        return isSameDevice(model, Medtronic_523andHigher);
+//    }
 
 
     public boolean isFamily() {
@@ -120,13 +120,17 @@ public enum MedtronicDeviceType {
     }
 
 
-    public boolean isLargerFormat() {
+//    public boolean isLargerFormat() {
+//        return isSameDevice(this, Medtronic_523andHigher);
+//    }
+
+    public boolean isMedtronic_523orHigher() {
         return isSameDevice(this, Medtronic_523andHigher);
     }
 
 
     public int getBolusStrokes() {
-        return (isLargerFormat(this)) ? 40 : 10;
+        return (isMedtronic_523orHigher()) ? 40 : 10;
     }
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/dialogs/WizardInfoDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/dialogs/WizardInfoDialog.kt
index 4e77a8f758..c65c75c00e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/dialogs/WizardInfoDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/dialogs/WizardInfoDialog.kt
@@ -21,7 +21,7 @@ class WizardInfoDialog : DialogFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
-        dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
+        dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
         isCancelable = true
         return inflater.inflate(R.layout.treatments_wizardinfo_dialog, container, false)
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileViewerDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileViewerDialog.kt
index 0d09f60755..a27ebfb656 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileViewerDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileViewerDialog.kt
@@ -84,7 +84,7 @@ class ProfileViewerDialog : DialogFragment() {
     }
 
     override fun onResume() {
-        dialog.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+        dialog?.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
         super.onResume()
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.kt b/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.kt
index 598616f1bf..11e8f7a5a9 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/BolusWizard.kt
@@ -241,8 +241,10 @@ class BolusWizard @JvmOverloads constructor(val profile: Profile,
     private fun confirmMessageAfterConstraints(pump: PumpInterface): String {
 
         var confirmMessage = MainApp.gs(R.string.entertreatmentquestion)
-        if (insulinAfterConstraints > 0)
-            confirmMessage += "<br/>" + MainApp.gs(R.string.bolus) + ": " + "<font color='" + MainApp.gc(R.color.bolus) + "'>" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints) + "U" + "</font>"
+        if (insulinAfterConstraints > 0) {
+            val pct = if (percentageCorrection != 100.0) " (" + percentageCorrection.toInt() + "%)" else ""
+            confirmMessage += "<br/>" + MainApp.gs(R.string.bolus) + ": " + "<font color='" + MainApp.gc(R.color.bolus) + "'>" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints) + "U" + pct + "</font>"
+        }
         if (carbs > 0) {
             var timeShift = ""
             if (carbTime > 0) {
@@ -253,7 +255,7 @@ class BolusWizard @JvmOverloads constructor(val profile: Profile,
             confirmMessage += "<br/>" + MainApp.gs(R.string.carbs) + ": " + "<font color='" + MainApp.gc(R.color.carbs) + "'>" + carbs + "g" + timeShift + "</font>"
         }
         if (insulinFromCOB > 0) {
-            confirmMessage += "<br/>" + MainApp.gs(R.string.insulinFromCob, MainApp.gc(R.color.cobAlert), cob, insulinFromCOB)
+            confirmMessage += "<br/>" + MainApp.gs(R.string.insulinFromCob, MainApp.gc(R.color.cobAlert), insulinFromBolusIOB + insulinFromBasalsIOB + insulinFromCOB + insulinFromBG)
             val absorptionRate = IobCobCalculatorPlugin.getPlugin().slowAbsorptionPercentage(60)
             if (absorptionRate > .25)
                 confirmMessage += "<br/>" + MainApp.gs(R.string.slowabsorptiondetected, MainApp.gc(R.color.cobAlert), (absorptionRate * 100).toInt())
diff --git a/app/src/main/res/values-af-rZA/exam.xml b/app/src/main/res/values-af-rZA/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-af-rZA/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index 218137bd17..0fd0888377 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -317,19 +317,6 @@
     <string name="overview_bolusprogress_goingtodeliver">Gaan %1$.2fU lewer</string>
     <string name="objectives_0_objective">Opstel van visualisering en monitering, en ontleed basale en verhoudings</string>
     <string name="objectives_0_gate">Verifieer dat BG beskikbaar is in Nightscout, en dat pomp insulien data opgelaai word</string>
-    <string name="objectives_openloop_objective">Begin op \'n oop lus</string>
-    <string name="objectives_openloop_gate">Loop in oop lus modus vir \'n paar dae en boots met hand met baie tydelike basale. Stel tydelike gebruik en verstek tydelike teikens (bv. vir aktiwiteit of hipo behandeling koolhidrate)</string>
-    <string name="objectives_maxbasal_objective">Verstaan jou oop lus, insluitend sy tydelike basale aanbevelings</string>
-    <string name="objectives_maxbasal_gate">Gebaseer op daardie ervaring, besluit watter maks basale moet gebruik word, en stel dit op die pomp en voorkeure</string>
-    <string name="objectives_maxiobzero_objective">Begin toe die lus met lae glukose opgeskort</string>
-    <string name="objectives_maxiobzero_gate">Loop in geslote lus met max IAB = 0 vir \'n paar dae sonder te veel LGS gebeure</string>
-    <string name="objectives_maxiob_objective">Verstel die geslote lus, verhoog maks IAB bo 0 en geleidelik verlaag BG doelwitte</string>
-    <string name="objectives_maxiob_gate">Lus vir \'n paar dae, en ten minste een nag met geen lae BG alarms, voor BG val</string>
-    <string name="objectives_autosens_objective">Pas basale en verhoudings aan as nodig, en dan aktiveer auto-sens</string>
-    <string name="objectives_autosens_gate">1 week suksesvolle dagtyd lus met gereelde karb toevoegings</string>
-    <string name="objectives_ama_objective">Skakel bykomende nutsfunskies aan vir bedagse gebruik, soos bv advanced meal assist</string>
-    <string name="objectives_smb_objective">Skakel bykomende nutsfunskies aan vir bedags gebruik, soos bv. SMB</string>
-    <string name="objectives_smb_gate">Jy moet asb die wiki lees en verhoog maksIAB om SMBs te laat werk! \'n Goeie begin is maksIAB = gemiddelde ete bolus + 3 x maks daaglikse basale</string>
     <string name="youareonallowedlimit">Die toegelate limiet is bereik</string>
     <string name="noprofileselected">Geen profiel gekies</string>
     <string name="smscommunicator_loophasbeendisabled">Loop is gedeaktiveer</string>
@@ -563,7 +550,6 @@
     <string name="enablesuperbolus">Ontsper superbolus in Ghoeroe</string>
     <string name="enablesuperbolus_summary">Ontsper superbolus funksionaliteit in Ghoeroe. Moenie aktiveer totdat jy leer wat dit werklik doen. DIT KAN \'n INSULIEN OORDOSIS VEROORSAAK AS BLINDELINGS GEBRUIK WORD!</string>
     <string name="show_statuslights">Wys status vlae op tuisskerm</string>
-    <string name="show_statuslights_summary">Wys status vlae vir cage, iage, sage, stoor en battery vlak op tuisskerm.</string>
     <string name="statuslights_res_warning">Drempel waarskuwings stoor vlak [U]</string>
     <string name="statuslights_res_critical">Drempel kritieke stoor vlak [U]</string>
     <string name="statuslights_bat_warning">Drempel waarskuwing battery vlak [%%]</string>
@@ -637,7 +623,6 @@
     <string name="mdtp_cancel">Kanselleer</string>
     <string name="notloadedplugins">Nie alle profiele gelaai!</string>
     <string name="valuesnotstored">Waardes nie gestoor!</string>
-    <string name="ns_localbroadcasts">Ontsper uitsaai na ander toepassings (soos xDrip).</string>
     <string name="ns_localbroadcasts_title">Aktiveer plaaslike Uitsaai.</string>
     <string name="careportal_activity_label">AKTIWITEIT &amp; TERUGVOER</string>
     <string name="careportal_carbsandbolus_label">KARBS &amp; BOLUS</string>
@@ -1293,7 +1278,6 @@
     <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 -->
@@ -1363,7 +1347,6 @@
     <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="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="reservoirvalue">%1$.0f / %2$d U</string>
     <plurals name="objective_days">
diff --git a/app/src/main/res/values-bg-rBG/exam.xml b/app/src/main/res/values-bg-rBG/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-bg-rBG/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index f27b5de8d4..0d89d0b8b0 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -34,6 +34,7 @@
     <string name="description_smb">Най-новият алгоритъм (само за напреднали потребители)</string>
     <string name="description_overview">Показва текущото състояние на вашия APS и бутони за най-често използваните действия</string>
     <string name="description_persistent_notification">Показва известие с резюме на това, което прави вашия APS</string>
+    <string name="description_profile_local">Този тип профил е достъпен в офлайн режим.</string>
     <string name="description_profile_nightscout">Работа с профила, които сте дефинирали в Nightscout</string>
     <string name="description_profile_simple">Работа с профил със само една стойност за всички часове.</string>
     <string name="description_pump_combo">Поддръжка за Accu-Chek Combo помпи, изискваща инсталиран ruffy</string>
@@ -319,18 +320,18 @@
     <string name="objectives_0_objective">Настройка на визуализацията и наблюдението, а също и анализиране на базалните нужди и коефициенти</string>
     <string name="objectives_0_gate">Потвърждаване, че КЗ е достъпна в Найтскаут и данните за помпата се качват там</string>
     <string name="objectives_openloop_objective">Стартиране в режим Отворен кръг (Open loop)</string>
-    <string name="objectives_openloop_gate">Работа в режим \"Отворен кръг\" за няколко дни и ръчно въвеждане на много временни базали. Настройте и използвайте временни и стандартни временни цели (напр. за активни или хипо-третирани въглехидрати)</string>
+    <string name="objectives_openloop_gate">Работа в режим \"Отворен кръг\" за няколко дни и ръчно въвеждане на много временни базали. Настройте и използвайте временни и стандартни временни цели (напр. за активни въглехидрати или такива при хипо)</string>
     <string name="objectives_maxbasal_objective">Опитайте се да разбирате по-добре вашият APS в режим \"Отворен кръг\", включително препоръчваните временни базали</string>
     <string name="objectives_maxbasal_gate">Определяне на макс. лимит на базалния инсулин и настройване в помпата и програмата</string>
     <string name="objectives_maxiobzero_objective">Стартиране на \"Затворен кръг\" с изключване на базал при ниска КЗ</string>
     <string name="objectives_maxiobzero_gate">Стартиране на \"Затворен кръг\" с макс. IOB=0 без твърде много събития тип ниска КЗ</string>
     <string name="objectives_maxiob_objective">Настройване на \"Затворен кръг\" чрез повишаване на максималният IOB над 0 и понижаване на целевите нива на КЗ</string>
-    <string name="objectives_maxiob_gate">Прекарайте няколко дни по този начин, като поне една нощ нямате аларма за ниска КЗ.</string>
+    <string name="objectives_maxiob_gate">Прекарайте няколко дни по този начин, като поне една нощ нямате аларма за ниска КЗ</string>
     <string name="objectives_autosens_objective">Настройване на базалния инсулин и коефициенти ако е необходимо и активиране на auto-sens</string>
     <string name="objectives_autosens_gate">Една седмица успешно дневно използване с редовно въвеждане на въглехидрати</string>
     <string name="objectives_ama_objective">Активиране на допълнителни функции за дневно използване, включително и advanced meal assist (АМА)</string>
     <string name="objectives_smb_objective">Добавяне на допълнителни функции за използване през деня, като SMB</string>
-    <string name="objectives_smb_gate">Вие трябва да прочетете wiki и увеличите maxIOB за да може SMB да работи добре! Добро начало е maxIOB = средния болус за хранене + 3 x най-големия базал от профила</string>
+    <string name="objectives_smb_gate">Трябва да прочетете wiki и увеличите maxIOB за да може SMB да работи добре! Добро начало е maxIOB = средния болус за хранене + 3 x най-големия базал от профила</string>
     <string name="youareonallowedlimit">Достигнахте лимита</string>
     <string name="noprofileselected">Няма избран профил</string>
     <string name="smscommunicator_loophasbeendisabled">APS е деактивиран</string>
@@ -564,7 +565,8 @@
     <string name="enablesuperbolus">Разреши използването на Суперболус</string>
     <string name="enablesuperbolus_summary">Разреши функцията суперболус в съветника. Не я разрешавайте докато не научите какво наистина прави. ТОВА МОЖЕ ДА СЪЗДАДЕ ОПАСНОСТ ОТ ПРЕДОЗИРАНЕ С ИНСУЛИН.</string>
     <string name="show_statuslights">Покажи статус светлини на началния екран</string>
-    <string name="show_statuslights_summary">Покажи статус светлини за канула, инсулин, сензор, резервоар и батерията на началния екран.</string>
+    <string name="show_statuslights_extended">Покажи статус светлини с подробности на началния екран</string>
+    <string name="show_statuslights_extended_summary">Показвай подробни статус светлини за канула, инсулин, сензор, резервоар и батерията на началния екран.</string>
     <string name="statuslights_res_warning">Ниво за аларма за останал инсулин в резервоара [Е]</string>
     <string name="statuslights_res_critical">Критично ниво на останал инсулин в резервоар [Е]</string>
     <string name="statuslights_bat_warning">Ниско ниво на батерията под [%%]</string>
@@ -638,7 +640,7 @@
     <string name="mdtp_cancel">Откажи</string>
     <string name="notloadedplugins">Не всички профили са заредени!</string>
     <string name="valuesnotstored">Стойностите не са запазени!</string>
-    <string name="ns_localbroadcasts">Разреши предаване към други приложения (напр. xDrip)</string>
+    <string name="ns_localbroadcasts">Включете излъчване към други приложения (като xDrip). Не включвайте, ако имате повече от един AAPS или имате инсталиран NSClient!</string>
     <string name="ns_localbroadcasts_title">Разреши локално предаване на данни</string>
     <string name="careportal_activity_label">АКТИВНОСТ И ОБРАТНА ВРЪЗКА</string>
     <string name="careportal_carbsandbolus_label">ХРАНА И БОЛУС</string>
@@ -950,6 +952,7 @@
     <string name="sensitivitysetup">Конфигуриране на модул за чувствителност</string>
     <string name="setupwizard_sensitivity_description">Модула за чувствителност се използва за определяне на чувствителността и COB изчисления. За повече информация посетете:</string>
     <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
+    <string name="nsclientinfotext">NSClient поддържа връзка с Nightscout. Можете да пропуснете тази настройка сега, но вие няма можете да преминете целите, докато не го настроите.</string>
     <string name="diawarning">Моля, не забравяйте: нови инсулин профили изискват време на действие на инсулиина - DIA от поне 5ч. DIA 5-6ч на нов профил е равно на DIA 3ч при стари инсулин профили.</string>
     <string name="bgsourcesetup">Конфигуриране на източник на КЗ</string>
     <string name="setupwizard_profile_description">Моля изберете вид профил. Ако пациентът е дете, трябва да използвате NS профил. Ако никой освен Вас не ви проследява в Nightscout вероятно ще предпочетете Локален профил. Моля, не забравяйте, че тук само избирате източника на профил. За да го използвате трябва да го активирате с натискане на \"Смяна на профила\"</string>
@@ -1123,7 +1126,7 @@
     <string name="glucoseisnotavailable">КЗ не е достъпна</string>
     <string name="glucosecomparedmgdl">КЗ %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">КЗ %1$s %2$.1f %3$s</string>
-    <string name="percentagecompared">Профил проц %1$s %2$d</string>
+    <string name="percentagecompared">Профил процент %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
     <string name="and">И</string>
     <string name="or">или</string>
@@ -1213,8 +1216,8 @@
     <string name="autosenscompared">Аутосенс %1$s %2$s %%</string>
     <string name="autosenslabel">Аутосенс %</string>
     <string name="deltacompared">%3$s %1$s %2$s</string>
-    <string name="deltalabel">Разлика в кръвната захар</string>
-    <string name="deltalabel_u">Разлика в кръвната захар [%1$s]</string>
+    <string name="deltalabel">Изменение в кръвната захар</string>
+    <string name="deltalabel_u">Изменение в кръвната захар [%1$s]</string>
     <string name="currentlocation">Текущото местоположение</string>
     <string name="location">Местоположение</string>
     <string name="latitude_short">Ширина:</string>
@@ -1232,7 +1235,7 @@
     <string name="please_choose_a_trigger_type">Моля изберете условие:</string>
     <string name="triggers">Активиращи условия:</string>
     <string name="remove_label">ИЗТРИИ</string>
-    <string name="preconditions">Предварителни:</string>
+    <string name="preconditions">Предварителни условия:</string>
     <!-- Pump Abstract -->
     <string name="pump_operation_not_supported_by_pump_driver">Неподдържана операция.</string>
     <string name="pump_operation_not_yet_supported_by_pump">Операцията не се поддържа от помпата (ВСЕ ОЩЕ).</string>
@@ -1365,13 +1368,35 @@
     <string name="medtronic_cmd_desc_get_tbr">Получи временния базал</string>
     <string name="medtronic_cmd_desc_set_tbr">Приложи временен базал</string>
     <string name="medtronic_cmd_desc_set_bolus">Стартирай болус</string>
-    <string name="insulinFromCob"><![CDATA[Инсулин за въгл: <font color=\'%1$s\'>%2$.1fг %3$.2fЕ</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%% от времето. Проверете въведените данни. Може да има голяма грешка !!!!!</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d Е</string>
     <string name="partialboluswizard">Стартирай част от резултата в калкулатора [%]</string>
     <string name="deliverpartofboluswizard">Калкулатора изчислява нужния инсулин, но само тази част ще бъде доставена. Полезно със SMB алгоритъма.</string>
     <string name="loading">Зареждане ...</string>
+    <string name="snooze">Отложи</string>
+    <string name="accomplished">Изпълнено: %1$s</string>
+    <string name="objectives_usage_objective">Научете се да управлявате AndroidAPS</string>
+    <string name="objectives_usage_gate">Извършете различни действия в AndroidAPS</string>
+    <string name="objectives_useprofileswitch">Настройте профила на 90% за 10 минути (задръжте върху името на профила в таб Общ)</string>
+    <string name="objectives_usedisconnectpump">Симулирайте душ. Изключете помпата за 1 час (задръжте върху Отворен кръг)</string>
+    <string name="objectives_usereconnectpump">... и отново я свържете по същия начин</string>
+    <string name="objectives_usetemptarget">Създаване на различна временна цел с продължителност 10 мин. (задръжте върху сегашната си цел)</string>
+    <string name="objectives_useactions">В Конфигурация включете плъгин Действия и го направете видим, след което го изберете от списъка с табове.</string>
+    <string name="objectives_useloop">Отворете съдържанието на Цикъл плъгина.</string>
+    <string name="objectives_usescale">Използвайте функцията за удължаване на периода на графиката, като задържите върху нея.</string>
+    <string name="objectives_button_enter">Въведи</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Въведете кода, получен от разработчиците да прескочите останалите цели</string>
+    <string name="codeaccepted">Код приет!</string>
+    <string name="codeinvalid">Неправилен код</string>
+    <string name="objectives_exam_objective">Докажете знанията си</string>
+    <string name="objectives_exam_gate">Отговорете правилно на въпросите</string>
+    <string name="answerdisabledto">Изключено до: %1$s</string>
+    <string name="wronganswer">Грешен отговор!</string>
+    <string name="unfinshed_button">Следващия неотговорен</string>
+    <string name="close">Затвори</string>
+    <string name="requestcode">Код (request code): %1$s</string>
+    <string name="objectives_hint">(отбележете всички правилни отговори)</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d дeн</item>
         <item quantity="other">%1$d дни</item>
diff --git a/app/src/main/res/values-cs-rCZ/exam.xml b/app/src/main/res/values-cs-rCZ/exam.xml
new file mode 100644
index 0000000000..503870e0b7
--- /dev/null
+++ b/app/src/main/res/values-cs-rCZ/exam.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="dia_whatmeansdia">Co je pravda o DIA?</string>
+    <string name="dia_label">Téma: Doba trvání účinku inzulínu</string>
+    <string name="dia_minimumis3h">Předem stanovené minimum je 3 hodiny.</string>
+    <string name="dia_minimumis5h">Předem stanovené minimum je 5 hodin.</string>
+    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Configuration/Config-Builder.html#inzulin</string>
+    <string name="dia_meaningisequaltodiapump">Je rovno parametru DIA používaném ve vaší pumpě.</string>
+    <string name="dia_valuemustbedetermined">Musíte určit svou individuální hodnotu (ale ne méně než 5 hodin).</string>
+    <string name="hypott_label">Téma: Dočasný cíl Hypoglykémie</string>
+    <string name="hypott_whenhypott">Proč je užitečné nastavit dočasný cíl pro hypoglykémii?</string>
+    <string name="hypott_goinglow">Prevence nízké glykémie.</string>
+    <string name="hypott_havinglow">Pomoci zotavit se z nízké glykémie.</string>
+    <string name="hypott_preventoversmb">Aby se po vzestupu glykémie z rychlých sacharidů po řešení hypoglykémie zabránilo vydávání SMB.</string>
+    <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/temptarget.html</string>
+    <string name="offlineprofile_whatprofile">Který profil lze použít a konfigurovat offline?</string>
+    <string name="offlineprofile_label">Téma: Offline profil</string>
+    <string name="offlineprofile_nsprofile">NS profil může být použit, ale ne nastaven.</string>
+    <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Configuration/Config-Builder.html#profile</string>
+    <string name="pumpdisconnect_label">Téma: Odpojení od pumpy</string>
+    <string name="pumpdisconnect_whattodo">Co dělat, když sundáte pumpu?</string>
+    <string name="pumpdisconnect_letknow">Klikněte na možnost Odpojit pumpu a dejte smyčce vědět, že do vašeho těla nebude dodáván inzulín.</string>
+    <string name="pumpdisconnect_dontchnage">Ve smyčce nic neměňte, jen odpojte pumpu.</string>
+    <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#dalsi-nastaveni</string>
+    <string name="objectives_label">Téma: Nastavení AndroidAPS</string>
+    <string name="objectives_howtosave">Jaké jsou nejlepší postupy pro zálohování vašich nastavení?</string>
+    <string name="objectives_exportsettings">Exportovat je lokálně z nabídky Údržba.</string>
+    <string name="objectives_storeelsewhere">Uložte exportovaný soubor do jiného umístění, např. e-mail, Dropbox, Disk Google…</string>
+    <string name="objectives_doexportonstart">Exportovat je ihned po instalaci AAPS.</string>
+    <string name="objectives_doexportafterchange">Exportovat je po každé změně nastavení.</string>
+    <string name="objectives_doexportafterfirtssettings">Exportovat je, jakmile dokončíte počáteční nastavení.</string>
+    <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/ExportImportSettings.html</string>
+    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#jake-vybaveni-pro-pripad-nouze-se-doporucuje-brat-s-sebou</string>
+    <string name="noisycgm_label">Téma: Šum dat ze senzoru</string>
+    <string name="noisycgm_whattodo">Co dělat, když vidíte, že hodnoty CGM poskakují?</string>
+    <string name="nothing">Nic, smyčka se s tím vypořádá.</string>
+    <string name="noisycgm_pause">Pozastavte uzavřenou smyčku, abyste předešli předávkování.</string>
+    <string name="noisycgm_replacesensor">Vyměňte senzor.</string>
+    <string name="noisycgm_turnoffphone">Vypnout telefon.</string>
+    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#vyhlazovani-zarusenych-dat-glykemii</string>
+    <string name="noisycgm_checksmoothing">Zkontrolujte, zda vaše aplikace CGM vyhlazuje data.</string>
+    <string name="exercise_label">Téma: Cvičení</string>
+    <string name="exercise_whattodo">Jak můžete pomoci systému vypořádat se s cvičením?</string>
+    <string name="exercise_setactivitytt">Nastavit dočasný cíl aktivity.</string>
+    <string name="exercise_switchprofilebelow100">Přepnout na profil pod 100 %.</string>
+    <string name="exercise_switchprofileabove100">Přepnout na profil nad 100 %.</string>
+    <string name="exercise_stoploop">Zastavit smyčku.</string>
+    <string name="exercise_doitbeforestart">Nastavit dočasný cíl aktivity před zahájením cvičení.</string>
+    <string name="exercise_doitafterstart">Nastavit dočasný cíl aktivity po začátku cvičení.</string>
+    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/temptarget.html#docasny-cil-pri-pohybove-aktivite</string>
+    <string name="suspendloop_label">Téma: Pozastavená smyčka</string>
+    <string name="suspendloop_doigetinsulin">Dostávám inzulín, když je smyčka pozastavena?</string>
+    <string name="suspendloop_yes">Ano, běžný bazál.</string>
+    <string name="suspendloop_no">Ne, podávání inzulínu je zastaveno.</string>
+    <string name="basaltest_label">Téma: Testování bazálu, ISF a IC</string>
+    <string name="basaltest_when">Kdy mám ověřit hodnoty bazálů, ISF a IC?</string>
+    <string name="basaltest_beforeloop">Než začnu provozovat smyčku.</string>
+    <string name="basaltest_havingregularhypo">Když mám pravidelné hypoglykémie.</string>
+    <string name="basaltest_havingregularhyper">Když mám pravidelné hyperglykémie.</string>
+    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#nastaveni-androidaps</string>
+    <string name="prerequisites_label">Téma: Nezbytné předpoklady</string>
+    <string name="prerequisites_what">Co potřebuji?</string>
+    <string name="prerequisites_determinedcorrectprofile">Zjistit správný profil (bazály, IC, ISF, DIA).</string>
+    <string name="prerequisites_computer">Počítač pro vytvoření APK.</string>
+    <string name="prerequisites_phone">Podporovaný telefon.</string>
+    <string name="prerequisites_car">Auto.</string>
+    <string name="prerequisites_nightscout">Nightscout, pro splnění cílů.</string>
+    <string name="prerequisites_tidepoolaccount">Účet Tidepool.</string>
+    <string name="prerequisites_googleaccount">Účet Google.</string>
+    <string name="prerequisites_githubaccount">Účet Github.</string>
+    <string name="prerequisites_beanandroiddeveloper">Je třeba být vývojářem pro Android.</string>
+    <string name="prerequisites_own670g">Pumpu MiniMed 670G.</string>
+    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Module/module.html</string>
+    <string name="prerequisites_smartwatch">Chytré hodinky.</string>
+    <string name="prerequisites_supportedcgm">Podporované CGM.</string>
+    <string name="update_label">Téma: Aktualizace AndroidAPS</string>
+    <string name="whatistrue">Co je pravda?</string>
+    <string name="update_git">Musíte mít nainstalován Git.</string>
+    <string name="update_asap">Aktualizovat ihned po uvolnění nové verze.</string>
+    <string name="update_keys">Můžete použít stejné podpisové klíče.</string>
+    <string name="update_neverupdate">Nikdy neaktualizujte, pokud systém funguje dobře.</string>
+    <string name="update_askfriend">Požádejte kamaráda o novou verzi APK.</string>
+    <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Installing-AndroidAPS/Update-to-new-version.html</string>
+    <string name="troubleshooting_label">Téma: Odstraňování problémů</string>
+    <string name="troubleshooting_wheretoask">Kde hledat pomoc?</string>
+    <string name="troubleshooting_fb">Připojte se do facebookové skupiny AndroidAPS.</string>
+    <string name="troubleshooting_wiki">Navštivte AndroidAPS Wiki.</string>
+    <string name="troubleshooting_gitter">Navštivte místnost AndroidAPS na Gitteru.</string>
+    <string name="troubleshooting_googlesupport">Navštivte Google podporu AndroidAPS</string>
+    <string name="troubleshooting_yourendo">Promluvte si se svým diabetologem.</string>
+    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/index.html#poradce-pri-potizich</string>
+    <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
+    <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
+    <string name="insulin_label">Téma: Inzulín</string>
+    <string name="insulin_ultrarapid">Kterou značku inzulínu lze použít s modulem Ultra-Rychlý-Oref?</string>
+    <string name="insulin_fiasp">Fiasp®</string>
+    <string name="insulin_novorapid">NovoRapid®</string>
+    <string name="insulin_humalog">Humalog®</string>
+    <string name="insulin_actrapid">Actrapid®</string>
+    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Configuration/Config-Builder.html#inzulin</string>
+    <string name="sensitivity_label">Téma: Modul citlivosti</string>
+    <string name="sensitivity_which">Který plugin pro detekci citlivosti má uživatelem definovaný časový rozsah pro detekci?</string>
+    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Configuration/Config-Builder.html#detekce-citlivosti</string>
+    <string name="sensitivityuam_which">Který modul citlivosti musí být použit pro funkci UAM (rozpoznání neoznámeného jídla)?</string>
+    <string name="wrongcarbs_label">Téma: Špatně zadané sacharidy</string>
+    <string name="wrongcarbs_whattodo">Vidíte, že jste chybně zadali sacharidy. Co byste měli udělat?</string>
+    <string name="wrongcarbs_treatmentstab">Jděte do Ošetření, smažte špatně zadané sacharidy a vložte nové sacharidy.</string>
+    <string name="wrongcarbs_addfakeinsulin">Přidat falešný inzulin pomocí funkce Doplňování</string>
+    <string name="extendedcarbs_label">Téma: Jídlo s tukem a bílkovinami</string>
+    <string name="extendedcarbs_handling">Co dělat, když jídlo obsahuje vysoké množství tuků a/nebo bílkovin?</string>
+    <string name="extendedcarbs_useextendedcarbs">Přepočítejte tuky a bílkoviny na sacharidy a použijte funkci „Rozložené sacharidy“.</string>
+    <string name="extendedcarbs_add">Přepočítejte tuky a bílkoviny na sacharidy a přidejte je do výpočtu bolusu.</string>
+    <string name="extendedcarbs_useextendedbolus">Použijte prodloužený bolus, abyste pokryli tuky a bílkoviny.</string>
+    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Extended-Carbs.html</string>
+    <string name="nsclient_label">Téma: Monitorování dětí</string>
+    <string name="nsclient_howcanyou">Jak můžete na dálku monitorovat AAPS svého dítěte?</string>
+    <string name="nsclient_nightscout">Pomocí stránky Nightscout.</string>
+    <string name="nsclient_dexcomfollow">Aplikace Dexcom Follow, pokud používáte originální aplikaci Dexcom.</string>
+    <string name="nsclient_dexcomfollowxdrip">Aplikace Dexcom Follow, pokud používáte aplikaci xDrip.</string>
+    <string name="nsclient_xdripfollower">Aplikace xDrip v režimu sledování.</string>
+    <string name="nsclient_looponiphone">Aplikace Loop na iPhone.</string>
+    <string name="nsclient_spikeiphone">Aplikace Spike na iPhone.</string>
+    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Children/Children.html</string>
+    <string name="isf_label">Téma: Citlivost na inzulín</string>
+    <string name="isf_increasingvalue">Zvýšení hodnoty citlivosti bude mít za následek méně vydaného inzulinu, když se budete snažit snížit glykémii pomocí bolusové kalkulačky.</string>
+    <string name="isf_decreasingvalue">Snížení hodnoty citlivosti bude mít za následek méně dodaného inzulinu, když se budete snažit snížit glykémii pomocí bolusové kalkulačky.</string>
+    <string name="isf_noeffect">Změna citlivosti nemá žádný vliv na množství inzulínu, který je vydán prostřednictvím AAPS při pokusu o korekci hyperglykémie.</string>
+    <string name="isf_preferences">Musíte zadat citlivost v Nastavení.</string>
+    <string name="isf_profile">Změna hodnoty citlivosti ve vašem profilu postačuje k tomu, aby se tato změna použila.</string>
+    <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#korekcni-faktor-citlivost-na-inzulin-isf-mmol-l-u-nebo-mg-dl-u</string>
+    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Profiles.html</string>
+    <string name="ic_label">Téma: Hodnota inzulino-sacharidového poměru</string>
+    <string name="ic_increasingvalue">Zvýšení inzulino-sacharidového poměru bude mít za následek méně vydaného inzulinu na stejné množství sacharidů.</string>
+    <string name="ic_decreasingvalue">Snížení hodnoty inzulino-sacharidového poměru bude mít za následek méně vydaného inzulinu na stejné množství sacharidů.</string>
+    <string name="ic_noeffect">Předpokládejme, že máte 0 COB. Změna inzulino-sacharidového poměru povede k jinému množství inzulínu vydanému pro korekci glykémie.</string>
+    <string name="ic_different">Inzulino-sacharidový poměr se bude lišit podle toho, zda počítáte výměnnou jednotku jako 10 g nebo jako 12 g sacharidů.</string>
+    <string name="ic_meaning">Inzulino-sacharidový poměr vyjadřuje: kolik výměnných jednotek pokryje 1 jednotka inzulinu.</string>
+    <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#inzulino-sacharidovy-pomer-cr-g-u</string>
+    <string name="profileswitch_label">Téma: Přepínání profilu</string>
+    <string name="profileswitch_pctwillchange">Když v přepnutí profilu zadáte 90 %…</string>
+    <string name="profileswitch_basalhigher">Bazály budou o 10 % vyšší.</string>
+    <string name="profileswitch_basallower">Bazály budou o 10 % nižší.</string>
+    <string name="profileswitch_ichigher">Hodnota inzulino-sacharidového poměru bude o 10 % vyšší.</string>
+    <string name="profileswitch_iclower">Hodnota inzulino-sacharidového poměru bude o 10 % nižší.</string>
+    <string name="profileswitch_isfhigher">Hodnota citlivosti bude o 10 % vyšší.</string>
+    <string name="profileswitch_isflower">Hodnota citlivosti bude o 10 % nižší.</string>
+    <string name="profileswitch_overall">Celkově dostanete o 10 % inzulinu méně.</string>
+    <string name="profileswitch_targethigher">Cíl bude o 10 % vyšší.</string>
+    <string name="profileswitch_targetlower">Cíl bude o 10 % nižší.</string>
+    <string name="profileswitch_targetbottom">Pouze dolní cíl bude o 10 % nižší.</string>
+    <string name="profileswitch_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Profiles.html?highlight=p%C5%99epnut%C3%AD%20profilu</string>
+    <string name="profileswitchtime_iwant">Chci přepnout profil, protože jsem se musel(a) probudit o 1 h dříve než obvykle, takže dává větší smysl oznámit tuto změnu prostřednictvím časového posunu profilu. Jaké číslo mám použít?</string>
+    <string name="profileswitchtime_1">1</string>
+    <string name="profileswitchtime__1">-1</string>
+    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Profiles.html#posun-casu</string>
+    <string name="profileswitchtime_60">60</string>
+    <string name="profileswitchtime__60">-60</string>
+    <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Module/module.html#spravny-individualni-algoritmus-davkovani-pro-lecbu-vaseho-diabetu</string>
+    <string name="basalhelp_label">Téma: Pomoc s bazály</string>
+    <string name="basalhelp_where">Kam jít pro pomoc s bazály apod.</string>
+    <string name="basalhelp_diabetesteam">K Vašemu lékaři</string>
+    <string name="basalhelp_google">Google</string>
+    <string name="basalhelp_facebook">Facebook</string>
+</resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 2f92358a64..bde8479327 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -321,17 +321,17 @@
     <string name="objectives_0_gate">Zkontrolovat, zda jsou glykémie a údaje z pumpy viditelné v Nightscoutu</string>
     <string name="objectives_openloop_objective">Začít s otevřenou smyčkou</string>
     <string name="objectives_openloop_gate">Provozovat několik dní otevřenou smyčku a ručně potvrzovat doporučené dočasné bazály. Nastavovat a používat dočasné cíle (např. pro sport nebo hypo)</string>
-    <string name="objectives_maxbasal_objective">Porozumět otevřené smyčce a doporučeným dočasným bazálům</string>
+    <string name="objectives_maxbasal_objective">Porozumět otevřené smyčce, včetně jejích doporučení ohledně dočasných bazálů</string>
     <string name="objectives_maxbasal_gate">Na základě předchozích zkušeností rozhodnout, jaký je třeba maximální bazál a nastavit ho v pumpě a v aplikaci</string>
-    <string name="objectives_maxiobzero_objective">Začít uzavřenou smyčku pouze s hlídáním nízké glykémie</string>
+    <string name="objectives_maxiobzero_objective">Spustit uzavřenou smyčku pouze se zastavováním při nízké glykémii</string>
     <string name="objectives_maxiobzero_gate">Spustit uzavřenou smyčku s max IOB = 0 na několik dní s minimem nutných korekcí na nízkou glykémii</string>
     <string name="objectives_maxiob_objective">Zapnout uzavřenou smyčku, zvyšovat max IOB nad 0 a snižovat cílovou glykémii</string>
     <string name="objectives_maxiob_gate">Provozovat smyčku několik dní s alespoň jednou nocí bez alarmů na nízkou glykémii</string>
-    <string name="objectives_autosens_objective">Upravit bazály a koeficienty, když bude potřeba a povolit automatickou detekci citlivosti na inzulín</string>
+    <string name="objectives_autosens_objective">Upravit bazály a poměry, bude-li to potřeba, a povolit automatickou detekci citlivosti na inzulín</string>
     <string name="objectives_autosens_gate">Jeden týden úspěšného používání s běžným příjmem sacharidů</string>
     <string name="objectives_ama_objective">Povolit další funkce pro běžné používání jako AMA</string>
     <string name="objectives_smb_objective">Povolit další funkce pro běžné používání jako SMB</string>
-    <string name="objectives_smb_gate">Přečíst si dokumentaci a zvýšit maximání IOB, aby mohlo SMB fungovat. Pro začátek se dá použít velikost běžného bolusu + 3x maximální denní bazál</string>
+    <string name="objectives_smb_gate">Přečíst si dokumentaci a zvýšit maximální IOB, aby mohlo SMB fungovat. Pro začátek se dá použít velikost běžného bolusu + 3x maximální denní bazál</string>
     <string name="youareonallowedlimit">Dosaženo limitu</string>
     <string name="noprofileselected">Není vybrán žádný profil</string>
     <string name="smscommunicator_loophasbeendisabled">Smyčka byla zakázána</string>
@@ -565,7 +565,8 @@
     <string name="enablesuperbolus">Povolit superbolus</string>
     <string name="enablesuperbolus_summary">Povolení superbolusu v kalkulátoru. Nepovolujte, dokud se nenaučíte, co to opravdu dělá. MŮŽE ZPŮSOBIT PŘEDÁVKOVÁNÍ INZULÍNEM PŘI NESPRÁVNÉM POUŽITÍ!</string>
     <string name="show_statuslights">Zobrazit stavové indikátory na domovské obrazovce</string>
-    <string name="show_statuslights_summary">Povolte stavové indikátory pro stáří kanyly, inzulínu, senzoru, zásobníku a baterie na domovské obrazovce.</string>
+    <string name="show_statuslights_extended">Zobrazit rozšířené stavové indikátory na domovské obrazovce</string>
+    <string name="show_statuslights_extended_summary">Povolí rozšířené stavové indikátory pro stáří kanyly, inzulínu, senzoru, zásobníku a baterie na domovské obrazovce.</string>
     <string name="statuslights_res_warning">Úroveň varování stavu zásobníku [U]</string>
     <string name="statuslights_res_critical">Úroveň kritického varování stavu zásobníku [U]</string>
     <string name="statuslights_bat_warning">Úroveň varování stavu baterie [%%]</string>
@@ -639,7 +640,7 @@
     <string name="mdtp_cancel">Zrušit</string>
     <string name="notloadedplugins">Všechny profily nenačteny!</string>
     <string name="valuesnotstored">Hodnoty nejsou uloženy!</string>
-    <string name="ns_localbroadcasts">Povolit odesílání do ostatních aplikací (jako xDrip)</string>
+    <string name="ns_localbroadcasts">Povolit vysílání do jiných aplikací (například xDrip). Nepovolujte, pokud máte instalovánu více než jednu instanci AAPS nebo NSClient!</string>
     <string name="ns_localbroadcasts_title">Povolení odesílaní</string>
     <string name="careportal_activity_label">AKTIVITA &amp; ZPĚTNÁ VAZBA</string>
     <string name="careportal_carbsandbolus_label">SACHARIDY &amp; BOLUSY</string>
@@ -1265,9 +1266,9 @@
     <string name="rileylink_scanner_selected_device">Vybráno</string>
     <string name="rileylink_scanner_title">Vyhledávání RileyLinku</string>
     <string name="rileylink_scanner_ble_not_supported">Bluetooth Low Energy nepodporováno.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth není povolen.</string>
+    <string name="rileylink_scanner_ble_not_enabled">Bluetooth není povoleno.</string>
     <string name="location_not_found_title">Zjišťování místa není povoleno</string>
-    <string name="location_not_found_message">Pro vyhledání Bluetooth zařízení na novějších telefonech musí být povoleno zjišťování polohy. AAPS Vás nesleduje a po provedení párování to může být opět zakázáno.</string>
+    <string name="location_not_found_message">Pro vyhledání Bluetooth zařízení na novějších telefonech musí být povoleno zjišťování polohy. AAPS vás nesleduje a po provedení párování můžete tuto volbu opět zakázat.</string>
     <string name="location_yes">Povolit</string>
     <string name="location_no">Ne</string>
     <string name="rileylink_scanner_scanning">Vyhledávání</string>
@@ -1328,7 +1329,7 @@
     <string name="medtronic_error_pump_wrong_max_bolus_set">Chybný max. bolus na pumpě (musí být %1$.2f).</string>
     <string name="medtronic_error_pump_wrong_max_basal_set">Chybný max. bazál na pumpě (musí být %1$.2f).</string>
     <string name="medtronic_error_operation_not_possible_no_configuration">Operace není možná.\n\nNejdříve je nutné nakonfigurovat pumpu, než bude možné tuto funkci použít.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Požadována změna času větší než 24h.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Požadována změna času větší než 24 h.</string>
     <!-- MDT History -->
     <string name="medtronic_history_group_basal">Bazály</string>
     <string name="medtronic_history_group_configuration">Konfigurace</string>
@@ -1367,14 +1368,36 @@
     <string name="medtronic_cmd_desc_get_tbr">Načítání dočasného bazálu</string>
     <string name="medtronic_cmd_desc_set_tbr">Nastavování dočasného bazálu</string>
     <string name="medtronic_cmd_desc_set_bolus">Nastavování bolusu</string>
-    <string name="insulinFromCob"><![CDATA[Inzulín z COB: <font color=\'%1$s\'>%2$.1fg %3$.2fU</font>]]></string>
+    <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.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 nadhodnocené a proto může být počítáno více inzulínu !!!!!</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 nadhodnocené, a proto může být počítáno více inzulínu !!!!!</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <string name="partialboluswizard">Podat tuto část z výsledku kalkulace [%]</string>
     <string name="deliverpartofboluswizard">Kalkulátor provede výpočet, ale dodána je pouze tato část inzulínu. Výhodné při používání SMB algoritmu.</string>
     <string name="loading">Načítání…</string>
     <string name="snooze">Ztišit</string>
+    <string name="accomplished">Splněno: %1$s</string>
+    <string name="objectives_usage_objective">Naučte se, jak ovládat AndroidAPS</string>
+    <string name="objectives_usage_gate">Provádějte v AndroidAPS různé akce</string>
+    <string name="objectives_useprofileswitch">Nastavte profil na 90 % na 10 min (Dlouhé stisknutí názvu profilu na obrazovce Přehled)</string>
+    <string name="objectives_usedisconnectpump">Předstírejte, že se jdete sprchovat. Odpojte pumpu na 1 h (Dlouze přidržte tlačítko Otevřená smyčka)</string>
+    <string name="objectives_usereconnectpump">...a stejným způsobem ji znovu připojte</string>
+    <string name="objectives_usetemptarget">Vytvořte vlastní dočasný cíl s trváním 10 min (Dlouze přidržte aktuální cíl)</string>
+    <string name="objectives_useactions">Na kartě Konfigurace povolte modul Akce, aktivujte jeho zobrazení a zobrazte jeho obsah z horní nabídky</string>
+    <string name="objectives_useloop">Zobrazte obsah modulu Smyčka</string>
+    <string name="objectives_usescale">Přepněte režim zobrazení dlouhým stisknutím grafu glykémie</string>
+    <string name="objectives_button_enter">Zadat</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Zadejte kód, který jste získali od vývojářů, abyste obešli zbývající cíle</string>
+    <string name="codeaccepted">Kód přijat</string>
+    <string name="codeinvalid">Neplatný kód</string>
+    <string name="objectives_exam_objective">Prokažte své znalosti</string>
+    <string name="objectives_exam_gate">Studujte a správně zodpovězte otázky</string>
+    <string name="answerdisabledto">Odpovídání zakázáno do: %1$s</string>
+    <string name="wronganswer">Špatná odpověď!</string>
+    <string name="unfinshed_button">Další nedokončená</string>
+    <string name="close">Zavřít</string>
+    <string name="requestcode">Kód žádosti: %1$s</string>
+    <string name="objectives_hint">(zatrhněte všechny správné odpovědi)</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/exam.xml b/app/src/main/res/values-de-rDE/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-de-rDE/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index c15f283b5c..9acf4ba696 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -268,10 +268,10 @@
     <string name="smscommunicator_bolusreplywithcode">Um einen Bolus von %1$.2f IE abzugeben, antworte mit  dem Code %2$s.</string>
     <string name="smscommunicator_calibrationreplywithcode">Um die Kalibrierung %1$.2f zu senden, antworte mit dem Code %2$s.</string>
     <string name="smscommunicator_bolusfailed">Bolus fehlgeschlagen</string>
-    <string name="bolusdelivered">Bolus %1$.2fU erfolgreich abgegeben</string>
-    <string name="bolusrequested">Werde %1$.2fU abgeben</string>
-    <string name="smscommunicator_bolusdelivered">Bolus %1$.2fU erfolgreich abgegeben</string>
-    <string name="bolusdelivering">Gebe %1$.2fU ab</string>
+    <string name="bolusdelivered">Bolus %1$.2fIE erfolgreich abgegeben</string>
+    <string name="bolusrequested">Werde %1$.2fIE abgeben</string>
+    <string name="smscommunicator_bolusdelivered">Bolus %1$.2fIE erfolgreich abgegeben</string>
+    <string name="bolusdelivering">Gebe %1$.2fIE ab</string>
     <string name="smscommunicator_remotecommandsallowed">Erlaube externe Befehle per SMS</string>
     <string name="glucosetype_finger">Finger</string>
     <string name="glucosetype_sensor">Sensor</string>
@@ -316,20 +316,20 @@
     <string name="overview_bolusprogress_stop">Stopp</string>
     <string name="overview_bolusprogress_stoppressed">STOPP GEDRÜCKT</string>
     <string name="waitingforpump">Warte auf Pumpe</string>
-    <string name="overview_bolusprogress_goingtodeliver">Werde %1$.2fU abgeben</string>
+    <string name="overview_bolusprogress_goingtodeliver">Werde %1$.2fIE abgeben</string>
     <string name="objectives_0_objective">Konfiguriere die Anzeige und das Monitoring (Nightscout) und analysiere Basal-Raten und Faktoren</string>
     <string name="objectives_0_gate">Verifiziere, dass BZ- und Pumpen-Insulin-Daten erfolgreich zu Nightscout hochgeladen werden.</string>
-    <string name="objectives_openloop_objective">Starte den Open Loop Modus</string>
+    <string name="objectives_openloop_objective">Den Open Loop starten.</string>
     <string name="objectives_openloop_gate">Erprobe den Open Loop Modus für ein paar Tage und setze manuell temporäre Basal-Raten. Richte temporäre Ziele ein und nutze sie (z.B. für Bewegung, unterstützend zur Hypobehandlung).</string>
     <string name="objectives_maxbasal_objective">Verstehe den Open Loop und die TBR-Empfehlungen</string>
     <string name="objectives_maxbasal_gate">Entscheide anhand von dieser Erfahrung, wie hoch max Basal sein sollte, und übernehme den Wert in die Pumpen- und AAPS-Einstellungen.</string>
     <string name="objectives_maxiobzero_objective">Starte den Closed Loop Modus mit Abschaltung bei niedrigen Werten</string>
     <string name="objectives_maxiobzero_gate">Erprobe den Closed Loop Modus mit max IOB = 0 für ein paar Tage, ohne zu viele Unterzuckerungen zu haben.</string>
-    <string name="objectives_maxiob_objective">Stelle den Closed Loop fein ein, erhöhe max IOB über 0 und setze den Zielbereich langsam herunter.</string>
-    <string name="objectives_maxiob_gate">Verwende es ein paar Tage und zumindest eine Nacht ohne Niedrig-Alarme (UZ), bevor du den BZ-Zielbereich senkst.</string>
+    <string name="objectives_maxiob_objective">Stelle den Closed Loop feiner ein, erhöhe max IOB über 0 und setze den Zielwert langsam herunter.</string>
+    <string name="objectives_maxiob_gate">Bevor Du den Zielwert runter setzt, musst Du einige Tage Erfahrung sammeln und mind. eine Nacht ohne Alarm wegen niedriger BZ-Werte absolvieren.</string>
     <string name="objectives_autosens_objective">Passe, falls notwendig, Basal und Faktoren an und aktiviere dann die Autosens-Funktion.</string>
-    <string name="objectives_autosens_gate">Loope eine Woche erfolgreich am Tag mit regelmäßiger Kohlenhydrat-Eingabe.</string>
-    <string name="objectives_ama_objective">Aktiviere zusätzliche Funktionen wie z. B. den Mahlzeitenassistenten</string>
+    <string name="objectives_autosens_gate">Loope eine Woche erfolgreich tagsüber mit regelmäßiger Kohlenhydrat-Eingabe.</string>
+    <string name="objectives_ama_objective">Aktiviere zusätzliche Funktionen wie z. B. den erweiterten Mahlzeitenassistenten (AMA).</string>
     <string name="objectives_smb_objective">Aktiviere zusätzliche Funktionen wie z. B. SMB</string>
     <string name="objectives_smb_gate">Lies das Wiki und hebe maxIOB an, damit SMB funktioniert. Ein guter Startwert ist
 maxIOB = durchschnittlicher Essensbolus + 3 x maximale Basalrate</string>
@@ -343,13 +343,13 @@ maxIOB = durchschnittlicher Essensbolus + 3 x maximale Basalrate</string>
     <string name="valueoutofrange">Wert %1$s ist außerhalb des festen Limits.</string>
     <string name="smscommunicator_remotecommandnotallowed">Ferngesteuerte Befehle sind nicht erlaubt.</string>
     <string name="smscommunicator_remotebolusnotallowed">Bolusabgabe aus der Ferne nicht verfügbar. Versuche es später erneut.</string>
-    <string name="smscommunicator_basalreplywithcode">Um eine Basalrate von %1$.2fU/h für %2$d Minuten zu setzen, antworte mit dem Code %3$s</string>
+    <string name="smscommunicator_basalreplywithcode">Um eine Basalrate von %1$.2fIE/h für %2$d Minuten zu setzen, antworte mit dem Code %3$s</string>
     <string name="smscommunicator_profilereplywithcode">Um das Profil auf %1$s %2$d%% zu setzen, antworte mit dem Code %3$s</string>
-    <string name="smscommunicator_extendedreplywithcode">Um den erweiterten Bolus %1$.2fU für %2$d Minuten abzugeben, antworte mit dem Code %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Um den erweiterten Bolus %1$.2fIE für %2$d Minuten abzugeben, antworte mit dem Code %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Um die Basalrate von %1$d%% für %2$d Minuten zu setzen, antworte mit dem Code %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Um das Loopen für %1$d Minuten zu pausieren, antworte mit dem Code %2$s.</string>
     <string name="smscommunicator_tempbasalset">TBR mit %1$.2f IE/h für %2$d min wurde erfolgreich gestartet.</string>
-    <string name="smscommunicator_extendedset">Der erweiterte Bolus %1$.2fU für %2$d Minuten wurde erfolgreich gestartet</string>
+    <string name="smscommunicator_extendedset">Der erweiterte Bolus %1$.2f IE/h für %2$d Minuten wurde erfolgreich gestartet</string>
     <string name="smscommunicator_tempbasalset_percent">Die temporäre Basalrate wurde erfolgreich für %2$d Minuten auf %1$d%% gesetzt</string>
     <string name="smscommunicator_tempbasalfailed">Das Starten der TBR ist fehlgeschlagen.</string>
     <string name="smscommunicator_extendedfailed">Die Abgabe des erweiterten Bolus ist fehlgeschlagen</string>
@@ -566,7 +566,8 @@ maxIOB = durchschnittlicher Essensbolus + 3 x maximale Basalrate</string>
     <string name="enablesuperbolus">Aktiviere Superbolus im Wizard</string>
     <string name="enablesuperbolus_summary">Aktiviere die SuperBolus-Funktion im Wizard. Nicht aktivieren, wenn Du nicht weißt, welche Auswirkungen dieser Bolus hat! ES KANN ZU EINER ÜBERDOSIERUNG AN INSULIN KOMMEN!</string>
     <string name="show_statuslights">Statusanzeige auf Homescreen</string>
-    <string name="show_statuslights_summary">Statusanzeige für CAGE, IAGE, SAGE, Reservoir- und Batteriestand auf dem Homescreen.</string>
+    <string name="show_statuslights_extended">Erweiterte Statusanzeige auf Homescreen</string>
+    <string name="show_statuslights_extended_summary">Erweiterte Statusanzeige für CAGE, IAGE, SAGE, Reservoir- und Batteriestand auf dem Homescreen.</string>
     <string name="statuslights_res_warning">Warnschwelle Reservoirstand [IE]</string>
     <string name="statuslights_res_critical">Warnschwelle kritischer Reservoirstand [IE]</string>
     <string name="statuslights_bat_warning">Warnschwelle Batteriestand [%%]</string>
@@ -640,7 +641,7 @@ maxIOB = durchschnittlicher Essensbolus + 3 x maximale Basalrate</string>
     <string name="mdtp_cancel">Abbrechen</string>
     <string name="notloadedplugins">Es sind nicht alle Profile geladen!</string>
     <string name="valuesnotstored">Werte nicht gespeichert!</string>
-    <string name="ns_localbroadcasts">Aktiviere Broadcasts für andere Apps (z. B. xDrip+)</string>
+    <string name="ns_localbroadcasts">Aktiviere die Datenübertragung zu anderen Apps (z.B. xDrip). Nicht aktivieren falls Du mehr als eine Instanz von AAPS oder NSClient installiert hast!</string>
     <string name="ns_localbroadcasts_title">Aktiviere lokale Broadcasts</string>
     <string name="careportal_activity_label">AKTIVITÄT &amp; FEEDBACK</string>
     <string name="careportal_carbsandbolus_label">CARBS &amp; BOLUS</string>
@@ -882,7 +883,7 @@ maxIOB = durchschnittlicher Essensbolus + 3 x maximale Basalrate</string>
     <string name="basal_set_correctly">Basalrate richtig eingestellt</string>
     <string name="limitingpercentrate">Begrenzung des max. Prozentsatzes auf %1$d%% wegen %2$s</string>
     <string name="limitingbolus">Begrenze Bolusmenge auf %1$.1f IE wegen %2$s</string>
-    <string name="limitingextendedbolus">Begrenze verzögerten Bolus auf %1$.1f U wegen %2$s</string>
+    <string name="limitingextendedbolus">Begrenze verzögerten Bolus auf %1$.1f IE wegen %2$s</string>
     <string name="limitingmaxiob">Begrenze max. IOB auf %1$.1f IE wegen %2$s</string>
     <string name="limitingcarbs">Begrenze Kohlenhydrate auf %1$d g wegen %2$s</string>
     <string name="limitingiob">Begrenze IOB auf %1$.1f IE wegen %2$s</string>
@@ -1082,7 +1083,7 @@ Unerwartetes Verhalten.</string>
     <string name="tbr_formatter">%1$d%% für %2$d / %3$d min</string>
     <string name="extended_bolus">Verzögerter Bolus</string>
     <string name="multiwave_bolus">Multiwave-Bolus</string>
-    <string name="eb_formatter">%1$.2f / %2$.2f U für %3$d min</string>
+    <string name="eb_formatter">%1$.2f / %2$.2f IE für %3$d min</string>
     <string name="enable_tbr_over_notification">TBR-Vorrüber-Benachrichtigung aktivieren\n(Pumpeneinstellung)</string>
     <string name="disable_tbr_over_notification">TBR-Vorrüber-Benachrichtigung deaktivieren\n(Pumpeneinstellung)</string>
     <string name="refresh">Aktualisieren</string>
@@ -1090,7 +1091,7 @@ Unerwartetes Verhalten.</string>
     <string name="not_inserted">Nicht eingesetzt</string>
     <string name="short_status_last_connected">Letzte Verb.: vor %1$d min</string>
     <string name="short_status_tbr">TBR: %1$d%% für %2$d / %3$d min</string>
-    <string name="short_status_extended">Verzögert: %1$.2f / %2$.2f U für %3$d min</string>
+    <string name="short_status_extended">Verzögert: %1$.2f / %2$.2f IE für %3$d min.</string>
     <string name="short_status_multiwave">Multiwave: %1$.2f / %2$.2f IE für %3$d min.</string>
     <string name="short_status_tdd">TDD: %1$.2f</string>
     <string name="short_status_reservoir">Reser.: %1$.2fIE</string>
@@ -1369,14 +1370,36 @@ Unerwartetes Verhalten.</string>
     <string name="medtronic_cmd_desc_get_tbr">Hole Temporäre Basalraten</string>
     <string name="medtronic_cmd_desc_set_tbr">Setze Temporäre Basalrate</string>
     <string name="medtronic_cmd_desc_set_bolus">Setze Bolus</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="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
+    <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus-Einschränkung angewendet: %2$.2fIE zu %3$.2fIE</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Langsamer Kohlenhydrat-Abbau erkannt: %2$d%% der Zeit. Überprüfe Deine Berechnung. COB könnte zu hoch sein und deswegen zu viel Insulin abgegeben werden!!!!!</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d IE</string>
     <string name="partialboluswizard">Abgabe von [%] des Ergebnisses des Bolusrechners</string>
     <string name="deliverpartofboluswizard">Der Bolus-Assistent führt Berechnungen durch, aber nur dieser Teil der berechneten Insulin wird abgegeben. Nützlich mit SMB-Algorithmus.</string>
     <string name="loading">Lädt ...</string>
     <string name="snooze">Schlummern</string>
+    <string name="accomplished">Erfüllt: %1$s</string>
+    <string name="objectives_usage_objective">Lerne, AndroidAPS zu bedienen.</string>
+    <string name="objectives_usage_gate">Führe verschiedene Aktionen in AndroidAPS aus.</string>
+    <string name="objectives_useprofileswitch">Setzte das Profil für 10 min. auf 90% (Drücke dazu lange auf den Profilnamen auf der Startseite)</string>
+    <string name="objectives_usedisconnectpump">Simuliere duschen. Trenne die Pumpe für 1 Std. (Drücke lang auf Open Loop)</string>
+    <string name="objectives_usereconnectpump">...und verbinde die Pumpe auf dem selben Weg wieder.</string>
+    <string name="objectives_usetemptarget">Erstelle ein benutzerdefiniertes temporäres Ziel mit 10 min. Dauer (Drücke lange auf Deinen aktuellen Zielwert)</string>
+    <string name="objectives_useactions">Aktiviere das Plugin Aktionen im Konfigurations-Generator, zeige es an und rufe es vom Startbildschirm aus auf.</string>
+    <string name="objectives_useloop">Zeige den Inhalt des Loop-Plugins ein.</string>
+    <string name="objectives_usescale">Nutze die Skalierfunktion. Drücke dazu lange auf das Diagramm.</string>
+    <string name="objectives_button_enter">Eingabe</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Gib den Code ein, den Du von den Entwicklern erhalten hast, um die restlichen Objectives zu überspringen.</string>
+    <string name="codeaccepted">Code akzeptiert</string>
+    <string name="codeinvalid">Code ungültig</string>
+    <string name="objectives_exam_objective">Belege Dein Wissen</string>
+    <string name="objectives_exam_gate">Beantworte die Fragen richtig.</string>
+    <string name="answerdisabledto">Beantwortung deaktiviert bis: %1$s</string>
+    <string name="wronganswer">Falsche Antwort!</string>
+    <string name="unfinshed_button">Nächte unbeantwortete</string>
+    <string name="close">Schließen</string>
+    <string name="requestcode">Erfrage Code:: %1$s</string>
+    <string name="objectives_hint">(kreuze alle richtigen Antworten an)</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/exam.xml b/app/src/main/res/values-el-rGR/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-el-rGR/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 90ca7efad6..55af02c156 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -18,6 +18,7 @@
     <string name="danar_bt_name_title">DanaR συσκευή Bluetooth</string>
     <string name="ns_sync_use_absolute_title">Χρησιμοποιείτε πάντα απόλυτες τιμές βασικού</string>
     <string name="alert_dialog_storage_permission_text">Παρακαλώ κάντε επανεκίνηση στο τηλέφώνο ή restart στο AndroidAPS από τις Ρυθμίσεις Συστήματος, \nαλλιώς το AndroidAPS δεν θα έχει καταγραφή (επαληθεύστε ότι οι αλγόριθμοι δουλεύουν σωστά)!</string>
+    <string name="alert_dialog_permission_battery_optimization_failed">Αυτή η συσκευή δεν φαίνεται να υποστηρίζει τη λίστα κατάτμησης βελτιστοποίησης μπαταρίας - ενδέχεται να αντιμετωπίσετε προβλήματα απόδοσης.</string>
     <string name="description_actions">Ορισμένα πλήκτρα για γρήγορη πρόσβαση σε κοινά χαρακτηριστικά</string>
     <string name="description_careportal">Εισάγετε καταχωρήσεις ημερολογίου.</string>
     <string name="description_config_builder">Χρησιμοποιείται για ρύθμιση ενεργών συνδέσεων</string>
@@ -33,6 +34,7 @@
     <string name="description_smb">Ο πιο πρόσφατος αλγόριθμος για προχωρημένους χρήστες</string>
     <string name="description_overview">Εμφανίζει την τρέχουσα κατάσταση του κυκλώματός σας και τα πλήκτρα για τις πιο κοινές ενέργειες</string>
     <string name="description_persistent_notification">Εμφανίζει μία τρέχουσα ειδοποίηση με σύντομη επισκόπηση του τι κάνει το κύκλωμα τώρα</string>
+    <string name="description_profile_local">Ορίστε ένα προφίλ που είναι διαθέσιμο εκτός σύνδεσης.</string>
     <string name="description_profile_nightscout">Παρέχει το προφίλ που έχετε ορίσει στο Nightscout</string>
     <string name="description_profile_simple">Ορίστε ένα προφίλ με μόνο μία χρονική περίοδο.</string>
     <string name="description_pump_combo">Η ολοκλήρωση της αντλίας, για τις αντλίες Accu-Check Combo, απαιτεί να έχετε εγκαταστήσει ruffy</string>
@@ -317,11 +319,11 @@
     <string name="overview_bolusprogress_goingtodeliver">Προς έγχυση %1$.2fU</string>
     <string name="objectives_0_objective">Δημιουργία παρακολούθησης και ανάλυση βασικού ρυθμού και αναλογιών</string>
     <string name="objectives_0_gate">Επιβεβαιώστε ότι η BG φαίνεται στο Nightscout και τα δεδομένα της αντλίας φορτώθηκαν</string>
-    <string name="objectives_openloop_objective">Ξεκινήστε σε ανοιχτό κύκλωμα</string>
-    <string name="objectives_openloop_gate">Εκτελέστε σε ανοιχτό κύκλωμα για μερικές ημέρες και χειροκίνητα κάντε πολλές παρεμβάσεις με προσωρινό ρυθμό. Ρυθμίστε και χρησιμοποιήστε προσωρινούς στόχους (π.χ. για αθλήματα ή υπογλυκαιμία)</string>
+    <string name="objectives_openloop_objective">Ξεκινώντας ανοιχτό κύκλωμα</string>
+    <string name="objectives_openloop_gate">Τρέξτε σε ανοιχτό κύκλωμα μερικές ημέρες και χειροκίνητα κάντε πολλούς προσωρινούς ρυθμούς. Φτιάξτε και χρησιμοποιήστε προσωρινούς και στανταρντ προσωρινούς στόχους (π.χ. για άσκηση ή θεραπεία υπογλυκαιμίας)</string>
     <string name="objectives_maxbasal_objective">Κατανοήστε το ανοιχτό κύκλωμα, περιλαμβάνοντας τις προτάσεις για Προσωρινό ρυθμό</string>
     <string name="objectives_maxbasal_gate">Βάση της εμπειρίας σας, αποφασίστε ποιο είναι το μέγιστο βασικής δόσης και αποθηκεύστε το στην αντλία και στις Επιλογές</string>
-    <string name="objectives_maxiobzero_objective">Ξεκινήστε να κλείσετε το κύκλωμα με Σταμάτημα Χαμηλής Γλυκόζης (Low Glucose Suspend) </string>
+    <string name="objectives_maxiobzero_objective">Ξεκινήστε να κλείσετε το κύκλωμα με Σταμάτημα Χαμηλής Γλυκόζης (Low Glucose Suspend)</string>
     <string name="objectives_maxiobzero_gate">Εκτελέστε σε κλειστό κύκλωμα με μέγιστο IOB = 0 για μερικές ημέρες χωρίς πολλά LGS - υπογλυκαιμίες</string>
     <string name="objectives_maxiob_objective">Ρυθμίζοντας το κλειστό κύκλωμα, αυξήστε το μέγιστο IOB πάνω από 0 και σταδιακά μειώστε τους στόχους BG</string>
     <string name="objectives_maxiob_gate">Τρέξτε το για λίγες ημέρες, και τουλάχιστον μία νύχτα χωρίς χαμηλό συναγερμό BG, πριν χαμηλώσετε τα όρια</string>
@@ -563,7 +565,8 @@
     <string name="enablesuperbolus">Ενεργοποίηση superbolus στον σύντομο οδηγό</string>
     <string name="enablesuperbolus_summary">Ενεργοποιήστε την λειτουργία superbolus στον σύντομο οδηγό. Μην το κάνετε μέχρι να μάθετε τι ακριβώς κάνει. ΜΠΟΡΕΙ ΝΑ ΕΓΧΥΣΕΙ ΠΑΡΑΠΑΝΩ ΔΟΣΕΙΣ ΙΝΣΟΥΛΙΝΗΣ ΑΝ ΧΡΗΣΙΜΟΠΟΙΗΘΕΙ ΛΑΝΘΑΣΜΕΝΑ!</string>
     <string name="show_statuslights">Εμφάνιση του φωτισμού κατάστασης στην αρχική οθόνη</string>
-    <string name="show_statuslights_summary">Ενεργοποίηση του φωτισμού κατάστασης για cage, iage, sage, reservoir και επίπεδο μπεταρίας στην αρχική οθόνη.</string>
+    <string name="show_statuslights_extended">Εμφάνιση του φωτισμού κατάστασης στην αρχική οθόνη</string>
+    <string name="show_statuslights_extended_summary">Ενεργοποίηση του φωτισμού κατάστασης για cage, iage, sage, reservoir και επίπεδο μπαταρίας στην αρχική οθόνη.</string>
     <string name="statuslights_res_warning">Όριο προειδοποίησης χαμηλής αμπούλας [U]</string>
     <string name="statuslights_res_critical">Όριο προειδοποίησης πολύ χαμηλής αμπούλας [U]</string>
     <string name="statuslights_bat_warning">Όριο προειδοποίησης χαμηλής μπαταρίας [%%]</string>
@@ -637,7 +640,6 @@
     <string name="mdtp_cancel">Ακύρωση</string>
     <string name="notloadedplugins">Δεν έχουν φορτωθεί όλα τα προφίλ!</string>
     <string name="valuesnotstored">Οι τιμές δεν αποθηκεύτηκαν!</string>
-    <string name="ns_localbroadcasts">Ενεργοποιήστε την αποστολή σε άλλες εφαρμογές (όπως xDrip).</string>
     <string name="ns_localbroadcasts_title">Ενεργοποιήστε τις τοπικές αποστολές.</string>
     <string name="careportal_activity_label">ΔΡΑΣΤΗΡΙΟΤΗΤΑ &amp; FEEDBACK</string>
     <string name="careportal_carbsandbolus_label">ΥΔΑΤΑΝΘΡΑΚΕΣ &amp; BOLUS</string>
@@ -949,6 +951,7 @@
     <string name="sensitivitysetup">Ρυθμίσετε την προσθήκη Ευαισθησία</string>
     <string name="setupwizard_sensitivity_description">Η προσθήκη Ευαισθησία χρησιμοποιείται για την ανίχνευση αλλαγών στην ευαισθησία και τον υπολογισμό του COB. Για περισσότερες πληροφορίες εδώ:</string>
     <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
+    <string name="nsclientinfotext">Το NSClient χειρίζεται τη σύνδεση με το Nightscout. Μπορείτε να παραλείψετε αυτό τώρα αλλά δεν θα μπορείτε να ολοκληρώσετε τους Στόχους μέχρι να κάνετε τις ρυθμίσεις του.</string>
     <string name="diawarning">Προσοχή: Τα νέα προφίλ ινσουλίνης απαιτούν DIA τουλάχιστον 5 ωρών. Η DIA 5-6 ώρες στα νέα προφίλ είναι ισοδύναμα με DIA των 3 ωρών στα παλιά προφίλ ινσουλινών.</string>
     <string name="bgsourcesetup">Διαμόρφωση πηγής BG</string>
     <string name="setupwizard_profile_description">Επιλέξτε μια πηγή του προφίλ. Για ένα παιδί, χρησιμοποιήστε το προφίλ NS. Εάν κανείς δεν σας ακολουθεί μέσω NS, πιθανότατα προτιμάτε Τοπικό προφίλ. Σημειώστε ότι ορίζετε μόνο την πηγή προφίλ. Για να χρησιμοποιείται το προφίλ πρέπει να το ενεργοποιήσετε εκτελώντας το \"Προφίλ αλλαγής\"</string>
@@ -1213,6 +1216,7 @@
     <string name="autosenslabel">Autosens %</string>
     <string name="deltacompared">%3$s %1$s %2$s</string>
     <string name="deltalabel">Διαφορά BG</string>
+    <string name="deltalabel_u">Διαφορά BG [%1$s]</string>
     <string name="currentlocation">Τρέχουσα θέση</string>
     <string name="location">Τοποθεσία</string>
     <string name="latitude_short">Lat:</string>
@@ -1293,7 +1297,6 @@
     <string name="rileylink_state_not_started">Δεν ξεκίνησε</string>
     <string name="rileylink_state_rl_init">Αρχικοποίηση του RileyLink…</string>
     <string name="rileylink_state_rl_error">RileyLink Σφάλμα</string>
-    <string name="rileylink_state_pc_tune_up">Ρύθμιση του RileyLink και της αντλίας</string>
     <string name="rileylink_state_pc_error">Πρόβλημα σύνδεσης με την Αντλία</string>
     <string name="rileylink_state_connected">Συνδέθηκε</string>
     <!-- RL Errors -->
@@ -1363,9 +1366,35 @@
     <string name="medtronic_cmd_desc_get_tbr">Λάβετε Προσωρινό Ρυθμό</string>
     <string name="medtronic_cmd_desc_set_tbr">Βάλτε Προσωρινό Ρυθμό</string>
     <string name="medtronic_cmd_desc_set_bolus">Βάλτε Bolus</string>
-    <string name="insulinFromCob"><![CDATA[Ινσουλίνη COB: <font color=\'%1$s\'>%2$.1fg %3$.2f</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus constraint applied: %2$.2fU to %3$.2fU</font>]]></string>
+    <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Μικρή απορρόφηση υδατανθράκων ανιχνεύτηκε: %2$d%% της ώρας. Τσεκάρετε τους υπολογισμούς σας. COB μπορεί να υπερεκτιμήθηκε και να δόθηκε περισσότερη ινσουλίνη!!!!!</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="partialboluswizard">Χορήγηση του αποτελέσματος αυτού του μέρους του υπολογισμού bolus [%]</string>
+    <string name="deliverpartofboluswizard">Ο Υπολογισμός Bolus κάνει υπολογισμούς αλλά μόνο αυτό το μέρος της υπολογίσημης ινσουλίνης χορηγείται. Χρήσιμο με τον αλγόριθμο SMB.</string>
+    <string name="loading">Φόρτωση ...</string>
+    <string name="snooze">Αναβολή</string>
+    <string name="accomplished">Επιτεύχθηκε: %1$s</string>
+    <string name="objectives_usage_objective">Μάθε πως να ελέγχεις το AndroidAPS</string>
+    <string name="objectives_usage_gate">Κάντε διαφορετικές ενέργειες στο AndroidAPS</string>
+    <string name="objectives_useprofileswitch">Θέστε το προφίλ στο 90% για 10 λεπτά (Παρατεταμένο πάτημα του προφίλ στην Επισκόπηση)</string>
+    <string name="objectives_usedisconnectpump">Προσομοίωση ένδειξης. Αποσυνδέστε την αντλία για 1 ώρα (Παρατεταμένο στο Ανοιχτό Κύκλωμα)</string>
+    <string name="objectives_usereconnectpump">... και επανασυνδέστε με τον ίδιο τρόπο</string>
+    <string name="objectives_usetemptarget">Φτιάξτε προσωρινούς στόχους με διάρκεια 10 λεπτά (Παρατεταμένο πάτημα στον στόχο σας)</string>
+    <string name="objectives_useactions">Στην Διαμόρφωση ενεργοποιήστε την προσθήκη Ενέργειες, κάντε την ορατή ώστε να την βλέπετε από το δικό της tab</string>
+    <string name="objectives_useloop">Εμφάνιση περιεχομένου της προσθήκης Κύκλωμα</string>
+    <string name="objectives_usescale">Χρησιμοποιήστε τη λειτουργία κλίμακας πατώντας παρατεταμένα το διάγραμμα BG</string>
+    <string name="objectives_button_enter">Εισαγωγή</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Εισαγάγετε τον κωδικό που λαμβάνετε από τους προγραμματιστές για να παρακάμψετε τους υπόλοιπους στόχους</string>
+    <string name="codeaccepted">Κωδικός αποδεκτός</string>
+    <string name="codeinvalid">Μη έγκυρος κωδικός</string>
+    <string name="objectives_exam_objective">Αποδείξτε τις γνώσεις σας</string>
+    <string name="objectives_exam_gate">Διαβάστε και απαντήστε τις ερωτήσεις σωστά</string>
+    <string name="answerdisabledto">Οι απαντήσεις εμφανίζονται στο: %1$s</string>
+    <string name="wronganswer">Λάθος απάντηση!</string>
+    <string name="unfinshed_button">Επόμενο ημιτελές</string>
+    <string name="close">Κλείσιμο</string>
+    <string name="requestcode">Κωδικός αιτήματος: %1$s</string>
+    <string name="objectives_hint">(ελέγξτε όλες τις σωστές απαντήσεις)</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d ημέρα</item>
         <item quantity="other">%1$d ημέρες</item>
diff --git a/app/src/main/res/values-es-rES/exam.xml b/app/src/main/res/values-es-rES/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-es-rES/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index cbb0669f0e..7b4720874e 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -18,6 +18,7 @@
     <string name="danar_bt_name_title">Dispositivo Bluetooth DanaR</string>
     <string name="ns_sync_use_absolute_title">Usar siempre valores basales absolutos</string>
     <string name="alert_dialog_storage_permission_text">Por favor reinicia el teléfono o AndroidAPS desde ajustes de sistema, sino AndroidAPS no guardará registros (importante para trazar y verificar que el algoritmo funcione correctamente)</string>
+    <string name="alert_dialog_permission_battery_optimization_failed">Este dispositivo no parece soportar la optimización de la batería por los ajustes - pueden ocurrir problemas de funcionamiento.</string>
     <string name="description_actions">Algunos botones para acceder rápidamente a funciones comunes</string>
     <string name="description_careportal">Insertar notas de registro avanzadas.</string>
     <string name="description_config_builder">Utilizado para configurar complementos activos</string>
@@ -33,6 +34,7 @@
     <string name="description_smb">Algoritmo más reciente para usuarios avanzados</string>
     <string name="description_overview">Muestra el estado actual de tu lazo y los botones para las acciones más usadas</string>
     <string name="description_persistent_notification">Muestra una notificación en curso con un breve resumen de lo que está haciendo tu lazo</string>
+    <string name="description_profile_local">Definir un perfil disponible fuera de linea.</string>
     <string name="description_profile_nightscout">Proporciona el perfil definido en Nightscout</string>
     <string name="description_profile_simple">Definir un perfil con un solo bloque de tiempo.</string>
     <string name="description_pump_combo">Integración de bombas de insulina Accu-Check Combo, necesita tener ruffy instalado</string>
@@ -317,16 +319,16 @@
     <string name="overview_bolusprogress_goingtodeliver">Se van a infundir %1$.2fU</string>
     <string name="objectives_0_objective">Configuración de visualización y monitorización, y análisis de basales y ratios</string>
     <string name="objectives_0_gate">Comprobar que los datos de BG están disponibles en Nightscout, y que los datos de la bomba de insulina se están subiendo</string>
-    <string name="objectives_openloop_objective">Empezar con lazo abierto</string>
+    <string name="objectives_openloop_objective">Comenzando en lazo abierto</string>
     <string name="objectives_openloop_gate">Ejecutar en modo de lazo abierto durante unos días, y aceptar manualmente las basales temporales. Configure y use objetivos temporales y predeterminados (por ejemplo, para actividad o carbohidratos para hipoglucemia)</string>
     <string name="objectives_maxbasal_objective">Entender el lazo abierto, incluidas las recomendaciones de basales temporales</string>
     <string name="objectives_maxbasal_gate">Sobre la base de esa experiencia, decidir valores de máximo basal, y ajustar la bomba y preferencias</string>
     <string name="objectives_maxiobzero_objective">Iniciando el lazo cerrado con suspensión con baja glucosa</string>
     <string name="objectives_maxiobzero_gate">Ejecutar en lazo cerrado con max IOB=0 durante unos días sin demasiados valores bajos de glucosa</string>
     <string name="objectives_maxiob_objective">Ajuste del lazo cerrado, aumentando máximo IOB por encima de 0 y bajando gradualmente objetivos BG</string>
-    <string name="objectives_maxiob_gate">Funcionando unos cuantos días, y al menos una noche sin alarmas de glucosa baja, antes de bajar valor de glucosa</string>
-    <string name="objectives_autosens_objective">Ajustar los basales y ratios, si es necesario, y luego activar auto-sens</string>
-    <string name="objectives_autosens_gate">Una semana con éxito en lazo cerrado durante el día con entrada regular de carbohidratos</string>
+    <string name="objectives_maxiob_gate">Usar unos cuantos días, y al menos una noche sin alarmas de glucosa baja, antes de bajar valor de glucosa</string>
+    <string name="objectives_autosens_objective">Ajustar las basales y ratios, si es necesario, y luego activar auto-sens</string>
+    <string name="objectives_autosens_gate">Una semana con éxito en lazo cerrado durante el día con entrada de carbohidratos</string>
     <string name="objectives_ama_objective">Habilitar funciones adicionales para su uso durante el día, como asistente de comida avanzado</string>
     <string name="objectives_smb_objective">Habilitar funciones adicionales para uso durante el día como SMB</string>
     <string name="objectives_smb_gate">¡Debes leer el wiki y subir maxIOB para que SMB funcione bien! Para comenzar un buen valor sería maxIOB = bolo de comida medio + 3 x máximo basal diario</string>
@@ -340,6 +342,7 @@
     <string name="valueoutofrange">El valor %1$s está fuera de límites</string>
     <string name="smscommunicator_remotecommandnotallowed">Comando remoto no permitido</string>
     <string name="smscommunicator_remotebolusnotallowed">El bolo remoto no está disponible. Inténtalo de nuevo más tarde.</string>
+    <string name="smscommunicator_basalreplywithcode">Para iniciar una basal de %1$.2f% durante %2$d min, responder con el código %3$s</string>
     <string name="smscommunicator_profilereplywithcode">Para cambiar el perfil a %1$s %2$d%% responder con el código %3$s</string>
     <string name="smscommunicator_extendedreplywithcode">Para iniciar un bolo extendido de %1$.2fU durante %2$d minutos, responder con el código %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Para iniciar una basal de %1$d%% durante %2$d min, responder con el código %3$s</string>
@@ -531,10 +534,12 @@
     <string name="loopsuspended">Loop desactivado</string>
     <string name="loopsuspendedfor">Desactivado (%1$d m)</string>
     <string name="loopsuperbolusfor">Superbolo (%1$d m)</string>
+    <string name="suspendloop">Suspender lazo</string>
     <string name="suspendloopfor1h">Desactivar lazo por 1h</string>
     <string name="suspendloopfor2h">Desactivar lazo por 2h</string>
     <string name="suspendloopfor3h">Desactivar lazo por 3h</string>
     <string name="suspendloopfor10h">Desactivar lazo por 10 h</string>
+    <string name="suspendloopforXmin">Suspender lazo durante %1$d min</string>
     <string name="disconnectpumpfor15m">Desconectar bomba por 15 min</string>
     <string name="disconnectpumpfor30m">Desconectar bomba por 30 min</string>
     <string name="disconnectpumpfor1h">Desconectar bomba por 1 h</string>
@@ -560,7 +565,8 @@
     <string name="enablesuperbolus">Activar superbolo en asistente</string>
     <string name="enablesuperbolus_summary">Activar función superbolo en asistente. No lo actives hasta que hayas aprendido lo que realmente hace. ¡PUEDE CAUSAR SOBREDOSIS DE INSULINA usándolo sin precaución!</string>
     <string name="show_statuslights">Mostrar luces de estado en la pantalla de inicio</string>
-    <string name="show_statuslights_summary">Habilitar las luces de estado para tiempo de la canula, tiempo de la insulina, tiempo del sensor y nivel de bateria en la pantalla de inicio.</string>
+    <string name="show_statuslights_extended">Mostrar luces de estado extendidas en pantalla de inicio</string>
+    <string name="show_statuslights_extended_summary">Habilita luces de estado extendidas para tiempo de cánula, tiempo de insulina, tiempo del sensor, reservorio y nivel de batería en pantalla de inicio.</string>
     <string name="statuslights_res_warning">Umbral de advertencia de nivel de reservorio [U]</string>
     <string name="statuslights_res_critical">Umbral crítico de nivel de reservorio [U]</string>
     <string name="statuslights_bat_warning">Umbral de advertencia de nivel de batería [%%]</string>
@@ -634,7 +640,6 @@
     <string name="mdtp_cancel">Cancelar</string>
     <string name="notloadedplugins">Faltan perfiles por cargar!</string>
     <string name="valuesnotstored">Valores no guardados!</string>
-    <string name="ns_localbroadcasts">Permitir emisión de mensajes a otras aplicaciones (como xDrip).</string>
     <string name="ns_localbroadcasts_title">Permitir emisión de mensajes localmente.</string>
     <string name="careportal_activity_label">ACTIVIDAD Y FEEDBACK</string>
     <string name="careportal_carbsandbolus_label">CARBS Y BOLUS</string>
@@ -788,6 +793,7 @@
     <string name="extendedbolusdeliveryerror">Error al emitir bolo extendido</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">hace</string>
+    <string name="format_hours">%1$.2f h</string>
     <string name="enablesmbalways">Habilitar SMB siempre</string>
     <string name="enablesmbalways_summary">Habilitar SMB siempre de forma independiente a los Bolos. Solo posible con fuente BG con buen filtrado de datos como G5</string>
     <string name="enablesmbaftercarbs">Habilitar SMB después de Carbohidratos</string>
@@ -830,6 +836,7 @@
     <string name="bolusrecordedonly">El Bolo sólo será anotado</string>
     <string name="ns_autobackfill_summary">Rellenar BGs perdidos desde NS</string>
     <string name="loop_smbsetbypump_label">SMB administrado por bomba</string>
+    <string name="overview_show_activity">Actividad</string>
     <string name="overview_show_sensitivity">Sensibilidad</string>
     <string name="overview_show_deviations">Desviaciones</string>
     <string name="overview_show_cob">Carbohidratos activos COB</string>
@@ -840,6 +847,7 @@
     <string name="closed_loop_disabled_on_dev_branch">Ejecutando versión dev. Lazo cerrado no disponible.</string>
     <string name="engineering_mode_enabled">Modo de ingeniería activado</string>
     <string name="not_eng_mode_or_release">Modo de ingeniería no está activado y no disponible en esta rama</string>
+    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="combo_actvity_reading_basal_profile">Leyendo perfil basal</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">El historial de la bomba ha cambiado después de que se realizó el cálculo del bolo. El bolo no fue entregado. Por favor, vuelva a calcular si aún se necesita un bolo.</string>
     <string name="combo_error_updating_treatment_record">El bolo se administró con éxito, pero falló la incorporación de la entrada del tratamiento. Esto puede suceder si se administran dos bolos pequeños del mismo tamaño en los últimos dos minutos. Verifique el historial de la bomba y las entradas de tratamiento y use el portal de tratamientos para agregar entradas faltantes. Asegúrese de no agregar ninguna entrada para el mismo minuto exacto y la misma cantidad.</string>
@@ -943,6 +951,7 @@
     <string name="sensitivitysetup">Configurar complemento Sensibilidad</string>
     <string name="setupwizard_sensitivity_description">El complemento de sensibilidad es usado para detectar la sensibilidad y cálculo de COB. Para más info ver:</string>
     <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
+    <string name="nsclientinfotext">NSCliente controla la conexión con Nightscout. Puedes saltar este paso ahora pero no podrás completar los objetivos hasta que lo configures.</string>
     <string name="diawarning">Por favor, recuerde: nuevos perfiles de insulina requieren DIA de al menos 5h. DIA de 5-6h en nuevos perfiles es lo mismo que DIA de 3h en perfiles antiguos.</string>
     <string name="bgsourcesetup">Configurar origen de BG</string>
     <string name="setupwizard_profile_description">Selecciona origen de perfil. Si el usuario es un niño debe seleccionar perfil NS. Si no hay nadie siguiendo tu Nightscout probablemente preferirás perfil Local. Recuerde que sólo está seleccionando el origen del perfil. Para usarlo debe activarlo ejecutando \"Cambio Perfil\"</string>
@@ -1020,6 +1029,7 @@
     <string name="speederror">Error de velocidad</string>
     <string name="insulinlimitviolation">Violación del límite de insulina</string>
     <string name="loop_openmode_min_change">Valor mínimo de cambio [%]</string>
+    <string name="loop_openmode_min_change_summary">El lazo abierto sólo mostrará una demanda de cambio si el cambio es mayor a este valor. El valor predeterminado es el 20 %</string>
     <string name="pairfirst">Por favor, empareje su bomba con su teléfono!</string>
     <string name="searching_for_devices">Buscando dispositivos…</string>
     <string name="please_wait">Por favor, espere…</string>
@@ -1087,7 +1097,48 @@
     <string name="min_recovery_duration">Min. duración de recuperación [s]</string>
     <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="weekday_sunday_short">Dom</string>
+    <string name="weekday_saturday_short">Sáb</string>
+    <string name="weekday_friday_short">Vie</string>
+    <string name="weekday_thursday_short">Jue</string>
+    <string name="weekday_wednesday_short">Mie</string>
+    <string name="weekday_tuesday_short">Mar</string>
+    <string name="weekday_monday_short">Lun</string>
+    <string name="automation_description">Tareas de automatización definidas por el usuario</string>
+    <string name="automation_missing_task_name">Introduzca un nombre de tarea.</string>
+    <string name="automation_missing_trigger">Por favor, especifique al menos un iniciador.</string>
+    <string name="automation_missing_action">Por favor, especifique al menos una acción.</string>
+    <string name="alreadyenabled">Ya está habilitado</string>
+    <string name="alreadydisabled">Ya está deshabilitado</string>
+    <string name="alreadysuspended">Ya está suspendido</string>
+    <string name="resumeloop">Reactivar el lazo</string>
+    <string name="notsuspended">No suspendido</string>
+    <string name="starttemptarget">Iniciar objetivo temporal</string>
+    <string name="stoptemptarget">Detener objetivo temporal</string>
+    <string name="islesser">es menor que</string>
+    <string name="isequalorlesser">es igual o menor que</string>
+    <string name="isequal">es igual a</string>
+    <string name="isequalorgreater">es igual o mayor que</string>
+    <string name="isgreater">es mayor que</string>
+    <string name="isnotavailable">no está disponible</string>
+    <string name="unknown">desconocido</string>
+    <string name="glucoseisnotavailable">El valor de glucosa no está disponible</string>
+    <string name="glucosecomparedmgdl">Glucosa %1$s %2$.0f %3$s</string>
+    <string name="glucosecomparedmmol">Glucosa %1$s %2$.1f %3$s</string>
+    <string name="percentagecompared">Porcentaje de basal en perfil %1$s %2$d</string>
+    <string name="iobcompared">IOB (Insulina a Bordo) %1$s %2$.1f</string>
+    <string name="and">Y</string>
+    <string name="or">O</string>
+    <string name="xor">Xor (O exclusiva)</string>
+    <string name="atspecifiedtime">A las %1$s</string>
+    <string name="use_network_location">Permitir la ubicación de red</string>
+    <string name="use_gps_location">Añadir ubicación GPS</string>
+    <string name="use_passive_location">Usar ubicación automática</string>
+    <string name="locationservice">Servicios de localización</string>
+    <string name="automation_short">Auto</string>
+    <string name="automation">Automatización</string>
     <string name="profile_total">== ∑%1$s U</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">Registro de cambio de sensor a NS</string>
@@ -1127,7 +1178,21 @@
     <string name="sms_wrongcode">Código incorrecto. Comando cancelado.</string>
     <string name="notconfigured">Sin configurar</string>
     <string name="profileswitchcreated">Cambio de perfil creado</string>
+    <string name="recurringTime">Hora de Repetición</string>
+    <string name="every">Cada</string>
+    <string name="never">Nunca</string>
+    <string name="mins">%1$dminutos</string>
+    <string name="condition">Condición:</string>
+    <string name="action">Acción:</string>
+    <string name="iob_u">IOB (Insulina a Bordo) [U]:</string>
+    <string name="glucose_u">Glucosa [%1$s]:</string>
+    <string name="delete_short">SUPR</string>
+    <string name="add_short">AÑAD</string>
+    <string name="copy_short">COPIA</string>
+    <string name="addnew">Añadir nuevo</string>
     <string name="versionChecker">Verificador de versión</string>
+    <string name="signature_verifier">Verificador de firma</string>
+    <string name="running_invalid_version">Hemos detectado que está ejecutando una versión no válida. ¡Bucle desactivado!</string>
     <string name="old_version">versión antigua</string>
     <string name="very_old_version">versión muy antigua</string>
     <string name="new_version_warning">Nueva versión desde al menos %1$d dias disponible! Respaldo a LGS después de 60 días, se deshabilitará el lazo después de 90 días</string>
@@ -1136,18 +1201,200 @@
     <string name="dexcom_app_patched">DexcomG App (parcheada)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Recibir valores de glucosa de la app parcheada de Dexcom.</string>
+    <string name="notification">Notificación</string>
+    <string name="notification_message">Notificación: %1$s</string>
+    <string name="message_short">Msj:</string>
+    <string name="profilepercentage">Porcentaje de perfil</string>
+    <string name="percent_u">Porcentaje [%]:</string>
+    <string name="startprofile">Iniciar perfil %1$d%% durante %2$d min</string>
+    <string name="startprofileforever">Iniciar el perfil %1$d%%</string>
+    <string name="exists">existe</string>
+    <string name="notexists">no existe</string>
+    <string name="temptargetcompared">Objetivo temporal %1$s</string>
+    <string name="wifissidcompared">SSID WiFi %1$s %2$s</string>
+    <string name="autosenscompared">Autosens %1$s %2$s %%</string>
+    <string name="autosenslabel">Autosens %</string>
+    <string name="deltacompared">%3$s %1$s %2$s</string>
+    <string name="deltalabel">Diferencia BG</string>
+    <string name="deltalabel_u">Diferencia de BG %1$s</string>
+    <string name="currentlocation">Localización actual</string>
+    <string name="location">Ubicación</string>
+    <string name="latitude_short">Lat:</string>
+    <string name="longitude_short">Long:</string>
+    <string name="distance_short">Dist. [m]:</string>
+    <string name="name_short">Nombre:</string>
+    <string name="locationis">La ubicación es %1$s</string>
+    <string name="lastboluslabel">Último bolo</string>
+    <string name="lastboluscompared">Hora del último bolo: hace %1$s %2$s min</string>
+    <string name="triggercoblabel">COB</string>
+    <string name="cobcompared">COB %1$s %2$.0f</string>
+    <string name="taskname">Nombre de la tarea</string>
+    <string name="edit_short">Editar</string>
+    <string name="please_choose_an_action_type">Por favor, elija el tipo de acción:</string>
+    <string name="please_choose_a_trigger_type">Por favor, elija un tipo de activación:</string>
+    <string name="triggers">Activadores:</string>
+    <string name="remove_label">ELIMINAR</string>
+    <string name="preconditions">Precondiciones:</string>
     <!-- Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operación no soportada por bomba y/o controlador.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operación no soportada todavía por la bomba.</string>
     <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Integración de Bomba para Medtronic, requiere dispositivo RileyLink y modelo específico de Bomba</string>
     <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Número de serie de la Infusora</string>
+    <string name="medtronic_pump_type">Tipo de Infusora</string>
+    <string name="medtronic_pump_frequency">Frecuencia de la Infusora Medtronic</string>
+    <string name="medtronic_pump_bolus_delay">Retraso antes de que el bolo se inicie (s)</string>
+    <string name="medtronic_pump_max_bolus">Bolo máximo en infusora (U)</string>
+    <string name="medtronic_pump_max_basal">Máxima Basal en Infusora (U/h)</string>
+    <string name="medtronic_pump_encoding">Codificación de Medtronic</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canadá (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">A nivel mundial (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Codificación de software 4b6b</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Codificación de hardware 4b6b</string>
+    <string name="medtronic_custom_action_wake_and_tune">Encender y ajustar</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Borrar el bloque de bolo</string>
+    <string name="medtronic_custom_action_reset_rileylink">Restablecer configuración de RileyLink</string>
+    <string name="medtronic_pump_battery_select">Tipo de batería (Vista de energía)</string>
+    <string name="medtronic_pump_battery_no">No seleccionado (Vista simple)</string>
+    <string name="medtronic_pump_battery_alkaline">Alcalina (vista extendida)</string>
+    <string name="medtronic_pump_battery_lithium">Litio (vista extendida)</string>
     <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">ESCANEAR</string>
+    <string name="rileylink_scanner_scan_stop">DETENER</string>
+    <string name="rileylink_scanner_selected_device">Seleccionado</string>
+    <string name="rileylink_scanner_title">Escaneo de RileyLink</string>
+    <string name="rileylink_scanner_ble_not_supported">Bluetooth de baja energía no soportado.</string>
+    <string name="rileylink_scanner_ble_not_enabled">Bluetooth no activado.</string>
+    <string name="location_not_found_title">La ubicación no está habilitada</string>
+    <string name="location_not_found_message">Para activar la visibilidad Bluetooth en nuevos dispositivos, la ubicación debe estar habilitada. AAPS no hace un seguimiento de su ubicación y se puede desactivar después de la realizada la vinculación.</string>
+    <string name="location_yes">Habilitar</string>
+    <string name="location_no">No</string>
+    <string name="rileylink_scanner_scanning">Buscando</string>
+    <string name="rileylink_scanner_scanning_finished">Búsqueda Finalizada</string>
+    <string name="rileylink_scanner_scanning_error">Error de escaneo: %1$d</string>
     <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Configuración</string>
+    <string name="rileylink_settings_tab2">Historico</string>
+    <string name="rileylink_status">Estado RileyLink</string>
+    <string name="medtronic_pump_status">Estado de Infusora</string>
+    <string name="title_activity_rileylink_settings">Ajustes de RileyLink</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Dirección configurada</string>
+    <string name="rileylink_connected_device">Dispositivo conectado</string>
+    <string name="rileylink_connection_status">Estado de la conexión</string>
+    <string name="rileylink_connection_error">Error de conexión</string>
+    <string name="rileylink_device">Dispositivo</string>
+    <string name="rileylink_device_type">Tipo de dispositivo</string>
+    <string name="rileylink_device_model">Modelo del dispositivo</string>
+    <string name="rileylink_last_used_frequency">Última frecuencia usada</string>
+    <string name="rileylink_last_device_contact">Último contacto del dispositivo</string>
+    <string name="rileylink_firmware_version">Firmware RL</string>
     <!-- RL State -->
+    <string name="rileylink_state_bt_init">Inicializando Bluetooth…</string>
+    <string name="rileylink_state_bt_error">Error Bluetooth</string>
+    <string name="rileylink_state_bt_ready">Bluetooth listo</string>
+    <string name="rileylink_state_not_started">No iniciado</string>
+    <string name="rileylink_state_rl_init">Inicialización de RileyLink…</string>
+    <string name="rileylink_state_rl_error">Error de RileyLink</string>
+    <string name="rileylink_state_pc_error">Problema al conectar con la infusora</string>
+    <string name="rileylink_state_connected">Conectado</string>
     <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">El dispositivo no es un RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink no accesible</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth está desactivado</string>
+    <string name="rileylink_error_no_bt_adapter">No hay adaptador Bluetooth</string>
+    <string name="rileylink_error_tuneup_failed">Error al configurar</string>
+    <string name="rileylink_error_pump_unreachable">Infusora no alcanzable</string>
+    <string name="rileylink_error_pod_unreachable">Infusora no alcanzable</string>
+    <string name="rileylink_error_address_not_set_short">Sin configurar</string>
     <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Infusora Medtronic</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
     <!-- MDT Errors -->
+    <string name="medtronic_errors">Errores</string>
+    <string name="medtronic_error_serial_not_set">Nº serie no establecido.</string>
+    <string name="medtronic_error_serial_invalid">Número de serie no válido.</string>
+    <string name="medtronic_error_pump_type_not_set">Tipo de infusora no establecido.</string>
+    <string name="medtronic_error_pump_type_invalid">Tipo de infusora no soportado.</string>
+    <string name="medtronic_error_pump_frequency_not_set">No se ha establecido la frecuencia de la infusora.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Frecuencia de la infusora no soportada.</string>
+    <string name="medtronic_error_rileylink_address_invalid">Dirección de RileyLink no válida.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">El tipo de infusora detectado no es el mismo que el tipo configurado.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Los perfiles basales no están habilitados en la infusora.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">El perfil basal establecido en la infusora es incorrecto (debe ser estándar).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo incorrecto de basal temporal en la infusora (debe ser Absoluto).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Valor máximo incorrecto configurado en la infusora (debe ser %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Error en el valor máximo de basal configurado en la infusora (debe ser %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">La operación no es posible.\n\n Necesitas configurar primero la infusora Medtronic, antes de poder usar esta operación.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Se ha solicitado un cambio de hora de más de 24h.</string>
     <!-- MDT History -->
+    <string name="medtronic_history_group_basal">Dosis Basales</string>
+    <string name="medtronic_history_group_configuration">Ajustes</string>
+    <string name="medtronic_history_group_notification">Notificaciones</string>
+    <string name="medtronic_history_group_statistic">Estadísticas</string>
+    <string name="medtronic_history_group_unknown">Desconocido/a</string>
+    <string name="medtronic_history_group_all">Todos</string>
+    <string name="medtronic_pump_history">Historial de la infusora Medtronic</string>
     <!-- MDT Pump Status -->
+    <string name="medtronic_pump_status_never_contacted">Nunca conectados</string>
+    <string name="medtronic_pump_status_waking_up">En fase de inicio</string>
+    <string name="medtronic_pump_status_error_comm">Error con la comunicación</string>
+    <string name="medtronic_pump_status_timeout_comm">Tiempo de espera en la comunicación</string>
+    <string name="medtronic_pump_status_pump_unreachable">Infusora no alcanzable</string>
+    <string name="medtronic_pump_status_invalid_config">Configuración no válida</string>
+    <string name="medtronic_pump_status_active">Activo</string>
+    <string name="medtronic_pump_status_sleeping">Suspendida</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">Has cancelado el bolo después de que ya estaba enviado a la infusora. Debido a que la infusora Medtronic no soporta comando cancelar, tendrás que cancelarlo manualmente. Pon la infusora en modo suspender y luego reinicia (si todavía quieres cancelar). La aplicación recogerá los cambios en la próxima actualización (en menos de 5 minutos).</string>
+    <string name="medtronic_cmd_cant_read_tbr">No se pudo leer la basal temporal actual.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">No se pudo cancelar la basal temporal actual. Detener la operación.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">El perfil no se pudo activar debido a que los siguientes patrones tienen una basal demasiado grande: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">No se pudo entregar el bolo.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">El bolo no pudo ser entregado porque la cantidad de insulina disponible (%1$.2f) es inferior al bolo solicitado (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">La basal temporal no se ha podido activar.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">No se pudo cancelar la basal temporal actual.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">No se pudo establecer el perfil de basal.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">El perfil basal es el mismo, por lo que no será establecido de nuevo.</string>
+    <string name="medtronic_cmd_desc_get_history">Recuperar el historial - Página %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Recuperar el historial - Página %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Obtener la hora de la infusora</string>
+    <string name="medtronic_cmd_desc_get_settings">Obtener la configuración</string>
+    <string name="medtronic_cmd_desc_get_model">Obtener el modelo de la infusora</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Obtener el perfil basal</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Establecer el perfil basal</string>
+    <string name="medtronic_cmd_desc_get_tbr">Obtener la basal temporal</string>
+    <string name="medtronic_cmd_desc_set_tbr">Establecer la basal temporal</string>
+    <string name="medtronic_cmd_desc_set_bolus">Fijar Bolo</string>
+    <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Restricción de bolo aplicada: %2$.2fU a %3$.2fU</font>]]></string>
+    <string name="slowabsorptiondetected"><![CDATA[¡<font color=\'%1$s\'>! Se ha detectado una absorción lenta de hidratos de carbono: %2$d% de tiempo. Compruebe de nuevo su calculo. Los COB se pueden sobrestimar, por lo que ¡se podría administrar más insulina de la cuenta!</font>]]></string>
+    <string name="reservoirvalue">%1$.0f/%2$dU</string>
+    <string name="partialboluswizard">Administrar esta parte del resultado del asistente de bolos [%]</string>
+    <string name="deliverpartofboluswizard">El asistente de bolos realiza el cálculo, pero solo se entrega esta parte de la insulina calculada. Útil con el algoritmo SMB.</string>
+    <string name="loading">Cargando...</string>
+    <string name="snooze">Silenciar</string>
+    <string name="accomplished">Completado: %1$s</string>
+    <string name="objectives_usage_objective">Aprende a controlar AndroidAPS</string>
+    <string name="objectives_usage_gate">Realice diferentes acciones en AndroidAPS</string>
+    <string name="objectives_useprofileswitch">Establecer perfil 90% durante 10 min (Pulsación larga en nombre del perfil en Resumen)</string>
+    <string name="objectives_usedisconnectpump">Simular ducha. Desconectar bomba durante 1h (Pulsación larga en el bucle abierto)</string>
+    <string name="objectives_usereconnectpump">... y volver a conectar de la misma manera</string>
+    <string name="objectives_usetemptarget">Crear un objetivo temporal personalizado con 10 min de duración (Pulsación larga en tu objetivo actual)</string>
+    <string name="objectives_useactions">En Config Builder habilitar el plugin Acciones, hágalo visible y muestre su contenido desde el menú superior</string>
+    <string name="objectives_useloop">Mostrar contenido del plugin Loop</string>
+    <string name="objectives_usescale">Usar función de escala mediante un gráfico BG pulsado largo</string>
+    <string name="objectives_button_enter">Intro</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Introduzca el código obtenido de los desarrolladores para eludir el resto de objetivos</string>
+    <string name="codeaccepted">Código aceptado</string>
+    <string name="codeinvalid">Código no válido</string>
+    <string name="objectives_exam_objective">Compruebe su conocimiento</string>
+    <string name="objectives_exam_gate">Responder correctamente</string>
+    <string name="answerdisabledto">Respuesta deshabilitada a: %1$s</string>
+    <string name="wronganswer">Respuesta incorrecta!</string>
+    <string name="unfinshed_button">Siguien&amp;te sin terminar</string>
+    <string name="close">Cerrar</string>
+    <string name="requestcode">Solicitad código: %1$s</string>
+    <string name="objectives_hint">(compruebe todas las respuestas correctas)</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d día</item>
         <item quantity="other">%1$d días</item>
diff --git a/app/src/main/res/values-fi-rFI/exam.xml b/app/src/main/res/values-fi-rFI/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-fi-rFI/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-fr-rFR/exam.xml b/app/src/main/res/values-fr-rFR/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-fr-rFR/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 3e40a6aa1b..d04a6fc056 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -320,19 +320,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="overview_bolusprogress_goingtodeliver">%1$.2fU vont être injectées</string>
     <string name="objectives_0_objective">Paramétrer la visualisation et la surveillance des données, analyser les débits de basal et les ratios</string>
     <string name="objectives_0_gate">Vérifiez que la Glycémie est disponible sur Nightscout et que les données d’insuline ont été téléchargées de la pompe</string>
-    <string name="objectives_openloop_objective">Commencez par la configuration Boucle Ouverte</string>
-    <string name="objectives_openloop_gate">Utiliser le système Boucle Ouverte pour quelques jours, et activer manuellement de nombreux débits de basal temporaires. Définir et utiliser des objectifs temporaires (ex : activités ou utilisation de glucides pour traiter des hypos)</string>
-    <string name="objectives_maxbasal_objective">Comprendre votre système Boucle Ouverte, y compris ses recommandations de débit de Basal temporaire</string>
-    <string name="objectives_maxbasal_gate">Partant de ce constat, décidez quel est le débit de base maximum à choisir, et entrez le dans la pompe et les préférences </string>
-    <string name="objectives_maxiobzero_objective">Commencez par utiliser la Boucle Fermée avec le système Arrêt Glycémie Basse</string>
-    <string name="objectives_maxiobzero_gate">Utiliser la Boucle Fermée avec max IA = 0 pour quelques jours sans avoir trop d’événements AGB Arrêt Glycémie Basse (LGS Low Glucose Suspend)</string>
-    <string name="objectives_maxiob_objective">Ajustez votre système Boucle Fermée, augmentez la fonction « max IOB » au delà de 0 et diminuez progressivement vos cibles glycémiques</string>
-    <string name="objectives_maxiob_gate">Utiliser pendant quelques jours, et au moins une nuit sans les alarmes d’hypoglycémie, avant la baisse de G</string>
-    <string name="objectives_autosens_objective">Ajustez si besoin les débits de base et les ratios, activez ensuite « Autosens »</string>
-    <string name="objectives_autosens_gate">Une semaine réussie avec des journées en Boucle Fermée, avec des entrées normales des glucides</string>
-    <string name="objectives_ama_objective">Activer d’autres fonctionnalités pour l’utilisation dans la journée, tel que Assistance Repas Avancée (AMA Advanced Meal Assist)</string>
-    <string name="objectives_smb_objective">Activer des fonctionnalités supplémentaires pour l\'utilisation dans la journée, telles que la fonction SMB</string>
-    <string name="objectives_smb_gate">Vous devez lire le wiki et augmenter les max IA pour faire fonctionner SMB ! Un bon début est max IA = moyenne bolus repas + 3 fois max daily basal</string>
     <string name="youareonallowedlimit">Vous avez atteint la limite maximale</string>
     <string name="noprofileselected">Aucun profil séléctionné</string>
     <string name="smscommunicator_loophasbeendisabled">La Boucle été désactivée</string>
@@ -566,7 +553,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="enablesuperbolus">Activer les Superbolus dans l’Assistant</string>
     <string name="enablesuperbolus_summary">Activer la fonctionnalité SuperBolus dans l’Assistant. Ne pas l’activer avant de bien comprendre comment cela fonctionne réellement. IL PEUT PROVOQUER UNE OVERDOSE D’INSULINE SI UTILISÉ AVEUGLÉMENT !</string>
     <string name="show_statuslights">Afficher les lumières d\'état sur l\'écran d\'accueil</string>
-    <string name="show_statuslights_summary">Activer les lumières d\'état pour AgeC, AgeI, AgeS, niveaux du réservoir et de batterie sur l\'écran d\'accueil.</string>
     <string name="statuslights_res_warning">Seuil d\'avertissement de niveau du réservoir [U]</string>
     <string name="statuslights_res_critical">Seuil critique de niveau du réservoir [U]</string>
     <string name="statuslights_bat_warning">Seuil d’avertissement du niveau de batterie [%%]</string>
@@ -640,7 +626,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="mdtp_cancel">Annuler</string>
     <string name="notloadedplugins">Les profils ne sont pas tous téléchargés !</string>
     <string name="valuesnotstored">Valeurs non enregistrées !</string>
-    <string name="ns_localbroadcasts">Activer les transmissions de données sur d\'autres app. (ex. xDrip).</string>
     <string name="ns_localbroadcasts_title">Activer les transmissions locales.</string>
     <string name="careportal_activity_label">ACTIVITÉ et FEEDBACK</string>
     <string name="careportal_carbsandbolus_label">GLUCIDES et BOLUS</string>
@@ -1298,7 +1283,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="rileylink_state_not_started">Non démarré</string>
     <string name="rileylink_state_rl_init">Initialisation du RileyLink…</string>
     <string name="rileylink_state_rl_error">Erreur RileyLink</string>
-    <string name="rileylink_state_pc_tune_up">Préparation RileyLink et pompe</string>
     <string name="rileylink_state_pc_error">Problème communication avec la pompe</string>
     <string name="rileylink_state_connected">Connecté</string>
     <!-- RL Errors -->
@@ -1368,7 +1352,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="medtronic_cmd_desc_get_tbr">Obtenir le Basal Temporaire</string>
     <string name="medtronic_cmd_desc_set_tbr">Définir le Basal Temporaire</string>
     <string name="medtronic_cmd_desc_set_bolus">Définir le Bolus</string>
-    <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. Les GA (Glucides Actifs) peuvent être surestimés et alors plus d\'insuline pourrait être délivré !!!!!</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
diff --git a/app/src/main/res/values-ga-rIE/exam.xml b/app/src/main/res/values-ga-rIE/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-ga-rIE/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-hr-rHR/exam.xml b/app/src/main/res/values-hr-rHR/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-hr-rHR/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-it-rIT/exam.xml b/app/src/main/res/values-it-rIT/exam.xml
new file mode 100644
index 0000000000..e7705078e0
--- /dev/null
+++ b/app/src/main/res/values-it-rIT/exam.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="dia_whatmeansdia">Cosa è vero riguardo DIA?</string>
+    <string name="dia_label">Argomento: Durata dell\'Azione dell\'Insulina</string>
+    <string name="dia_minimumis3h">Il minimo predefinito è 3 ore.</string>
+    <string name="dia_minimumis5h">Il minimo predefinito è 5 ore.</string>
+    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
+    <string name="dia_meaningisequaltodiapump">È uguale al parametro DIA utilizzato nel tuo micro.</string>
+    <string name="dia_valuemustbedetermined">Devi determinare il tuo valore individuale (ma non meno di 5 ore).</string>
+    <string name="hypott_label">Argomento: Temp-Target \"Ipoglicemia\"</string>
+    <string name="hypott_whenhypott">Perché è utile impostare un TT Ipoglicemia?</string>
+    <string name="hypott_goinglow">Evitare che la glicemia vada in basso.</string>
+    <string name="hypott_havinglow">Per aiutare il recupero da una glicemia bassa.</string>
+    <string name="hypott_preventoversmb">Per evitare che SMB reagisca all\'aumento della glicemia dovuto ai carboidrati a rapido assorbimento durante una ipo.</string>
+    <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
+    <string name="offlineprofile_whatprofile">Quale profilo può essere usato e configurato offline?</string>
+    <string name="offlineprofile_label">Argomento: Profilo Offline</string>
+    <string name="offlineprofile_nsprofile">Il profilo NS può essere utilizzato, ma non configurato.</string>
+    <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
+    <string name="pumpdisconnect_label">Argomento: Disconnessione dal micro</string>
+    <string name="pumpdisconnect_whattodo">Cosa fare quando si toglie il micro?</string>
+    <string name="pumpdisconnect_letknow">Far sapere al Loop che non viene erogata insulina al tuo corpo facendo click su \"disconnettere micro\".</string>
+    <string name="pumpdisconnect_dontchnage">Non cambiare nulla nel Loop, staccare solo il micro.</string>
+    <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
+    <string name="objectives_label">Argomento: Impostazioni di AndroidAPS</string>
+    <string name="objectives_howtosave">Quali sono le migliori pratiche per il backup delle impostazioni?</string>
+    <string name="objectives_exportsettings">Esportarle localmente dal menu Manutenzione.</string>
+    <string name="objectives_storeelsewhere">Salvare il file esportato in un altro posto come l\'email, Dropbox, Google drive…</string>
+    <string name="objectives_doexportonstart">Esportarle subito dopo l\'installazione di AAPS.</string>
+    <string name="objectives_doexportafterchange">Esportarle dopo ogni modifica di un\'impostazione.</string>
+    <string name="objectives_doexportafterfirtssettings">Esportarle quando termini le configurazioni iniziali.</string>
+    <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
+    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
+    <string name="noisycgm_label">Argomento: Letture CGM \"rumorose\" (noisy)</string>
+    <string name="noisycgm_whattodo">Cosa fare quando vedi che i valori CGM sono troppo \"rumorosi\" (instabili)?</string>
+    <string name="nothing">Nulla, il Loop se ne occuperà.</string>
+    <string name="noisycgm_pause">Sospendere la modalità \"Loop Chiuso\" per evitare il sovradosaggio.</string>
+    <string name="noisycgm_replacesensor">Sostituire il sensore CGM.</string>
+    <string name="noisycgm_turnoffphone">Spegnere il telefono.</string>
+    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
+    <string name="noisycgm_checksmoothing">Controllare se la tua app CGM fa lo \"smoothing\" dei dati (ne filtra il \"rumore\").</string>
+    <string name="exercise_label">Argomento: Esercizio Fisico</string>
+    <string name="exercise_whattodo">Come puoi aiutare il sistema a gestire l\'esercizio fisico?</string>
+    <string name="exercise_setactivitytt">Impostare un Temp-Target \"Attività\".</string>
+    <string name="exercise_switchprofilebelow100">Fare un cambio profilo sotto il 100%.</string>
+    <string name="exercise_switchprofileabove100">Fare un cambio profilo sopra il 100%.</string>
+    <string name="exercise_stoploop">Stoppare il Loop.</string>
+    <string name="exercise_doitbeforestart">Impostare il Temp-Target \"Attività\" prima dell\'inizio dell\'esercizio.</string>
+    <string name="exercise_doitafterstart">Impostare il Temp-Target \"Attività\" dopo l\'inizio dell\'esercizio.</string>
+    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="suspendloop_label">Argomento: Loop sospeso</string>
+    <string name="suspendloop_doigetinsulin">Ricevo insulina quando il Loop è sospeso?</string>
+    <string name="suspendloop_yes">Sì, la velocità basale ordinaria.</string>
+    <string name="suspendloop_no">No, l\'erogazione di insulina è interrotta.</string>
+    <string name="basaltest_label">Argomento: Basale, ISF e Test IC</string>
+    <string name="basaltest_when">Quando dovrei verificare i valori di basali, ISF e IC?</string>
+    <string name="basaltest_beforeloop">Prima di iniziare il Loop.</string>
+    <string name="basaltest_havingregularhypo">Quando si hanno Ipoglicemie regolarmente.</string>
+    <string name="basaltest_havingregularhyper">Quando si hanno Iperglicemie regolarmente.</string>
+    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
+    <string name="prerequisites_label">Argomento: Prerequisiti</string>
+    <string name="prerequisites_what">Di cosa ho bisogno?</string>
+    <string name="prerequisites_determinedcorrectprofile">Profilo determinato correttamente (Basali, IC, ISF, DIA).</string>
+    <string name="prerequisites_computer">Un computer per creare un APK.</string>
+    <string name="prerequisites_phone">Un telefono supportato.</string>
+    <string name="prerequisites_car">Un\'auto.</string>
+    <string name="prerequisites_nightscout">Nightscout, per superare gli obiettivi.</string>
+    <string name="prerequisites_tidepoolaccount">Un account Tidepool.</string>
+    <string name="prerequisites_googleaccount">Un account Google.</string>
+    <string name="prerequisites_githubaccount">Un account Github.</string>
+    <string name="prerequisites_beanandroiddeveloper">È necessario essere uno sviluppatore Android.</string>
+    <string name="prerequisites_own670g">Un micro MiniMed 670G.</string>
+    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="prerequisites_smartwatch">Uno Smartwatch.</string>
+    <string name="prerequisites_supportedcgm">Un CGM Supportato.</string>
+    <string name="update_label">Argomento: Aggiornamento di AndroidAPS</string>
+    <string name="whatistrue">Cosa è vero?</string>
+    <string name="update_git">Hai bisogno di avere Git installato.</string>
+    <string name="update_asap">Aggiornare non appena la nuova versione viene rilasciata.</string>
+    <string name="update_keys">Puoi usare le stesse chiavi di firma.</string>
+    <string name="update_neverupdate">Non aggiornare mai se il sistema funziona bene.</string>
+    <string name="update_askfriend">Chiedere al tuo amico il nuovo APK.</string>
+    <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
+    <string name="troubleshooting_label">Argomento: Risoluzione dei problemi</string>
+    <string name="troubleshooting_wheretoask">Dove cercare aiuto?</string>
+    <string name="troubleshooting_fb">Entrare nel gruppo Facebook di AndroidAPS.</string>
+    <string name="troubleshooting_wiki">Visitare il Wiki di AndroidAPS.</string>
+    <string name="troubleshooting_gitter">Visitare la Gitter Room di AndroidAPS.</string>
+    <string name="troubleshooting_googlesupport">Visitare il supporto Google di AndroidAPS</string>
+    <string name="troubleshooting_yourendo">Parlare con il tuo endocrinologo.</string>
+    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
+    <string name="troubleshooting_hint2">https://www.facebook.com/groups/aapsitalia/</string>
+    <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
+    <string name="insulin_label">Argomento: Insulina</string>
+    <string name="insulin_ultrarapid">Quale marca di insulina può essere usata con il plugin Ultra-Rapid-Oref?</string>
+    <string name="insulin_fiasp">Fiasp®</string>
+    <string name="insulin_novorapid">NovoRapid®</string>
+    <string name="insulin_humalog">Humalog®</string>
+    <string name="insulin_actrapid">Actrapid®</string>
+    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
+    <string name="sensitivity_label">Argomento: Plugin di Sensibilità</string>
+    <string name="sensitivity_which">Quale plugin di sensibilità ha un intervallo di tempo definito dall\'utente per il rilevamento?</string>
+    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="sensitivityuam_which">Quale plugin di sensibilità deve essere utilizzato per la funzione UAM?</string>
+    <string name="wrongcarbs_label">Argomento: Inserimenti non corretti dei Carboidrati</string>
+    <string name="wrongcarbs_whattodo">Ti accorgi che hai inserito erroneamente i carboidrati. Cosa dovresti fare?</string>
+    <string name="wrongcarbs_treatmentstab">Andare nella sezione Trattamenti, eliminare i carboidrati \"errati\" e fare un nuovo inserimento.</string>
+    <string name="wrongcarbs_addfakeinsulin">Aggiungere insulina fittizia usando la funzione Riempimento</string>
+    <string name="extendedcarbs_label">Argomento: Cibo con Grassi e Proteine</string>
+    <string name="extendedcarbs_handling">Cosa fare se il tuo cibo contiene una grande quantità di grassi e/o proteine?</string>
+    <string name="extendedcarbs_useextendedcarbs">Convertire grassi e proteine in carboidrati e utilizzare la funzione \"carboidrati estesi\" (eCarbs).</string>
+    <string name="extendedcarbs_add">Convertire grassi e proteine in carboidrati e aggiungerli al calcolo del bolo.</string>
+    <string name="extendedcarbs_useextendedbolus">Utilizzare il bolo esteso per coprire grassi e proteine.</string>
+    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
+    <string name="nsclient_label">Argomento: Monitoraggio dei bambini</string>
+    <string name="nsclient_howcanyou">Come puoi monitorare AAPS del tuo bambino in remoto?</string>
+    <string name="nsclient_nightscout">Usando un sito Nightscout.</string>
+    <string name="nsclient_dexcomfollow">L\'app Dexcom Follow se stai usando l\'app originale Dexcom.</string>
+    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow se stai usando l\'app xDrip.</string>
+    <string name="nsclient_xdripfollower">xDrip in modalità follower.</string>
+    <string name="nsclient_looponiphone">App Loop su iPhone.</string>
+    <string name="nsclient_spikeiphone">App Spike su iPhone.</string>
+    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_label">Argomento: Fattore di Sensibilità all\'Insulina</string>
+    <string name="isf_increasingvalue">L\'aumento del valore ISF porterà a una minore erogazione di insulina se stai cercando di abbassare la tua glicemia con il \"bolus wizard\".</string>
+    <string name="isf_decreasingvalue">La riduzione del valore ISF porterà a una minore erogazione di insulina se stai cercando di abbassare la tua glicemia con il \"bolus wizard\".</string>
+    <string name="isf_noeffect">La modifica di ISF non ha alcun effetto sulla quantità di insulina somministrata da APPS quando si cerca di correggere l\'iperglicemia.</string>
+    <string name="isf_preferences">Devi inserire ISF nelle Preferenze.</string>
+    <string name="isf_profile">Cambiare il valore ISF nel tuo profilo è sufficiente per applicare la modifica.</string>
+    <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
+    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
+    <string name="ic_label">Argomento: Il Valore IC</string>
+    <string name="ic_increasingvalue">L\'aumento del valore IC porterà a una minore erogazione di insulina per la stessa quantità di carboidrati.</string>
+    <string name="ic_decreasingvalue">La riduzione del valore IC porterà a una minore erogazione di insulina per la stessa quantità di carboidrati.</string>
+    <string name="ic_noeffect">Supporre di avere 0 COB. La modifica dell\'IC porterà a una diversa quantità di insulina necessaria per correggere il valore della glicemia.</string>
+    <string name="ic_different">IC sarà diverso se consideri l\'unità di pane (BE) come 10g o 12g.</string>
+    <string name="ic_meaning">Il significato di IC è: Quante unità di pane (BE) sono coperte da 1U di insulina.</string>
+    <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
+    <string name="profileswitch_label">Argomento: Cambio Profilo</string>
+    <string name="profileswitch_pctwillchange"> Quando si specifica il 90% nel cambio profilo…</string>
+    <string name="profileswitch_basalhigher">Le basali saranno il 10% più alte.</string>
+    <string name="profileswitch_basallower">Le basali saranno il 10% più basse.</string>
+    <string name="profileswitch_ichigher">Il valore IC sarà il 10% più alto.</string>
+    <string name="profileswitch_iclower">Il valore IC sarà il 10% più basso.</string>
+    <string name="profileswitch_isfhigher">Il valore ISF sarà il 10% più alto.</string>
+    <string name="profileswitch_isflower">Il valore ISF sarà il 10% più basso.</string>
+    <string name="profileswitch_overall">Riceverai il 10% in meno di insulina, in totale.</string>
+    <string name="profileswitch_targethigher">Il Target sarà il 10% più alto.</string>
+    <string name="profileswitch_targetlower">Il Target sarà il 10% più basso.</string>
+    <string name="profileswitch_targetbottom">Solo il target inferiore sarà il 10% più basso.</string>
+    <string name="profileswitch_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
+    <string name="profileswitchtime_iwant">Voglio fare un cambio profilo perché mi sono dovuto svegliare 1h prima del solito, quindi è più sensato annunciare lo spostamento d\'orario mediante un cambio profilo. Che valore dovrei usare?</string>
+    <string name="profileswitchtime_1">1</string>
+    <string name="profileswitchtime__1">-1</string>
+    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
+    <string name="profileswitchtime_60">60</string>
+    <string name="profileswitchtime__60">-60</string>
+</resources>
diff --git a/app/src/main/res/values-it-rIT/insight_alert_descriptions.xml b/app/src/main/res/values-it-rIT/insight_alert_descriptions.xml
index 253fab6a2b..1fbe9ab431 100644
--- a/app/src/main/res/values-it-rIT/insight_alert_descriptions.xml
+++ b/app/src/main/res/values-it-rIT/insight_alert_descriptions.xml
@@ -7,7 +7,7 @@
     <string name="alert_w33_description">Imposta ora/data.</string>
     <string name="alert_w34_description">Contatta il supporto Accu-Chek.</string>
     <string name="alert_w36_description"><![CDATA[Quantità: <b>%1$d%%</b><br/>Durata: <b>%2$s h</b>]]></string>
-    <string name="alert_w38_description"><![CDATA[Programmato: <b>%1$s U</b><br/>Consegnato: <b>%2$s U</b>]]></string>
+    <string name="alert_w38_description"><![CDATA[Programmato: <b>%1$s U</b><br/>Erogato: <b>%2$s U</b>]]></string>
     <string name="alert_m20_description">Inserisci cartuccia.</string>
     <string name="alert_m21_description">Cambia cartuccia.</string>
     <string name="alert_m22_description">Cambia la batteria.</string>
diff --git a/app/src/main/res/values-it-rIT/insight_alert_titles.xml b/app/src/main/res/values-it-rIT/insight_alert_titles.xml
index b35b6edf74..97ed97fa7f 100644
--- a/app/src/main/res/values-it-rIT/insight_alert_titles.xml
+++ b/app/src/main/res/values-it-rIT/insight_alert_titles.xml
@@ -16,7 +16,7 @@
     <string name="alert_m20_title">Cartuccia non inserita</string>
     <string name="alert_m21_title">Cartuccia vuota</string>
     <string name="alert_m22_title">Batteria scarica</string>
-    <string name="alert_m23_title">Spegnimento automatico - micro in stop</string>
+    <string name="alert_m23_title">Spegnimento automatico - micro stoppato</string>
     <string name="alert_m24_title">Occlusione</string>
     <string name="alert_m25_title">Prestito terminato - fine operatività</string>
     <string name="alert_m26_title">Cambio cartuccia non completato</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 7335ef70d7..fb842a6f32 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -8,35 +8,35 @@
     <!--    <string name="pt_BR_lang" translatable="false">Portuguese, Brazilian</string> -->
     <string name="treatmentssafety_title">Sicurezza trattamenti</string>
     <string name="treatmentssafety_maxbolus_title">Max Bolo consentito [U]</string>
-    <string name="treatmentssafety_maxcarbs_title">Max carboidrati consentiti [g]</string>
+    <string name="treatmentssafety_maxcarbs_title">Max Carboidrati consentiti [g]</string>
     <string name="nav_preferences">Preferenze</string>
-    <string name="nav_refreshtreatments">Ricarica trattamenti da NS</string>
-    <string name="nav_resetdb">Ripristina database</string>
-    <string name="reset_db_confirm">Vuoi davvero ripristinare i database?</string>
+    <string name="nav_refreshtreatments">Ricaricare trattamenti da NS</string>
+    <string name="nav_resetdb">Reset database</string>
+    <string name="reset_db_confirm">Vuoi davvero resettare i database?</string>
     <string name="nav_exit">Uscita</string>
-    <string name="danar_useextended_title">Usa bolo esteso per &gt;200%%</string>
-    <string name="danar_bt_name_title">Dispositivo Bluetooh DanaR</string>
+    <string name="danar_useextended_title">Usare boli estesi per &gt;200%%</string>
+    <string name="danar_bt_name_title">Dispositivo DanaR Bluetooth</string>
     <string name="ns_sync_use_absolute_title">Utilizzare sempre valori basali assoluti</string>
     <string name="alert_dialog_storage_permission_text">Per favore riavvia il tuo telefono oppure fai ripartire AndroidAPS dalle impostazioni di sistema \naltrimenti Android APS non farà il log (è importante monitorare e verificare che gli algoritmi stiano funzionando correttamente)!</string>
-    <string name="alert_dialog_permission_battery_optimization_failed">Questo dispositivo non sembra supportare la whitelisting dell\'ottimizzazione della batteria: potrebbero verificarsi problemi di prestazioni.</string>
+    <string name="alert_dialog_permission_battery_optimization_failed">Questo dispositivo non sembra supportare la whitelist dell\'ottimizzazione della batteria: potrebbero verificarsi problemi di prestazioni.</string>
     <string name="description_actions">Alcuni pulsanti per accedere rapidamente alle funzioni comuni</string>
-    <string name="description_careportal">Immetti voci di registro avanzate.</string>
+    <string name="description_careportal">Inserire voci di registro avanzate.</string>
     <string name="description_config_builder">Utilizzato per configurare i plugin attivi</string>
     <string name="description_objectives">Programma di apprendimento</string>
     <string name="description_food">Visualizza l\'elenco dei cibi definiti in Nightscout</string>
     <string name="description_insulin_rapid">Preset per insulina Humalog e NovoRapid</string>
     <string name="description_insulin_ultra_rapid">Preset per insulina Fiasp</string>
-    <string name="description_insulin_free_peak">Consente di definire il picco dell\'insulina e deve essere utilizzato solo dagli utenti avanzati</string>
-    <string name="description_loop">Attiva o disattiva l\'implementazione del loop.</string>
+    <string name="description_insulin_free_peak">Ti consente di definire il picco dell\'insulina e deve essere utilizzato solo dagli utenti avanzati</string>
+    <string name="description_loop">Attivare o disattivare l\'implementazione del loop.</string>
     <string name="description_ns_client">Sincronizza i tuoi dati con Nightscout</string>
     <string name="description_ma">Stato dell\'algoritmo nel 2016</string>
     <string name="description_ama">Stato dell\'algoritmo nel 2017</string>
     <string name="description_smb">Algoritmo più recente per gli utenti avanzati</string>
     <string name="description_overview">Visualizza lo stato corrente del tuo loop e i pulsanti per le azioni più comuni</string>
     <string name="description_persistent_notification">Mostra una notifica con una breve panoramica di ciò che sta facendo il tuo loop</string>
-    <string name="description_profile_local">Definisci un profilo disponibile offline.</string>
+    <string name="description_profile_local">Definire un profilo disponibile offline.</string>
     <string name="description_profile_nightscout">Fornisce il profilo definito in Nightscout</string>
-    <string name="description_profile_simple">Imposta un profilo con un solo intervallo temporale.</string>
+    <string name="description_profile_simple">Impostare un profilo con un solo intervallo temporale.</string>
     <string name="description_pump_combo">Integrazione del microinfusore Accu-Chek Combo, è necessario avere Ruffy installato</string>
     <string name="description_pump_dana_r">Integrazione del microinfusore DANA Diabecare R</string>
     <string name="description_pump_dana_r_korean">Integrazione del microinfusore DANA Diabecare R Korean</string>
@@ -44,22 +44,22 @@
     <string name="description_pump_dana_rs">Integrazione del microinfusore DANA Diabecare RS</string>
     <string name="description_pump_mdi">Per le persone in terapia multi-iniettiva</string>
     <string name="description_pump_virtual">Per microinfusori che non hanno ancora alcun driver (Loop Aperto)</string>
-    <string name="description_sensitivity_aaps">La sensibilità è calcolata allo stesso modo di Oref0, ma è possibile specificare l\'intervallo di tempo al passato. Minimal carb absorption è calcolato da max carb absorption time nelle preferenze.</string>
+    <string name="description_sensitivity_aaps">La sensibilità è calcolata allo stesso modo di Oref0, ma è possibile specificare l\'intervallo di tempo al passato. L\'assorbimento minimo dei carboidrati è calcolato da \'max tempo assorbimento carb\' nelle preferenze.</string>
     <string name="description_sensitivity_oref0">La sensibilità è calcolata dai dati delle ultime 24h e i carboidrati (se non assorbiti) vengono tagliati fuori dopo il tempo specificato nelle preferenze.</string>
     <string name="description_sensitivity_oref1">La sensibilità è calcolata dai dati delle ultime 8h e i carboidrati (se non assorbiti) vengono tagliati fuori dopo il tempo specificato nelle preferenze. Il Plugin calcola anche UAM.</string>
-    <string name="description_sensitivity_weighted_average">La sensibilità è calcolata come media ponderata dalle deviazioni. Le deviazioni più recenti hanno peso maggiore. Minimal carb absorption è calcolato da max carb absorption time nelle preferenze. Questo algoritmo è il più veloce nel seguire i cambiamenti di sensibilità.</string>
-    <string name="description_source_eversense">Ricevi valori Glicemia dall\'app Eversense modificata.</string>
-    <string name="description_source_glimp">Ricevi valori Glicemia da Glimp.</string>
-    <string name="description_source_mm640g">Ricevi valori Glicemia da 600SeriesAndroidUploader.</string>
+    <string name="description_sensitivity_weighted_average">La sensibilità è calcolata come media ponderata dalle deviazioni. Le deviazioni più recenti hanno peso maggiore. L\'assorbimento minimo dei carboidrati è calcolato da \'max tempo assorbimento carb\' nelle preferenze. Questo algoritmo è il più veloce nel seguire i cambiamenti di sensibilità.</string>
+    <string name="description_source_eversense">Ricevere valori Glicemia dall\'app Eversense modificata.</string>
+    <string name="description_source_glimp">Ricevere valori Glicemia da Glimp.</string>
+    <string name="description_source_mm640g">Ricevere valori Glicemia da 600SeriesAndroidUploader.</string>
     <string name="description_source_ns_client">Scarica dati Glicemia da Nightscout</string>
-    <string name="description_source_xdrip">Ricevi dati Glicemia da xDrip.</string>
+    <string name="description_source_xdrip">Ricevere dati Glicemia da xDrip.</string>
     <string name="description_treatments">Salva tutti i trattamenti</string>
-    <string name="description_wear">Monitora e controlla AndroidAPS usando il tuo smartwatch WearOS.</string>
-    <string name="description_xdrip_status_line">Visualizza le informazioni del loop sulla watchface di xDrip+.</string>
-    <string name="description_sms_communicator">Controlla AndroidAPS in remoto utilizzando i comandi SMS.</string>
+    <string name="description_wear">Monitorare e controllare AndroidAPS usando il tuo smartwatch WearOS.</string>
+    <string name="description_xdrip_status_line">Visualizzare le informazioni del loop sulla watchface di xDrip+.</string>
+    <string name="description_sms_communicator">Controllare AndroidAPS in remoto utilizzando i comandi SMS.</string>
     <string name="objectives_button_back">Indietro</string>
-    <string name="objectives_button_start">Avvio</string>
-    <string name="objectives_button_verify">Verifica</string>
+    <string name="objectives_button_start">Avviare</string>
+    <string name="objectives_button_verify">Verificare</string>
     <string name="nsprofileview_units_label">Unità</string>
     <string name="nsprofileview_dia_label">DIA - Durata Azione dell\'Insulina</string>
     <string name="nsprofileview_ic_label">IC - Rapporto Insulina/Carboidrati</string>
@@ -85,19 +85,19 @@
     <string name="treatments_wizard_carbs_label">Carboidrati</string>
     <string name="treatments_wizard_correction_label">Correzione</string>
     <string name="insulin_unit_shortname">U</string>
-    <string name="treatments_wizard_bolusiob_label">Bolo IOB</string>
-    <string name="openapsma_run">Avvia ora</string>
+    <string name="treatments_wizard_bolusiob_label">IOB da bolo</string>
+    <string name="openapsma_run">Avviare ora</string>
     <string name="vitualpump_label">MICROINFUSORE VIRTUALE</string>
     <string name="pump_basebasalrate_label">Vel. basale originale</string>
-    <string name="pump_tempbasal_label">Basale temporanea</string>
+    <string name="pump_tempbasal_label">Basale Temporanea</string>
     <string name="virtualpump_extendedbolus_label">Bolo Esteso</string>
     <string name="pump_battery_label">Batteria</string>
     <string name="pump_reservoir_label">Serbatoio</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">Ultima esecuzione</string>
-    <string name="openapsma_inputparameters_label">Entrata parametro</string>
+    <string name="openapsma_inputparameters_label">Parametri di input</string>
     <string name="openapsma_glucosestatus_label">Stato glicemia</string>
-    <string name="openapsma_currenttemp_label">Basale temporanea attuale</string>
+    <string name="openapsma_currenttemp_label">Temp. Corrente</string>
     <string name="openapsma_iobdata_label">Dati IOB</string>
     <string name="openapsma_profile_label">Profilo</string>
     <string name="openapsma_mealdata_label">Dati Pasto</string>
@@ -112,17 +112,17 @@
     <string name="delta">Delta</string>
     <string name="sms_delta">Delta:</string>
     <string name="configbuilder">Configuratore</string>
-    <string name="objectives">Obbiettivi</string>
+    <string name="objectives">Obiettivi</string>
     <string name="openapsma">OpenAPS MA</string>
     <string name="overview">Panoramica</string>
     <string name="nsprofile">Profilo NS</string>
     <string name="simpleprofile">Profilo semplice</string>
-    <string name="tempbasal">BasaleTemp</string>
+    <string name="tempbasal">Basale Temporanea</string>
     <string name="treatments">Trattamenti</string>
     <string name="virtualpump">Micro Virtuale</string>
-    <string name="careportal">Careportal</string>
+    <string name="careportal">Portale</string>
     <string name="configbuilder_pump">Microinfusore</string>
-    <string name="configbuilder_pump_description">Quale microinfusore vuoi utilizzare con AndroidAPS?</string>
+    <string name="configbuilder_pump_description">Quale microinfusore desideri utilizzare con AndroidAPS?</string>
     <string name="configbuilder_treatments">Trattamenti</string>
     <string name="configbuilder_treatments_description">Quale plugin dovrebbe essere utilizzato per la gestione del trattamento?</string>
     <string name="configbuilder_profile">Profilo</string>
@@ -139,56 +139,56 @@
     <string name="configbuilder_loop_description">Consente di attivare l\'integrazione del loop di AndroidAPS.</string>
     <string name="loop_aps_label">APS</string>
     <string name="loop_constraintsprocessed_label">Dopo aver elaborato i vincoli</string>
-    <string name="loop_tbrsetbypump_label">Basale Temp attivata sul microinfusore</string>
-    <string name="openapsma_lastenact_label">Ultimo attuato</string>
+    <string name="loop_tbrsetbypump_label">Basale Temporanea impostata dal micro</string>
+    <string name="openapsma_lastenact_label">Ultima attivazione</string>
     <string name="ok">OK</string>
     <string name="cancel">Annulla</string>
     <string name="noapsselected">NESSUN APS SELEZIONATO O RISULTATO FORNITO</string>
     <string name="safety">Sicurezza</string>
-    <string name="openapsma_disabled">Plugin disabilitato</string>
+    <string name="openapsma_disabled">Il Plugin è disabilitato</string>
     <string name="constraints_violation">Violazione dei vincoli</string>
-    <string name="treatmentdeliveryerror">Errore di erogazione del bolo</string>
-    <string name="tempbasaldeliveryerror">Errore somministrazione Basale Temp</string>
+    <string name="treatmentdeliveryerror">Errore erogazione bolo</string>
+    <string name="tempbasaldeliveryerror">Errore erogazione Basale Temporanea</string>
     <string name="overview_newtempbasal_basalpercent">Valore Basale [%%]</string>
     <string name="overview_newtempbasal_percent_label">%% (100%% = corrente)</string>
-    <string name="setbasalquestion">Accetta nuova Basale Temp:</string>
+    <string name="setbasalquestion">Accetta nuova Basale Temporanea:</string>
     <string name="overview_treatment_label">Trattamento</string>
     <string name="overview_calculator_label">Calcolatore</string>
     <string name="constraintapllied">Vincolo applicato!</string>
     <string name="confirmation">Conferma</string>
-    <string name="entertreatmentquestion">Inserisci nuovo trattamento:</string>
+    <string name="entertreatmentquestion">Inserire nuovo trattamento:</string>
     <string name="bolus">Bolo</string>
     <string name="sms_bolus">Bolo:</string>
     <string name="basal">Basale</string>
     <string name="sms_basal">Basale</string>
     <string name="carbs">Carboidrati</string>
-    <string name="changeyourinput">Cambia il tuo input!</string>
-    <string name="setextendedbolusquestion">Imposta nuovo bolo esteso:</string>
+    <string name="changeyourinput">Cambiare il tuo input!</string>
+    <string name="setextendedbolusquestion">Impostare nuovo bolo esteso:</string>
     <string name="configbuilder_bgsource">Origine Glicemia</string>
-    <string name="configbuilder_bgsource_description">Dove prendere i dati per AndroidAPS?</string>
+    <string name="configbuilder_bgsource_description">Da dove AndroidAPS dovrebbe ottenere i suoi dati?</string>
     <string name="xdrip">xDrip</string>
     <string name="apsmode_title">Modalità APS</string>
     <string name="closedloop">Loop Chiuso</string>
     <string name="openloop">Loop Aperto</string>
     <string name="disabledloop">Loop Disabilitato</string>
-    <string name="disableloop">Disabilita Loop</string>
-    <string name="enableloop">Abilita Loop</string>
+    <string name="disableloop">Disabilitare Loop</string>
+    <string name="enableloop">Abilitare Loop</string>
     <string name="openloop_newsuggestion">Nuovo suggerimento disponibile</string>
-    <string name="unsupportedclientver">Versione NSClient non supportata</string>
+    <string name="unsupportedclientver">Versione non supportata di NSClient</string>
     <string name="unsupportednsversion">Versione non supportata di Nightscout</string>
-    <string name="nsclientnotinstalled">NSClient non istallato. Record perduto!</string>
+    <string name="nsclientnotinstalled">NSClient non installato. Record perduto!</string>
     <string name="objectives_bgavailableinns">Glicemia disponibile in NS</string>
     <string name="objectives_pumpstatusavailableinns">Stato Micro disponibile in NS</string>
-    <string name="objectives_manualenacts">Manuale</string>
+    <string name="objectives_manualenacts">Attivazioni manuali</string>
     <string name="loopdisabled">LOOP DISABILITATO DAI VINCOLI</string>
-    <string name="treatments_wizard_basaliob_label">Basale IOB</string>
+    <string name="treatments_wizard_basaliob_label">IOB da Basale</string>
     <string name="bolusconstraintapplied">Vincolo bolo applicato</string>
     <string name="carbsconstraintapplied">Vincolo carboidrati applicato</string>
     <string name="careportal_bgcheck">Controllo Glicemia</string>
     <string name="careportal_announcement">Annuncio</string>
     <string name="careportal_note">Nota</string>
     <string name="careportal_question">Domanda</string>
-    <string name="careportal_exercise">Sport</string>
+    <string name="careportal_exercise">Esercizio</string>
     <string name="careportal_pumpsitechange">Cambio posizione cannula</string>
     <string name="careportal_cgmsensorinsert">Inserimento sensore</string>
     <string name="careportal_cgmsensorstart">Avvio Sensore</string>
@@ -198,8 +198,8 @@
     <string name="careportal_mealbolus">Bolo pasto</string>
     <string name="careportal_correctionbolus">Bolo di Correzione</string>
     <string name="careportal_combobolus">Bolo Combo</string>
-    <string name="careportal_tempbasalstart">Inizio Basale Temp</string>
-    <string name="careportal_tempbasalend">Fine Basale Temp</string>
+    <string name="careportal_tempbasalstart">Inizio Basale Temporanea</string>
+    <string name="careportal_tempbasalend">Fine Basale Temporanea</string>
     <string name="careportal_carbscorrection">Correzione con carboidrati</string>
     <string name="careportal_openapsoffline">OpenAPS Offline</string>
     <string name="careportal_newnstreatment_eventtype">Tipo di evento</string>
@@ -219,7 +219,7 @@
     <string name="careportal_newnstreatment_enteredby_title">Inserito da</string>
     <string name="careportal_newnstreatment_glucosetype">Tipo Glicemia</string>
     <string name="noprofile">Nessun profilo ancora caricato da NS</string>
-    <string name="overview_tempbasal_button">Basale Temp</string>
+    <string name="overview_tempbasal_button">Basale Temporanea</string>
     <string name="overview_extendedbolus_button">Bolo Esteso</string>
     <string name="configbuilder_nightscoutversion_label">Versione Nightscout:</string>
     <string name="missing">Mancante</string>
@@ -228,22 +228,22 @@
     <string name="import_from">Importa impostazioni da</string>
     <string name="setting_imported">Impostazioni importate</string>
     <string name="filenotfound">File non trovato</string>
-    <string name="nav_export">Esporta impostazioni</string>
-    <string name="nav_import">Importa impostazioni</string>
-    <string name="openapsma_maxbasal_title">Max U/h che una Basale Temp può impostare</string>
-    <string name="openapsma_maxbasal_summary">Questo valore è chiamato \"max basal\" nel contesto OpenAPS</string>
-    <string name="openapsma_maxiob_title">Basale Massima in IOB OpenAPS</string>
+    <string name="nav_export">Esportare impostazioni</string>
+    <string name="nav_import">Importare impostazioni</string>
+    <string name="openapsma_maxbasal_title">Max U/h che una Basale Temporanea può impostare</string>
+    <string name="openapsma_maxbasal_summary">Questo valore è chiamato max basale nel contesto OpenAPS</string>
+    <string name="openapsma_maxiob_title">Max IOB da Basale che OpenAPS può erogare [U]</string>
     <string name="openapsma_maxiob_summary">Questo valore è chiamato Max IOB nel contesto OpenAPS\nIndica l\'insulina massima in [U] che APS può erogare contemporaneamente.</string>
     <string name="dismiss">RESPINGI</string>
     <string name="danarpump">DanaR</string>
-    <string name="connecting">In Connessione</string>
+    <string name="connecting">Connessione</string>
     <string name="connected">Connesso</string>
     <string name="disconnected">Disconnesso</string>
     <string name="danar_pump_settings">Impostazioni micro DanaR</string>
     <string name="end_user_license_agreement">Contratto di licenza per l\'utente</string>
     <string name="end_user_license_agreement_text">NON DEVE ESSERE UTILIZZATO PER PRENDERE DECISIONI MEDICHE. NON ESISTE ALCUNA GARANZIA PER IL PROGRAMMA, NELLA MISURA CONSENTITA DALLA LEGGE APPLICABILE. TRANNE QUANDO DIVERSAMENTE INDICATO PER ISCRITTO, I DETENTORI DEL COPYRIGHT E/O ALTRE PARTI FORNISCONO IL PROGRAMMA \"COSÌ COM\'È\" SENZA GARANZIA DI ALCUN TIPO, ESPLICITA O IMPLICITA, INCLUSE, MA NON LIMITATAMENTE A, GARANZIE IMPLICITE DI COMMERCIABILITÀ E IDONEITÀ PER UN SCOPO PARTICOLARE. L\'INTERO RISCHIO RIGUARDO LA QUALITÀ E LE PRESTAZIONI DEL PROGRAMMA È TUO. SE IL PROGRAMMA DOVESSE RISULTARE DIFETTOSO, TI ASSUMI IL COSTO DI TUTTE LE NECESSARIE MANUTENZIONI, RIPARAZIONI O CORREZIONI.</string>
     <string name="end_user_license_agreement_i_understand">COMPRENDO E ACCETTO</string>
-    <string name="save">Salva</string>
+    <string name="save">Salvare</string>
     <string name="nobtadapter">Nessun adattatore bluetooth trovato</string>
     <string name="devicenotfound">Dispositivo selezionato non trovato</string>
     <string name="connectionerror">Errore connessione Microinfusore</string>
@@ -253,183 +253,183 @@
     <string name="hoursago">%1$.1fh fa</string>
     <string name="danar_invalidinput">Dati di input non validi</string>
     <string name="danar_valuenotsetproperly">Valore non impostato correttamente</string>
-    <string name="reloadprofile">Ricarica Profilo</string>
-    <string name="danar_viewprofile">Visualizza Profilo</string>
+    <string name="reloadprofile">Ricaricare Profilo</string>
+    <string name="danar_viewprofile">Visualizzare Profilo</string>
     <string name="enacted">Attuato</string>
-    <string name="comment">Commenta</string>
+    <string name="comment">Commento</string>
     <string name="success">OK</string>
     <string name="percent">Per cento</string>
     <string name="absolute">Assoluto</string>
-    <string name="canceltemp">Cancella Basale Temp</string>
+    <string name="canceltemp">Cancellare Basale Temporanea</string>
     <string name="smscommunicator">Comunicazioni SMS</string>
-    <string name="waitingforpumpresult">Attendere risultato</string>
-    <string name="smscommunicator_allowednumbers">Numero di telefono acettato</string>
+    <string name="waitingforpumpresult">In attesa del risultato</string>
+    <string name="smscommunicator_allowednumbers">Numeri di telefono consentiti</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
-    <string name="smscommunicator_bolusreplywithcode">Per erogare il bolo di %1$.2fU rispondi col codice %2$s</string>
-    <string name="smscommunicator_calibrationreplywithcode">Per inviare la calibrazione %1$.2f rispondi col codice %2$s</string>
+    <string name="smscommunicator_bolusreplywithcode">Per erogare il bolo di %1$.2fU rispondere col codice %2$s</string>
+    <string name="smscommunicator_calibrationreplywithcode">Per inviare la calibrazione %1$.2f rispondere col codice %2$s</string>
     <string name="smscommunicator_bolusfailed">Bolo fallito</string>
     <string name="bolusdelivered">Bolo di %1$.2fU erogato con successo</string>
     <string name="bolusrequested">Sto per erogare %1$.2fU</string>
     <string name="smscommunicator_bolusdelivered">Bolo di %1$.2fU erogato con successo</string>
-    <string name="bolusdelivering">Erogazione %1$.2fU</string>
-    <string name="smscommunicator_remotecommandsallowed">Consenti comandi remoti tramite SMS</string>
+    <string name="bolusdelivering">Erogazione di %1$.2fU</string>
+    <string name="smscommunicator_remotecommandsallowed">Consentire comandi remoti tramite SMS</string>
     <string name="glucosetype_finger">Dito</string>
     <string name="glucosetype_sensor">Sensore</string>
     <string name="manual">Manuale</string>
     <string name="careportal_temporarytarget">Target Temporaneo</string>
-    <string name="careportal_temporarytargetcancel">Cancella Target Temporaneo</string>
+    <string name="careportal_temporarytargetcancel">Cancellare Target Temporaneo</string>
     <string name="danarprofile">Impostazioni profilo DanaR</string>
     <string name="danarprofile_dia">DIA [h]</string>
-    <string name="danarprofile_dia_summary">Durata Azione Insulina</string>
+    <string name="danarprofile_dia_summary">Durata Azione dell\'Insulina</string>
     <string name="failedupdatebasalprofile">Impossibile aggiornare il profilo basale</string>
-    <string name="danar_historyreload">Ricarica</string>
+    <string name="danar_historyreload">Ricaricare</string>
     <string name="uploading">Caricamento</string>
     <string name="danar_ebolus">Bolo E</string>
     <string name="danar_dsbolus">Bolo DS</string>
     <string name="danar_debolus">Bolo DE</string>
     <string name="danar_error">Errore</string>
-    <string name="danar_refill">ricarica</string>
-    <string name="danar_basalhour">basale oraria</string>
+    <string name="danar_refill">ricaricare</string>
+    <string name="danar_basalhour">ora basale</string>
     <string name="danar_glucose">glicemia</string>
     <string name="danar_carbohydrate">carboidrato</string>
     <string name="danar_alarm">allarme</string>
-    <string name="danar_totaluploaded">Totale %1$d record caricati</string>
+    <string name="danar_totaluploaded">%1$d record totali caricati</string>
     <string name="danar_sbolus">Bolo S</string>
     <string name="danar_history_alarm">Allarmi</string>
-    <string name="danar_history_basalhours">Basali orarie</string>
+    <string name="danar_history_basalhours">Ore basali</string>
     <string name="danar_history_bolus">Boli</string>
     <string name="danar_history_carbohydrates">Carboidrati</string>
     <string name="danar_history_dailyinsulin">Insulina giornaliera</string>
     <string name="danar_history_errors">Errori</string>
     <string name="danar_history_glucose">Glicemia</string>
-    <string name="danar_history_refill">Ricarica</string>
-    <string name="danar_history_syspend">Sospendi</string>
+    <string name="danar_history_refill">Ricaricare</string>
+    <string name="danar_history_syspend">Sospendere</string>
     <string name="danar_history_connectingfor">In connessione per %1$d s</string>
     <string name="danar_password_title">Password Microinfusore</string>
     <string name="wrongpumppassword">Password micro Errata!</string>
-    <string name="pumpbusy">Micro occupato</string>
+    <string name="pumpbusy">Il Micro è occupato</string>
     <string name="overview_bolusprogress_delivered">Erogato</string>
     <string name="overview_bolusprogress_stoped">Stoppato</string>
     <string name="bolusstopped">Bolo stoppato</string>
     <string name="bolusstopping">Stop del bolo in corso</string>
     <string name="occlusion">Occlusione</string>
-    <string name="overview_bolusprogress_stop">Arresta</string>
+    <string name="overview_bolusprogress_stop">Stop</string>
     <string name="overview_bolusprogress_stoppressed">STOP PREMUTO</string>
     <string name="waitingforpump">In attesa del micro</string>
     <string name="overview_bolusprogress_goingtodeliver">Sto per erogare %1$.2fU</string>
     <string name="objectives_0_objective">Configurazione della visualizzazione e del monitoraggio, analisi basali e rapporti</string>
     <string name="objectives_0_gate">Verificare che la Glicemia sia disponibile su Nightscout e che i dati sull\'insulina del micro siano in fase di caricamento</string>
-    <string name="objectives_openloop_objective">Partenza con Loop Aperto</string>
-    <string name="objectives_openloop_gate">Esegui l\'applicazione in modalità Loop Aperto per alcuni giorni e accetta manualmente le basali temporanee. Imposta e utilizza i target temporanei, anche quelli predefiniti (ad esempio, per l\'attività fisica o il trattamento dell\'ipoglicemia con carboidrati)</string>
-    <string name="objectives_maxbasal_objective">Comprendi il tuo Loop Aperto, incluse le relative raccomandazioni sulle basali temporanee</string>
-    <string name="objectives_maxbasal_gate">Sulla base di tale esperienza, decidi quale deve essere il valore max della basale e impostalo sul microinfusore e nelle preferenze</string>
-    <string name="objectives_maxiobzero_objective">Iniziare a chiudere il Loop con Low Glucose Suspend</string>
-    <string name="objectives_maxiobzero_gate">Esegui l\'applicazione in Loop Chiuso con max IOB = 0 per pochi giorni senza troppi eventi LGS</string>
-    <string name="objectives_maxiob_objective">Regola il Loop Chiuso, aumentando max IOB al di sopra di 0 e abbassando gradualmente i target glicemici</string>
-    <string name="objectives_maxiob_gate">Esegui l\'applicazione per alcuni giorni e almeno una notte senza allarmi glicemia, prima di abbassare il target glicemico</string>
-    <string name="objectives_autosens_objective">Regola le basali e i rapporti se necessario, quindi attiva auto-sens</string>
+    <string name="objectives_openloop_objective">Avvio in Loop Aperto</string>
+    <string name="objectives_openloop_gate">Eseguire l\'applicazione in modalità Loop Aperto per alcuni giorni. Approvare manualmente il maggior numero possibile di basali temporanee suggerite prestando attenzione alla sicurezza. Impostare e utilizzare i target temporanei, anche quelli predefiniti (ad esempio per l\'attività fisica o il trattamento dell\'ipoglicemia con carboidrati)</string>
+    <string name="objectives_maxbasal_objective">Comprensione tuo Loop Aperto, incluse le relative raccomandazioni sulle basali temporanee</string>
+    <string name="objectives_maxbasal_gate">Sulla base di tale esperienza, decidere quale dovrebbe essere il valore di \'max basale\' e impostarlo sul microinfusore e nelle preferenze</string>
+    <string name="objectives_maxiobzero_objective">Avvio della chiusura del Loop con Low Glucose Suspend</string>
+    <string name="objectives_maxiobzero_gate">Eseguire l\'applicazione in Loop Chiuso con max IOB = 0 per pochi giorni senza troppi eventi LGS</string>
+    <string name="objectives_maxiob_objective">Regolazione del Loop Chiuso, aumentando max IOB al di sopra di 0 e abbassando gradualmente i target glicemici</string>
+    <string name="objectives_maxiob_gate">Eseguire l\'applicazione per alcuni giorni e almeno una notte senza allarmi di glicemia bassa, prima di abbassare il target glicemico</string>
+    <string name="objectives_autosens_objective">Adattare basali e rapporti se necessario, quindi attivare auto-sens</string>
     <string name="objectives_autosens_gate">1 settimana di looping diurno con dichiarazione regolare dei carboidrati, eseguito con successo</string>
-    <string name="objectives_ama_objective">Abilita funzioni aggiuntive per l\'uso diurno, ad esempio AMA (advanced meal assist - assistenza avanzata del pasto)</string>
-    <string name="objectives_smb_objective">Abilita funzioni aggiuntive per l\'uso diurno, come SMB</string>
+    <string name="objectives_ama_objective">Abilitazione funzioni aggiuntive per l\'uso diurno, ad esempio AMA (advanced meal assist - assistenza avanzata del pasto)</string>
+    <string name="objectives_smb_objective">Abilitazione funzioni aggiuntive per l\'uso diurno, come SMB</string>
     <string name="objectives_smb_gate">È necessario leggere il wiki e aumentare maxIOB affinché le azioni di SMB funzionino adeguatamente! Un buon inizio è maxIOB = media bolo posto + 3 x max basale giornaliera</string>
     <string name="youareonallowedlimit">Hai raggiunto il limite consentito</string>
     <string name="noprofileselected">Nessun profilo selezionato</string>
-    <string name="smscommunicator_loophasbeendisabled">Disattivazione Loop corretta</string>
-    <string name="smscommunicator_loophasbeenenabled">Lopp abilitato correttamente</string>
+    <string name="smscommunicator_loophasbeendisabled">Il Loop è stato disabilitato</string>
+    <string name="smscommunicator_loophasbeenenabled">Il Loop è stato abilitato</string>
     <string name="smscommunicator_loopisdisabled">Il Loop è disabilitato</string>
     <string name="smscommunicator_loopisenabled">Il Loop è abilitato</string>
     <string name="valuelimitedto">%1$.2f limitato a %2$.2f</string>
     <string name="valueoutofrange">Il valore %1$s è fuori limite massimo</string>
     <string name="smscommunicator_remotecommandnotallowed">Il comando da remoto non è permesso</string>
     <string name="smscommunicator_remotebolusnotallowed">Bolo remoto non disponibile. Riprova più tardi.</string>
-    <string name="smscommunicator_basalreplywithcode">Per avviare la basale %1$.2fU/h per %2$d min rispondi col codice %3$s</string>
-    <string name="smscommunicator_profilereplywithcode">Per passare al profilo %1$s %2$d%% rispondi col codice %3$s</string>
-    <string name="smscommunicator_extendedreplywithcode">Per avviare il bolo esteso %1$.2fU/h per %2$d min rispondi col codice %3$s</string>
-    <string name="smscommunicator_basalpctreplywithcode">Per avviare la basale %1$d%% per %2$d min rispondi col codice %3$s</string>
-    <string name="smscommunicator_suspendreplywithcode">Per sospendere il Loop per %1$d minuti rispondi col codice %2$s</string>
-    <string name="smscommunicator_tempbasalset">Basale Temp %1$.2fU/h per %2$d min avviata con successo</string>
+    <string name="smscommunicator_basalreplywithcode">Per avviare la basale %1$.2fU/h per %2$d min rispondere col codice %3$s</string>
+    <string name="smscommunicator_profilereplywithcode">Per passare al profilo %1$s %2$d%% rispondere col codice %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Per avviare il bolo esteso %1$.2fU/h per %2$d min rispondere col codice %3$s</string>
+    <string name="smscommunicator_basalpctreplywithcode">Per avviare la basale %1$d%% per %2$d min rispondere col codice %3$s</string>
+    <string name="smscommunicator_suspendreplywithcode">Per sospendere il Loop per %1$d minuti rispondere col codice %2$s</string>
+    <string name="smscommunicator_tempbasalset">Basale Temporanea %1$.2fU/h per %2$d min avviata con successo</string>
     <string name="smscommunicator_extendedset">Bolo esteso %1$.2fU/h per %2$d min avviato con successo</string>
-    <string name="smscommunicator_tempbasalset_percent">Basale Temp %1$d%% per %2$d min avviata con successo</string>
-    <string name="smscommunicator_tempbasalfailed">Avvio Basale Temp fallito</string>
+    <string name="smscommunicator_tempbasalset_percent">Basale Temporanea %1$d%% per %2$d min avviata con successo</string>
+    <string name="smscommunicator_tempbasalfailed">Avvio Basale Temporanea fallito</string>
     <string name="smscommunicator_extendedfailed">Avvio Bolo esteso fallito</string>
-    <string name="smscommunicator_basalstopreplywithcode">Per interrompere la Basale Temp rispondi col codice %1$s</string>
-    <string name="smscommunicator_extendedstopreplywithcode">Per interrompere il bolo esteso rispondi col codice %1$s</string>
-    <string name="smscommunicator_tempbasalcanceled">Basale Temp cancellata</string>
+    <string name="smscommunicator_basalstopreplywithcode">Per interrompere la Basale Temporanea rispondere col codice %1$s</string>
+    <string name="smscommunicator_extendedstopreplywithcode">Per interrompere il bolo esteso rispondere col codice %1$s</string>
+    <string name="smscommunicator_tempbasalcanceled">Basale Temporanea cancellata</string>
     <string name="smscommunicator_extendedcanceled">Bolo esteso cancellato</string>
-    <string name="smscommunicator_tempbasalcancelfailed">Cancellazione Basale Temp fallita</string>
-    <string name="smscommunicator_extendedcancelfailed">Cancellazione bolo esteso fallito</string>
+    <string name="smscommunicator_tempbasalcancelfailed">Cancellazione Basale Temporanea fallita</string>
+    <string name="smscommunicator_extendedcancelfailed">Cancellazione bolo esteso fallita</string>
     <string name="smscommunicator_unknowncommand">Comando sconosciuto o risposta errata</string>
     <string name="quickwizard">QuickWizard</string>
     <string name="quickwizardsettings">Impostazioni QuickWizard</string>
     <string name="overview_editquickwizard_buttontext">Testo pulsante:</string>
     <string name="overview_editquickwizard_carbs">Carboidrati:</string>
     <string name="overview_editquickwizard_valid">Valido:</string>
-    <string name="overview_editquickwizardlistactivity_add">Aggiungi</string>
-    <string name="overview_quickwizard_item_edit_button">Modifica</string>
-    <string name="overview_quickwizard_item_remove_button">Rimuovi</string>
+    <string name="overview_editquickwizardlistactivity_add">Aggiungere</string>
+    <string name="overview_quickwizard_item_edit_button">Modificare</string>
+    <string name="overview_quickwizard_item_remove_button">Rimuovere</string>
     <string name="mealbolus">Pasto</string>
     <string name="correctionbous">Correzione</string>
     <string name="actions">Azioni</string>
     <string name="androidaps_start">AndroidAPS avviato</string>
-    <string name="ns_upload_only">Solo caricamento NS (sincronizzazione disabilitata)</string>
-    <string name="ns_upload_only_summary">Carica solo su NS. Non ha effetto su SGV a meno che non sia selezionata una fonte locale come xDrip. Non ha effetto sui Profili durante l\'utilizzo dei profili NS.</string>
+    <string name="ns_upload_only">NS: solo upload (sincronizzazione disabilitata)</string>
+    <string name="ns_upload_only_summary">NS: solo upload. Non ha effetto su SGV a meno che non sia selezionata una fonte locale come xDrip. Non ha effetto sui Profili durante l\'utilizzo dei profili NS.</string>
     <string name="pumpNotInitialized">Micro non inizializzato!</string>
     <string name="pumpNotInitializedProfileNotSet">Micro non inizializzato, profilo non impostato!</string>
-    <string name="primefill">Carica/Riempi</string>
+    <string name="primefill">Caricare/Riempire</string>
     <string name="fillwarning">Assicurati che la quantità corrisponda alla specifica del tuo set di infusione!</string>
     <string name="othersettings_title">Altro</string>
-    <string name="fillbolus_title">Riempimento/Prime quantità di insulina standard.</string>
+    <string name="fillbolus_title">Quantità standard di insulina per la funzione Caricare/Riempire.</string>
     <string name="button1">Tasto 1</string>
     <string name="button2">Tasto 2</string>
     <string name="button3">Tasto 3</string>
     <string name="units">Unità:</string>
     <string name="mgdl">mg/dl</string>
     <string name="mmol">mmol/l</string>
-    <string name="dia">Durata Azione dell\'Insulina:</string>
+    <string name="dia">DIA:</string>
     <string name="target_range">Intervallo Target:</string>
     <string name="prefs_range_title">Intervallo di visualizzazione</string>
     <string name="prefs_range_summary">Limite alto e basso per i grafici nella sezione Panoramica e sullo Smartwatch</string>
     <string name="low_mark">Limite BASSO</string>
     <string name="high_mark">Limite ALTO</string>
     <string name="wear">Smartwatch</string>
-    <string name="resend_all_data">Invia di nuovo tutti i dati</string>
-    <string name="open_settings_on_wear">Apri impostazioni sullo smartwatch</string>
+    <string name="resend_all_data">Inviare di nuovo tutti i dati</string>
+    <string name="open_settings_on_wear">Aprire impostazioni sullo smartwatch</string>
     <string name="pumperror">Errore Micro</string>
     <string name="lowbattery">Livello Batteria Basso</string>
     <string name="pumpshutdown">Arresto Micro</string>
     <string name="batterydischarged">Batteria del micro Scarica</string>
     <string name="danarkoreanpump">DanaR Korean</string>
     <string name="basal_rate">Velocità basale:</string>
-    <string name="profile_set_failed">Impostazione Profilo Basale fallito</string>
+    <string name="profile_set_failed">Impostazione Profilo Basale fallita</string>
     <string name="profile_set_ok">Profilo Basale aggiornato nel Micro</string>
-    <string name="danar_disableeasymode">Disabilita la modalità EasyUI nel micro</string>
-    <string name="danar_enableextendedbolus">Abilita bolo esteso sul micro</string>
-    <string name="danar_switchtouhmode">Cambia la modalità da U/d in U/h nel micro</string>
+    <string name="danar_disableeasymode">Disabilitare la modalità EasyUI nel micro</string>
+    <string name="danar_enableextendedbolus">Abilitare bolo esteso sul micro</string>
+    <string name="danar_switchtouhmode">Cambiare la modalità da U/d in U/h nel micro</string>
     <string name="basalvaluebelowminimum">Valore basale inferiore al minimo, Profilo non impostato!</string>
     <string name="sms_actualbg">Glicemia:</string>
     <string name="sms_lastbg">Ultima Glicemia:</string>
     <string name="mdi">MDI</string>
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Notifica in corso</string>
-    <string name="old_data">VECCHI DATI</string>
+    <string name="old_data">DATI VECCHI</string>
     <string name="minago">%1$d min fa</string>
     <string name="sms_minago">%1$dmin fa</string>
     <string name="localprofile">Profilo locale</string>
     <string name="openapsama">OpenAPS AMA</string>
-    <string name="short_avgdelta">Deviazione media ridotta</string>
-    <string name="long_avgdelta">Deviazione media estesa</string>
+    <string name="short_avgdelta">Delta medio ridotto</string>
+    <string name="long_avgdelta">Delta medio esteso</string>
     <string name="array_of_elements">Matrice di %1$d elementi.\nValore attuale:</string>
     <string name="openapsma_autosensdata_label">Dati Autosens</string>
     <string name="openapsma_scriptdebugdata_label">Script debug</string>
-    <string name="openapsama_useautosens">Usa la funzione Autosens</string>
-    <string name="refresheventsfromnightscout">Ricarica eventi da NS</string>
-    <string name="deletefuturetreatments">Elimina trattamenti nel futuro</string>
-    <string name="eatingsoon">Mangiare a breve</string>
-    <string name="hypo">Ipo</string>
+    <string name="openapsama_useautosens">Usare la funzione Autosens</string>
+    <string name="refresheventsfromnightscout">Ricaricare eventi da NS</string>
+    <string name="deletefuturetreatments">Eliminare trattamenti nel futuro</string>
+    <string name="eatingsoon">Pasto Imminente</string>
+    <string name="hypo">Ipoglicemia</string>
     <string name="activity">Attività</string>
-    <string name="removerecord">Rimuovi campo:</string>
+    <string name="removerecord">Rimuovere campo:</string>
     <string name="danar_stats">Statistiche DanaR</string>
-    <string name="danar_stats_cumulative_tdd">TDD totale</string>
+    <string name="danar_stats_cumulative_tdd">TDD cumulativo</string>
     <string name="danar_stats_expweight">TDD esponenzialmente ponderato</string>
     <string name="danar_stats_basalrate">Basale</string>
     <string name="danar_stats_bolus">Bolo</string>
@@ -440,7 +440,7 @@
     <string name="danar_stats_weight">Peso</string>
     <string name="danar_stats_warning_Message">Probabilmente inaccurato se si usano i boli per il caricamento/riempimento al posto dell\'apposita funzione!</string>
     <string name="danar_stats_olddata_Message">Dati Vecchi, premere \"RICARICA\"</string>
-    <string name="danar_stats_tbb">Totale basale originale</string>
+    <string name="danar_stats_tbb">Basale originale Totale</string>
     <string name="danar_stats_tbb2">TBB * 2</string>
     <string name="initializing">Inizializzazione...</string>
     <string name="actions_shortname">ACT</string>
@@ -458,103 +458,103 @@
     <string name="objectives_shortname">OBJ</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
-    <string name="short_tabtitles">Titoli schede abbreviati</string>
-    <string name="always_use_shortavg">Utilizzare sempre deviazione media ridotta invece della deviazione semplice</string>
+    <string name="short_tabtitles">Abbreviare i titoli delle schede</string>
+    <string name="always_use_shortavg">Utilizzare sempre il delta medio ridotto anziché il delta semplice</string>
     <string name="always_use_shortavg_summary">Utile quando i dati provenienti da sorgenti non filtrate come xDrip diventano \"rumorosi\" (instabili).</string>
     <string name="advancedsettings_title">Impostazioni Avanzate</string>
     <string name="danar_model">Modello:%1$02X Protocollo:%2$02X Codice:%3$02X</string>
     <string name="profile">Profilo</string>
-    <string name="openapsama_max_daily_safety_multiplier_summary">[Valore predefinito: 3] Questo è un parametro di sicurezza chiave in OpenAPS. Ciò che fa è limitare le tue basali a essere 3 volte, al più, la tua velocità basale massima. Probabilmente non avrai bisogno di cambiare questo valore, ma dovresti essere consapevole di cosa significa il gruppo di parametri \"3x max daily; 4x current\" e per quali motivi di sicurezza siano stati impostati tali valori.</string>
-    <string name="openapsama_current_basal_safety_multiplier_summary">[Valore predefinito: 4] Questo è un ulteriore parametro di sicurezza chiave in OpenAPS. La tua basale, indipendentemente dalla basale massima impostata sul micro, non può mai essere più alta della tua basale in ogni specifico momento, moltiplicata per tale valore. Questo serve a impedire alle persone di addentrarsi in \"territori pericolosi\" impostando basali massime eccessivamente alte prima di aver capito come funziona l\'algoritmo. Ancora una volta, il valore predefinito è 4x; la maggior parte delle persone non avrà bisogno di modificare questo valore e avrà, invece, maggiori probabilità di dover regolare le altre impostazioni.</string>
-    <string name="openapsama_autosens_max_summary">[Valore predefinito: 1.2]\nQuesto è un moltiplicatore di sicurezza per autosens (e presto autotune) per impostare un limite massimo del 20%% (col valore predefinito) riguardo l\'aumento del rapporto di autosens, che a sua volta determina quanto in alto autosens può regolare la basale, quanto in basso può regolare ISF (la sensibilità all\'insulina) e quanto in basso può impostare il Target Glicemico.</string>
+    <string name="openapsama_max_daily_safety_multiplier_summary">[Valore predefinito: 3] Questo è un parametro di sicurezza chiave in OpenAPS. Ciò che fa è limitare le tue basali a essere 3 volte, al più, la tua velocità basale massima. Probabilmente non avrai bisogno di cambiare questo valore, ma dovresti essere consapevole di cosa significa il gruppo di parametri \"3x max giornaliera; 4x corrente\" e per quali motivi di sicurezza siano stati impostati tali valori.</string>
+    <string name="openapsama_current_basal_safety_multiplier_summary">[Valore predefinito: 4] Questo è un ulteriore parametro di sicurezza chiave in OpenAPS. La tua basale temporanea, indipendentemente dalla basale massima impostata sul micro, non può mai essere più alta di questo valore moltiplicato per tua basale corrente in ogni specifico momento. Questo serve a impedire alle persone di addentrarsi in \"territori pericolosi\" impostando basali massime eccessivamente alte prima di aver capito come funziona l\'algoritmo. Ancora una volta, il valore predefinito è 4x; la maggior parte delle persone non avrà bisogno di modificare questo valore e avrà, invece, maggiori probabilità di dover regolare le altre impostazioni.</string>
+    <string name="openapsama_autosens_max_summary">[Valore predefinito: 1.2]\nQuesto è un moltiplicatore di sicurezza per autosens (e presto autotune) per impostare un limite massimo del 20%% (col valore predefinito) su quanto alto può essere il rapporto di autosens, che a sua volta determina quanto in alto autosens può regolare la basale, quanto in basso può regolare ISF (la sensibilità all\'insulina) e quanto in basso può impostare il Target Glicemico.</string>
     <string name="openapsama_autosens_min_summary">[Valore predefinito: 0.7]\nUn altro limite di sicurezza di autosens, imposta un blocco a quanto in basso autosens può regolare le basali e a quanto in alto può regolare ISF e i Target Glicemici.</string>
     <string name="openapsama_autosens_adjusttargets">Autosens regola anche i target</string>
-    <string name="openapsama_autosens_adjusttargets_summary">[Valore predefinito: true]\nViene utilizzato per consentire ad autosens di regolare i Target Glicemici, in aggiunta a ISF e basali.</string>
-    <string name="openapsama_bolussnooze_dia_divisor_summary">[Valore predefinito: 2]\nBolus snooze è attivato dopo un bolo pasto per fare in modo che il Loop non interagisca con basali temporanee basse quando hai appena mangiato. AndroidAPS non imposterà velocità basali troppo basse nel periodo corrispondente a DIA (durata azione dell\'insulina) diviso il parametro bolus snooze dia divisor. Con DIA di 3 ore \"bolus snooze\" durerà 1.5 ore (3/2).</string>
+    <string name="openapsama_autosens_adjusttargets_summary">[Valore predefinito: vero]\nViene utilizzato per consentire ad autosens di regolare i Target Glicemici, in aggiunta a ISF e basali.</string>
+    <string name="openapsama_bolussnooze_dia_divisor_summary">[Valore predefinito: 2]\nBolus snooze è attivato dopo un bolo pasto per fare in modo che il Loop non imposti basali temporanee basse quando hai appena mangiato. AndroidAPS non imposterà velocità basali troppo basse nel periodo corrispondente a DIA (durata azione dell\'insulina) diviso il parametro bolus snooze - divisore DIA. Con DIA di 3 ore \"bolus snooze\" durerà 1.5 ore (3/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">[Valore predefinito: 3.0 (AMA) o 8.0 (SMB)]. Questa è un\'impostazione per l\'impatto di assorbimento predefinito dei carboidrati in 5 minuti. L\'impostazione predefinita è una previsione di 3mg/dl/5min. Ha effetto sulla velocità di decadimento dei COB (carboidrati attivi) e su quanto il loro assorbimento incide nella previsione dell’andamento glicemico, quando la Glicemia sta scendendo più del previsto o non sta salendo quanto previsto.</string>
-    <string name="openapsama_link_to_preferncejson_doc_txt">Attenzione!\nNormalmente non dovresti modificare questi valori. FAI CLICK QUI e leggi il testo e assicuratevi di AVER CAPITO prima di cambiare uno di questi valori.</string>
-    <string name="error_only_numeric_digits_allowed">Digitare solo numeri</string>
-    <string name="error_only_numeric_digits_range_allowed">Sono ammessi solo numeri nel range %1$s - %2$s.</string>
+    <string name="openapsama_link_to_preferncejson_doc_txt">Attenzione!\nNormalmente non dovresti modificare questi valori. FAI CLICK QUI e leggi il testo e assicuratevi di AVERLO CAPITO prima di cambiare uno di questi valori.</string>
+    <string name="error_only_numeric_digits_allowed">Sono consentite solo cifre numeriche.</string>
+    <string name="error_only_numeric_digits_range_allowed">Sono consentite solo cifre numeriche nel range %1$s - %2$s.</string>
     <string name="error_field_must_not_be_empty">Il campo non deve essere vuoto</string>
     <string name="error_phone_not_valid">Numero di telefono non valido</string>
     <string name="smscommunicator_invalidphonennumber">Numero di telefono SMS non valido</string>
     <string name="overview_calibration">Calibrazione</string>
-    <string name="send_calibration">Invia calibrazione %1$.1f a xDrip?</string>
+    <string name="send_calibration">Inviare calibrazione %1$.1f a xDrip?</string>
     <string name="xdripnotinstalled">xDrip+ non installato</string>
     <string name="calibrationsent">Calibrazione inviata a xDrip</string>
-    <string name="smscommunicator_calibrationsent">La calibrazione inviata. La ricezione deve essere abilitata in xDrip.</string>
+    <string name="smscommunicator_calibrationsent">Calibrazione inviata. La ricezione deve essere abilitata in xDrip.</string>
     <string name="smscommunicator_calibrationfailed">xDrip non sta ricevendo calibrazioni</string>
     <string name="pumpsuspended">Micro Sospeso</string>
-    <string name="gettingpumpstatus">Richiesta Stato Micro</string>
-    <string name="settingtempbasal">Impostazione Basale Temp</string>
-    <string name="stoppingtempbasal">Stop Basale Temp</string>
+    <string name="gettingpumpstatus">Ricezione Stato Micro</string>
+    <string name="settingtempbasal">Impostazione Basale Temporanea</string>
+    <string name="stoppingtempbasal">Stop Basale Temporanea</string>
     <string name="settingextendedbolus">Impostazione bolo esteso</string>
     <string name="stoppingextendedbolus">Stop bolo esteso</string>
-    <string name="updatingbasalrates">Aggiornamento basali</string>
+    <string name="updatingbasalrates">Aggiornamento velocità basali</string>
     <string name="disconnecting">Disconnessione</string>
     <string name="executing">Esecuzione</string>
     <string name="virtualpump_settings">Impostazioni Micro virtuale</string>
-    <string name="virtualpump_uploadstatus_title">Carica stato in NS</string>
+    <string name="virtualpump_uploadstatus_title">Caricare stato in NS</string>
     <string name="wrongpassword">Password Errata</string>
     <string name="settings_password">Password per le impostazioni</string>
-    <string name="unlock_settings">Sblocca impostazioni</string>
+    <string name="unlock_settings">Sbloccare impostazioni</string>
     <string name="approachingdailylimit">Si avvicina il limite giornaliero di insulina</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">URL:</string>
-    <string name="nsclientinternal_autoscroll">Autoscroll</string>
-    <string name="restart">Riavvia</string>
+    <string name="nsclientinternal_autoscroll">Autoscorrimento</string>
+    <string name="restart">Riavviare</string>
     <string name="nsclientinternal_title">NSClient</string>
     <string name="nsclientinternal_url_title">Nightscout URL</string>
     <string name="nsclientinternal_url_dialogmessage">Inserisci il tuo URL Nightscout</string>
     <string name="nsclientinternal_secret_title">NS API secret</string>
     <string name="nsclientinternal_secret_dialogtitle">NS API secret</string>
-    <string name="nsclientinternal_secret_dialogmessage">Inserisci NS API secret (minimo 12 caratteri)</string>
-    <string name="deliver_now">Eroga adesso</string>
-    <string name="clear_queue">Cancella coda</string>
-    <string name="show_queue">Visualizza coda</string>
+    <string name="nsclientinternal_secret_dialogmessage">Inserire NS API secret (minimo 12 caratteri)</string>
+    <string name="deliver_now">Erogare adesso</string>
+    <string name="clear_queue">Cancellare la coda</string>
+    <string name="show_queue">Visualizzare la coda</string>
     <string name="queue">Coda:</string>
     <string name="status">Stato:</string>
     <string name="paused">In Pausa</string>
-    <string name="clearlog">Cancella log</string>
+    <string name="clearlog">Cancellare il log</string>
     <string name="nowritepermission">NSCLIENT non ha il permesso di scrittura. API secret Errato?</string>
-    <string name="wear_settings">Impostazioni smartwatch</string>
-    <string name="wear_detailedIOB_title">Mostra IOB dettagliato</string>
-    <string name="wear_detailedIOB_summary">Dividi IOB tra boli e IOB basale, sulla watchface dello smartwatch</string>
-    <string name="nosuccess">non riuscito - controlla il telefono</string>
+    <string name="wear_settings">Impostazioni Smartwatch</string>
+    <string name="wear_detailedIOB_title">Mostrare IOB dettagliato</string>
+    <string name="wear_detailedIOB_summary">Dividere IOB tra boli e IOB da basale, sulla watchface dello smartwatch</string>
+    <string name="nosuccess">non riuscito - controllare il telefono</string>
     <string name="notavailable">Non disponibile</string>
     <string name="patientage">Età del paziente</string>
     <string name="child">Bambino</string>
     <string name="teenage">Adolescente</string>
     <string name="adult">Adulto</string>
     <string name="resistantadult">Adulto insulino-resistente</string>
-    <string name="patientage_summary">Seleziona l\'età del paziente per impostare i limiti di sicurezza</string>
+    <string name="patientage_summary">Selezionare l\'età del paziente per impostare i limiti di sicurezza</string>
     <string name="Glimp">Glimp</string>
     <string name="needwhitelisting">Per un buon funzionamento, %1$s ha bisogno di essere nella whitelist della funzione \"ottimizzazione batteria\" di Android</string>
     <string name="loopsuspended">Loop sospeso</string>
     <string name="loopsuspendedfor">Sospeso (%1$d m)</string>
     <string name="loopsuperbolusfor">Superbolo (%1$d m)</string>
-    <string name="suspendloop">Sospendi loop</string>
-    <string name="suspendloopfor1h">Sospendi loop per 1h</string>
-    <string name="suspendloopfor2h">Sospendi loop per 2h</string>
-    <string name="suspendloopfor3h">Sospendi loop per 3h</string>
-    <string name="suspendloopfor10h">Sospendi loop per 10h</string>
-    <string name="suspendloopforXmin">Sospendi loop per %1$d min</string>
-    <string name="disconnectpumpfor15m">Disconnetti Micro per 15 min</string>
-    <string name="disconnectpumpfor30m">Disconnetti Micro per 30 min</string>
-    <string name="disconnectpumpfor1h">Disconnetti Micro per 1 h</string>
-    <string name="disconnectpumpfor2h">Disconnetti Micro per 2 h</string>
-    <string name="disconnectpumpfor3h">Disconnetti Micro per 3 h</string>
-    <string name="resume">Riprendi</string>
-    <string name="reconnect">Riconnetti Micro</string>
+    <string name="suspendloop">Sospendere loop</string>
+    <string name="suspendloopfor1h">Sospendere loop per 1h</string>
+    <string name="suspendloopfor2h">Sospendere loop per 2h</string>
+    <string name="suspendloopfor3h">Sospendere loop per 3h</string>
+    <string name="suspendloopfor10h">Sospendere loop per 10h</string>
+    <string name="suspendloopforXmin">Sospendere loop per %1$d min</string>
+    <string name="disconnectpumpfor15m">Disconnettere Micro per 15 min</string>
+    <string name="disconnectpumpfor30m">Disconnettere Micro per 30 min</string>
+    <string name="disconnectpumpfor1h">Disconnettere Micro per 1 h</string>
+    <string name="disconnectpumpfor2h">Disconnettere Micro per 2 h</string>
+    <string name="disconnectpumpfor3h">Disconnettere Micro per 3 h</string>
+    <string name="resume">Riprendere</string>
+    <string name="reconnect">Riconnettere Micro</string>
     <string name="smscommunicator_wrongduration">Durata errata</string>
     <string name="smscommunicator_loopsuspended">Loop sospeso</string>
     <string name="smscommunicator_loopresumed">Loop ripreso</string>
     <string name="treatments_wizard_bgtrend_label">Trend 15min</string>
     <string name="treatments_wizard_cob_label">COB</string>
     <string name="superbolus">Super bolo</string>
-    <string name="ns_logappstartedevent">Registra l\'avvio dell\'app in NS</string>
-    <string name="restartingapp">Chiusura applicazione per applicare le impostazioni.</string>
+    <string name="ns_logappstartedevent">Registrare l\'avvio dell\'app in NS</string>
+    <string name="restartingapp">Uscita dall\'applicazione per applicare le impostazioni.</string>
     <string name="danarv2pump">DanaRv2</string>
     <string name="configbuilder_insulin">Insulina</string>
     <string name="configbuilder_insulin_description">Quale tipo di insulina stai usando?</string>
@@ -562,10 +562,11 @@
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
     <string name="ultrafastactinginsulincomment">Fiasp</string>
     <string name="insulin_shortname">INS</string>
-    <string name="enablesuperbolus">Abilita Super Bolo nel Calcolatore</string>
-    <string name="enablesuperbolus_summary">Abilita funzionalità Super Bolo nel Calcolatore. Non abilitare fino a quando non impari ciò che realmente fa. PUÒ CAUSARE SOVRADOSAGGIO DI INSULINA SE USATO IMPROPRIAMENTE!</string>
-    <string name="show_statuslights">Mostra \"indicatori di stato\" sulla schermata iniziale</string>
-    <string name="show_statuslights_summary">Abilita indicatori di stato per \"età\" cannula, insulina, sensore, serbatoio e livello batteria sulla schermata iniziale.</string>
+    <string name="enablesuperbolus">Abilitare Super Bolo nel Calcolatore</string>
+    <string name="enablesuperbolus_summary">Abilitare la funzionalità Super Bolo nel Calcolatore. Non abilitare fino a quando non impari ciò che realmente fa. PUÒ CAUSARE SOVRADOSAGGIO DI INSULINA SE USATO IMPROPRIAMENTE!</string>
+    <string name="show_statuslights">Mostrare \"indicatori di stato\" sulla schermata iniziale</string>
+    <string name="show_statuslights_extended">Mostrare \"indicatori di stato\" estesi sulla schermata iniziale</string>
+    <string name="show_statuslights_extended_summary">Abilitare indicatori di stato estesi per \"età\" cannula, insulina, sensore, serbatoio e livello batteria sulla schermata iniziale.</string>
     <string name="statuslights_res_warning">Soglia di avviso livello serbatoio [U]</string>
     <string name="statuslights_res_critical">Soglia critica livello serbatoio [U]</string>
     <string name="statuslights_bat_warning">Soglia di avviso livello batteria [%%]</string>
@@ -575,16 +576,16 @@
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="pump_lastconnection_label">Ultima connessione</string>
     <string name="danar_bluetooth_status">Stato Bluetooth</string>
-    <string name="nav_about">Riguardo a...</string>
+    <string name="nav_about">Riguardo a</string>
     <string name="smscommunicator_missingsmspermission">Autorizzazione SMS mancante</string>
     <string name="smscommunicator_missingphonestatepermission">Autorizzazione Stato telefono mancante</string>
     <string name="xdripstatus_settings">Stato xDrip (smartwatch)</string>
     <string name="xdripstatus">xDrip Statusline (smartwatch)</string>
     <string name="xdripstatus_shortname">xds</string>
-    <string name="wear_showbgi_title">Mostra BGI</string>
-    <string name="wear_showbgi_summary">Aggiungi BGI alla statusline</string>
+    <string name="wear_showbgi_title">Mostrare BGI</string>
+    <string name="wear_showbgi_summary">Aggiungere BGI alla statusline</string>
     <string name="ns_noupload">Nessun caricamento in NS</string>
-    <string name="ns_noupload_summary">Tutti i dati inviati a NS vengono rifiutati. AAPS è connesso a NS, ma non vengono apportate modifiche a NS</string>
+    <string name="ns_noupload_summary">Tutti i dati inviati a NS vengono rifiutati. AAPS è connesso a NS, ma non vengono apportate modifiche</string>
     <string name="basal_step">Incremento Basale</string>
     <string name="bolus_step">Incremento Bolo</string>
     <string name="extendedbolus">Bolo Esteso</string>
@@ -609,12 +610,12 @@
     <string name="nsalarm_staledatavalue_label">Soglia Dati non aggiornati [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Soglia Dati non aggiornati da molto tempo [min]</string>
     <string name="openapsama_autosens_period">Intervallo per autosens [h]</string>
-    <string name="openapsama_autosens_period_summary">Quantità di ore al passato per il rilevamento della sensibilità (il tempo di assorbimento dei carburi è escluso)</string>
+    <string name="openapsama_autosens_period_summary">Quantità di ore al passato per il rilevamento della sensibilità (il tempo di assorbimento dei carboidrati è escluso)</string>
     <string name="pump">Micro</string>
     <string name="openaps">OpenAPS</string>
     <string name="uploader">Uploader</string>
     <string name="configbuilder_sensitivity">Rilevamento sensibilità</string>
-    <string name="configbuilder_sensitivity_description">Quale algoritmo di sensibilità deve essere utilizzato?</string>
+    <string name="configbuilder_sensitivity_description">Quale algoritmo di sensibilità dovrebbe essere utilizzato?</string>
     <string name="sensitivity_shortname">SENS</string>
     <string name="sensitivityoref0">Sensibilità Oref0</string>
     <string name="sensitivityoref1">Sensibilità Oref1</string>
@@ -622,7 +623,7 @@
     <string name="absorptionsettings_title">Impostazioni assorbimento</string>
     <string name="absorption_maxtime_title">Max tempo assorbimento pasto [h]</string>
     <string name="absorption_maxtime_summary">Tempo in ore in cui è previsto che tutti i carboidrati del pasto vengano assorbiti</string>
-    <string name="danar_visualizeextendedaspercentage_title">Visualizza bolo esteso come %%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Visualizzare bolo esteso come %%</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -631,16 +632,16 @@
     <string name="uploader_short">UPLD</string>
     <string name="basal_short">BAS</string>
     <string name="virtualpump_extendedbolus_label_short">EXT</string>
-    <string name="keep_screen_on_title">Mantieni lo schermo acceso</string>
-    <string name="keep_screen_on_summary">Impedisci a Android di disattivare lo schermo. Consumerà molta energia quando non è collegato alla presa di corrente.</string>
-    <string name="sensitivity_warning">Attivando la funzione Autosense, ricorda di dichiarare tutti i carboidrati assunti. Altrimenti le deviazioni di glicemia dovute ai carboidrati saranno identificate erroneamente come variazione di sensibilità !!</string>
+    <string name="keep_screen_on_title">Mantenere lo schermo acceso</string>
+    <string name="keep_screen_on_summary">Impedire ad Android di disattivare lo schermo. Consumerà molta energia quando non è collegato alla presa di corrente.</string>
+    <string name="sensitivity_warning">Attivando la funzione Autosense, ricordare di dichiarare tutti i carboidrati assunti. Altrimenti le deviazioni di glicemia dovute ai carboidrati saranno identificate erroneamente come variazione di sensibilità !!</string>
     <string name="sensitivityweightedaverage">Sensibilità WeightedAverage</string>
     <string name="mdtp_ok">OK</string>
     <string name="mdtp_cancel">Annulla</string>
     <string name="notloadedplugins">Non tutti i profili caricati!</string>
     <string name="valuesnotstored">Valori non memorizzati!</string>
-    <string name="ns_localbroadcasts">Abilita la trasmissione ad altre applicazioni (come xDrip).</string>
-    <string name="ns_localbroadcasts_title">Abilita la trasmissione locale.</string>
+    <string name="ns_localbroadcasts">Abilitare le trasmissioni ad altre app (come xDrip). Non abilitare se hai installato più di un\'istanza di AAPS o NSClient!</string>
+    <string name="ns_localbroadcasts_title">Abilitare le trasmissioni locali.</string>
     <string name="careportal_activity_label">ATTIVITÀ &amp; FEEDBACK</string>
     <string name="careportal_carbsandbolus_label">CARBOIDRATI &amp; BOLO</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
@@ -649,17 +650,17 @@
     <string name="careportal_newnstreatment_duration_min_label">Durata [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="smb_shortname">SMB</string>
-    <string name="enableuam">Abilita UAM</string>
-    <string name="enablesmb">Abilita SMB</string>
-    <string name="enablesmb_summary">Utilizza Super Micro Boli al posto della basale temporanea per un\'azione più veloce</string>
-    <string name="enableuam_summary">Rilevazione dei Pasti Non Dichiarati</string>
+    <string name="enableuam">Abilitare UAM</string>
+    <string name="enablesmb">Abilitare SMB</string>
+    <string name="enablesmb_summary">Utilizzare Super Micro Boli al posto della basale temporanea per un\'azione più veloce</string>
+    <string name="enableuam_summary">Rilevazione dei Pasti Non Annunciati</string>
     <string name="insulin_oref_peak">IOB Curve Peak Time</string>
     <string name="insulin_peak_time">Peak Time [min]</string>
     <string name="free_peak_oref">Free-Peak Oref</string>
     <string name="rapid_acting_oref">Rapid-Acting Oref</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
     <string name="dia_too_short">DIA di %1$f troppo breve - al suo posto, utilizzo %2$f.</string>
-    <string name="activate_profile">Attiva profilo</string>
+    <string name="activate_profile">Attivare profilo</string>
     <string name="date">Data</string>
     <string name="invalid">NON VALIDO</string>
     <string name="waitingforpairing">In attesa di associare il micro</string>
@@ -673,28 +674,28 @@
     <string name="danarspump">DanaRS</string>
     <string name="danarspump_shortname">Dana</string>
     <string name="selectedpump">Micro selezionato</string>
-    <string name="pairpump">Associa nuovo micro</string>
+    <string name="pairpump">Associare nuovo micro</string>
     <string name="bolusspeed">Velocità bolo</string>
-    <string name="danar_setbasalstep001">Imposta incremento basale a 0.01 U/h</string>
+    <string name="danar_setbasalstep001">Impostare incremento basale a 0.01 U/h</string>
     <string name="serialnumber">Numero seriale</string>
     <string name="careportal_newnstreatment_percentage_label">Percentuale</string>
     <string name="careportal_newnstreatment_timeshift_label">Cambio orario</string>
     <string name="default_temptargets">Temp-Target predefiniti</string>
-    <string name="eatingsoon_duration">durata \"eatingsoon\"</string>
-    <string name="eatingsoon_target">target \"eatingsoon\"</string>
-    <string name="activity_duration">durata attività</string>
-    <string name="activity_target">target \"activity\"</string>
-    <string name="hypo_duration">durata \"hypo\"</string>
-    <string name="hypo_target">target \"hypo\"</string>
-    <string name="danar_history_prime">Carica</string>
-    <string name="gettingextendedbolusstatus">Richiesta stato bolo esteso</string>
-    <string name="gettingbolusstatus">Richiesta stato bolo</string>
-    <string name="gettingtempbasalstatus">Richiesta stato basale temporanea</string>
-    <string name="gettingpumpsettings">Richiesta stato micro</string>
-    <string name="gettingpumptime">Richiesta ora micro</string>
-    <string name="reuse">riutilizzo</string>
+    <string name="eatingsoon_duration">target \"pasto imminente\" - durata</string>
+    <string name="eatingsoon_target">target \"pasto imminente\"</string>
+    <string name="activity_duration">target \"attività\" - durata</string>
+    <string name="activity_target">target \"attività\"</string>
+    <string name="hypo_duration">target \"ipoglicemia\" - durata</string>
+    <string name="hypo_target">target \"ipoglicemia\"</string>
+    <string name="danar_history_prime">Riempimento</string>
+    <string name="gettingextendedbolusstatus">Ricezione stato bolo esteso</string>
+    <string name="gettingbolusstatus">Ricezione stato bolo</string>
+    <string name="gettingtempbasalstatus">Ricezione stato basale temporanea</string>
+    <string name="gettingpumpsettings">Ricezione stato micro</string>
+    <string name="gettingpumptime">Ricezione ora micro</string>
+    <string name="reuse">riutilizzare</string>
     <string name="wearcontrol_title">Controlli da smartwatch</string>
-    <string name="wearcontrol_summary">Imposta Temp-Target e inserisci Trattamenti dallo smartwatch.</string>
+    <string name="wearcontrol_summary">Impostare Temp-Target e inserire Trattamenti dallo smartwatch.</string>
     <string name="connectiontimedout">Time Out Connessione</string>
     <string name="food">Cibo</string>
     <string name="shortgramm">g</string>
@@ -713,7 +714,7 @@
     <string name="pumpdrivercorrected">Driver del micro corretto</string>
     <string name="pump_unreachable">Micro irraggiungibile</string>
     <string name="missed_bg_readings">Letture Glicemia mancanti</string>
-    <string name="raise_notifications_as_android_notifications">Utilizza le notifiche di sistema per avvisi e notifiche</string>
+    <string name="raise_notifications_as_android_notifications">Utilizzare le notifiche di sistema per avvisi e notifiche</string>
     <string name="localalertsettings_title">Allarmi locali</string>
     <string name="enable_missed_bg_readings_alert">Allarme se non si ricevono dati Glicemia</string>
     <string name="enable_pump_unreachable_alert">Allarme se il micro non è raggiungibile</string>
@@ -722,22 +723,22 @@
     <string name="info">INFO</string>
     <string name="bluetooth">Bluetooth</string>
     <string name="btwatchdog_title">BT Watchdog</string>
-    <string name="btwatchdog_summary">Spegni il bluetooth del telefono per qualche secondo se non è possibile alcuna connessione al micro. Questo può essere utile su alcuni telefoni.</string>
+    <string name="btwatchdog_summary">Spegnere il bluetooth del telefono per qualche secondo se non è possibile alcuna connessione al micro. Questo può essere utile su alcuni telefoni.</string>
     <string name="eversense">Eversense App (modificata)</string>
-    <string name="dexcomg5_nsupload_title">Carica dati Glicemia su NS</string>
-    <string name="bgsource_upload">Impostazioni caricamento BG</string>
-    <string name="wear_detailed_delta_title">Visualizza delta dettagliato</string>
-    <string name="wear_detailed_delta_summary">Visualizza delta con una cifra decimale in più</string>
-    <string name="smbmaxminutes_summary">Max minuti basale con cui limitare SMB</string>
+    <string name="dexcomg5_nsupload_title">Caricare dati Glicemia su NS</string>
+    <string name="bgsource_upload">Impostazioni caricamento Glicemia</string>
+    <string name="wear_detailed_delta_title">Visualizzare delta dettagliato</string>
+    <string name="wear_detailed_delta_summary">Visualizzare delta con una cifra decimale in più</string>
+    <string name="smbmaxminutes_summary">Max minuti di basale ai quali limitare SMB</string>
     <string name="unsupportedfirmware">Firmware del micro non supportato</string>
-    <string name="dexcomg5_xdripupload_title">Invia dati Glicemia a xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">In xDrip+ seleziona origine dati 640g/Eversense</string>
-    <string name="nsclientbg">NSClient BG</string>
+    <string name="dexcomg5_xdripupload_title">Inviare dati Glicemia a xDrip+</string>
+    <string name="dexcomg5_xdripupload_summary">In xDrip+ selezionare origine dati 640g/Eversense</string>
+    <string name="nsclientbg">Glicemia NSClient</string>
     <string name="minimalbasalvaluereplaced">Valore basale sostituito dal minimo valore supportato: %1$s</string>
     <string name="maximumbasalvaluereplaced">Valore basale sostituito dal massimo valore supportato: %1$s</string>
     <string name="overview_editquickwizard_usebg">Calcolo Glicemia</string>
-    <string name="overview_editquickwizard_usebolusiob">Calcolo IOB bolo</string>
-    <string name="overview_editquickwizard_usebasaliob">Calcolo IOB basale</string>
+    <string name="overview_editquickwizard_usebolusiob">Calcolo IOB da bolo</string>
+    <string name="overview_editquickwizard_usebasaliob">Calcolo IOB da basale</string>
     <string name="overview_editquickwizard_usetrend">Calcolo Trend</string>
     <string name="overview_editquickwizard_usesuperbolus">Calcolo Super Bolo</string>
     <string name="yes">Sì</string>
@@ -745,17 +746,17 @@
     <string name="positiveonly">Solo Positivo</string>
     <string name="negativeonly">Solo Negativo</string>
     <string name="overview_editquickwizard_usecob">Calcolo COB</string>
-    <string name="overview_editquickwizard_usetemptarget">Calcolo Temp-Target</string>
+    <string name="overview_editquickwizard_usetemptarget">Calcolo Target Temporaneo</string>
     <string name="loopenabled">Loop abilitato</string>
     <string name="apsselected">APS selezionato</string>
     <string name="nsclienthaswritepermission">NSClient ha il permesso di scrittura</string>
     <string name="closedmodeenabled">Modalità Chiusa attivata</string>
-    <string name="maxiobset">IOB massima impostata correttamente</string>
+    <string name="maxiobset">Max IOB impostata correttamente</string>
     <string name="hasbgdata">Glicemia disponibile da sorgente selezionata</string>
     <string name="basalprofilenotaligned">Valori basali non allineati alle ore: %1$s</string>
     <string name="zerovalueinprofile">Profilo non valido: %1$s</string>
     <string name="combo_programming_bolus">Programmazione micro per erogazione</string>
-    <string name="combo_refresh">Ricarica</string>
+    <string name="combo_refresh">Ricaricare</string>
     <string name="combo_pump_state_label">Stato</string>
     <string name="combo_pump_activity_label">Attività</string>
     <string name="combo_no_pump_connection">Nessuna connessione per %1$d min</string>
@@ -769,128 +770,128 @@
     <string name="combo_pump_action_bolusing">Erogazione Bolo (%1$.1f U)</string>
     <string name="combo_pump_action_refreshing">Aggiornamento</string>
     <string name="combo_pump_unsupported_operation">Operazione richiesta non supportata dal micro</string>
-    <string name="combo_low_suspend_forced_notification">Utilizzo non sicuro: sono attivi boli estesi o multiwave. Il Loop è stato messo in modalità di sola sospensione in caso di valori bassi, per 6 ore. In modalità Loop sono supportati solo boli normali</string>
-    <string name="combo_force_disabled_notification">Utilizzo non sicuro: il micro utilizza un profilo basale diverso dal primo in elenco tra le sue impostazioni. Il Loop è stato disattivato. Seleziona sul microinfusore il profilo basale numero 1.</string>
-    <string name="bolus_frequency_exceeded">Un bolo con la stessa quantità è stato richiesto negli ultimi due minuti. Per evitare accidentali boli doppi e a protezione di eventuali \"bug\", questo non è consentito.</string>
+    <string name="combo_low_suspend_forced_notification">Utilizzo non sicuro: sono attivi boli estesi o multiwave. Il Loop è stato messo in modalità di sola sospensione dell\'erogazione di insulina in caso di valori bassi, per 6 ore. In modalità Loop sono supportati solo boli normali</string>
+    <string name="combo_force_disabled_notification">Utilizzo non sicuro: il micro utilizza un profilo basale diverso dal primo in elenco tra le sue impostazioni. Il Loop è stato disabilitato. Selezionare sul microinfusore il profilo basale numero 1.</string>
+    <string name="bolus_frequency_exceeded">Un bolo con la stessa quantità è stato richiesto negli ultimi due minuti. Questo non è consentito al fine di evitare boli doppi accidentali e a protezione di eventuali \"bug\".</string>
     <string name="combo_pump_connected_now">Adesso</string>
     <string name="combo_activity_reading_pump_history">Lettura storico micro</string>
-    <string name="danar_history">Storia</string>
+    <string name="danar_history">storico micro</string>
     <string name="combo_activity_setting_basal_profile">Impostazione profilo basale</string>
     <string name="combo_pump_cartridge_low_warrning">Livello serbatoio basso</string>
-    <string name="combo_pump_battery_low_warrning">Batteria bassa</string>
-    <string name="combo_is_in_error_state">Il microinfusore sta mostrando l\'errore E%1$d: %2$s</string>
+    <string name="combo_pump_battery_low_warrning">Livello batteria basso</string>
+    <string name="combo_is_in_error_state">Il micro sta mostrando l\'errore E%1$d: %2$s</string>
     <string name="combo_reservoir_low">Basso</string>
     <string name="combo_reservoir_empty">Vuoto</string>
     <string name="combo_reservoir_normal">Normale</string>
     <string name="combo_notification_check_time_date">Necessario aggiornare orologio micro</string>
     <string name="combo_warning">Attenzione</string>
-    <string name="combo_pump_tbr_cancelled_warrning">Avviso TBR CANCELLATA è stata confermato</string>
+    <string name="combo_pump_tbr_cancelled_warrning">Avviso TBR CANCELLATO confermato</string>
     <string name="combo_error_no_connection_no_bolus_delivered">Il micro potrebbe non essere raggiungibile. Nessun bolo erogato</string>
-    <string name="combo_error_no_bolus_delivered">Erogazione bolo fallita. Sembra che nessun bolo sia stato erogato. Per sicurezza, controlla il micro per evitare un doppio bolo e se è tutto ok, erogalo di nuovo. Come protezione da eventuali \"bug\", i boli non vengono ripetuti automaticamente.</string>
-    <string name="combo_error_partial_bolus_delivered">Solo la quantità di %1$.2f U del bolo richiesto di %2$.2f U è stata erogata, a causa di un errore. Controlla il micro per verificare quanto accaduto e intraprendi le azioni necessarie.</string>
-    <string name="combo_error_bolus_verification_failed">Erogare il bolo e la verifica di storia della pompa non è riuscita, si prega di controllare la pompa. Se è stato somministrato un bolo, si aggiungerà ai trattamenti durante il successivo collegamento alla pompa.</string>
+    <string name="combo_error_no_bolus_delivered">Erogazione bolo fallita. Sembra che nessun bolo sia stato erogato. Per sicurezza, controllare il micro per evitare un doppio bolo e se è tutto ok, erogarlo di nuovo. Come protezione da eventuali \"bug\", i boli non vengono ripetuti automaticamente.</string>
+    <string name="combo_error_partial_bolus_delivered">Solo la quantità di %1$.2f U del bolo richiesto di %2$.2f U è stata erogata a causa di un errore. Controllare il micro per verificare quanto accaduto e intraprendere le azioni necessarie.</string>
+    <string name="combo_error_bolus_verification_failed">Erogazione del bolo e verifica dello storico del micro fallite, si prega di controllare il micro. Se è stato erogato un bolo, sarà aggiunto ai trattamenti durante la successiva connessione al micro.</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">Insulina nel serbatoio insufficiente per erogare il bolo</string>
     <string name="extendedbolusdeliveryerror">Errore erogazione bolo esteso</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">fa</string>
     <string name="format_hours">%1$.2f h</string>
-    <string name="enablesmbalways">Abilita SMB sempre</string>
-    <string name="enablesmbalways_summary">Abilita SMB sempre, indipendentemente dai boli. Possibile solo con sorgente glicemie con buon filtraggio dati, come G5</string>
-    <string name="enablesmbaftercarbs">Abilita SMB dopo i carboidrati</string>
-    <string name="enablesmbaftercarbs_summary">Abilita SMB per 6h dopo la dichiarazione di carboidrati, anche con 0 COB. Possibile solo con sorgente glicemie con buon filtraggio dati, come G5</string>
-    <string name="enablesmbwithcob">Abilita SMB con COB</string>
-    <string name="enablesmbwithcob_summary">Abilita SMB quando COB è attivo.</string>
-    <string name="enablesmbwithtemptarget">Abilita SMB con temp-target</string>
-    <string name="enablesmbwithtemptarget_summary">Abilita SMB quando c\'è un temp-target attivo (eating soon, activity)</string>
-    <string name="enablesmbwithhightemptarget">Abilita SMB con high temp-target</string>
-    <string name="enablesmbwithhightemptarget_summary">Abilita SMB quando c\'è un \"high temp target\" attivo</string>
-    <string name="let_temp_basal_run">Permetti esecuzione Basale Temp</string>
+    <string name="enablesmbalways">Abilitare SMB sempre</string>
+    <string name="enablesmbalways_summary">Abilitare SMB sempre, indipendentemente dai boli. Possibile solo con sorgente glicemie con un buon filtraggio dei dati, come G5</string>
+    <string name="enablesmbaftercarbs">Abilitare SMB dopo i carboidrati</string>
+    <string name="enablesmbaftercarbs_summary">Abilitare SMB per 6h dopo i carboidrati, anche con 0 COB. Possibile solo con sorgente glicemie con un buon filtraggio dei dati, come G5</string>
+    <string name="enablesmbwithcob">Abilitare SMB con COB</string>
+    <string name="enablesmbwithcob_summary">Abilitare SMB quando COB è attivo (ci sono carboidrati non assorbiti).</string>
+    <string name="enablesmbwithtemptarget">Abilitare SMB con temp-target</string>
+    <string name="enablesmbwithtemptarget_summary">Abilitare SMB quando è attivo un temp-target (pasto imminente, attività)</string>
+    <string name="enablesmbwithhightemptarget">Abilitare SMB con temp-target \"alti\"</string>
+    <string name="enablesmbwithhightemptarget_summary">Abilitare SMB quando è attivo un temp-target \"alto\"</string>
+    <string name="let_temp_basal_run">Lasciare in esecuzione / consentire la Basale Temporanea</string>
     <string name="mute">Muto</string>
     <string name="overview_insulin_label">Insulina</string>
     <string name="overview_carbs_label">Carboidrati</string>
-    <string name="overview_buttons_selection">Pulsanti</string>
-    <string name="show_calibration_button_summary">Invia una calibrazione a xDrip+ o apri la finestra di calibrazione del G5</string>
-    <string name="show_cgm_button_summary">Apre xDrip+, il pulsante indietro torna ad AAPS</string>
-    <string name="carb_increment_button_message">Numero di carboidrati da aggiungere quando si preme il pulsante</string>
-    <string name="insulin_increment_button_message">Quantità di insulina da aggiungere quando si preme il pulsante</string>
-    <string name="error_starting_cgm">Impossibile avviare applicazione CGM. Assicurati che sia installata.</string>
+    <string name="overview_buttons_selection">Tasti</string>
+    <string name="show_calibration_button_summary">Inviare una calibrazione a xDrip+ o aprire la finestra di calibrazione del G5</string>
+    <string name="show_cgm_button_summary">Aprire xDrip+, il pulsante indietro torna ad AAPS</string>
+    <string name="carb_increment_button_message">Numero di carboidrati da aggiungere quando si preme il tasto</string>
+    <string name="insulin_increment_button_message">Quantità di insulina da aggiungere quando si preme il tasto</string>
+    <string name="error_starting_cgm">Impossibile avviare applicazione CGM. Assicurarsi che sia installata.</string>
     <string name="overview_cgm">CGM</string>
     <string name="nav_historybrowser">Rivedi storico</string>
-    <string name="wear_notifysmb_title">Notifica in SMB</string>
-    <string name="wear_notifysmb_summary">Mostra SMB sullo smartwatch come un bolo standard.</string>
-    <string name="ns_create_announcements_from_errors_title">Crea avvisi da errori</string>
-    <string name="ns_create_announcements_from_errors_summary">Crea avviso Nightscout per finestre di errore e allarmi locali (anche visualizzabile in Careportal sotto la voce Trattamenti)</string>
-    <string name="wear_predictions_summary">Visualizza le predizioni sulla watchface.</string>
+    <string name="wear_notifysmb_title">Notificare SMB</string>
+    <string name="wear_notifysmb_summary">Mostrare SMB sullo smartwatch come un bolo standard.</string>
+    <string name="ns_create_announcements_from_errors_title">Creare avvisi da errori</string>
+    <string name="ns_create_announcements_from_errors_summary">Creare avviso su Nightscout per finestre di errore e allarmi locali (anche visualizzabile nella sezione Portale sotto la voce Trattamenti)</string>
+    <string name="wear_predictions_summary">Visualizzare le predizioni sulla watchface.</string>
     <string name="wear_predictions_title">Predizioni</string>
     <string name="data_choices">Scelta dei Dati</string>
     <string name="fabric_upload">Invio a fabric.io</string>
-    <string name="allow_automated_crash_reporting">Consenti la segnalazione automatica degli errori e l\'invio dei dati di utilizzo delle funzioni dell\'app agli sviluppatori tramite il servizio fabric.io.</string>
-    <string name="g5appnotdetected">Aggiorna la tua Dexcom app ad una versione supportata</string>
-    <string name="dexcom_app_not_installed">Dexcom app non installata.</string>
-    <string name="start_activity_tt">Avvia Activity TT</string>
-    <string name="start_eating_soon_tt">Avvia Eating soon TT</string>
+    <string name="allow_automated_crash_reporting">Consentire la segnalazione automatica degli errori e l\'invio dei dati di utilizzo delle funzioni dell\'app agli sviluppatori tramite il servizio fabric.io.</string>
+    <string name="g5appnotdetected">Aggiorna la tua app Dexcom ad una versione supportata</string>
+    <string name="dexcom_app_not_installed">App Dexcom non installata.</string>
+    <string name="start_activity_tt">Avviare TT Attività</string>
+    <string name="start_eating_soon_tt">Avviare TT Pasto Imminente</string>
     <string name="temptargetshort">TT</string>
     <string name="do_not_bolus_record_only">No bolo, solo record</string>
     <string name="category">Categoria</string>
     <string name="subcategory">Sottocategoria</string>
     <string name="bolusrecordedonly">Il bolo sarà solo memorizzato</string>
-    <string name="ns_autobackfill_summary">Riempimento automatico BG mancanti da NS</string>
+    <string name="ns_autobackfill_summary">Riempimento automatico Glicemie mancanti da NS</string>
     <string name="loop_smbsetbypump_label">SMB impostato dal micro</string>
     <string name="overview_show_activity">Attività</string>
     <string name="overview_show_sensitivity">Sensibilità</string>
     <string name="overview_show_deviations">Deviazioni</string>
-    <string name="overview_show_cob">Carboidrato attivi</string>
-    <string name="overview_show_iob">Insulina attiva</string>
+    <string name="overview_show_cob">Carboidrato attivi (COB)</string>
+    <string name="overview_show_iob">Insulina attiva (IOB)</string>
     <string name="overview_show_basals">Basali</string>
     <string name="no_action_selected">Nessuna azione selezionata, non succederà nulla</string>
-    <string name="start_hypo_tt">Avviare Hypo TT</string>
-    <string name="closed_loop_disabled_on_dev_branch">Versione sviluppatore. Loop Chiuso disabilitato.</string>
+    <string name="start_hypo_tt">Avviare TT Ipoglicemia</string>
+    <string name="closed_loop_disabled_on_dev_branch">Versione sviluppatore in esecuzione. Loop Chiuso disabilitato.</string>
     <string name="engineering_mode_enabled">Engineering mode abilitata</string>
-    <string name="not_eng_mode_or_release">Modalità di ingegneria non abilitato e non su ramo di release</string>
+    <string name="not_eng_mode_or_release">Engineering mode non abilitata e non su \'release branch\'</string>
     <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="combo_actvity_reading_basal_profile">Lettura profilo basale</string>
-    <string name="combo_bolus_rejected_due_to_pump_history_change">Lo storico del micro è cambiato dopo il calcolo del bolo. Il bolo non è stato erogato. Ricalcola il bolo se è ancora necessario.</string>
-    <string name="combo_error_updating_treatment_record">Bolo erogato con successo, ma impossibile aggiungere la voce ai Trattamenti. Questo può accadere se due piccoli boli della stessa quantità sono stati somministrati negli ultimi due minuti. Verifica lo storico del micro e le voci della sezione Trattamenti e utilizza il Careportal per aggiungere eventuali voci mancanti. Assicurati di non aggiungere voci con lo stesso orario e con la stessa quantità.</string>
-    <string name="combo_high_temp_rejected_due_to_pump_history_changes">Rifiuto high temp in quanto il calcolo non ha considerato i cambiamenti recenti nello storico del micro</string>
+    <string name="combo_bolus_rejected_due_to_pump_history_change">Lo storico del micro è cambiato dopo il calcolo del bolo. Il bolo non è stato erogato. Ricalcolare se un bolo è ancora necessario.</string>
+    <string name="combo_error_updating_treatment_record">Bolo erogato con successo, ma impossibile aggiungere la voce ai Trattamenti. Questo può accadere se due piccoli boli della stessa quantità sono stati somministrati negli ultimi due minuti. Verificare lo storico del micro e le voci della sezione Trattamenti e utilizzare la sezione Portale per aggiungere eventuali voci mancanti. Assicurarsi di non aggiungere voci con lo stesso orario e con la stessa quantità.</string>
+    <string name="combo_high_temp_rejected_due_to_pump_history_changes">Rifiuto basale temporanea \"alta\" in quanto il calcolo non ha considerato i cambiamenti recenti allo storico del micro</string>
     <string name="combo_activity_checking_pump_state">Aggiornamento stato micro</string>
     <string name="combo_warning_pump_basal_rate_changed">La velocità basale nel micro è cambiata e verrà presto aggiornata</string>
     <string name="combo_error_failure_reading_changed_basal_rate">Velocità basale cambiata sul micro, ma la sua lettura è fallita</string>
     <string name="combo_activity_checking_for_history_changes">Controllo delle modifiche allo storico</string>
-    <string name="combo_error_multiple_boluses_with_identical_timestamp">Sono stati importati più boli con la stessa quantità nello stesso minuto. Solo un record può essere aggiunto ai Trattamenti. Controlla il micro e aggiungi manualmente un record di bolo utilizzando la scheda Careportal. Assicurati di creare un bolo con un orario che nessun altro bolo utilizza.</string>
+    <string name="combo_error_multiple_boluses_with_identical_timestamp">Sono stati importati più boli con la stessa quantità nello stesso minuto. Solo un record può essere aggiunto ai Trattamenti. Controllare il micro e aggiungere manualmente un record di bolo utilizzando la sezione Portale. Assicurarsi di creare un bolo con un orario non utilizzato da nessun altro bolo.</string>
     <string name="about_link_urls">\n\nhttp://www.androidaps.org\nhttp://www.androidaps.de (de)\n\nfacebook:\nhttp://facebook.androidaps.org\nhttp://facebook.androidaps.de (de)</string>
-    <string name="combo_check_date">L\'ultimo bolo è più vecchio di 24 ore o ha una data nel futuro. Controlla che la data sul micro sia impostata correttamente.</string>
-    <string name="combo_suspious_bolus_time">L\'ora/la data del bolo erogato sul micro sembra errata, IOB probabilmente non è corretto. Controlla l\'ora e/o la data del micro.</string>
-    <string name="profileswitch_ismissing">Nessun cambio profilo. Effettua un cambio profilo o premi \"Attiva Profilo\" nella sezione Profilo Locale.</string>
+    <string name="combo_check_date">L\'ultimo bolo è più vecchio di 24 ore o ha una data nel futuro. Controllare che la data sul micro sia impostata correttamente.</string>
+    <string name="combo_suspious_bolus_time">L\'ora/la data del bolo erogato sul micro sembra errata, IOB probabilmente non è corretto. Controllare l\'ora e/o la data del micro.</string>
+    <string name="profileswitch_ismissing">Nessun cambio profilo eseguito. Effettuare un cambio profilo o premere \"Attivare Profilo\" nella sezione Profilo Locale.</string>
     <string name="combo_bolus_count">Conteggio Bolo</string>
     <string name="combo_tbr_count">Conteggio TBR</string>
     <string name="objectivenotstarted">Obiettivo %1$d non avviato</string>
     <string name="objectivenotfinished">Obiettivo %1$d non terminato</string>
-    <string name="pumpisnottempbasalcapable">Micro non in grado di impostare la basale temp</string>
+    <string name="pumpisnottempbasalcapable">Micro non in grado di impostare la basale temporanea</string>
     <string name="novalidbasalrate">Nessuna velocità basale valida letta dal micro</string>
-    <string name="closedmodedisabledinpreferences">Modalità ciclo chiuso disattivata nelle preferenze</string>
+    <string name="closedmodedisabledinpreferences">Modalità Loop Chiuso disabilitata nelle preferenze</string>
     <string name="autosensdisabledinpreferences">Autosens disabilitato nelle preferenze</string>
     <string name="smbdisabledinpreferences">SMB disabilitato nelle preferenze</string>
     <string name="uamdisabledinpreferences">UAM disabilitato nelle preferenze</string>
-    <string name="uamdisabledoref1notselected">UAM disabilitato perché si basa sul plugin di sensibilità Oref1</string>
+    <string name="uamdisabledoref1notselected">UAM disabilitato perché il plugin di sensibilità Oref1, dal quale UAM dipende, non è abilitato</string>
     <string name="limitingbasalratio">Limitazione max velocità basale a %1$.2f U/h. Causa: %2$s</string>
     <string name="pumplimit">limite micro</string>
     <string name="itmustbepositivevalue">deve essere un valore positivo</string>
-    <string name="maxbasalmultiplier">max moltiplicatore basale</string>
-    <string name="maxdailybasalmultiplier">max moltiplicatore basale giornaliera</string>
+    <string name="maxbasalmultiplier">moltiplicatore - max basale</string>
+    <string name="maxdailybasalmultiplier">moltiplicatore - max basale giornaliera</string>
     <string name="smb_frequency_exceeded">Un bolo è stato erogato negli ultimi 3 minuti, SMB ignorato</string>
     <string name="basal_set_correctly">Basale impostata correttamente</string>
-    <string name="limitingpercentrate">Limito max percentuale a %1$d%% Causa: %2$s</string>
-    <string name="limitingbolus">Limito il bolo a %1$.1f U Causa: %2$s</string>
-    <string name="limitingextendedbolus">Limito il bolo esteso a %1$.1f U Causa: %2$s</string>
-    <string name="limitingmaxiob">Limito max IOB a %1$.1f U Causa: %2$s</string>
+    <string name="limitingpercentrate">Limito max tasso percentuale a %1$d%% - Causa: %2$s</string>
+    <string name="limitingbolus">Limito il bolo a %1$.1f U - Causa: %2$s</string>
+    <string name="limitingextendedbolus">Limito il bolo esteso a %1$.1f U - Causa: %2$s</string>
+    <string name="limitingmaxiob">Limito max IOB a %1$.1f U - Causa: %2$s</string>
     <string name="limitingcarbs">Limito i carboidrati a %1$d g Causa: %2$s</string>
-    <string name="limitingiob">Limito IOB a %1$.1f U Causa: %2$s</string>
+    <string name="limitingiob">Limito IOB a %1$.1f U - Causa: %2$s</string>
     <string name="maxvalueinpreferences">valore max nelle preferenze</string>
     <string name="hardlimit">limite fisso</string>
     <string name="unsafeusage">utilizzo non sicuro</string>
     <string name="readstatusfailed">Lettura stato fallita</string>
-    <string name="record_pump_site_change">Registra cambio sito micro</string>
-    <string name="record_insulin_cartridge_change">Sostituzione della cartuccia di insulina record</string>
+    <string name="record_pump_site_change">Registrare cambio posizione cannula</string>
+    <string name="record_insulin_cartridge_change">Registrare cambio serbatoio insulina</string>
     <string name="smbalwaysdisabled">Le funzioni \"SMB sempre\" e \"SMB dopo carboidrati\" sono disabilitate perché la sorgente dati della Glicemia non supporta il filtraggio avanzato</string>
     <string name="smbnotallowedinopenloopmode">SMB non consentito in modalità Loop Aperto</string>
     <string name="food_short">Cibo</string>
@@ -899,18 +900,18 @@
     <string name="loopdisconnectedfor">Disconnesso (%1$d m)</string>
     <string name="openapssmb_maxiob_title">Max IOB totale oltre la quale OpenAPS non può andare [U]</string>
     <string name="openapssmb_maxiob_summary">Questo valore è chiamato Max IOB nel contesto OpenAPS\nOpenAPS non aggiungerà ulteriore insulina se IOB corrente è maggiore di questo valore</string>
-    <string name="pump_stopped">Micro sospeso</string>
+    <string name="pump_stopped">Micro stoppato</string>
     <string name="pump_started">Micro avviato</string>
     <string name="pump_paused">Micro in pausa</string>
     <string name="absorption_cutoff_title">Max tempo assorbimento pasto [h]</string>
     <string name="absorption_cutoff_summary">Tempo entro il quale ogni pasto si considera assorbito. Eventuali carboidrati rimanenti verranno tagliati fuori.</string>
     <string name="time">Tempo</string>
-    <string name="overview_show_notes_field_in_dialogs_title">Mostra campo note nelle finestre trattamento</string>
+    <string name="overview_show_notes_field_in_dialogs_title">Mostrare campo note nelle finestre trattamento</string>
     <string name="next_button">Avanti</string>
     <string name="previous_button">Indietro</string>
     <string name="nav_setupwizard">Configurazione guidata</string>
     <string name="setupwizard_finish">FINE</string>
-    <string name="setupwizard_language_prompt">Seleziona la tua lingua</string>
+    <string name="setupwizard_language_prompt">Selezionare la tua lingua</string>
     <string name="boluserrorcode">Chiesto: %1$.2fU Erogato: %2$.2fU Codice errore: %3$s</string>
     <string name="firstinsulinincrement">Primo incremento di insulina</string>
     <string name="secondinsulinincrement">Secondo incremento di insulina</string>
@@ -928,34 +929,34 @@
     <string name="openapsama_autosens_max">Max rapporto autosens</string>
     <string name="openapsama_autosens_min">Min rapporto autosens</string>
     <string name="openapsama_bolussnooze_dia_divisor">Bolus snooze - divisore DIA</string>
-    <string name="openapsama_max_daily_safety_multiplier">Max moltiplicatore di sicurezza basale giornaliera</string>
+    <string name="openapsama_max_daily_safety_multiplier">Moltiplicatore di sicurezza max basale giornaliera</string>
     <string name="openapsama_current_basal_safety_multiplier">Moltiplicatore di sicurezza basale corrente</string>
     <string name="value_unavailable_short">n/a</string>
     <string name="virtualpump_type">Micro virtuale</string>
     <string name="virtualpump_definition">Definizione micro</string>
     <string name="virtualpump_pump_def">Bolo: Step=%1$s\nBolo Esteso: [Step=%2$s, Durata=%3$smin-%4$sh]\nBasale: Step=%5$s\nTBR: %6$s (di %7$s), Durata=%8$smin-%9$sh\n%10$s</string>
     <string name="virtualpump_pump_def_extended_note">* Sono supportati solo valori discreti, non intervalli di valori, come incrementi per basale/bolo nel micro virtuale.</string>
-    <string name="ns_autobackfill_title">Riempimento automatico BG</string>
+    <string name="ns_autobackfill_title">Riempimento automatico Glicemie</string>
     <string name="wear_wizard_settings">Impostazioni Wizard</string>
     <string name="wear_wizard_settings_summary">Calcoli inclusi nel risultato della procedura guidata:</string>
     <string name="wear_display_settings">Impostazioni visualizzazione</string>
     <string name="wear_general_settings">Impostazioni generali</string>
-    <string name="enable_nsclient">Abilita NSClient</string>
-    <string name="welcometosetupwizard">Benvenuto nella procedura guidata di configurazione. Ti seguirò durante tutto il processo.\n</string>
+    <string name="enable_nsclient">Abilitare NSClient</string>
+    <string name="welcometosetupwizard">Benvenuto nella configurazione guidata. Ti seguirò durante tutto il processo.\n</string>
     <string name="pumpsetup">Setup Micro</string>
-    <string name="readstatus">Leggi stato</string>
+    <string name="readstatus">Lettura stato</string>
     <string name="adjustprofileinns">Le modifiche devono essere fatte in NS</string>
-    <string name="exitwizard">Salta configurazione guidata</string>
+    <string name="exitwizard">Saltare configurazione guidata</string>
     <string name="setupwizard_loop_description">Premere il pulsante in basso per permettere ad AndroidAPS di suggerire/fare modifiche alla basale</string>
-    <string name="apssetup">Configura il plugin APS</string>
-    <string name="sensitivitysetup">Configura il plugin di Sensibilità</string>
-    <string name="setupwizard_sensitivity_description">Il plugin di Sensibilità è utilizzato per il rilevamento della sensibilità all\'insulina e il calcolo di COB. Per ulteriori informazioni visita:</string>
+    <string name="apssetup">Configurare il plugin APS</string>
+    <string name="sensitivitysetup">Configurare il plugin di Sensibilità</string>
+    <string name="setupwizard_sensitivity_description">Il plugin di Sensibilità è utilizzato per il rilevamento della sensibilità all\'insulina e il calcolo di COB. Per ulteriori informazioni visitare:</string>
     <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
     <string name="nsclientinfotext">NSClient gestisce la connessione a Nightscout. Puoi saltare questa parte ora, ma non sarai in grado di superare gli obiettivi fino a quando non ne porterai a termine la configurazione.</string>
     <string name="diawarning">Ricorda: i nuovi profili di insulina richiedono una DIA di almeno 5h. DIA di 5 - 6h sui nuovi profili sono uguali a DIA di 3h sui vecchi profili di insulina.</string>
-    <string name="bgsourcesetup">Configura sorgente Glicemie</string>
-    <string name="setupwizard_profile_description">Seleziona il tipo di profilo. Se il paziente è un bambino è necessario utilizzare il profilo di NS. Se non c\'è nessuno a seguirti su Nightscout probabilmente preferirai il profilo locale. Ricorda che stai solo selezionando la sorgente del profilo. Per utilizzarlo devi attivarlo tramite l\'esecuzione del comando \"Cambio Profilo\"</string>
-    <string name="setupwizard_aps_description">Seleziona uno da algoritmi disponibili. Sono ordinati dal più vecchio al più recente. L\'algoritmo più recente è solitamente più potente, incisivo e \"aggressivo\". Pertanto, se sei un nuovo utente, probabilmente potresti/dovresti iniziare con AMA e non con l\'ultimo. Non dimenticare di leggere la documentazione di OpenAPS e di configurarlo prima dell\'uso.</string>
+    <string name="bgsourcesetup">Configurare sorgente Glicemie</string>
+    <string name="setupwizard_profile_description">Selezionare il tipo di profilo. Se il paziente è un bambino dovresti utilizzare il profilo di NS. Se non c\'è nessuno a seguirti su Nightscout probabilmente preferirai il profilo locale. Ricorda che stai solo selezionando la sorgente del profilo. Per utilizzarlo devi attivarlo tramite l\'esecuzione del comando \"Cambio Profilo\"</string>
+    <string name="setupwizard_aps_description">Selezionare uno degli algoritmi disponibili. Sono ordinati dal più vecchio al più recente. L\'algoritmo più recente è solitamente più potente, incisivo e \"aggressivo\". Pertanto, se sei un nuovo utente, probabilmente potresti/dovresti iniziare con AMA e non con l\'ultimo. Non dimenticare di leggere la documentazione di OpenAPS e di configurarlo prima dell\'uso.</string>
     <string name="startobjective">Inizia il tuo primo obiettivo</string>
     <string name="permission">Permesso</string>
     <string name="askforpermission">Chiedi il permesso</string>
@@ -977,30 +978,30 @@
     <string name="danar_glucoseunits">Unità Glucosio</string>
     <string name="danar_shutdown">Spegnimento(ore)</string>
     <string name="danar_lowreservoir">Livello serbatoio basso (Unità)</string>
-    <string name="danar_saveuseroptions">Salva opzioni nel micro</string>
+    <string name="danar_saveuseroptions">Salvare opzioni nel micro</string>
     <string name="option_on">On</string>
     <string name="option_off">Off</string>
-    <string name="open_navigation">Apri navigazione</string>
-    <string name="close_navigation">Chiudi navigazione</string>
+    <string name="open_navigation">Aprire navigazione</string>
+    <string name="close_navigation">Chiudere navigazione</string>
     <string name="nav_plugin_preferences">Preferenze Plugin</string>
     <string name="completed_well_done">Completato, ben fatto!</string>
     <string name="not_completed_yet">Non ancora completato</string>
     <string name="time_elapsed">Tempo trascorso</string>
     <string name="nth_objective">%1$d. Obiettivo</string>
     <string name="poctech">Poctech</string>
-    <string name="description_source_poctech">Ricevi valori Glicemia da app Poctech</string>
-    <string name="description_source_tomato">Ricevi valori Glicemia da app Tomato (dispositivo MiaoMiao)</string>
-    <string name="high_temptarget_raises_sensitivity_title">High Temp-Target aumenta la sensibilità</string>
-    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Aumenta la sensibilità per temp-target >= 100]]></string>
-    <string name="low_temptarget_lowers_sensitivity_title">Low Temp-Target diminuisce la sensibilità</string>
-    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Diminuisci la sensibilità per temp-target < 100]]></string>
-    <string name="combo_invalid_setup">Configurazione micro non valida, controlla la documentazione e verifica che il menu Quick Info sia denominato QUICK INFO utilizzando \"360 configuration software\".</string>
+    <string name="description_source_poctech">Ricevere valori Glicemia da app Poctech</string>
+    <string name="description_source_tomato">Ricevere valori Glicemia da app Tomato (dispositivo MiaoMiao)</string>
+    <string name="high_temptarget_raises_sensitivity_title">Temp-Target \"alto\" aumenta la sensibilità</string>
+    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Aumentare la sensibilità per temp-target >= 100]]></string>
+    <string name="low_temptarget_lowers_sensitivity_title">Temp-Target \"basso\" riduce la sensibilità</string>
+    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Ridurre la sensibilità per temp-target < 100]]></string>
+    <string name="combo_invalid_setup">Configurazione micro non valida, controllare la documentazione e verificare che il menu Quick Info sia denominato QUICK INFO utilizzando \"360 configuration software\".</string>
     <string name="custom">Personalizzato</string>
     <string name="largetimedifftitle">Grande differenza d\'orario</string>
-    <string name="largetimediff">Grande differenza d\'orario:\nL\'orario nel micro differisce per più di 1h e 30m. \nRegola l\'ora manualmente e assicurati che la lettura dello storico del micro non causi comportamenti imprevisti.\nSe possibile, cancella la cronologia del micro prima di cambiare l\'orario oppure disabilita il Loop Chiuso per un tempo corrispondente alla tua DIA a partire dall\'orario dall\'ultima voce errata, ma in ogni caso almeno a partire da adesso.</string>
-    <string name="careportal_removestartedevents">Rimuovi eventi avviati da AndroidAPS</string>
+    <string name="largetimediff">Grande differenza d\'orario:\nL\'orario nel micro differisce per più di 1h e 30m. \nRegolare l\'ora manualmente e assicurarsi che la lettura dello storico del micro non causi comportamenti imprevisti.\nSe possibile, cancellare la cronologia del micro prima di cambiare l\'orario oppure disabilitare il Loop Chiuso per un tempo corrispondente alla tua DIA.</string>
+    <string name="careportal_removestartedevents">Rimuovere gli eventi \"AndroidAPS avviato\"</string>
     <string name="storedsettingsfound">Trovate impostazioni salvate</string>
-    <string name="allow_hardware_pump_text">Attenzione: se attivi e connetti un micro, AndroidAPS copierà le impostazioni della basale dal profilo al micro, sovrascrivendo la velocità basale memorizzata sul micro. Assicurati di avere la giusta impostazione della basale in AndroidAPS. Se non sei sicuro o non vuoi sovrascrivere le impostazioni della basale sul micro, premi Cancella e ricollega il micro in un altro momento.</string>
+    <string name="allow_hardware_pump_text">Attenzione: se attivi e connetti un micro, AndroidAPS copierà le impostazioni della basale dal profilo al micro, sovrascrivendo la velocità basale memorizzata sul micro. Assicurati di avere la giusta impostazione della basale in AndroidAPS. Se non sei sicuro o non vuoi sovrascrivere le impostazioni della basale sul micro, premi Annulla e ricollega il micro in un altro momento.</string>
     <string name="error_adding_treatment_title">Dati trattamento incompleti</string>
     <string name="maintenance_settings">Impostazioni Manutenzione</string>
     <string name="maintenance_email">Email</string>
@@ -1008,14 +1009,14 @@
     <string name="maintenance">Manutenzione</string>
     <string name="maintenance_shortname">MAINT</string>
     <string name="description_maintenance">Fornisce numerose funzioni per la manutenzione (ad es. invio log, eliminazione log).</string>
-    <string name="send_all_logs">Invia i log via Email</string>
-    <string name="delete_logs">Elimina i log</string>
-    <string name="error_adding_treatment_message">Un trattamento (insulina: %1$.2f, carboidrati: %2$d, a: %3$s) non può essere aggiunto ai trattamenti. Controlla e aggiungi il record necessario.</string>
+    <string name="send_all_logs">Inviare i log via Email</string>
+    <string name="delete_logs">Eliminare i log</string>
+    <string name="error_adding_treatment_message">Un trattamento (insulina: %1$.2f, carboidrati: %2$d, a: %3$s) non può essere aggiunto ai trattamenti. Controllare e aggiungere il record necessario.</string>
     <string name="generated_ecarbs_note">eCarbs: %1$d g (%2$d h), ritardo: %3$d m</string>
     <string name="openaps_noasdata">Nessun dato autosens disponibile</string>
     <string name="nav_logsettings">Impostazioni Log</string>
-    <string name="resettodefaults">Ripristina impostazioni predefinite</string>
-    <string name="nsmalfunction">Malfunzionamento NSClient Considera il riavvio di NS e NSClient.</string>
+    <string name="resettodefaults">Ripristinare impostazioni predefinite</string>
+    <string name="nsmalfunction">Malfunzionamento NSClient. Considerare il riavvio di NS e NSClient.</string>
     <string name="as">AS</string>
     <string name="versionavailable">Versione %1$s disponibile</string>
     <string name="time_offset">Differenza di fuso orario</string>
@@ -1023,35 +1024,35 @@
     <string name="treatments_wizard_total_label">Totale</string>
     <string name="calculation_short">Calc</string>
     <string name="handshaking">Connessione</string>
-    <string name="sendlogfiles">Invia agli sviluppatori i file log di oggi e del momento attuale. Situazione inaspettata.</string>
+    <string name="sendlogfiles">Inviare agli sviluppatori i file log di oggi e di questo momento. Situazione inaspettata.</string>
     <string name="maxbolusviolation">Violazione bolo massimo</string>
     <string name="commanderror">Errore comando</string>
     <string name="speederror">Errore velocità</string>
     <string name="insulinlimitviolation">Violazione limite insulina</string>
-    <string name="loop_openmode_min_change">Richiesta cambiamento minima [%]</string>
+    <string name="loop_openmode_min_change">Richiesta minima di modifica [%]</string>
     <string name="loop_openmode_min_change_summary">Il Loop Aperto mostrerà una nuova richiesta di modifica solo se la modifica è maggiore di questo valore in %. Il valore predefinito è 20%</string>
     <string name="pairfirst">Associa il micro con il tuo telefono!</string>
     <string name="searching_for_devices">Ricerca dispositivi…</string>
-    <string name="please_wait">Attendi…</string>
+    <string name="please_wait">Attendere…</string>
     <string name="pairing_completed">Associazione completata</string>
     <string name="code_compare">I codici mostrati su questo dispositivo e sul micro combaciano?</string>
-    <string name="insight_pairing">associazione Insight</string>
+    <string name="insight_pairing">Associazione Insight</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2fU / %2$.2fU erogate</string>
+    <string name="insight_delivered">%1$.2fU / %2$.2fU erogato</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Catetere sostituito</string>
     <string name="pump_time_updated">Ora del micro aggiornata</string>
     <string name="confirm">Conferma</string>
     <string name="mute_alert">Muto</string>
     <string name="pump_alert">Avviso microinfusore</string>
-    <string name="log_site_changes">Log cambio sito</string>
-    <string name="log_reservoir_changes">Log cambio serbatoio</string>
-    <string name="log_tube_changes">Log cambio catetere</string>
-    <string name="log_battery_changes">Log cambio batteria</string>
-    <string name="log_operating_mode_changes">Log cambio modalità di funzionamento</string>
-    <string name="log_alerts">Log avvisi</string>
-    <string name="enable_tbr_emulation">Abilita emulazione TBR</string>
-    <string name="enable_tbr_emulation_summary">Usa i bolli estesi invece dei TBR per aggirare il limite del 250%%</string>
+    <string name="log_site_changes">Registrare cambi posizione cannula</string>
+    <string name="log_reservoir_changes">Registrare cambi serbatoio</string>
+    <string name="log_tube_changes">Registrare cambi catetere</string>
+    <string name="log_battery_changes">Registrare cambi batteria</string>
+    <string name="log_operating_mode_changes">Registrare cambi modalità di funzionamento</string>
+    <string name="log_alerts">Registrare avvisi</string>
+    <string name="enable_tbr_emulation">Abilitare emulazione TBR</string>
+    <string name="enable_tbr_emulation_summary">Usare i bolli estesi invece dei TBR per aggirare il limite del 250%%</string>
     <string name="disconnect_delay">Ritardo disconnessione [s]</string>
     <string name="serial_number">Numero seriale</string>
     <string name="release_software_version">Versione software di rilascio</string>
@@ -1063,10 +1064,10 @@
     <string name="bluetooth_address">Indirizzo Bluetooth</string>
     <string name="system_id_appendix">Appendice ID sistema</string>
     <string name="manufacturing_date">Data di produzione</string>
-    <string name="delete_pairing">Elimina associazione</string>
+    <string name="delete_pairing">Eliminare associazione</string>
     <string name="pairing_information">Informazioni associazione</string>
-    <string name="start_pump">Avvia micro</string>
-    <string name="stop_pump">Ferma micro</string>
+    <string name="start_pump">Avviare micro</string>
+    <string name="stop_pump">Stoppare micro</string>
     <string name="operating_mode">Modalità operativa</string>
     <string name="insight_status">Stato</string>
     <string name="tdd_bolus">TDD Boli</string>
@@ -1076,14 +1077,14 @@
     <string name="not_paired">Non associato</string>
     <string name="last_connected">Ultima connessione</string>
     <string name="started">Avviato</string>
-    <string name="stopped">Fermato</string>
+    <string name="stopped">Stoppato</string>
     <string name="tbr_formatter">%1$d%% per %2$d / %3$d min</string>
     <string name="extended_bolus">Bolo Esteso</string>
     <string name="multiwave_bolus">Bolo Multiwave</string>
     <string name="eb_formatter">%1$.2f / %2$.2f U per %3$d min</string>
-    <string name="enable_tbr_over_notification">Abilita notifica di fine TBR\n(impostazione micro)</string>
-    <string name="disable_tbr_over_notification">Disabilita notifica di fine TBR\n(impostazione micro)</string>
-    <string name="refresh">Ricarica</string>
+    <string name="enable_tbr_over_notification">Abilitare notifica di fine TBR\n(impostazione micro)</string>
+    <string name="disable_tbr_over_notification">Disabilitare notifica di fine TBR\n(impostazione micro)</string>
+    <string name="refresh">Ricaricare</string>
     <string name="description_pump_insight_local">Integrazione micro Accu-Chek Insight</string>
     <string name="not_inserted">Non inserito</string>
     <string name="short_status_last_connected">Ultima conn: %1$d min fa</string>
@@ -1096,7 +1097,7 @@
     <string name="max_recovery_duration">Durata massima recupero [s]</string>
     <string name="min_recovery_duration">Durata minima recupero [s]</string>
     <string name="recovery_duration">Durata recupero</string>
-    <string name="timeout_during_handshake">Timeout durante la comunicazione - riavvia il bluetooth</string>
+    <string name="timeout_during_handshake">Timeout durante la comunicazione - riavviare il bluetooth</string>
     <string name="weekday_sunday_short">Dom</string>
     <string name="weekday_saturday_short">Sab</string>
     <string name="weekday_friday_short">Ven</string>
@@ -1105,16 +1106,16 @@
     <string name="weekday_tuesday_short">Mar</string>
     <string name="weekday_monday_short">Lun</string>
     <string name="automation_description">Automation task definiti dall\'utente</string>
-    <string name="automation_missing_task_name">Inserisci un nome task.</string>
-    <string name="automation_missing_trigger">Specifica almeno un trigger.</string>
-    <string name="automation_missing_action">Specifica almeno un\'azione.</string>
+    <string name="automation_missing_task_name">Inserire un nome task.</string>
+    <string name="automation_missing_trigger">Specificare almeno un trigger.</string>
+    <string name="automation_missing_action">Specificare almeno un\'azione.</string>
     <string name="alreadyenabled">Già abilitato</string>
     <string name="alreadydisabled">Già disabilitato</string>
     <string name="alreadysuspended">Già sospeso</string>
-    <string name="resumeloop">Riprendi il Loop</string>
+    <string name="resumeloop">Riprendere il Loop</string>
     <string name="notsuspended">Non sospeso</string>
-    <string name="starttemptarget">Avvia temp-target</string>
-    <string name="stoptemptarget">Ferma temp-target</string>
+    <string name="starttemptarget">Avviare temp-target</string>
+    <string name="stoptemptarget">Stoppare temp-target</string>
     <string name="islesser">è inferiore a</string>
     <string name="isequalorlesser">è uguale o inferiore a</string>
     <string name="isequal">è uguale a</string>
@@ -1131,9 +1132,9 @@
     <string name="or">Or</string>
     <string name="xor">Xor</string>
     <string name="atspecifiedtime">A %1$s</string>
-    <string name="use_network_location">Usa posizione di rete</string>
-    <string name="use_gps_location">Usa posizione GPS</string>
-    <string name="use_passive_location">Usa posizione passiva</string>
+    <string name="use_network_location">Usare posizione di rete</string>
+    <string name="use_gps_location">Usare posizione GPS</string>
+    <string name="use_passive_location">Usare posizione passiva</string>
     <string name="locationservice">Servizio di localizzazione</string>
     <string name="automation_short">Auto</string>
     <string name="automation">Automazione</string>
@@ -1141,8 +1142,8 @@
     <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>
-    <string name="dexcom_lognssensorchange_summary">Crea evento \"Cambio Sensore\" in NS all\'avvio del sensore</string>
+    <string name="dexcom_lognssensorchange_title">Registrare cambio sensore in NS</string>
+    <string name="dexcom_lognssensorchange_summary">Creare evento \"Cambio Sensore\" in NS all\'avvio del sensore</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="unit_second">secondo</string>
@@ -1164,16 +1165,16 @@
     <string name="title_tidepool_dev_servers">Usa server integrativi (test)</string>
     <string name="tidepool">Tidepool</string>
     <string name="tidepool_shortname">TDP</string>
-    <string name="description_tidepool">Carica dati in Tidepool</string>
-    <string name="tidepool_upload_cgm">Carica dati CGM</string>
-    <string name="tidepool_upload_bolus">Carica trattamenti (insulina, carbo)</string>
-    <string name="tidepool_upload_tbr">Carica basali temporanee</string>
-    <string name="tidepool_upload_profile">Carica switch di profilo, target temporanei</string>
-    <string name="tidepool_upload_bg">Carica test Glicemia</string>
+    <string name="description_tidepool">Caricare dati in Tidepool</string>
+    <string name="tidepool_upload_cgm">Caricare dati CGM</string>
+    <string name="tidepool_upload_bolus">Caricare trattamenti (insulina, carboidrati)</string>
+    <string name="tidepool_upload_tbr">Caricare basali temporanee</string>
+    <string name="tidepool_upload_profile">Caricare cambi profilo, target temporanei</string>
+    <string name="tidepool_upload_bg">Caricare test Glicemia</string>
     <string name="dst_in_24h_warning">Cambio all\'ora legale in 24h o meno</string>
-    <string name="dst_loop_disabled_warning">Cambio all\'ora legale avvenuto meno di 3 ore fa - Loop Chiuso disattivato</string>
+    <string name="dst_loop_disabled_warning">Cambio all\'ora legale avvenuto meno di 3 ore fa - Loop Chiuso disabilitato</string>
     <string name="storage">vincolo di archiviazione interna</string>
-    <string name="diskfull">Libera almeno %1$d MB dalla memoria interna! Loop disabilitato!</string>
+    <string name="diskfull">Liberare almeno %1$d MB dalla memoria interna! Loop disabilitato!</string>
     <string name="wrongformat">Formato errato</string>
     <string name="sms_wrongcode">Codice errato. Comando annullato.</string>
     <string name="notconfigured">Non configurato</string>
@@ -1189,7 +1190,7 @@
     <string name="delete_short">CANC</string>
     <string name="add_short">AGG</string>
     <string name="copy_short">COPIA</string>
-    <string name="addnew">Aggiungi nuovo</string>
+    <string name="addnew">Aggiungere nuovo</string>
     <string name="versionChecker">Controllo Versione</string>
     <string name="signature_verifier">Verificatore firma</string>
     <string name="running_invalid_version">Abbiamo rilevato che stai eseguendo una versione non valida. Loop disabilitato!</string>
@@ -1200,14 +1201,14 @@
     <string name="formatinsulinunits">%1$.2fU</string>
     <string name="dexcom_app_patched">Dexcom App (modificata)</string>
     <string name="dexcom_short">DXCM</string>
-    <string name="description_source_dexcom">Ricevi valori Glicemia dall\'app Dexcom modificata.</string>
+    <string name="description_source_dexcom">Ricevere valori Glicemia dall\'app Dexcom modificata.</string>
     <string name="notification">Notifica</string>
     <string name="notification_message">Notifica: %1$s</string>
     <string name="message_short">Msg:</string>
     <string name="profilepercentage">Percentuale profilo</string>
     <string name="percent_u">Percentuale [%]:</string>
-    <string name="startprofile">Avvia profilo %1$d%% per %2$d min</string>
-    <string name="startprofileforever">Avvia profilo %1$d%%</string>
+    <string name="startprofile">Avviare profilo %1$d%% per %2$d min</string>
+    <string name="startprofileforever">Avviare profilo %1$d%%</string>
     <string name="exists">esiste</string>
     <string name="notexists">non esiste</string>
     <string name="temptargetcompared">Temp target %1$s</string>
@@ -1230,8 +1231,8 @@
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Nome Task</string>
     <string name="edit_short">MODIFICA</string>
-    <string name="please_choose_an_action_type">Scegli un tipo di azione:</string>
-    <string name="please_choose_a_trigger_type">Scegli un tipo di trigger:</string>
+    <string name="please_choose_an_action_type">Scegliere un tipo di azione:</string>
+    <string name="please_choose_a_trigger_type">Scegliere un tipo di trigger:</string>
     <string name="triggers">Trigger:</string>
     <string name="remove_label">RIMUOVI</string>
     <string name="preconditions">Presupposti:</string>
@@ -1253,12 +1254,12 @@
     <string name="medtronic_pump_encoding_4b6b_local">Codifica Software 4b6b</string>
     <string name="medtronic_pump_encoding_4b6b_rileylink">Codifica Hardware 4b6b</string>
     <string name="medtronic_custom_action_wake_and_tune">Risveglio e Sintonizzazione</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Cancella Blocco Bolo</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Cancellare Blocco Bolo</string>
     <string name="medtronic_custom_action_reset_rileylink">Reset Configurazione RileyLink</string>
     <string name="medtronic_pump_battery_select">Tipo batteria (Power View)</string>
     <string name="medtronic_pump_battery_no">Non selezionato (Simple view)</string>
-    <string name="medtronic_pump_battery_alkaline">Alkaline (Extended view)</string>
-    <string name="medtronic_pump_battery_lithium">Lithium (Extended view)</string>
+    <string name="medtronic_pump_battery_alkaline">Alcalina (Extended view)</string>
+    <string name="medtronic_pump_battery_lithium">Litio (Extended view)</string>
     <!-- RL BLE Scanning -->
     <string name="rileylink_scanner_scan_scan">SCAN</string>
     <string name="rileylink_scanner_scan_stop">STOP</string>
@@ -1266,11 +1267,11 @@
     <string name="rileylink_scanner_title">Scansione RileyLink</string>
     <string name="rileylink_scanner_ble_not_supported">Bluetooth Low Energy non supportato.</string>
     <string name="rileylink_scanner_ble_not_enabled">Bluetooth disabilitato.</string>
-    <string name="location_not_found_title">La posizione non è abilitata</string>
-    <string name="location_not_found_message">Affinché la ricerca bluetooth funzioni coi nuovi dispositivi, la localizzazione deve essere abilitata, ma può essere disabilitata dopo l\'associazione. AAPS non tiene traccia della tua posizione.</string>
-    <string name="location_yes">Abilita</string>
+    <string name="location_not_found_title">La Posizione è disabilitata</string>
+    <string name="location_not_found_message">Affinché la ricerca bluetooth funzioni sui nuovi dispositivi, la localizzazione deve essere abilitata, ma può essere disabilitata dopo l\'associazione. AAPS non tiene traccia della tua posizione.</string>
+    <string name="location_yes">Abilitare</string>
     <string name="location_no">No</string>
-    <string name="rileylink_scanner_scanning">Scansione in corso</string>
+    <string name="rileylink_scanner_scanning">Scansione</string>
     <string name="rileylink_scanner_scanning_finished">Scansione terminata</string>
     <string name="rileylink_scanner_scanning_error">Errore scansione: %1$d</string>
     <!-- RL Status Page -->
@@ -1321,7 +1322,7 @@
     <string name="medtronic_error_pump_frequency_not_set">Frequenza micro non impostata.</string>
     <string name="medtronic_error_pump_frequency_invalid">Frequenza micro non supportata.</string>
     <string name="medtronic_error_rileylink_address_invalid">Indirizzo RileyLink non valido.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">Tipo di micro rilevato non è uguale al tipo configurato.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Il tipo di micro rilevato non è uguale al tipo configurato.</string>
     <string name="medtronic_error_pump_basal_profiles_not_enabled">I profili basali non sono abilitati nel microinfusore.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Il profilo basale impostato nel micro non è corretto (deve essere STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo TBR errato impostato nel micro (deve essere Assoluto).</string>
@@ -1367,14 +1368,36 @@
     <string name="medtronic_cmd_desc_get_tbr">Ottieni Basale Temporanea</string>
     <string name="medtronic_cmd_desc_set_tbr">Imposta Basale Temporanea</string>
     <string name="medtronic_cmd_desc_set_bolus">Imposta Bolo</string>
-    <string name="insulinFromCob"><![CDATA[Insulina COB: <font color=\'%1$s\'>%2$.1fg %3$.2fU</font>]]></string>
+    <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.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 potrebbero essere sovrastimati e potrebbe essere somministrata più insulina !!!!!</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
-    <string name="partialboluswizard">Eroga questa parte del risultato del bolus wizard [%]</string>
+    <string name="partialboluswizard">Erogare questa parte del risultato del bolus wizard [%]</string>
     <string name="deliverpartofboluswizard">Bolus wizard esegue il calcolo, ma solo questa parte dell\'insulina calcolata è erogata. Utile con algoritmo SMB.</string>
     <string name="loading">Caricamento ...</string>
     <string name="snooze">Snooze</string>
+    <string name="accomplished">Compiuto: %1$s</string>
+    <string name="objectives_usage_objective">Imparare a controllare AndroidAPS</string>
+    <string name="objectives_usage_gate">Eseguire varie azioni in AndroidAPS</string>
+    <string name="objectives_useprofileswitch">Impostare il profilo \"90%\" per 10 min (premere a lungo sul nome profilo nella sezione Panoramica)</string>
+    <string name="objectives_usedisconnectpump">Simulare la doccia. Disconnettere il micro per 1h (premere a lungo su Loop Aperto)</string>
+    <string name="objectives_usereconnectpump">... e riconnettere allo stesso modo</string>
+    <string name="objectives_usetemptarget">Creare un temp-target personalizzato con una durata di 10 min (premere a lungo sul tuo target corrente)</string>
+    <string name="objectives_useactions">Nel Configuratore attivare il plugin Azioni, renderlo visibile e visualizzarne i contenuti tramite il menu in alto</string>
+    <string name="objectives_useloop">Visualizzare il contenuto del plugin Loop</string>
+    <string name="objectives_usescale">Usare la funzione di ridimensionamento premendo a lungo sul grafico delle glicemie</string>
+    <string name="objectives_button_enter">Entrare</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Inserire il codice ottenuto dagli sviluppatori per aggirare il resto degli obiettivi</string>
+    <string name="codeaccepted">Codice accettato</string>
+    <string name="codeinvalid">Codice non valido</string>
+    <string name="objectives_exam_objective">Dare prova della tua conoscenza</string>
+    <string name="objectives_exam_gate">Studiare e rispondere correttamente alle domande</string>
+    <string name="answerdisabledto">Risposta disabilitata per: %1$s</string>
+    <string name="wronganswer">Risposta sbagliata!</string>
+    <string name="unfinshed_button">Prossimo non completato</string>
+    <string name="close">Chiudi</string>
+    <string name="requestcode">Codice richiesta: %1$s</string>
+    <string name="objectives_hint">(segnare tutte le risposte corrette)</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-iw-rIL/exam.xml b/app/src/main/res/values-iw-rIL/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-iw-rIL/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-ja-rJP/exam.xml b/app/src/main/res/values-ja-rJP/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-ja-rJP/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-ko-rKR/exam.xml b/app/src/main/res/values-ko-rKR/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-ko-rKR/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index f122aa4420..a0b91c3eee 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -319,19 +319,6 @@
     <string name="overview_bolusprogress_goingtodeliver">%1$.2fU을 주입합니다</string>
     <string name="objectives_0_objective">표시설정과 모니터설정을 완료하고, Basal과 비율을 분석한다.</string>
     <string name="objectives_0_gate">나이트스카우트에서 혈당 데이터가 잘 들어오는지, 펌프데이터가 업로드 되는지 확인한다.</string>
-    <string name="objectives_openloop_objective">Open Loop를 시작한다.</string>
-    <string name="objectives_openloop_gate">Open Loop 모드에서 몇일간 사용하여보고, 임시Basal을 여러번 수동으로 주입해 본다. 임시목표와 기본임시목표(\'식사직전\', \'활동\',\'저혈당\' 임시목표)를 설정하고 사용해 본다.</string>
-    <string name="objectives_maxbasal_objective">임시Basal 추천기능을 포함해서, Open Loop에 대해 이해한다.</string>
-    <string name="objectives_maxbasal_gate">이 경험을 토대로, 최대 Basal을 결정하고 이를 펌프와 설정에 입력한다.</string>
-    <string name="objectives_maxiobzero_objective">Closed Loop를 시작하고 저혈당인슐린 중지 기능을 사용해본다.</string>
-    <string name="objectives_maxiobzero_gate">최대 IOB = 0 인 상태로 Closed Loop를 몇일동안 실행시켜 본다. 저혈당 인슐린일시중지가 많이 발생하지 않도록 한다.</string>
-    <string name="objectives_maxiob_objective">Closed Loop를 조정하여 최대 IOB를 0 이상으로 올려서 서서히 혈당 목표치를 낮춘다.</string>
-    <string name="objectives_maxiob_gate">혈당을 낮추기 전에 몇일간 사용해보되 최소한 하루는 저혈당 혈당 알람이 발생하지 않도록 해본다.</string>
-    <string name="objectives_autosens_objective">필요하면 Basal과 비율을 조절하고, auto-sens를 활성화한다.</string>
-    <string name="objectives_autosens_gate">평소의 탄수화물을 입력하면서 1주일동안 낮시간대에 loop를 성공적으로 사용해본다.</string>
-    <string name="objectives_ama_objective">AMA(Advanced Meal Assist)같은 낮시간대를 위한 추가적인 기능들을 실행하여 본다.</string>
-    <string name="objectives_smb_objective">낮시간대에 SMB(Super Micro Bolus)같은 추가기능을 활성화해 사용해본다.</string>
-    <string name="objectives_smb_gate">SMB가 잘 작동하게 하기위해서 wiki를 반드시 읽은다음 maxIOB를 올려주세요. maxIOB=평균 식사 Bolus + 3 x 최대하루 Basal이면 괜찮은 시작값입니다.</string>
     <string name="youareonallowedlimit">허용된 제한값에 도달하였습니다</string>
     <string name="noprofileselected">프로파일이 선택되지 않았습니다</string>
     <string name="smscommunicator_loophasbeendisabled">Loop가 중지되었습니다.</string>
@@ -565,7 +552,6 @@
     <string name="enablesuperbolus">마법사에서 Superbolus 활성화하기</string>
     <string name="enablesuperbolus_summary">마법사에서 Superbolus 기능을 활성화합니다. 어떤 기능인지 확실히 알기전까지 활성화 하지 마세요. 제대로 알지 못하고 사용하면 일슐린이 과다 주입될 수 있습니다!</string>
     <string name="show_statuslights">홈화면에 상태 표시등 보여주기</string>
-    <string name="show_statuslights_summary">홈화면에 캐뉼라 사용기간, 인슐린 사용기간, 센서 사용기간, 펌프용 주사기와 배터리 남은 양의 표시등을 활성화합니다.</string>
     <string name="statuslights_res_warning">주사기량 경고 기준값[U]</string>
     <string name="statuslights_res_critical">주사기량 위험 기준값[U]</string>
     <string name="statuslights_bat_warning">배터리량 경고 기준값[%%]</string>
@@ -639,7 +625,6 @@
     <string name="mdtp_cancel">취소</string>
     <string name="notloadedplugins">모든 프로파일이 로드되지 않았습니다.</string>
     <string name="valuesnotstored">값이 저장되지 않았습니다!</string>
-    <string name="ns_localbroadcasts">(xDrip 같은) 다른 앱으로의 브로드캐스트를 활성화합니다.</string>
     <string name="ns_localbroadcasts_title">Local Broadcasts 활성화하기</string>
     <string name="careportal_activity_label">활동 &amp; 피드백</string>
     <string name="careportal_carbsandbolus_label">탄수화물 &amp; Bolus</string>
@@ -1297,7 +1282,6 @@
     <string name="rileylink_state_not_started">시작되지 않았습니다.</string>
     <string name="rileylink_state_rl_init">RileyLink 초기화…</string>
     <string name="rileylink_state_rl_error">RileyLink 에러</string>
-    <string name="rileylink_state_pc_tune_up">RileyLink 와 펌프 튜닝</string>
     <string name="rileylink_state_pc_error">펌프 연결 문제</string>
     <string name="rileylink_state_connected">연결됨</string>
     <!-- RL Errors -->
@@ -1367,7 +1351,6 @@
     <string name="medtronic_cmd_desc_get_tbr">임시 Basal 받기</string>
     <string name="medtronic_cmd_desc_set_tbr">임시 Basal 설정</string>
     <string name="medtronic_cmd_desc_set_bolus">Bolus 설정</string>
-    <string name="insulinFromCob"><![CDATA[COB 인슐린: <font color=\'%1$s\'>%2$.1fg %3$.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus 제약 적용: %2$.2fU 에서 %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! 느린 탄수화물 흡수 감지: %2$d%% of time. 계산을 다시 확인하십시오. COB를 과대하게 측정하여 더 많은 인슐린이 주입될 수 있습니다 !!!!!</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
diff --git a/app/src/main/res/values-lt-rLT/exam.xml b/app/src/main/res/values-lt-rLT/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-lt-rLT/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 8b7a5dd029..982c8841f8 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -18,6 +18,7 @@
     <string name="danar_bt_name_title">DanaR Bluetooth įrenginys</string>
     <string name="ns_sync_use_absolute_title">Visada naudoti bazės absoliučias vertes</string>
     <string name="alert_dialog_storage_permission_text">Prašome iš naujo paleisti telefoną arba sistemos nustatymuose iš naujo paleisti AndroidAPS \nkitaip AndroidAPS negalės registruoti prisijungimų (svarbu stebėti ir tikrinti ar algoritmai veikia tinkamai)!</string>
+    <string name="alert_dialog_permission_battery_optimization_failed">Šis įrenginys nepalaiko baterijos optimizavimo išimčių - galite patirti veikimo nesklandumų.</string>
     <string name="description_actions">Mygtukai greitesniam pagrindinių funkcijų paleidimui</string>
     <string name="description_careportal">Papildomų įrašų žurnalas.</string>
     <string name="description_config_builder">Naudojama aktyvių įskiepių konfigūravimui</string>
@@ -33,6 +34,7 @@
     <string name="description_smb">Naujausias algoritmas patyrusiems vartotojams</string>
     <string name="description_overview">Rodo dabartinę Ciklo būseną ir pagrindinių veiksmų mygtukus</string>
     <string name="description_persistent_notification">Rodo atsinaujinančius pranešimus su trumpa Ciklo veiklos apžvalga</string>
+    <string name="description_profile_local">Nustatykite vietinį profilį.</string>
     <string name="description_profile_nightscout">Nustato profilį, kuris įvestas Nightscout puslapyje</string>
     <string name="description_profile_simple">Nustato profilį su vieninteliu laiko bloku.</string>
     <string name="description_pump_combo">Accu-Chek Combo pompos integracija, reikalinga Ruffy programėlė</string>
@@ -317,19 +319,6 @@
     <string name="overview_bolusprogress_goingtodeliver">Bus suleista %1$.2fvv</string>
     <string name="objectives_0_objective">Nustatymai vizualizacijai, monitoringui ir bazės verčių bei koeficientų analizei</string>
     <string name="objectives_0_gate">Įsitikinkite, kad gliukozės duomenys rodomi Nightscout, o pompos insulino duomenys yra įkelti</string>
-    <string name="objectives_openloop_objective">Aktyvuojamas atviras ciklas</string>
-    <string name="objectives_openloop_gate">Keletą dienų praleiskite atvirojo ciklo (Open Loop) režime, rankiniu būdu tvirtindami kuo daugiau siūlomų bazės pakeitimų. Nustatykite ir naudokite laikinus bei numatytuosiuos tikslus (pvz.: fiziniam aktyvumui ir hipo korekcijai angliavandeniais)</string>
-    <string name="objectives_maxbasal_objective">Perpraskite atvirojo ciklo veikimą bei laikinos bazės rekomendacijas</string>
-    <string name="objectives_maxbasal_gate">Remdamiesi šia patirtimi, nuspręskite, koks turėtų būti maksimalus bazės dydis bei įveskite jį pompoje ir programos Nustatymuose</string>
-    <string name="objectives_maxiobzero_objective">Pradėkite uždaro ciklo (Closed Loop) režimą su pompos stabdymu esant žemai gliukozei</string>
-    <string name="objectives_maxiobzero_gate">Keletą dienų praleiskite uždaro ciklo režime su kuo mažiau hipoglikemijų, kai IK = 0</string>
-    <string name="objectives_maxiob_objective">Koreguokite savo uždarąjį ciklą po truputį didindami maks IK ir mažindami tikslinę gliukozės vertę</string>
-    <string name="objectives_maxiob_gate">Praleiskite keletą dienų ir bent vieną naktį be hipoglikemijos aliarmų</string>
-    <string name="objectives_autosens_objective">Jei reikia, paderinkite valandines bazės vertes bei pagrindinius parametrus ir įgalinkite Autosens funkciją.</string>
-    <string name="objectives_autosens_gate">1 savaitę praleiskite sėkmingai naudodami uždarąjį ciklą dienos metu ir įvesdami visus valgomus angliavandenius.</string>
-    <string name="objectives_ama_objective">Dienos metu aktyvuokite papildomas funkcijas, tokias kaip pažangioji maisto skaičiuoklė (AMA Advanced Meal Assist)</string>
-    <string name="objectives_smb_objective">Dienos metu aktyvuokite papildomas funkcijas, tokias kaip SMB (Super Mikro Bolusas).</string>
-    <string name="objectives_smb_gate">Norėdami, kad SMB veiktų gerai, turite perskaityti dokumentaciją ir padidinti max IK! Pradžiai patartina skaičiuoti taip: maxIK=(didžiausia valandinė bazė x 3) + vidutinis bolusas.</string>
     <string name="youareonallowedlimit">Pasiekėte leistiną ribą</string>
     <string name="noprofileselected">Nepasirinktas profilis</string>
     <string name="smscommunicator_loophasbeendisabled">Ciklas buvo išjungtas</string>
@@ -561,7 +550,6 @@
     <string name="enablesuperbolus">Įgalinti superbolusus skaičiuoklėje</string>
     <string name="enablesuperbolus_summary">Įgalina superbolusų naudojimą insulino skaičiuoklėje. Nenaudokite, kol nesuprantate, ką superbolus funkcija atlieka. NAUDODAMI AKLAI GALITE PERDOZUOTI INSULINO!</string>
     <string name="show_statuslights">Pradžios ekrane rodyti spalvotus indikatorius</string>
-    <string name="show_statuslights_summary">Pradžios ekrane rodyti spalvotus indikatorius adatos, insulino, sensoriaus naudojimo trukmei bei baterijos įkrovimo lygiui.</string>
     <string name="statuslights_res_warning">Įspėjimo apie žemą rezervuaro lygį riba [U]</string>
     <string name="statuslights_res_critical">Įspėjimo apie kritiškai žemą rezervuaro lygį riba [U]</string>
     <string name="statuslights_bat_warning">Įspėjimo apie žemą baterijos įkrovimo lygį riba [%%]</string>
@@ -635,7 +623,6 @@
     <string name="mdtp_cancel">Atšaukti</string>
     <string name="notloadedplugins">Ne visi profiliai įkelti!</string>
     <string name="valuesnotstored">Reikšmės neišsaugotos!</string>
-    <string name="ns_localbroadcasts">Įgalinti duomenų perdavimą kitoms programėlėms (kaip xDrip).</string>
     <string name="ns_localbroadcasts_title">Įgalinti lokalų duomenų perdavimą.</string>
     <string name="careportal_activity_label">AKTYVUMAS &amp; ATGALINIS RYŠYS</string>
     <string name="careportal_carbsandbolus_label">ANGLIAVANDENIAI &amp; BOLUSAS</string>
@@ -1020,6 +1007,7 @@
     <string name="speederror">Greičio klaida</string>
     <string name="insulinlimitviolation">Pažeistas insulino dozės limitas</string>
     <string name="loop_openmode_min_change">Minimalaus pokyčio užklausa [%]</string>
+    <string name="loop_openmode_min_change_summary">Atviras Ciklas parodys naujų pakeitimų užklausą tik tada, kai pokytis bus didesnis nei ši vertė %. Numatytoji vertė yra 20%</string>
     <string name="pairfirst">Atnaujinkite pompos ir telefono ryšį!</string>
     <string name="searching_for_devices">Ieškoma įrenginių…</string>
     <string name="please_wait">Palaukite…</string>
diff --git a/app/src/main/res/values-nl-rNL/exam.xml b/app/src/main/res/values-nl-rNL/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-nl-rNL/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index b533055e4a..990eab1584 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -319,20 +319,6 @@
     <string name="overview_bolusprogress_goingtodeliver">Er worden %1$.2fE toegediend</string>
     <string name="objectives_0_objective">Opzetten van visualisatie en monitoring en analyzeren van basaal en ratio\'s</string>
     <string name="objectives_0_gate">Controleren van beschikbaarheid BG en insuline pomp data op Nightscout</string>
-    <string name="objectives_openloop_objective">Starten met de Open Loop modus</string>
-    <string name="objectives_openloop_gate">In Open Loop modus werken voor enkele dagen en handmatig meermaals tijdelijke basaal instellen.
-Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sporten of koolhydraten inname bij hypo)</string>
-    <string name="objectives_maxbasal_objective">De Open Loop begrijpen, inclusief de voorgestelde tijdelijke basaalstanden</string>
-    <string name="objectives_maxbasal_gate">Gebaseerd op deze ervaringen beslissen wat het maximale basaal mag zijn en dit in de pomp instellen</string>
-    <string name="objectives_maxiobzero_objective">Starten met closed Loop met bescherming tegen lage BG</string>
-    <string name="objectives_maxiobzero_gate">In closed Loop werken met een max. IOB = 0 gedurende enkele dagen met een beperkt aantal lage BG</string>
-    <string name="objectives_maxiob_objective">Inregelen van de closed loop, verhoog de max IOB boven 0 en laat gelijdelijk het streef BG dalen</string>
-    <string name="objectives_maxiob_gate">Verhoog max. IOB en test enkele dagen als ook minstens 1 nacht zonder een laag BG alarm voordat je jouw streef BG verlaagt</string>
-    <string name="objectives_autosens_objective">Pas het basaal en de ratios aan indien nodig, activeer hierna de auto-sens optie</string>
-    <string name="objectives_autosens_gate">Gedurende 1 week succesvol closed loop met invoer van koolhydraten</string>
-    <string name="objectives_ama_objective">Activeren van extra functies overdag zoals AMA</string>
-    <string name="objectives_smb_objective">Activeren van extra functies overdag zoals SMB</string>
-    <string name="objectives_smb_gate">Lees de wiki en verhoog maxIOB om SMB goed werkend te krijgen. Een goed begin is maxIOB=gemiddelde maaltijdbolus + 3 x max dagelijkse basaal</string>
     <string name="youareonallowedlimit">Limiet bereikt</string>
     <string name="noprofileselected">Geen profiel geselecteerd</string>
     <string name="smscommunicator_loophasbeendisabled">Loop was uitgeschakeld</string>
@@ -566,7 +552,6 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
     <string name="enablesuperbolus">Activeer superbolus in de wizard</string>
     <string name="enablesuperbolus_summary">Activeer de superbolus functie in de wizard. Activeer deze niet tot je begrijpt wat dit doet. OVERDOSIS IS MOGELIJK BIJ BLINDELINGS GEBRUIK!</string>
     <string name="show_statuslights">Toon statusindicatoren op startscherm</string>
-    <string name="show_statuslights_summary">Statusindicatoren inschakelen voor cage, iage, sage, reservoir en batterijniveau op het beginscherm.</string>
     <string name="statuslights_res_warning">Drempel waarschuwing reservoir niveau [E]</string>
     <string name="statuslights_res_critical">Drempel alarm reservoir niveau [E]</string>
     <string name="statuslights_bat_warning">Drempel waarschuwing batterij niveau [%%]</string>
@@ -640,7 +625,6 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
     <string name="mdtp_cancel">Afbreken</string>
     <string name="notloadedplugins">Niet alle profielen zijn geladen!</string>
     <string name="valuesnotstored">Waarden niet opgeslagen!</string>
-    <string name="ns_localbroadcasts">Activeer delen met andere apps (zoals xDrip).</string>
     <string name="ns_localbroadcasts_title">Activeer locaal delen.</string>
     <string name="careportal_activity_label">ACTIVITEIT &amp; FEEDBACK</string>
     <string name="careportal_carbsandbolus_label">KOOLHYDRATEN &amp; BOLUS</string>
@@ -1298,7 +1282,6 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
     <string name="rileylink_state_not_started">Niet gestart</string>
     <string name="rileylink_state_rl_init">RileyLink initialiseren…</string>
     <string name="rileylink_state_rl_error">RileyLink fout</string>
-    <string name="rileylink_state_pc_tune_up">RileyLink en Pomp status opvragen</string>
     <string name="rileylink_state_pc_error">Probleem tijdens verbinden met de pomp</string>
     <string name="rileylink_state_connected">Verbonden</string>
     <!-- RL Errors -->
@@ -1368,7 +1351,6 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
     <string name="medtronic_cmd_desc_get_tbr">Ophalen Tijdelijke Basaal</string>
     <string name="medtronic_cmd_desc_set_tbr">Instellen Tijdelijke Basaal</string>
     <string name="medtronic_cmd_desc_set_bolus">Instellen Bolus</string>
-    <string name="insulinFromCob"><![CDATA[COB insuline: <font color=\'%1$s\'>%2$.1fg %3$.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus limiet bereikt: %2$.2fU naar %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!! Trage koolhydraat absorptie gedetecteerd: %2$d%% van de tijd. Controleer je berekening nogmaals. COB kan zijn overschat waardoor er misschien meer insuline wordt afgegeven!!!</font> zijn]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d E</string>
diff --git a/app/src/main/res/values-pl-rPL/exam.xml b/app/src/main/res/values-pl-rPL/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-pl-rPL/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index dd5b411768..df693f36e6 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -319,19 +319,19 @@
     <string name="overview_bolusprogress_goingtodeliver">Zamierzam dostarczyć %1$.2fU</string>
     <string name="objectives_0_objective">Konfiguracja wizualizacji i monitorowania, analiza dawek i wartości bazowych</string>
     <string name="objectives_0_gate">Sprawdź czy BG (pomiary cukru) są dostępne w Nightscout, i dane pompy insulinowej są ładowane</string>
-    <string name="objectives_openloop_objective">Uruchamiam otwartą pętle (OpenLoop)</string>
-    <string name="objectives_openloop_gate">Używaj Otwartą pętle (OpenLoop) przez kilka dni, i ręcznie wykonaj wiele dawek bazowych tymczasowych (np. podczas aktywności fizycznej lub leczenia hipoglikemii węglowodanami)</string>
+    <string name="objectives_openloop_objective">Rozpoczęcie na trybie otwartej pętli (open loop)</string>
+    <string name="objectives_openloop_gate">Działaj w trybie Otwartej Pętli przez kilka dni i ręcznie wprowadzaj wiele ustawień bazy tymczasowej. Ustaw i używaj tymczasowych i domyślnych tymczasowych celów (np. do aktywności fizycznej lub węglowodanów w leczeniu hipoglikemii)</string>
     <string name="objectives_maxbasal_objective">Zrozumienie działania otwartej pętli, wraz z jej rekomendacjami dawek tymczasowych</string>
     <string name="objectives_maxbasal_gate">Na podstawie tych doświadczeń zdecyduj jaka maksymalna baza powinna być ustawiona, i wprowadź ją w pompie i w ustawieniach AAPS</string>
     <string name="objectives_maxiobzero_objective">Rozpoczęcie zamknięcia pętli z zawieszeniem podawania bazy przy niskim poziomie cukru</string>
     <string name="objectives_maxiobzero_gate">Używaj zamkniętej pętli (Closed Loop) z max IOB (maksymalną dawką aktywnej insuliny) = 0 bez zbyt wielu incydentów niedocukrzeń</string>
     <string name="objectives_maxiob_objective">Dostrajanie zamkniętej pętli, podniesienie wartości max IOB powyżej 0 i stopniowe obniżanie docelowego poziomu cukru (BG target)</string>
-    <string name="objectives_maxiob_gate">Używaj pętli przez kilka dni i przynajmniej jedną noc bez żadnego alarmu niskiego poziomu, przed obniżeniem docelowego poziomu cukru (BG target)</string>
+    <string name="objectives_maxiob_gate">Używaj pętli przez kilka dni i przynajmniej jedną noc bez żadnego alarmu niskiego poziomu, przed obniżeniem docelowego poziomu cukru</string>
     <string name="objectives_autosens_objective">Dostosuj bazę i wartości parametrów, i wtedy uruchom funkcję autosens</string>
     <string name="objectives_autosens_gate">1 tydzień sukcesu w działaniu pętli w ciągu dnia z regularnym wprowadzaniem spożywanych węglowodanów (węglow.)</string>
     <string name="objectives_ama_objective">Uruchomienie do użytku dziennego dodatkowych funkcji, jak AMA (zaawansowany asystent posiłku)</string>
     <string name="objectives_smb_objective">Uruchomienie do użytku dziennego dodatkowych funkcji, jak SMB (Super Mikro Bolusy)</string>
-    <string name="objectives_smb_gate">Musisz przeczytać wiki i zwiększyć maxIOB, aby SMB działało dobrze! Dobrym początkiem jest max10 = średni bolus + 3 x maks. dzienna dawka bazowa</string>
+    <string name="objectives_smb_gate">Musisz przeczytać wiki i zwiększyć maxIOB, aby SMB działało dobrze! Dobrym początkiem jest maxIOB = średni bolus + 3 x maks. dzienna dawka bazowa</string>
     <string name="youareonallowedlimit">Osiągnąłeś dozwolony limit</string>
     <string name="noprofileselected">Nie wybrano profilu</string>
     <string name="smscommunicator_loophasbeendisabled">Pętla (Loop) została wyłączona</string>
@@ -565,7 +565,8 @@
     <string name="enablesuperbolus">Zezwalaj na superbolus w kalkulatorze</string>
     <string name="enablesuperbolus_summary">Włącz funkcję Superbolus w kalkulatorze. Nie uruchamiaj, dopóki nie nauczysz się jak ta funkcja działa. MOŻESZ DOPROWADZIĆ DO PRZEDAWKOWANIA INSULINY JEŻELI UŻYJESZ TEJ FUNKCJI NIE POSIADAJĄC ODPOWIEDNIEJ WIEDZY!</string>
     <string name="show_statuslights">Pokaż diody stanu na ekranie głównym</string>
-    <string name="show_statuslights_summary">Włącz diody stanu dla cage, iage, sage, rezerwuar i poziom baterii na ekranie głównym.</string>
+    <string name="show_statuslights_extended">Pokaż diody stanu na ekranie głównym</string>
+    <string name="show_statuslights_extended_summary">Włącz diody stanu dla cage, iage, sage, rezerwuar i poziom baterii na ekranie głównym.</string>
     <string name="statuslights_res_warning">Próg ostrzeżenia o poziomie zbiornika [U]</string>
     <string name="statuslights_res_critical">Próg ostrzeżenia o krytycznym poziomie zbiornika [U]</string>
     <string name="statuslights_bat_warning">Próg ostrzeżenia o poziomie baterii [%%]</string>
@@ -640,7 +641,6 @@
     <string name="mdtp_cancel">Anuluj</string>
     <string name="notloadedplugins">Nie wszystkie profile zostały załadowane!</string>
     <string name="valuesnotstored">Wartości nie są przechowywane!</string>
-    <string name="ns_localbroadcasts">Włącz transmisje do innych aplikacji (jak xDrip).</string>
     <string name="ns_localbroadcasts_title">Włącz transmisję lokalnie.</string>
     <string name="careportal_activity_label">AKTYWNOŚĆ &amp; REAKCJA</string>
     <string name="careportal_carbsandbolus_label">WĘGLOW. &amp; BOLUS</string>
@@ -1298,7 +1298,6 @@
     <string name="rileylink_state_not_started">Nie rozpoczęto</string>
     <string name="rileylink_state_rl_init">Uruchamianie RileyLink…</string>
     <string name="rileylink_state_rl_error">Błąd RileyLink</string>
-    <string name="rileylink_state_pc_tune_up">Strojenie RileyLink i pompy</string>
     <string name="rileylink_state_pc_error">Problem z połączeniem z pompą</string>
     <string name="rileylink_state_connected">Połączono</string>
     <!-- RL Errors -->
@@ -1368,7 +1367,6 @@
     <string name="medtronic_cmd_desc_get_tbr">Pobierz tymczasową dawkę bazową</string>
     <string name="medtronic_cmd_desc_set_tbr">Ustaw tymczasową dawkę bazową</string>
     <string name="medtronic_cmd_desc_set_bolus">Ustaw bolus</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\'>Wprowadzono ograniczenie bolusa: %2$.2fU to %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Wykryto powolne wchłanianie węglowodanów: %2$d%% czasu. Sprawdź ponownie swoje obliczenia. COB mogły być przeszacowane przez co mogło być podane zbyt dużo insuliny !!!!!</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
@@ -1376,6 +1374,28 @@
     <string name="deliverpartofboluswizard">Kreator bolusa wykonuje obliczenia, ale tylko ta część obliczonej dawki insuliny jest dostarczana. Pomocne z algorytmem SMB.</string>
     <string name="loading">Wczytuję...</string>
     <string name="snooze">Wycisz</string>
+    <string name="accomplished">Wykonane: %1$s</string>
+    <string name="objectives_usage_objective">Naucz się jak zarządzać AndroidAPS</string>
+    <string name="objectives_usage_gate">Przeprowadź różne działania w AndroidAPS</string>
+    <string name="objectives_useprofileswitch">Ustaw profil 90% na 10 min (naciśnij dłużej nazwę profilu na ekranie głównym)</string>
+    <string name="objectives_usedisconnectpump">Symuluj prysznic. Rozłącz pompę na 1 godzinę (naciśnij dłużej przycisk Otwarta Pętla na ekranie głównym)</string>
+    <string name="objectives_usereconnectpump">... i połącz się ponownie w ten sam sposób</string>
+    <string name="objectives_usetemptarget">Utwórz własny cel tymczasowy z czasem trwania 10 min (przyciśnij dłużej przycisk z Twoją nazwą profilu)</string>
+    <string name="objectives_useactions">W menu konfiguracji uruchom wtyczkę Akcje, zrób ją widoczną i wyświetl jej zawartość w górnym menu</string>
+    <string name="objectives_useloop">Wyświetl zawartość wtyczki Pętla (Loop)</string>
+    <string name="objectives_usescale">Użyj funkcji skalowania przez dłuższe dotknięcie wykresu glikemii</string>
+    <string name="objectives_button_enter">Wprowadź</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Wprowadź kod otrzymany od programistów by pominąć resztę zadań</string>
+    <string name="codeaccepted">Kod przyjęty</string>
+    <string name="codeinvalid">Kod nieprawidłowy</string>
+    <string name="objectives_exam_objective">Potwierdź swoje umiejętności</string>
+    <string name="objectives_exam_gate">Ucz się i odpowiedz poprawnie na pytania</string>
+    <string name="answerdisabledto">Odpowiadanie wyłączone na: %1$s</string>
+    <string name="wronganswer">Nieprawidłowa odpowiedź!</string>
+    <string name="unfinshed_button">Następne nieukończone</string>
+    <string name="close">Zamknij</string>
+    <string name="requestcode">Kod żadania: %1$s</string>
+    <string name="objectives_hint">(sprawdź wszystkie poprawne odpowiedzi)</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d dzień</item>
         <item quantity="few">%1$d dni</item>
diff --git a/app/src/main/res/values-pt-rBR/exam.xml b/app/src/main/res/values-pt-rBR/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-pt-rBR/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index d5aa5f93cd..25a8513e39 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -34,6 +34,7 @@
     <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">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">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>
@@ -318,19 +319,7 @@
     <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_openloop_objective">A iniciar um open loop</string>
-    <string name="objectives_openloop_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_maxbasal_objective">Compreender o seu open loop, incluindo as suas recomendações de basais temporárias</string>
-    <string name="objectives_maxbasal_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_maxiobzero_objective">Começar o close loop com Suspensão por Glicose Baixa.</string>
-    <string name="objectives_maxiobzero_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_maxiob_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_maxiob_gate">Utilizar por alguns dias e pelo menos uma noite sem alarmes de valores glicémicos baixos, antes de baixar os valores</string>
-    <string name="objectives_autosens_objective">Ajustar as basals e os rácios se necessário e em seguida habilitar o auto-sens</string>
-    <string name="objectives_autosens_gate">1 semana de looping durante o dia com sucesso com entrada de hidratos de carbono regular</string>
-    <string name="objectives_ama_objective">Ativando recursos adicionais para uso durante o dia, como assistente avançado de refeição</string>
-    <string name="objectives_smb_objective">Ativando recursos adicionais para uso durante o dia, como SMB</string>
-    <string name="objectives_smb_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="objectives_openloop_objective">A iniciar em Open Loop</string>
     <string name="youareonallowedlimit">Atingiu o limite autorizado</string>
     <string name="noprofileselected">Nenhum perfil selecionado</string>
     <string name="smscommunicator_loophasbeendisabled">Loop foi desativado</string>
@@ -564,7 +553,6 @@
     <string name="enablesuperbolus">Activar superbólus no assistente</string>
     <string name="enablesuperbolus_summary">Habilite a funcionalidade de superbolus no assistente. Não habilite até que aprenda o funcionamento. PODE CAUSAR OVERDOSE DE INSULINA SE USAR INDISCRIMINADAMENTE!</string>
     <string name="show_statuslights">Mostrar luzes de estado no ecrã principal</string>
-    <string name="show_statuslights_summary">Ativar as luzes de status para idade da cânula, idade da insulina, idade do sensor, reservatório e bateria no ecrã inicial.</string>
     <string name="statuslights_res_warning">Limite de aviso de nível de reservatório [U]</string>
     <string name="statuslights_res_critical">Limite crítico de nível de reservatório [U]</string>
     <string name="statuslights_bat_warning">Limite de aviso de nível de bateria [%%]</string>
@@ -638,7 +626,6 @@
     <string name="mdtp_cancel">Cancelar</string>
     <string name="notloadedplugins">Nem todos perfis foram carregados!</string>
     <string name="valuesnotstored">Valores não guardados!</string>
-    <string name="ns_localbroadcasts">Activar partilha para outras aplicações (como xDrip).</string>
     <string name="ns_localbroadcasts_title">Activar partilha local.</string>
     <string name="careportal_activity_label">ATIVIDADE &amp; FEEDBACK</string>
     <string name="careportal_carbsandbolus_label">CARBOS &amp; BOLUS</string>
@@ -950,6 +937,7 @@
     <string name="sensitivitysetup">Configurar plugin Sensibilidade</string>
     <string name="setupwizard_sensitivity_description">Plugin de Sensibilidade é usado para detecção de sensibilidade e cálculos COB. Para mais info visite:</string>
     <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
+    <string name="nsclientinfotext">NSCliente gere a ligação ao Nightscout. Pode saltar esta parte mas não será possível passar os objectivos até que o configure.</string>
     <string name="diawarning">Lembre-se: novos perfis de insulina requerem diâmetro de pelo menos 5h. DIA 5–6h no novo perfil é igual ao diâmetro 3h nos antigos perfis de insulina.</string>
     <string name="bgsourcesetup">Configure a fonte das glicemias</string>
     <string name="setupwizard_profile_description">Por favor seleccione a fonte do perfil. Se o paciente é uma criança deverá utilizar perfil NS. Se ninguém o está a seguir no Nightscout provavelmente preferirá um perfil Local. Lembre-se que apenas está a escolher a fonte de perfil. Para o utilizar terá que o activar executando \"Troca Perfil\"</string>
@@ -1295,7 +1283,6 @@
     <string name="rileylink_state_not_started">Não Iniciado</string>
     <string name="rileylink_state_rl_init">Inicialização do RileyLink…</string>
     <string name="rileylink_state_rl_error">Erro no RileyLink</string>
-    <string name="rileylink_state_pc_tune_up">A configurar RileyLink e Bomba</string>
     <string name="rileylink_state_pc_error">Problema ao ligar à Bomba</string>
     <string name="rileylink_state_connected">Ligado</string>
     <!-- RL Errors -->
@@ -1365,7 +1352,6 @@
     <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="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 pode estar sobreestimado, assim mais insulina pode ser dada !!!</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
@@ -1373,6 +1359,21 @@
     <string name="deliverpartofboluswizard">Assistente de bólus executa o cálculo, mas apenas esta parte da insulina calculada é entregue. Útil com o algoritmo SMB.</string>
     <string name="loading">A carregar ...</string>
     <string name="snooze">Silenciar</string>
+    <string name="accomplished">Concluído: %1$s</string>
+    <string name="objectives_usage_objective">Aprenda a controlar o AndroidAPS</string>
+    <string name="objectives_usage_gate">Executar diferentes acções no AndroidAPS</string>
+    <string name="objectives_useloop">Exibir conteúdo do plugin do Loop</string>
+    <string name="objectives_button_enter">Inserir</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Digite o código obtido dos programadores para ignorar o resto dos objectivos</string>
+    <string name="codeaccepted">Código aceite</string>
+    <string name="codeinvalid">Código inválido</string>
+    <string name="objectives_exam_objective">Prove seu conhecimento</string>
+    <string name="answerdisabledto">Resposta desactivada para: %1$s</string>
+    <string name="wronganswer">Resposta errada!</string>
+    <string name="unfinshed_button">Próximo não concluído</string>
+    <string name="close">Fechar</string>
+    <string name="requestcode">Pedir código: %1$s</string>
+    <string name="objectives_hint">(seleccione todas as respostas correctas)</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/exam.xml b/app/src/main/res/values-pt-rPT/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-pt-rPT/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 8397635e0d..a89e329f2f 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -319,19 +319,7 @@
     <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_openloop_objective">A iniciar um open loop</string>
-    <string name="objectives_openloop_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_maxbasal_objective">Compreender o seu open loop, incluindo as suas recomendações de basais temporárias</string>
-    <string name="objectives_maxbasal_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_maxiobzero_objective">Começar o close loop com Suspensão por Glicose Baixa.</string>
-    <string name="objectives_maxiobzero_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_maxiob_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_maxiob_gate">Utilizar por alguns dias e pelo menos uma noite sem alarmes de valores glicémicos baixos, antes de baixar os valores</string>
-    <string name="objectives_autosens_objective">Ajustar as basals e os rácios se necessário e em seguida habilitar o auto-sens</string>
-    <string name="objectives_autosens_gate">1 semana de looping durante o dia com sucesso com entrada de hidratos de carbono regular</string>
-    <string name="objectives_ama_objective">Ativando recursos adicionais para uso durante o dia, como assistente avançado de refeição</string>
-    <string name="objectives_smb_objective">Ativando recursos adicionais para uso durante o dia, como SMB</string>
-    <string name="objectives_smb_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="objectives_openloop_objective">A iniciar em Open Loop</string>
     <string name="youareonallowedlimit">Atingiu o limite autorizado</string>
     <string name="noprofileselected">Nenhum perfil seleccionado</string>
     <string name="smscommunicator_loophasbeendisabled">Loop foi desactivado</string>
@@ -565,7 +553,6 @@
     <string name="enablesuperbolus">Activar superbólus no assistente</string>
     <string name="enablesuperbolus_summary">Habilite a funcionalidade de superbolus no assistente. Não habilite até que aprenda o funcionamento. PODE CAUSAR OVERDOSE DE INSULINA SE USAR INDISCRIMINADAMENTE!</string>
     <string name="show_statuslights">Mostrar luzes de estado no ecrã principal</string>
-    <string name="show_statuslights_summary">Ativar as luzes de status para idade da cânula, idade da insulina, idade do sensor, reservatório e bateria no ecrã inicial.</string>
     <string name="statuslights_res_warning">Limite de aviso de nível de reservatório [U]</string>
     <string name="statuslights_res_critical">Limite crítico de nível de reservatório [U]</string>
     <string name="statuslights_bat_warning">Limite de aviso de nível de bateria [%%]</string>
@@ -639,7 +626,6 @@
     <string name="mdtp_cancel">Cancelar</string>
     <string name="notloadedplugins">Nem todos perfis foram carregados!</string>
     <string name="valuesnotstored">Valores não guardados!</string>
-    <string name="ns_localbroadcasts">Activar partilha para outras aplicações (como xDrip).</string>
     <string name="ns_localbroadcasts_title">Activar partilha local.</string>
     <string name="careportal_activity_label">ACTIVIDADE &amp; FEEDBACK</string>
     <string name="careportal_carbsandbolus_label">HIDRATOS &amp; BÓLUS</string>
@@ -1297,7 +1283,7 @@
     <string name="rileylink_state_not_started">Não Iniciado</string>
     <string name="rileylink_state_rl_init">Inicialização do RileyLink…</string>
     <string name="rileylink_state_rl_error">Erro no RileyLink</string>
-    <string name="rileylink_state_pc_tune_up">A configurar RileyLink e Bomba</string>
+    <string name="rileylink_state_pc_tune_up">A ajustar RileyLink e a Bomba</string>
     <string name="rileylink_state_pc_error">Problema ao ligar à Bomba</string>
     <string name="rileylink_state_connected">Ligado</string>
     <!-- RL Errors -->
@@ -1367,7 +1353,7 @@
     <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_set_bolus">Definir Bólus</string>
-    <string name="insulinFromCob"><![CDATA[insulina COB: <font color=\'%1$s\'>%2$.1fg %3$.2fU</font>]]></string>
+    <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.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 pode estar sobreestimado, assim mais insulina pode ser dada !!!</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
@@ -1375,6 +1361,21 @@
     <string name="deliverpartofboluswizard">Assistente de bólus executa o cálculo, mas apenas esta parte da insulina calculada é entregue. Útil com o algoritmo SMB.</string>
     <string name="loading">A carregar ...</string>
     <string name="snooze">Silenciar</string>
+    <string name="accomplished">Concluído: %1$s</string>
+    <string name="objectives_usage_objective">Aprenda a controlar o AndroidAPS</string>
+    <string name="objectives_usage_gate">Executar diferentes acções no AndroidAPS</string>
+    <string name="objectives_useloop">Exibir conteúdo do plugin do Loop</string>
+    <string name="objectives_button_enter">Inserir</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Digite o código obtido dos programadores para ignorar o resto dos objectivos</string>
+    <string name="codeaccepted">Código aceite</string>
+    <string name="codeinvalid">Código inválido</string>
+    <string name="objectives_exam_objective">Prove seu conhecimento</string>
+    <string name="answerdisabledto">Resposta desactivada para: %1$s</string>
+    <string name="wronganswer">Resposta errada!</string>
+    <string name="unfinshed_button">Próximo não concluído</string>
+    <string name="close">Fechar</string>
+    <string name="requestcode">Pedir código: %1$s</string>
+    <string name="objectives_hint">(seleccione todas as respostas correctas)</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/exam.xml b/app/src/main/res/values-ro-rRO/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-ro-rRO/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index a082e820dc..2d8add15b1 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -319,19 +319,19 @@
     <string name="overview_bolusprogress_goingtodeliver">Se va livra un bolus de %1$.2fU</string>
     <string name="objectives_0_objective">Se stabilesc vizualizările și monitorizarea și se analizează bazalele și valorile ratelor</string>
     <string name="objectives_0_gate">Verificați că vedeți glicemia în Nightscout și că datele despre insulină date de pompă sunt înregistrate în site</string>
-    <string name="objectives_openloop_objective">Pornire în mod buclă deschisă</string>
-    <string name="objectives_openloop_gate">Rulați în modul Buclă Deschisă pentru câteva zile și faceți manual bazalele temporare sugerate. Setează și folosește ținte temporare implicite (ex.: pentru activități sau carbohidrați de tratare a hipo)</string>
-    <string name="objectives_maxbasal_objective">Trebuie să fie înțeleasă modalitatea de funcționare a buclei deschise, inclusiv recomandările de bazală temporară</string>
-    <string name="objectives_maxbasal_gate">Pe baza acestei experiențe, decideți care va fi bazala maximă și setați această valoare în pompă și în preferințe</string>
-    <string name="objectives_maxiobzero_objective">Se începe etapa de buclă închisă cu Suspendarea Insulinei la Valori Glicemie Mici (Low Glucose Suspend = LGS)</string>
-    <string name="objectives_maxiobzero_gate">Folosiți sistemul în mod buclă închisă cu IOB maxim = 0 pentru câteva zile fără prea multe evenimente LGS</string>
-    <string name="objectives_maxiob_objective">Acordați fin performanța buclei închise, prin mărirea valorii max IOB peste 0 și micșorarea graduală a țintelor glicemice</string>
-    <string name="objectives_maxiob_gate">Folosiți pentru câteva zile și cel puțin o noapte fără a avea alarme de hipoglicemie, înainte de scăderea glicemiei</string>
-    <string name="objectives_autosens_objective">Ajustați bazalele și ratele dacă este cazul și apoi activați autosens</string>
-    <string name="objectives_autosens_gate">O săptămână de folosire cu succes a sistemului cu buclă închisă cu introducerea normală de carbohidrați</string>
-    <string name="objectives_ama_objective">Folosirea instrumentelor adiționale pentru timpul zilei, cum ar fi asistența avansată pentru mese</string>
+    <string name="objectives_openloop_objective">Pornire cu buclă deschisă</string>
+    <string name="objectives_openloop_gate">Funcționare în modul Buclă Deschisă pentru câteva zile și introducere manuală a multiplelor sugestii de bazale temporare. Se stabilesc și se folosesc ținte temporare și ținte implicite (e.g. pentru activități sau pentru carbohidrați de corecție)</string>
+    <string name="objectives_maxbasal_objective">Se va înțelege modul de lucru în buclă deschisă, inclusiv recomandările de bazale temporare</string>
+    <string name="objectives_maxbasal_gate">Pe baza experienței, se va decide care va fi bazala maximă, și se va implementa aceasta în pompă și în preferințe</string>
+    <string name="objectives_maxiobzero_objective">Se va începe modul buclă închisă cu funcția Suspendare la Glicemie Mică</string>
+    <string name="objectives_maxiobzero_gate">Rulează în mod buclă închisă cu max IOB = 0 pentru câteva zile, fără prea multe evenimente LGS (Suspendare la Glicemii Mici)</string>
+    <string name="objectives_maxiob_objective">Îmbunătățirea buclei închise, mărirea valorii max IOB peste 0 și scăderea graduală a țintelor de glicemie</string>
+    <string name="objectives_maxiob_gate">Se rulează pentru câteva zile și cel puțin o noapte fără a avea alarme de glicemie mică înainte de scăderea țintei</string>
+    <string name="objectives_autosens_objective">Ajustarea bazalelor și a factorilor dacă este necesar și apoi activarea auto-sens</string>
+    <string name="objectives_autosens_gate">O săptămână de buclă închisă încheiată cu succes în condițiile introducerii regulate a carbohidraților</string>
+    <string name="objectives_ama_objective">Activarea unor facilități adiționale pentru funcționarea în timpul zilei, cum ar fi advanced meal assist</string>
     <string name="objectives_smb_objective">Se activează opțiuni pentru uzul în timpul zilei, cum ar fi SMB</string>
-    <string name="objectives_smb_gate">Trebuie sa citiți wiki și măriți maxIOB pentru a obține SMB corect! Un start bun este maxIOB=media bolusurilor + 3x maxima bazalei din zi</string>
+    <string name="objectives_smb_gate">Trebuie sa citiți wiki și să măriți maxIOB pentru a obține SMB corect! Un start bun este maxIOB=media bolusurilor + 3x maxima bazalei din zi</string>
     <string name="youareonallowedlimit">Ați atins limita permisă</string>
     <string name="noprofileselected">Niciun profil selectat</string>
     <string name="smscommunicator_loophasbeendisabled">Bucla a fost dezactivată</string>
@@ -565,7 +565,8 @@
     <string name="enablesuperbolus">Activează superbolus în asistent</string>
     <string name="enablesuperbolus_summary">Activează funcționalitatea de superbolus în asistentul de buclă. Nu activați până nu înțelegeți ce face cu adevărat. DACĂ ESTE FOLOSIT ÎN NECUNOȘTINȚĂ DE CAUZĂ POATE DUCE LA SUPRADOZĂ DE INSULINĂ!</string>
     <string name="show_statuslights">Afișați indicatorii luminoși ai pompei pe ecranul de start</string>
-    <string name="show_statuslights_summary">Activați indicatori pentru CAGE, IAGE, SAGE, nivel baterie și rezervor pe ecranul principal.</string>
+    <string name="show_statuslights_extended">Afișați indicatorii luminoși referitori la starea detaliată a pompei pe ecranul principal</string>
+    <string name="show_statuslights_extended_summary">Activați indicatori pentru CAGE, IAGE, SAGE, nivel baterie și rezervor pe ecranul principal.</string>
     <string name="statuslights_res_warning">Pragul de avertisment pentru insulina din rezervor [U]</string>
     <string name="statuslights_res_critical">Pragul critic al nivelului insulinei în rezervor [U]</string>
     <string name="statuslights_bat_warning">Pragul de avertizare nivel baterie [%%]</string>
@@ -639,7 +640,7 @@
     <string name="mdtp_cancel">Renunță</string>
     <string name="notloadedplugins">Nu s-au încărcat toate profilurile!</string>
     <string name="valuesnotstored">Nu s-au salvat valorile!</string>
-    <string name="ns_localbroadcasts">Permite anunțarea altor aplicații (ca xDrip).</string>
+    <string name="ns_localbroadcasts">Activează mesajele pentru alte aplicații (cum ar fi xDrip). Nu activați dacă aveți mai mult de o instanță de AAPS sau NSClient instalată!</string>
     <string name="ns_localbroadcasts_title">Permite anunțuri locale.</string>
     <string name="careportal_activity_label">ACTIVITATE ȘI VERIFICĂRI</string>
     <string name="careportal_carbsandbolus_label">CARBO ȘI BOLUS</string>
@@ -1297,7 +1298,6 @@
     <string name="rileylink_state_not_started">Nepornit</string>
     <string name="rileylink_state_rl_init">Se inițializează RileyLink…</string>
     <string name="rileylink_state_rl_error">Eroare RileyLink</string>
-    <string name="rileylink_state_pc_tune_up">Sincronizare cu RileyLink și pompă</string>
     <string name="rileylink_state_pc_error">Probleme la conectarea cu pompa</string>
     <string name="rileylink_state_connected">Conectat</string>
     <!-- RL Errors -->
@@ -1367,7 +1367,6 @@
     <string name="medtronic_cmd_desc_get_tbr">Preia bazala temporară</string>
     <string name="medtronic_cmd_desc_set_tbr">Setează bazala temporară</string>
     <string name="medtronic_cmd_desc_set_bolus">Setează bolusul</string>
-    <string name="insulinFromCob"><![CDATA[Insulină COB: <font color=\'%1$s\'>%2$.1fg %3$.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Restricție de bolus aplicată: %2$.2fU la %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! A fost detectată o absorbție lentă a carbohidraților: %2$d%% din timp. Reverificați calculele. COB poate fi supraestimat, astfel că este posibilă administrarea de mai multă insulină !!!!!</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
@@ -1375,6 +1374,28 @@
     <string name="deliverpartofboluswizard">Wizard bolus face un calcul, dar numai o parte din insulina calculată este și livrată. Este mai eficient când se folosește cu algoritmul SMB.</string>
     <string name="loading">Se încarcă ...</string>
     <string name="snooze">Amână</string>
+    <string name="accomplished">Îndeplinit: %1$s</string>
+    <string name="objectives_usage_objective">Învățați cum se controlează AndroidAPS</string>
+    <string name="objectives_usage_gate">Faceți diferite acțiuni în AndroidAPS</string>
+    <string name="objectives_useprofileswitch">Stabiliți profilul 90% pentru 10 min (apăsare prelungă a numelui profilului în Vedere de ansamblu)</string>
+    <string name="objectives_usedisconnectpump">Simularea unui duș. Deconectarea pompei pentru 1 oră (Apăsare prelungă pe Buclă deschisă)</string>
+    <string name="objectives_usereconnectpump">... și reconectare în același mod</string>
+    <string name="objectives_usetemptarget">Creați ținte temporare personalizate pentru o durată de 10 min (apăsare prelungă pe ținta curentă)</string>
+    <string name="objectives_useactions">În Generatorul de Configurații activați facilitatea Acțiuni, făceți-o vizibilă și afișați-i conținutul folosind meniul de sus</string>
+    <string name="objectives_useloop">Afișați conținutul facilității Buclă</string>
+    <string name="objectives_usescale">Folosiți funcția scală prin apăsarea prelungă a graficului glicemiei</string>
+    <string name="objectives_button_enter">Introduceţi</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Introduceți codul obținut de la dezvoltatori pentru a sări peste restul obiectivelor</string>
+    <string name="codeaccepted">Cod acceptat</string>
+    <string name="codeinvalid">Cod invalid</string>
+    <string name="objectives_exam_objective">Dovediți-vă cunoștințele</string>
+    <string name="objectives_exam_gate">Studiați și răspundeți corect la întrebări</string>
+    <string name="answerdisabledto">Răspunsul este dezactivat pentru: %1$s</string>
+    <string name="wronganswer">Răspuns greșit!</string>
+    <string name="unfinshed_button">Următoarea nefinalizată</string>
+    <string name="close">Închide</string>
+    <string name="requestcode">Solicită codul: %1$s</string>
+    <string name="objectives_hint">(bifați toate răspunsurile corecte)</string>
     <plurals name="objective_days">
         <item quantity="one">%1$d zi</item>
         <item quantity="few">%1$d zi</item>
diff --git a/app/src/main/res/values-ru-rRU/exam.xml b/app/src/main/res/values-ru-rRU/exam.xml
new file mode 100644
index 0000000000..bf19dfd648
--- /dev/null
+++ b/app/src/main/res/values-ru-rRU/exam.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="dia_whatmeansdia">Что верно о длительности работы инсулина DIA?</string>
+    <string name="dia_label">Тема: продолжительность действия инсулина DIA</string>
+    <string name="dia_minimumis3h">Предустановленный минимум составляет 3 часа.</string>
+    <string name="dia_minimumis5h">Предустановленный минимум составляет 5 часов.</string>
+    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
+    <string name="dia_meaningisequaltodiapump">Он равен параметру продолжительность действия инсулина DIA помпы.</string>
+    <string name="dia_valuemustbedetermined">Следует определить свое индивидуальное значение (но не менее 5 часов).</string>
+    <string name="hypott_label">Тема: Временная цель Hypo</string>
+    <string name="hypott_whenhypott">Почему полезно установить временную цель hypo TT?</string>
+    <string name="hypott_goinglow">Предотвратить падение ГК.</string>
+    <string name="hypott_havinglow">Помочь восстановиться после низкой ГК.</string>
+    <string name="hypott_preventoversmb">Предотвратить введение микроболюса SMB после подъёма ГК от быстрых углеводов.</string>
+    <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
+    <string name="offlineprofile_whatprofile">Какой профиль можно применить и настроить в автономном режиме?</string>
+    <string name="offlineprofile_label">Тема: Автономный профиль</string>
+    <string name="offlineprofile_nsprofile">Профилем NS можно пользоваться, но не настраивать.</string>
+    <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
+    <string name="pumpdisconnect_label">Тема: Отключение от помпы</string>
+    <string name="pumpdisconnect_whattodo">Что делать, когда снимается помпа?</string>
+    <string name="pumpdisconnect_letknow">Дайте алгоритму знать, что инсулин не подается, нажав на отключиться от помпы.</string>
+    <string name="pumpdisconnect_dontchnage">Не менять ничего в работе алгоритма, просто снять помпу.</string>
+    <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
+    <string name="objectives_label">Тема: Параметры AndroidAPS</string>
+    <string name="objectives_howtosave">Как эффективнее сохранить свои настройки?</string>
+    <string name="objectives_exportsettings">Локально экспортировать их из меню Обслуживание.</string>
+    <string name="objectives_storeelsewhere">Хранить экспортированный файл в другом месте, например, отправив по электронной почте, Dropbox, Google drive…</string>
+    <string name="objectives_doexportonstart">Экспортировать их сразу после установки AAPS.</string>
+    <string name="objectives_doexportafterchange">Экспортировать их после каждого изменения параметра.</string>
+    <string name="objectives_doexportafterfirtssettings">Экспортировать их при завершении начальной настройки.</string>
+    <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
+    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
+    <string name="noisycgm_label">Тема: Зашумленные данные мониторинга</string>
+    <string name="noisycgm_whattodo">Что делать, если наблюдаются шумы данных?</string>
+    <string name="nothing">Ничего, алгоритм AAPS сам справится с этим.</string>
+    <string name="noisycgm_pause">Приостановить режим замкнутого цикла, чтобы избежать избыточной дозировки.</string>
+    <string name="noisycgm_replacesensor">Заменить сенсор.</string>
+    <string name="noisycgm_turnoffphone">Выключить телефон.</string>
+    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
+    <string name="noisycgm_checksmoothing">Проверить, сглаживаются ли данные в приложении мониторинга.</string>
+    <string name="exercise_label">Тема: Нагрузки</string>
+    <string name="exercise_whattodo">Как помочь системе справиться с физическими нагрузками?</string>
+    <string name="exercise_setactivitytt">Задать временную цель Нагрузка.</string>
+    <string name="exercise_switchprofilebelow100">Задать профиль ниже 100%.</string>
+    <string name="exercise_switchprofileabove100">Задать профиль выше 100%.</string>
+    <string name="exercise_stoploop">Остановить цикл.</string>
+    <string name="exercise_doitbeforestart">Задать временную цель Нагрузка перед началом активности.</string>
+    <string name="exercise_doitafterstart">Задайте временную цель Нагрузка после начала активности.</string>
+    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="suspendloop_label">Тема: Приостановка замкнутого цикла</string>
+    <string name="suspendloop_doigetinsulin">Получаю ли я инсулин, когда цикл приостановлен?</string>
+    <string name="suspendloop_yes">Да, обычную базу.</string>
+    <string name="suspendloop_no">Нет, подача инсулина прекращается.</string>
+    <string name="basaltest_label">Тема: Определение базальной скорости, чувствительности к инсулину ISF и соотношения инсулин- углеводы IC</string>
+    <string name="basaltest_when">Когда следует определить значения базала, ISF и IC?</string>
+    <string name="basaltest_beforeloop">Перед тем, как начать пользоваться AAPS.</string>
+    <string name="basaltest_havingregularhypo">При регулярных гипо ГК.</string>
+    <string name="basaltest_havingregularhyper">При регулярных гипер ГК.</string>
+    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
+    <string name="prerequisites_label">Тема: Предварительные требования</string>
+    <string name="prerequisites_what">Что необходимо?</string>
+    <string name="prerequisites_determinedcorrectprofile">Задать правильный профиль (база, IC, ISF, DIA).</string>
+    <string name="prerequisites_computer">Компьютер для создания APK.</string>
+    <string name="prerequisites_phone">Поддерживаемый телефон.</string>
+    <string name="prerequisites_car">Автомобиль.</string>
+    <string name="prerequisites_nightscout">Nightscout для передачи целей.</string>
+    <string name="prerequisites_tidepoolaccount">Учетная запись Tidepool.</string>
+    <string name="prerequisites_googleaccount">Учетная запись Google.</string>
+    <string name="prerequisites_githubaccount">Учетная запись Github.</string>
+    <string name="prerequisites_beanandroiddeveloper">Требуется быть разработчиком Android.</string>
+    <string name="prerequisites_own670g">Помпа MiniMed 670G.</string>
+    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="prerequisites_smartwatch">Смарт часы.</string>
+    <string name="prerequisites_supportedcgm">Поддерживаемый мониторинг.</string>
+    <string name="update_label">Тема: Обновление AndroidAPS</string>
+    <string name="whatistrue">Что верно?</string>
+    <string name="update_git">Вы должны иметь установленный Git.</string>
+    <string name="update_asap">Обновлять, как только выходит новая версия.</string>
+    <string name="update_keys">Можно использовать те же ключи подписи.</string>
+    <string name="update_neverupdate">Никогда не обновлять, если система работает хорошо.</string>
+    <string name="update_askfriend">Попросить новую версию APK у друга.</string>
+    <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
+    <string name="troubleshooting_label">Тема: Устранение неполадок</string>
+    <string name="troubleshooting_wheretoask">Куда обращаться за помощью?</string>
+    <string name="troubleshooting_fb">Присоединиться к группе AndroidAPS на Facebook.</string>
+    <string name="troubleshooting_wiki">Перейти на страницу документации AndroidAPS Wiki.</string>
+    <string name="troubleshooting_gitter">Посетить чат Gitter AndroidAPS.</string>
+    <string name="troubleshooting_googlesupport">Посетить поддержку AndroidAPS Google</string>
+    <string name="troubleshooting_yourendo">Поговорить с эндокринологом.</string>
+    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
+    <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
+    <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS
+ 
+Context | Edit Context</string>
+    <string name="insulin_label">Тема: Инсулин</string>
+    <string name="insulin_ultrarapid">Какой тип инсулина можно использовать с модулем Ultra-Rapid-Oref?</string>
+    <string name="insulin_fiasp">Fiasp®</string>
+    <string name="insulin_novorapid">Новорапид®</string>
+    <string name="insulin_humalog">Хумалог®</string>
+    <string name="insulin_actrapid">Актрапид®</string>
+    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
+    <string name="sensitivity_label">Тема: Модуль Чувствительность</string>
+    <string name="sensitivity_which">Какой модуль чувствительности имеет задаваемый пользователем диапазон времени для обнаружения?</string>
+    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="sensitivityuam_which">Какой модуль чувствительности должен использоваться для функции UAM?</string>
+    <string name="wrongcarbs_label">Тема: Неверный ввод углеводов</string>
+    <string name="wrongcarbs_whattodo">Вы видите, что неправильно ввели углеводы. Ваши действия?</string>
+    <string name="wrongcarbs_treatmentstab">Перейти в раздел лечения/назначений, удалить неправильные углеводы и ввести новые углеводы.</string>
+    <string name="wrongcarbs_addfakeinsulin">Добавить фиктивный инсулин с помощью функции Заполнение</string>
+    <string name="extendedcarbs_label">Тема: Продукты с содержанием жиров и белков</string>
+    <string name="extendedcarbs_handling">Что делать, если ваша еда содержит большое количество жиров и/или белков?</string>
+    <string name="extendedcarbs_useextendedcarbs">Пересчитать жир и белки в углеводах и использовать функцию \"Пролонгированные углеводы\".</string>
+    <string name="extendedcarbs_add">Пересчитать жир и белки в углеводах и добавить их в калькулятор болюса.</string>
+    <string name="extendedcarbs_useextendedbolus">Использовать пролонгированный болюс для покрытия жиров и белков.</string>
+    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
+    <string name="nsclient_label">Тема: Детский мониторинг</string>
+    <string name="nsclient_howcanyou">Как можно дистанционно отслеживать AAPS вашего ребенка?</string>
+    <string name="nsclient_nightscout">С помощью сайта Nightscout.</string>
+    <string name="nsclient_dexcomfollow">Приложение Dexcom Follow, если вы используете оригинальное приложение Dexcom.</string>
+    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow, если вы используете приложение xDrip.</string>
+    <string name="nsclient_xdripfollower">xDrip в режиме follower.</string>
+    <string name="nsclient_looponiphone">Приложения Loop на iPhone.</string>
+    <string name="nsclient_spikeiphone">Приложения Spike на iPhone.</string>
+    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_label">Тема: Коэффициент чувствительности к инсулину</string>
+    <string name="isf_increasingvalue">Повышение значения ISF приведет к снижению подачи инсулина, если пытаться снизить ГК при помощи мастера болюса.</string>
+    <string name="isf_decreasingvalue">Понижение значения ISF приведет к снижению подачи инсулина, если пытаться снизить ГК при помощи мастера болюса.</string>
+    <string name="isf_noeffect">Изменение ISF не влияет на количество инсулина, подаваемое AAPS при попытке исправить гипергликемию.</string>
+    <string name="isf_preferences">Необходимо ввести ISF в Настройках.</string>
+    <string name="isf_profile">Изменение значения ISF в профиле достаточно для применения изменений.</string>
+    <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
+    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
+    <string name="ic_label">Тема: Сотношение инсулин-углеводы IC</string>
+    <string name="ic_increasingvalue">Увеличение значения IC приведет к уменьшению подачи инсулина на то же количество углеводов.</string>
+    <string name="ic_decreasingvalue">Уменьшение значения IC приведет к уменьшению подачи инсулина на то же количество углеводов.</string>
+    <string name="ic_noeffect">Предположим, у вас 0 углеводов COB. Изменение IC приведет к другому количеству инсулина на исправление ГК.</string>
+    <string name="ic_different">Соотношение инсулин-углеводы изменится если принимать ХЕ за 10 или 12г.</string>
+    <string name="ic_meaning">Смысл соотношения инсулин-углеводы IC таков: сколько хлебных единиц покрываются одной ед. инсулина.</string>
+    <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
+    <string name="profileswitch_label">Тема: Переключение Профиля</string>
+    <string name="profileswitch_pctwillchange"> При установке 90% в переключателе профиля…</string>
+    <string name="profileswitch_basalhigher">Базал будет на 10% выше.</string>
+    <string name="profileswitch_basallower">Базал будет на 10% ниже.</string>
+    <string name="profileswitch_ichigher">Значение IC будет на 10% больше.</string>
+    <string name="profileswitch_iclower">Значение IC будет на 10% ниже.</string>
+    <string name="profileswitch_isfhigher">Значение ISF будет на 10% выше.</string>
+    <string name="profileswitch_isflower">Значение ISF будет на 10% ниже.</string>
+    <string name="profileswitch_overall">В общей сложности вы получите на 10% меньше инсулина.</string>
+    <string name="profileswitch_targethigher">Целевое значение ГК будет на 10% выше.</string>
+    <string name="profileswitch_targetlower">Целевое значение ГК будет на 10% ниже.</string>
+    <string name="profileswitch_targetbottom">Только нижняя цель будет ниже на 10%.</string>
+    <string name="profileswitch_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
+    <string name="profileswitchtime_iwant">Я хочу переключить профиль, из-за того, что мне надо проснуться на 1 час раньше, чем обычно, чтобы совместить переход времени с переключением профиля. Какую величину я должен использовать?</string>
+    <string name="profileswitchtime_1">1</string>
+    <string name="profileswitchtime__1">-1</string>
+    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
+    <string name="profileswitchtime_60">60</string>
+    <string name="profileswitchtime__60">-60</string>
+    <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
+    <string name="basalhelp_label">Тема: Скорость базала. Справка</string>
+    <string name="basalhelp_where">Куда обращаться за помощью по скорости базала и т. д.</string>
+    <string name="basalhelp_diabetesteam">Ваши эндокринологи</string>
+    <string name="basalhelp_google">Google</string>
+    <string name="basalhelp_facebook">Facebook</string>
+</resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index a02cbfe998..65bc0f30f0 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -319,19 +319,19 @@
     <string name="overview_bolusprogress_goingtodeliver">Начинается подача болюса %1$.2fед.</string>
     <string name="objectives_0_objective">настройка визуализации и мониторинга, анализ базала и коэффициентов</string>
     <string name="objectives_0_gate">убедитесь что СК и данные помпы передаются в NS</string>
-    <string name="objectives_openloop_objective">старт незамкнутого цикла</string>
-    <string name="objectives_openloop_gate">Работа в режиме незамкнутого цикла и ручной подстройки величины временного базала. Установите и применяйте временные цели и временные цели по умолчанию (напр. углеводы при нагрузке или купировании гипо)</string>
-    <string name="objectives_maxbasal_objective">анализ вашего незамкнутого цикла включая рекомендации по врем базалу</string>
-    <string name="objectives_maxbasal_gate">на основе полученного опыта определите макс величину базала и введите ее в помпу и настройки</string>
-    <string name="objectives_maxiobzero_objective">закольцовывание цикла с Low Glucose Suspend (приостановка на низких СК)</string>
-    <string name="objectives_maxiobzero_gate">работа в замкнутом цикле с макс IOB = 0 несколько дней избегая событий типа Low Suspend</string>
-    <string name="objectives_maxiob_objective">настройка замкнутого цикла с поднятием макс величины IOB выше 0 и постепенным понижением целевых СК</string>
-    <string name="objectives_maxiob_gate">работа несколько дней и по кр мере одну ночь без срабатывания оповещений о низком СК</string>
-    <string name="objectives_autosens_objective">при необходимости настройка базала и коэффициентов с последующей активацией auto-sens</string>
+    <string name="objectives_openloop_objective">Старт незамкнутого цикла</string>
+    <string name="objectives_openloop_gate">Начинайте работу в режиме незамкнутого цикла и ручной подстройки величины временного базала. Установите и применяйте временные цели и временные цели по умолчанию (напр. углеводы при нагрузке или купировании гипо)</string>
+    <string name="objectives_maxbasal_objective">Глубже понимаем незакольцованную систему Open Loop, включая ее рекомендации по временным базалам</string>
+    <string name="objectives_maxbasal_gate">На основе полученного опыта определияем макс величину базала и вводим ее в помпу и настройки</string>
+    <string name="objectives_maxiobzero_objective">Начинаем замыкать цикл с Low Glucose Suspend (прекращением подачи инсулина на низких сахарах)</string>
+    <string name="objectives_maxiobzero_gate">Работа в замкнутом цикле с макс активным инсулином IOB = 0 на протяжении нескольких дней избегая событий типа приостановка на низких ГК Low Suspend</string>
+    <string name="objectives_maxiob_objective">Настройка замкнутого цикла с поднятием макс величины IOB выше 0 и постепенным понижением целевой ГК</string>
+    <string name="objectives_maxiob_gate">Работа несколько дней и по кр мере одну ночь без срабатывания оповещений о низкой ГК</string>
+    <string name="objectives_autosens_objective">Настраиваем базал и коэффициенты с последующей активацией auto-sens</string>
     <string name="objectives_autosens_gate">1 неделя успешной дневной работы с регулярным введением углеводов</string>
-    <string name="objectives_ama_objective">активация таких доп функций для дневного времени как калькулятор advanced meal assist</string>
+    <string name="objectives_ama_objective">Активация таких доп функций для дневного времени как расширенный калькулятор болюса advanced meal assist</string>
     <string name="objectives_smb_objective">Активация таких доп функций для дневного времени как супер микро болюс SMB</string>
-    <string name="objectives_smb_gate">Прочтите wiki и увеличьте maxIOB чтобы супер микро болюс SMB заработал как надо! Хорошее начало – maxIOB = средний болюс на еду + троекратный максимальный базал суток</string>
+    <string name="objectives_smb_gate">Прочтите wiki и увеличьте maxIOB чтобы супер микро болюс SMB заработал как положено! Хорошее начало – maxIOB = средний болюс на еду + троекратный максимальный суточный базал</string>
     <string name="youareonallowedlimit">разрешенный предел достигнут</string>
     <string name="noprofileselected">профиль не выбран</string>
     <string name="smscommunicator_loophasbeendisabled">зцикл был деактивирован</string>
@@ -565,7 +565,8 @@
     <string name="enablesuperbolus">активировать суперболюс</string>
     <string name="enablesuperbolus_summary">активировать возможность суперболюса в мастере. не активируйте если не знаете что это. МОЖЕТ ВЫЗВАТЬ ПЕРЕДОЗИРОВКУ ИНСУЛИНА ЕСЛИ ИСПОЛЬЗУЕТСЯ ВСЛЕПУЮ</string>
     <string name="show_statuslights">Показать индикаторы состояния на главном экране</string>
-    <string name="show_statuslights_summary">Включить на главном экране индикаторы отработанного времени для канюли помпы, инсулина, сенсора, резервуара, а также показать уровень аккумулятора.</string>
+    <string name="show_statuslights_extended">Показывать подробные индикаторы состояния на главном экране</string>
+    <string name="show_statuslights_extended_summary">Включить на главном экране подробные индикаторы отработанного времени для канюли помпы, инсулина, сенсора, резервуара, а также уровня заряда батареи.</string>
     <string name="statuslights_res_warning">Порог уровня наполненности резервуара для оповещения [ед.]</string>
     <string name="statuslights_res_critical">Порог критического уровня наполненности резервуара [U]</string>
     <string name="statuslights_bat_warning">Порог предупреждения о разрядке батареи [%%]</string>
@@ -639,7 +640,7 @@
     <string name="mdtp_cancel">отмена</string>
     <string name="notloadedplugins">не все профили загружены!</string>
     <string name="valuesnotstored">Данные не сохранены!</string>
-    <string name="ns_localbroadcasts">Активировать передачу на другие приложения (напр. xDrip)</string>
+    <string name="ns_localbroadcasts">Включить трансляцию для других приложений (например, xDrip). Не включайте, если установлено несколько экземпляров приложений AAPS или NSClient!</string>
     <string name="ns_localbroadcasts_title">Активировать локальную передачу</string>
     <string name="careportal_activity_label">АКТИВНОСТЬ</string>
     <string name="careportal_carbsandbolus_label">УГЛЕВОДЫ ; БОЛЮС</string>
@@ -1369,7 +1370,7 @@ Context | Edit Context</string>
     <string name="medtronic_cmd_desc_get_tbr">Получить временный базал</string>
     <string name="medtronic_cmd_desc_set_tbr">Установить временный базал</string>
     <string name="medtronic_cmd_desc_set_bolus">Настроить болюс</string>
-    <string name="insulinFromCob"><![CDATA[COB инсулин: <font color=\'%1$s\'>%2$.1fг %3$.2fU</font>]]></string>
+    <string name="insulinFromCob"><![CDATA[Активные углеводы COB в сопоставлении с Активным инсулином IOB: <font color=\'%1$s\'>%2$+.2fед</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>
@@ -1377,6 +1378,28 @@ Context | Edit Context</string>
     <string name="deliverpartofboluswizard">Мастер болюса выполняет расчет, но подана только эта часть рекомендуемого инсулина. Полезно с алгоритмом SMB.</string>
     <string name="loading">Загрузка...</string>
     <string name="snooze">Отложить</string>
+    <string name="accomplished">Выполнено: %1$s</string>
+    <string name="objectives_usage_objective">Научитесь контролировать AndroidAPS</string>
+    <string name="objectives_usage_gate">Выполните различные действия в AndroidAPS</string>
+    <string name="objectives_useprofileswitch">Установите профиль 90% на 10 мин (Долгое нажатие на имя профиля на Обзор)</string>
+    <string name="objectives_usedisconnectpump">Имитация душа. Отключите помпу на 1ч (Долгое нажатие на Open Loop)</string>
+    <string name="objectives_usereconnectpump">... и снова подключитесь таким же способом</string>
+    <string name="objectives_usetemptarget">Создайте настраиваемую временную цель длительностью 10 мин. (Долгое нажатие на текущую цель)</string>
+    <string name="objectives_useactions">В Конфигураторе включите плагин Actions, сделав его видимым и показав содержимое верхнего меню</string>
+    <string name="objectives_useloop">Показывать содержимое расширения ИПЖ</string>
+    <string name="objectives_usescale">Применить функцию масштабирования по долгому нажатию на диаграмму ГК</string>
+    <string name="objectives_button_enter">Ввод</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Введите код, полученный от разработчиков, чтобы обойти остальные цели</string>
+    <string name="codeaccepted">Код принят</string>
+    <string name="codeinvalid">Неверный код</string>
+    <string name="objectives_exam_objective">Подтвердите ваши знания</string>
+    <string name="objectives_exam_gate">Изучите вопросы и дайте точные ответы.</string>
+    <string name="answerdisabledto">Рассмотрение ответов приостановлено на: %1$s</string>
+    <string name="wronganswer">Неправильный ответ!</string>
+    <string name="unfinshed_button">Следующий незавершенный</string>
+    <string name="close">Закрыть</string>
+    <string name="requestcode">Запросить код</string>
+    <string name="objectives_hint">(проверить ответы)</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/exam.xml b/app/src/main/res/values-sk-rSK/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-sk-rSK/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 939d05599b..d6e74001b5 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -34,6 +34,7 @@
     <string name="description_smb">Najnovší algoritmus pre pokročilých užívateľov</string>
     <string name="description_overview">Zobrazenie aktuálneho stavu vašeho uzavretého okruhu a tlačidlá k najpoužívanejším ovládacím prvkom</string>
     <string name="description_persistent_notification">Zobrazuje priebežné oznámenia v Androide s krátkym prehľadom, čo práve uzavretý okruh robí</string>
+    <string name="description_profile_local">Definujte profil, ktorý je dostupný offline.</string>
     <string name="description_profile_nightscout">Použitie profilu, ktorý je definovaný v Nightscoute</string>
     <string name="description_profile_simple">Definuj profil s iba jedným časovým pásmom.</string>
     <string name="description_pump_combo">Ovládač pumpy pre Accu-Check Combo, vyžaduje nainštalovanú aplikáciu Ruffy</string>
@@ -320,16 +321,16 @@
     <string name="objectives_0_gate">Skontrolovať, či sú glykémie a údaje z pumpy viditeľné v Nightscoute</string>
     <string name="objectives_openloop_objective">Začať s otvoreným okruhom</string>
     <string name="objectives_openloop_gate">Niekoľko dní prevádzkovať otvorený okruh a ručne potvrdzovať doporučené dočasné bazály. Nastavovať a používať dočasné ciele (napr. pre šport, alebo hypo)</string>
-    <string name="objectives_maxbasal_objective">Porozumieť otvorenému okruhu a doporučeným dočasným bazálom</string>
+    <string name="objectives_maxbasal_objective">Porozumieť otvorenému okruhu, vrátane doporučeniam ohľadne dočasných bazálov</string>
     <string name="objectives_maxbasal_gate">Na základe predchádzajúcich skúseností rozhodnúť, aký vysoký má byť maximálny bazál a nastaviť ho v pumpe a v aplikácii</string>
     <string name="objectives_maxiobzero_objective">Začať s uzavretým okruhom iba s vypínaním pri nízkej glykémii</string>
     <string name="objectives_maxiobzero_gate">Spustiť uzavretý okruh s max IOB = 0 na niekoľko dní s minimom nutných korekcií na nízku glykémiu</string>
     <string name="objectives_maxiob_objective">Ladenie uzavretého okruhu, zvyšovať max IOB nad 0 a postupne znižovať cieľovú glykémiu</string>
-    <string name="objectives_maxiob_gate">Používať niekoľko dní s aspoň jednou nocou bez alarmov na nízku glykémiu, predtým ako znížiš cieľovú glykémiu</string>
-    <string name="objectives_autosens_objective">Ak je to potrebné, prispôsob bazály a prevody a potom aktivuj automatickú detekciu citlivosti</string>
+    <string name="objectives_maxiob_gate">Používať uzavretý okruh niekoľko dní s aspoň jednou nocou bez alarmov na nízku glykémiu, predtým ako znížiš cieľovú glykémiu</string>
+    <string name="objectives_autosens_objective">Ak je to potrebné, uprav bazály a prevody a potom aktivuj automatickú detekciu citlivosti</string>
     <string name="objectives_autosens_gate">Jeden týždeň úspešne používaj uzavretý okruh so zadávaním bežného príjmu sacharidov cez deň</string>
     <string name="objectives_ama_objective">Aktivuj ďalšie prídavné funkcie pre bežné používanie, ako napr. AMA (pokročilý asistent jedál)</string>
-    <string name="objectives_smb_objective">Aktivuj ďalšie prídavné funkcie pre bežné používanie, ako napr. SMB (Super Micro Bolusy)</string>
+    <string name="objectives_smb_objective">Aktivuj ďalšie prídavné funkcie pre bežné používanie, ako napr. SMB</string>
     <string name="objectives_smb_gate">Prečítať si dokumentáciu a zvýšiť maximálne IOB, aby mohlo správne fungovať SMB! Pre začiatok sa dá použiť veľkosť bežného bolusu + 3x maximálny denný bazál</string>
     <string name="youareonallowedlimit">Dosiahnutý limit</string>
     <string name="noprofileselected">Nebol vybraný žiadny profil</string>
@@ -564,7 +565,8 @@
     <string name="enablesuperbolus">Povoliť superbolus</string>
     <string name="enablesuperbolus_summary">Povolenie superbolusu v kalkulátore. Nepovoľujte, pokiaľ se nenaučíte, čo to v skutočnosti robí. MÔŽE SPÔSOBIŤ PREDÁVKOVANIE INZULÍNOM PRI NESPRÁVNOM POUŽITÍ!</string>
     <string name="show_statuslights">Zobraziť indikátory stavu na domovskej obrazovke</string>
-    <string name="show_statuslights_summary">Povoliť indikátory stavu pre CAGE, IAGE, SAGE, Reservoir a Battery Level na domovskej obrazovke.</string>
+    <string name="show_statuslights_extended">Zobraziť rozšírené indikátory stavu na domovskej obrazovke</string>
+    <string name="show_statuslights_extended_summary">Povoliť rozšírené indikátory stavu pre CAGE, IAGE, SAGE, Reservoir a Battery Level na domovskej obrazovke.</string>
     <string name="statuslights_res_warning">Prah upozornenia na úroveň hladiny zásobníka [JI]</string>
     <string name="statuslights_res_critical">Prah kritickej úrovne hladiny zásobníka [JI]</string>
     <string name="statuslights_bat_warning">Prah upozornenia na úroveň batérie [%%]</string>
@@ -638,7 +640,7 @@
     <string name="mdtp_cancel">Zrušiť</string>
     <string name="notloadedplugins">Nenačítané všetky profily!</string>
     <string name="valuesnotstored">Hodnoty nie sú uložené!</string>
-    <string name="ns_localbroadcasts">Povoliť odosielanie do ostatných aplikácií (napr. xDrip).</string>
+    <string name="ns_localbroadcasts">Povoliť vysielanie do iných aplikácií (napr. xDrip). Nepovoľujte, pokiaľ máte nainštalovanú viac ako jednu AAPS, alebo NSClient inštanciu!</string>
     <string name="ns_localbroadcasts_title">Povoliť lokálne vysielanie.</string>
     <string name="careportal_activity_label">AKTIVITA &amp; SPÄTNÁ VÄZBA</string>
     <string name="careportal_carbsandbolus_label">SACHARIDY &amp; BOLUSY</string>
@@ -950,6 +952,7 @@
     <string name="sensitivitysetup">Nastavenie citlivosti</string>
     <string name="setupwizard_sensitivity_description">Modul citlivosť slúži k detekcii zmien v citlivosti a k počítaniu COB. Viac informácií tu:</string>
     <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
+    <string name="nsclientinfotext">NSClient slúži na spojenie s Nightscoutom. Nastavenia môžete teraz preskočiť, ale nebudete schopný dokončiť ciele, pokiaľ neurobíte nastavenia.</string>
     <string name="diawarning">Prosím, zapamätajte si: Nové inzulínové profily vyžadujú DIA minimálne 5h. DIA 5-6 hodín zodpovedá zhruba nastaveniam 3h na starších typoch profilu.</string>
     <string name="bgsourcesetup">Konfigurácia zdroja glykémií</string>
     <string name="setupwizard_profile_description">Vyberte zdroj profilov. Pokiaľ ide o dieťa, využijete pravdepodobne NS profil. Pokiaľ Vás nikto cez NS nesleduje, budete pravdepodobne preferovať lokálny profil. Uvedomte si, že nastavujete iba zdroj profilov. Na to aby se naozaj profil začal používať, je potrebné vykonať aktiváciu profilu použitím funkcie \"Prepnutie profilu\"</string>
@@ -1365,13 +1368,35 @@
     <string name="medtronic_cmd_desc_get_tbr">Načítanie dočasného bazálu</string>
     <string name="medtronic_cmd_desc_set_tbr">Nastavovanie dočasného bazálu</string>
     <string name="medtronic_cmd_desc_set_bolus">Nastavovanie bolusu</string>
-    <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é, môže byť podaného viac inzulínu!!!!!</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d JI</string>
     <string name="partialboluswizard">Podaj túto časť z výsledku kalkulácie [%]</string>
     <string name="deliverpartofboluswizard">Bolusová kalkulačka urobí výpočet, ale iba táto časť vypočítaného inzulínu je podaná. Pomáha pri SMB algoritme.</string>
     <string name="loading">Načítavanie...</string>
+    <string name="snooze">Stíšiť</string>
+    <string name="accomplished">Splnené: %1$s</string>
+    <string name="objectives_usage_objective">Naučte sa, ako ovládať AndroidAPS</string>
+    <string name="objectives_usage_gate">Vykonávajte v AndroidAPS rôzne akcie</string>
+    <string name="objectives_useprofileswitch">Nastavte profil na 90 % na 10 min (Dlhé stlačenie názvu profilu na obrazovke Prehľad)</string>
+    <string name="objectives_usedisconnectpump">Predstierajte, že se idete sprchovať. Odpojte pumpu na 1 h (Dlhšie pridržte tlačítko Otvorený okruh)</string>
+    <string name="objectives_usereconnectpump">...a rovnakým spôsobom ju znovu pripojte</string>
+    <string name="objectives_usetemptarget">Vytvorte vlastný dočasný cieľ s trvaním 10 min (Dlhšie pridržte aktuálny cieľ)</string>
+    <string name="objectives_useactions">V Konfigurácii povoľte modul Akcie, aktivujte jeho zobrazenie a zobrazte jeho obsah z hornej ponuky</string>
+    <string name="objectives_useloop">Zobrazte obsah modulu uzavretý okruh</string>
+    <string name="objectives_usescale">Prepnite režim zobrazenia dlhým stlačením grafu glykémie</string>
+    <string name="objectives_button_enter">Zadať</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Zadajte kód, ktorý ste získali od vývojárov, aby ste obišli zostávajúce ciele</string>
+    <string name="codeaccepted">Kód akceptovaný</string>
+    <string name="codeinvalid">Neplatný kód</string>
+    <string name="objectives_exam_objective">Preukážte svoje znalosti</string>
+    <string name="objectives_exam_gate">Preštudujte a správne odpovedajte na otázky</string>
+    <string name="answerdisabledto">Odpovedanie zakázané do: %1$s</string>
+    <string name="wronganswer">Nesprávna odpoveď!</string>
+    <string name="unfinshed_button">Ďalšia nedokončená</string>
+    <string name="close">Zavrieť</string>
+    <string name="requestcode">Kód žiadosti: %1$s</string>
+    <string name="objectives_hint">(zaškrtnite všetky správne odpovede)</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/exam.xml b/app/src/main/res/values-sv-rSE/exam.xml
new file mode 100644
index 0000000000..8070c49d7c
--- /dev/null
+++ b/app/src/main/res/values-sv-rSE/exam.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+    <string name="dia_whatmeansdia">Vad är sant om DIA?</string>
+    <string name="dia_label">Ämne: Insulinduration</string>
+    <string name="dia_minimumis3h">Det förutbestämda minimumvärdet är 3 timmar.</string>
+    <string name="dia_minimumis5h">Det förutbestämda minimumvärdet är 5 timmar.</string>
+    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
+    <string name="dia_meaningisequaltodiapump">Det är samma som värdet Insulinduration som används i pumpen.</string>
+    <string name="dia_valuemustbedetermined">Du måste bestämma ditt individuella värde (men inte mindre än 5 timmar).</string>
+    <string name="hypott_label">Ämne: \"Hypo\" temp mål</string>
+    <string name="hypott_whenhypott">Varför är det användbart att sätta in en hypo TT?</string>
+    <string name="hypott_goinglow">Förhindra att BG går lågt.</string>
+    <string name="hypott_havinglow">För att hjälpa till att återhämta sig från en episod med lågt BG-värde.</string>
+    <string name="hypott_preventoversmb">För att förhindra att SMB går igång när de snabba kolhydraterna absorberas efter en hypo.</string>
+    <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
+    <string name="offlineprofile_whatprofile">Vilken profiltyp kan användas och konfigureras offline?</string>
+    <string name="offlineprofile_label">Ämne: Offlineprofil</string>
+    <string name="offlineprofile_nsprofile">NS-profil kan användas, men inte konfigureras.</string>
+    <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
+    <string name="pumpdisconnect_label">Ämne: Koppla från pumpen</string>
+    <string name="pumpdisconnect_whattodo">Vad ska man göra när man kopplar bort pumpen från kroppen?</string>
+    <string name="pumpdisconnect_letknow">Låt loopen veta att inget insulin levereras till din kropp genom att klicka på \"koppla från pump\".</string>
+    <string name="pumpdisconnect_dontchnage">Ändra inget i loopen, bara ta av pumpen.</string>
+    <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
+    <string name="objectives_label">Ämne: AndroidAPS inställningar</string>
+    <string name="objectives_howtosave">Vad är bästa praxis för att säkerhetskopiera dina inställningar?</string>
+    <string name="objectives_exportsettings">Lokalt exportera dem från underhållsmenyn.</string>
+    <string name="objectives_storeelsewhere">Spara den exporterade filen till ett annat ställe som e-post, Dropbox, Google Drive…</string>
+    <string name="objectives_doexportonstart">Exportera dem direkt efter installationen av AAPS.</string>
+    <string name="objectives_doexportafterchange">Exportera dem efter varje ändring av en inställning.</string>
+    <string name="objectives_doexportafterfirtssettings">Exportera dem när du är klar med initiala inställningar.</string>
+    <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
+    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
+    <string name="noisycgm_label">Ämne: Brusiga CGM-avläsningar</string>
+    <string name="noisycgm_whattodo">Vad gör du när du ser att CGM signalen är för brusig?</string>
+    <string name="nothing">Inget, loopen tar hand om det.</string>
+    <string name="noisycgm_pause">Pausa closed loop-läget för att undvika överdosering.</string>
+    <string name="noisycgm_replacesensor">Byt CGM-sensor.</string>
+    <string name="noisycgm_turnoffphone">Stäng av telefonen.</string>
+    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
+    <string name="noisycgm_checksmoothing">Kolla om din CGM-app jämnar ut data.</string>
+    <string name="exercise_label">Ämne: Träning</string>
+    <string name="exercise_whattodo">Hur kan du hjälpa systemet att hantera fysisk aktivitet?</string>
+    <string name="exercise_setactivitytt">Ange ett temp-mål, t ex Träning.</string>
+    <string name="exercise_switchprofilebelow100">Gör ett profilbyte med mindre än 100%.</string>
+    <string name="exercise_switchprofileabove100">Gör ett profilbyte med mer än 100%.</string>
+    <string name="exercise_stoploop">Pausa loopen.</string>
+    <string name="exercise_doitbeforestart">Ange ett temp-mål före träningspasset.</string>
+    <string name="exercise_doitafterstart">Ange ett temp-mål efter att träningspasset börjat.</string>
+    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="suspendloop_label">Ämne: Pausad eller inaktiverad loop</string>
+    <string name="suspendloop_doigetinsulin">Får jag insulin när loopen är pausad eller inaktiverad?</string>
+    <string name="suspendloop_yes">Ja, den vanliga basaldosen.</string>
+    <string name="suspendloop_no">Nej, leverans av insulin är stoppad.</string>
+    <string name="basaltest_label">Ämne: Basal, ISF, och IC-testning</string>
+    <string name="basaltest_when">När ska jag validera basaler, ISF-och IC-värden?</string>
+    <string name="basaltest_beforeloop">Innan jag börjar loopa.</string>
+    <string name="basaltest_havingregularhypo">Om jag får återkommande låga värden.</string>
+    <string name="basaltest_havingregularhyper">Om jag får återkommande höga värden.</string>
+    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
+    <string name="prerequisites_label">Ämne: Krav innan start</string>
+    <string name="prerequisites_what">Vad behöver jag?</string>
+    <string name="prerequisites_determinedcorrectprofile">Fastställd korrekt profil (Basal, IC, ISF, DIA).</string>
+    <string name="prerequisites_computer">En dator för att skapa en APK.</string>
+    <string name="prerequisites_phone">En telefon som stöds.</string>
+    <string name="prerequisites_car">En bil.</string>
+    <string name="prerequisites_nightscout">Nightscout för att klara målen.</string>
+    <string name="prerequisites_tidepoolaccount">Ett Tidepool-konto.</string>
+    <string name="prerequisites_googleaccount">Ett Google-konto.</string>
+    <string name="prerequisites_githubaccount">Ett Github-konto.</string>
+    <string name="prerequisites_beanandroiddeveloper">Måste vara en Android-utvecklare.</string>
+    <string name="prerequisites_own670g">En MiniMed 670G pump.</string>
+    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="prerequisites_smartwatch">En smart klocka.</string>
+    <string name="prerequisites_supportedcgm">En CGM som stöds.</string>
+    <string name="update_label">Ämne: Uppdatering av AndroidAPS</string>
+    <string name="whatistrue">Vad är sant?</string>
+    <string name="update_git">Du måste ha Git installerat.</string>
+    <string name="update_asap">Uppdatera så snart den nya versionen har släppts.</string>
+    <string name="update_keys">Du kan använda samma signera nycklar.</string>
+    <string name="update_neverupdate">Uppdatera aldrig om systemet fungerar bra.</string>
+    <string name="update_askfriend">Be din vän om den nya APK-filen.</string>
+    <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
+    <string name="troubleshooting_label">Ämne: Felsökning</string>
+    <string name="troubleshooting_wheretoask">Var ska jag leta efter hjälp?</string>
+    <string name="troubleshooting_fb">Gå med i AndroidAPS Facebook-grupp.</string>
+    <string name="troubleshooting_wiki">Besök AndroidAPS Wiki.</string>
+    <string name="troubleshooting_gitter">Besök AndroidAPS Gitter-rum.</string>
+    <string name="troubleshooting_googlesupport">Besök AndroidAPS Google-support</string>
+    <string name="troubleshooting_yourendo">Tala med din endokrinolog.</string>
+    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
+    <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
+    <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
+    <string name="insulin_label">Ämne: Insulin</string>
+    <string name="insulin_ultrarapid">Vilket märke av insulin kan användas med Insticksprogrammet Ultra-Rapid-Oref?</string>
+    <string name="insulin_fiasp">Fiasp®</string>
+    <string name="insulin_novorapid">NovoRapid ®</string>
+    <string name="insulin_humalog">Humalog ®</string>
+    <string name="insulin_actrapid">Actrapid ®</string>
+    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
+    <string name="sensitivity_label">Ämne: Känslighetsavkänning</string>
+    <string name="sensitivity_which">Vilket insticksprogram har ett användardefinierat tidsintervall?</string>
+    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="sensitivityuam_which">Vilken känslighetsplugin måste användas för att kunna använda UAM-funktionen?</string>
+    <string name="wrongcarbs_label">Ämne: Felaktiga KH-poster</string>
+    <string name="wrongcarbs_whattodo">Du ser att du har angett fel mängd kolhydrater. Vad ska du göra?</string>
+    <string name="wrongcarbs_treatmentstab">Gå till Treatments, ta bort felaktiga kolhydrater och mata in nya kolhydrater.</string>
+    <string name="wrongcarbs_addfakeinsulin">Lägg till en falsk bolus genom att använda påfyllningsfunktionen</string>
+    <string name="extendedcarbs_label">Ämne: Mat med fett och protein</string>
+    <string name="extendedcarbs_handling">Vad ska du göra om din mat innehåller en stor mängd fett och/eller proteiner?</string>
+    <string name="extendedcarbs_useextendedcarbs">Räkna fett och proteiner till kolhydrater och använda eCarbs-funktionen.</string>
+    <string name="extendedcarbs_add">Räkna om fett och proteiner till kolhydrater och lägga till det i bolusberäkningen.</string>
+    <string name="extendedcarbs_useextendedbolus">Använd förlängd bolus för att täcka fett och protein.</string>
+    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
+    <string name="nsclient_label">Ämne: Övervaka barn</string>
+    <string name="nsclient_howcanyou">Hur kan du övervaka AAPS för ditt barn på distans?</string>
+    <string name="nsclient_nightscout">Med hjälp av en Nightscout webbplats.</string>
+    <string name="nsclient_dexcomfollow">Appen Dexcom Follow om du använder Dexcoms app på barnets mobil.</string>
+    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow om du använder xDrip på barnets mobil.</string>
+    <string name="nsclient_xdripfollower">xDrip i följarläge.</string>
+    <string name="nsclient_looponiphone">Appen Loop för iPhone.</string>
+    <string name="nsclient_spikeiphone">Appen Spike för iPhone.</string>
+    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_label">Ämne: Insulinkänslighetsfaktor (ISF)</string>
+    <string name="isf_increasingvalue">Ökade ISF-siffror kommer att leda till mindre tillfört insulin om du försöker sänka BG med bolusguiden.</string>
+    <string name="isf_decreasingvalue">Minskade ISF-siffror kommer att leda till mindre tillfört insulin om du försöker sänka BG med bolusguiden.</string>
+    <string name="isf_noeffect">Förändringar i ISF påverkar inte den mängd insulin som ges av AAPS vid försök att korrigera hyperglykemi.</string>
+    <string name="isf_preferences">Du måste ange ISF i Inställningar.</string>
+    <string name="isf_profile">Om du ändrar ISF-värdet i din profil är det tillräckligt för att tillämpa ändringen.</string>
+    <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
+    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
+    <string name="ic_label">Ämne: IC-värdet</string>
+    <string name="ic_increasingvalue">Ökning av IC-värdet kommer att leda till mindre insulintillförsel för samma mängd kolhydrater.</string>
+    <string name="ic_decreasingvalue">Minskning av IC-värdet kommer att leda till mindre insulintillförsel för samma mängd kolhydrater.</string>
+    <string name="ic_noeffect">Anta att du har 0 COB. Om du ändrar IC kommer det att leda till en annan mängd insulin för att korrigera din BG-nivå.</string>
+    <string name="ic_different">IC kommer att vara annorlunda om du räknar en skiva bröd som 10g eller 12g.</string>
+    <string name="ic_meaning">IC-betydelsen är: Hur många skivor bröd omfattas av 1U insulin.</string>
+    <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
+    <string name="profileswitch_label">Ämne: Profilbyte</string>
+    <string name="profileswitch_pctwillchange"> När du anger 90% i profilbytet…</string>
+    <string name="profileswitch_basalhigher">kommer basalerna bli 10% högre.</string>
+    <string name="profileswitch_basallower">kommer basalerna bli 10% lägre.</string>
+    <string name="profileswitch_ichigher">kommer IC-värdet bli 10% högre.</string>
+    <string name="profileswitch_iclower">kommer IC-värdet bli 10% lägre.</string>
+    <string name="profileswitch_isfhigher">kommer ISF-värdet bli 10% högre.</string>
+    <string name="profileswitch_isflower">kommer ISF-värdet bli 10% lägre.</string>
+    <string name="profileswitch_overall">kommer du få 10% mindre insulin totalt sett.</string>
+    <string name="profileswitch_targethigher">kommer målet justeras upp med 10%.</string>
+    <string name="profileswitch_targetlower">kommer målet justeras ner med 10%.</string>
+    <string name="profileswitch_targetbottom">kommer endast den nedre målgränsen bli 10% lägre.</string>
+    <string name="profileswitch_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
+    <string name="profileswitchtime_iwant">Jag vill göra ett profilbyte eftersom jag var tvungen att vakna 1 timme tidigare än normalt, så det är mer logiskt att ange tidsförskjutningen via ett profilbyte. Vilken siffra ska jag använda?</string>
+    <string name="profileswitchtime_1">1</string>
+    <string name="profileswitchtime__1">-1</string>
+    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
+    <string name="profileswitchtime_60">60</string>
+    <string name="profileswitchtime__60">-60</string>
+    <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
+    <string name="basalhelp_label">Ämne: Hjälp med basaldoser</string>
+    <string name="basalhelp_where">Var man hittar hjälp för basaldoser m. m.</string>
+    <string name="basalhelp_diabetesteam">Ditt diabetesteam</string>
+    <string name="basalhelp_google">Google</string>
+    <string name="basalhelp_facebook">Facebook</string>
+</resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index cec99c78fc..a8ec059b2a 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -34,6 +34,7 @@
     <string name="description_smb">Den senaste algoritmen för avancerade användare</string>
     <string name="description_overview">Visar loopens nuvarande tillstånd och knappar för de vanligaste funktionerna</string>
     <string name="description_persistent_notification">Visar en konstant avisering med en kort sammanfattning av vad din loop gör</string>
+    <string name="description_profile_local">Definiera en profil som är tillgänglig offline.</string>
     <string name="description_profile_nightscout">Använder profiler från Nightscout</string>
     <string name="description_profile_simple">Definiera en insulinprofil som bara har ett enda tidsblock.</string>
     <string name="description_pump_combo">Pumpintegration för Accu-Chek Combo. Kräver att Ruffy är installerat</string>
@@ -319,14 +320,14 @@ Eversense-appen.</string>
     <string name="overview_bolusprogress_goingtodeliver">Kommer att leverera %1$.2f enheter</string>
     <string name="objectives_0_objective">Ställer in utseende och övervakning för att sedan kunna analysera basaler och kvoter</string>
     <string name="objectives_0_gate">Kontrollera att BG syns i Nightscout och att insulindata från pumpen laddas upp</string>
-    <string name="objectives_openloop_objective">Starta med open loop</string>
-    <string name="objectives_openloop_gate">Starta med open loop och använd det några dagar. Försök att ge många föreslagna temp basaler. Sätt upp och använd standardmålvärden (Träning, Äta snart och Hypo)</string>
+    <string name="objectives_openloop_objective">Startar med open loop</string>
+    <string name="objectives_openloop_gate">Kör i Open Loop-läge i några dagar och sätt ett antal temp-basaler manuellt. Konfigurera och använd temporära och förinställda temporära mål (t.ex. Träning eller Hypo)</string>
     <string name="objectives_maxbasal_objective">Förstå din open loop och hur den föreslår temp basaler</string>
-    <string name="objectives_maxbasal_gate">Utifrån vad du nu lärt dig, besluta vilken max basal du vill ha. Ställ in det både i inställningarna i APS och i din pump</string>
+    <string name="objectives_maxbasal_gate">Utifrån vad du nu lärt dig, besluta vilken max basal du vill ha. Ställ in det både i inställningarna i appen och i din pump</string>
     <string name="objectives_maxiobzero_objective">Börja använda closed loop med aktiverad funktion att stänga av vid lågt BG</string>
     <string name="objectives_maxiobzero_gate">Aktivera closed loop med max IOB=0 i några dagar till dess systemet inte stänger av pga lågt BG för många gånger</string>
-    <string name="objectives_maxiob_objective">Finjustering av closed loop, gradvis ökande IOB och minskande målvärde för BG</string>
-    <string name="objectives_maxiob_gate">Kör några dagar och åtminstone en natt utan larm för lågt BG innan du sänker målvärdet för BG.</string>
+    <string name="objectives_maxiob_objective">Finjustering av closed loop, med gradvis ökande max IOB och minskande målvärde för BG</string>
+    <string name="objectives_maxiob_gate">Kör några dagar och åtminstone en natt utan larm för lågt BG innan du sänker målvärdet för BG</string>
     <string name="objectives_autosens_objective">Justera basaler och kvoter om det behövs. Aktivera sedan autosens</string>
     <string name="objectives_autosens_gate">1 veckas lyckad looping dagtid, där alla måltider lagts in</string>
     <string name="objectives_ama_objective">Aktiverar extra funktioner som kan användas dagtid, såsom avancerad måltidsassistans, AMA</string>
@@ -565,7 +566,8 @@ Eversense-appen.</string>
     <string name="enablesuperbolus">Aktivera superbolus i kalkylatorn</string>
     <string name="enablesuperbolus_summary">Aktiverar superbolusfunktionen i kalkylatorn. Aktivera inte innan du förstått hur den fungerar. DEN KAN ORSAKA ÖVERDOSERING AV INSULIN OM INSIKT SAKNAS OM FUNKTIONEN!</string>
     <string name="show_statuslights">Visa statusindikationer på hemskärmen</string>
-    <string name="show_statuslights_summary">Aktivera statusindikationerna för cage, iage, sage, reservoar och batterinivå på hemskärmen.</string>
+    <string name="show_statuslights_extended">Visa statusindikatorer på hemskärmen</string>
+    <string name="show_statuslights_extended_summary">Aktivera statusindikatorerna för cage, iage, sage, reservoar och batterinivå på hemskärmen.</string>
     <string name="statuslights_res_warning">Varningsnivå för reservoar [U]</string>
     <string name="statuslights_res_critical">Akut varningsnivå för reservoar [U]</string>
     <string name="statuslights_bat_warning">Varningsnivå för batteri [%%]</string>
@@ -639,7 +641,7 @@ Eversense-appen.</string>
     <string name="mdtp_cancel">Avbryt</string>
     <string name="notloadedplugins">Alla profiler laddades inte!</string>
     <string name="valuesnotstored">Alla värden sparades inte!</string>
-    <string name="ns_localbroadcasts">Slå på sändning av data till alla appar i telefonen (ex xDrip).</string>
+    <string name="ns_localbroadcasts">Aktivera sändning till andra appar (som xDrip). Aktivera inte detta om du har fler än en förekomst av AAPS eller NSClient installerad.</string>
     <string name="ns_localbroadcasts_title">Aktivera lokala broadcasts</string>
     <string name="careportal_activity_label">TRÄNING &amp; BG-MÅL</string>
     <string name="careportal_carbsandbolus_label">KOLHYDRATER &amp; BOLUS</string>
@@ -951,6 +953,7 @@ Eversense-appen.</string>
     <string name="sensitivitysetup">Konfigurera insticksprogram för känslighet</string>
     <string name="setupwizard_sensitivity_description">Insticksprogrammet för känslighet används för att detektera insulinkänslighet och för att beräkning av aktiva kolhydrater, COB. För mer information, besök:</string>
     <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
+    <string name="nsclientinfotext">NSClient hanterar anslutningen till Nightscout. Du kan hoppa över denna del nu, men du kommer inte att kunna passera vissa mål tills du har satt upp det.</string>
     <string name="diawarning">Kom ihåg: De nya insulinprofilerna kräver en duration (DIA) på minst 5 timmar. En DIA på 5-6 timmar enligt de nya profilerna är ungefär lika med DIA 3 timmar enligt de gamla insulinprofilerna.</string>
     <string name="bgsourcesetup">Konfigurera BG-källa</string>
     <string name="setupwizard_profile_description">Vänligen välj källa för profil. Om patienten är ett barn bör du använda NS profil. Om ingen följer dig på Nightscout kommer du förmodligen föredra lokal profil. Kom ihåg att du endast väljer profilkälla här. För att använda den måste du aktivera den genom att köra ”Byt Profil”</string>
@@ -1366,11 +1369,36 @@ Eversense-appen.</string>
     <string name="medtronic_cmd_desc_get_tbr">Hämta temp basal</string>
     <string name="medtronic_cmd_desc_set_tbr">Sätt temp basal</string>
     <string name="medtronic_cmd_desc_set_bolus">Leverera bolus</string>
-    <string name="insulinFromCob"><![CDATA[COB insulin: <font color=\'%1$s\'>%2$.1fg %3$.2fU</font>]]></string>
+    <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.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 och du riskerar få för mycket insulin!</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="partialboluswizard">Direkt bolus [%]</string>
+    <string name="deliverpartofboluswizard">Bolusguiden utför beräkningar, men endast denna del av beräknat insulin levereras. Användbar med SMB-algoritm.</string>
     <string name="loading">Laddar...</string>
     <string name="snooze">Snooze</string>
+    <string name="accomplished">Utfört: %1$s</string>
+    <string name="objectives_usage_objective">Lär dig hur du kontrollerar AndroidAPS</string>
+    <string name="objectives_usage_gate">Utföra olika åtgärder i AndroidAPS</string>
+    <string name="objectives_useprofileswitch">Ställ in profilen 90% för 10 minuter (Tryck och håll in profilens namn i Översikten)</string>
+    <string name="objectives_usedisconnectpump">Simulera dusch. Koppla från pump i 1 timme (Tryck och håll in på Open Loop i Översikten)</string>
+    <string name="objectives_usereconnectpump">... och återanslut på samma sätt</string>
+    <string name="objectives_usetemptarget">Skapa ett anpassat tillfälligt mål med 10 min varaktighet (Tryck och håll in på nuvarande BG-mål i Översikten)</string>
+    <string name="objectives_useactions">I Konfigurationsverktyget, aktivera insticksprogrammet Åtgärder, gör det synligt och visa dess innehåll från övre menyn</string>
+    <string name="objectives_useloop">Visa innehållet i insticksprogrammet \"Loop\"</string>
+    <string name="objectives_usescale">Testa skala om BG-grafen genom att trycka och hålla in fingret på den</string>
+    <string name="objectives_button_enter">Enter</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Ange kod som erhållits från utvecklare för att kringgå resten av målen</string>
+    <string name="codeaccepted">Koden godkänd</string>
+    <string name="codeinvalid">Koden är felaktig</string>
+    <string name="objectives_exam_objective">Bevisa dina kunskaper</string>
+    <string name="objectives_exam_gate">Studera och besvara frågor på rätt sätt</string>
+    <string name="answerdisabledto">Svarsfunktionen inaktiverad till: %1$s</string>
+    <string name="wronganswer">Fel svar!</string>
+    <string name="unfinshed_button">Nästa icke slutförda</string>
+    <string name="close">Stäng</string>
+    <string name="requestcode">Begärd kod: %1$s</string>
+    <string name="objectives_hint">(kontrollera alla korrekta svar)</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/exam.xml b/app/src/main/res/values-tr-rTR/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-tr-rTR/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index a54171f2dc..d5d7b46d5d 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -306,19 +306,6 @@
     <string name="waitingforpump">Pompa bekleniyor</string>
     <string name="objectives_0_objective">Nightscout üzerinden izlemeyi ve görselleştirmeyi yapılandırın ve bazal oranlarını ve faktörleri düzenleyin</string>
     <string name="objectives_0_gate">Nightscout\'ta KŞ\'nin bulunduğunu ve insülin verilerinin yüklenmekte olduğunu doğrulayın</string>
-    <string name="objectives_openloop_objective">Açık Döngü modu başlatılıyor</string>
-    <string name="objectives_openloop_gate">Birkaç gün boyunca Açık Döngü modunda çalıştırın ve birçok geçici bazalı el yordamı ile girin. Geçici ve varsayılan geçici hedefleri düzenleyin ve kullanın (örn. egzersiz ve hipo-tedaviyi desteklemek için)</string>
-    <string name="objectives_maxbasal_objective">Geçici bazal tavsiyeleri de dahil olmak üzere Açık Döngü anlamak</string>
-    <string name="objectives_maxbasal_gate">Bu deneyime dayanarak, max bazalın ne olması gerektiğine karar vermeli ve bunu pompa ve tercihlere koymalısınız</string>
-    <string name="objectives_maxiobzero_objective">Kapalı Döngü, (LGS) Düşük Kan Şekerinde Duraklatma modunda başlatılıyor</string>
-    <string name="objectives_maxiobzero_gate">Çok sayıda LGS (düşük KŞ) olmadan birkaç gün boyunca maksimum IOB = 0 (Aktif insülin) Kapalı Döngü\'de deneyin</string>
-    <string name="objectives_maxiob_objective">Kapalı Döngü\'de ince ayarlar, maksimum (IOB) Aktif İnsülinin 0\'ın üzerine yükseltme ve yavaş yavaş KŞ hedeflerini aşağıya çekme</string>
-    <string name="objectives_maxiob_gate">KŞ hedefini azaltmadan önce birkaç gün ve en az bir gece düşük KŞ (Hipo) alarmı olmadan deneyin</string>
-    <string name="objectives_autosens_objective">Gerekirse, bazal ve oranları ayarlayın ve sonra auto-sens\'i etkinleştirin</string>
-    <string name="objectives_autosens_gate">Bir hafta boyunca düzenli Karbonhidrad girdileri yaparak gün boyunca Kapalı Döngüyü çalıştırın</string>
-    <string name="objectives_ama_objective">Gelişmiş yemek asistanı gibi gündüz kullanımı için ek özelliklerin etkinleştirilmesi</string>
-    <string name="objectives_smb_objective">SMB (Super Micro Bolus) gibi gündüz kullanımı için ek özelliklerin etkinleştirilmesi</string>
-    <string name="objectives_smb_gate">(Super Micro Bolus) SMB\'lerın iyi çalışabilmesi için wiki\'yi okumalısınız ve maxIOB\'u yükseltmelisiniz! İyi bir başlangıç için maxIOB = ortalama yemek bolusu + 3 x max günlük bazaldır</string>
     <string name="youareonallowedlimit">İzin verilen sınıra ulaştınız</string>
     <string name="noprofileselected">Profil seçilmedi</string>
     <string name="smscommunicator_loophasbeendisabled">Döngü devre dışı bırakıldı</string>
@@ -601,7 +588,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="mdtp_cancel">Vazgeç</string>
     <string name="notloadedplugins">Tüm profiller yüklenmedi!</string>
     <string name="valuesnotstored">Değerler saklanmadı!</string>
-    <string name="ns_localbroadcasts">Yayınları (xDrip gibi) diğer uygulamalar için etkinleştirin.</string>
     <string name="ns_localbroadcasts_title">Yerel yayınları etkinleştirin.</string>
     <string name="careportal_activity_label">AKTIVITE &amp; GERİBİLDİRİM</string>
     <string name="careportal_carbsandbolus_label">KARBONHİDRATLAR &amp; BOLUS</string>
diff --git a/app/src/main/res/values-zh-rCN/exam.xml b/app/src/main/res/values-zh-rCN/exam.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-zh-rCN/exam.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 876695eff9..956f3864ba 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -317,19 +317,6 @@
     <string name="overview_bolusprogress_goingtodeliver">将要输注 %1$.2fU</string>
     <string name="objectives_0_objective">设置可视化和监视, 并分析基础率和比率</string>
     <string name="objectives_0_gate">验证 Nightscout 中的血糖是否可用, 并且正在上传泵的胰岛素数据</string>
-    <string name="objectives_openloop_objective">开始开环</string>
-    <string name="objectives_openloop_gate">在开环模式下运行几天，并在手机上手动制定很多次临时基础率。设置和使用临时目标和默认的临时目标 (例如, 用于活动或处理碳水化合物)</string>
-    <string name="objectives_maxbasal_objective">了解你的开环，包括它的临时基础率建议</string>
-    <string name="objectives_maxbasal_gate">基于以上的经验，决定适合自己的最大基础率，在泵和本软件的参数选项上设置</string>
-    <string name="objectives_maxiobzero_objective">开始闭环模式，低血糖自动暂停</string>
-    <string name="objectives_maxiobzero_gate">在闭环模式下运行，设置最大IOB = 0 运行几天确保没有太多的低血糖事件</string>
-    <string name="objectives_maxiob_objective">优化闭环，逐渐增加最大IOB，并逐渐降低目标血糖值</string>
-    <string name="objectives_maxiob_gate">运行几天，至少一个晚上没有低血糖报警，然后才可以继续调低目标血糖</string>
-    <string name="objectives_autosens_objective">如果需要的话，调整基础率和比值，然后再启用auto-sense</string>
-    <string name="objectives_autosens_gate">一个星期成功的白天闭环，常规的碳水化合物摄入</string>
-    <string name="objectives_ama_objective">启用额外的功能以供白天使用，例如用餐助手(meal assist)</string>
-    <string name="objectives_smb_objective">启用额外的功能以供白天使用, 例如微型大剂量 SMB</string>
-    <string name="objectives_smb_gate">为了让微型大剂量工作的更好，你必须读指南，提高最大IOB的值。 建议是最大IOB值=餐时大剂量的平均值+3倍 的每日基础率中的最大值</string>
     <string name="youareonallowedlimit">你达到了允许的极限</string>
     <string name="noprofileselected">没有选定配置文件</string>
     <string name="smscommunicator_loophasbeendisabled">闭环已经被禁用</string>
@@ -561,7 +548,6 @@
     <string name="enablesuperbolus">在向导中启用超级大剂量</string>
     <string name="enablesuperbolus_summary">在向导中启用 superbolus超级大剂量 功能。不要启用, 直到你了解它真正的用法。如果盲目使用, 可能会导致胰岛素过量!</string>
     <string name="show_statuslights">在主屏幕上显示状态指示灯</string>
-    <string name="show_statuslights_summary">在主屏幕上启用cage(碳水时间)、iage(胰岛素时间)、sage(探头使用时间)、储药器和电池电量的状态指示灯。</string>
     <string name="statuslights_res_warning">储药器药量低于阈值[U] 警告</string>
     <string name="statuslights_res_critical">储药器药量低于阈值[U] 严重警告</string>
     <string name="statuslights_bat_warning">电池电量低于阈值[%%] 警告</string>
@@ -635,7 +621,6 @@
     <string name="mdtp_cancel">取消</string>
     <string name="notloadedplugins">配置文件加载不完整</string>
     <string name="valuesnotstored">值没有被存储</string>
-    <string name="ns_localbroadcasts">启用广播到其他应用程序（如xDrip）.</string>
     <string name="ns_localbroadcasts_title">启用本地广播。</string>
     <string name="careportal_activity_label">活动 &amp; 反馈</string>
     <string name="careportal_carbsandbolus_label">碳水化合物 &amp; 大剂量</string>
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 3c86968f82..0ca4e78ddb 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -1,146 +1,163 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">What is true about DIA?</string>
-    <string name="dia_meaningofdia">Meaning of DIA</string>
+    <string name="dia_label">Topic: Duration of Insulin Action</string>
     <string name="dia_minimumis3h">The predetermined minimum is 3 hours.</string>
     <string name="dia_minimumis5h">The predetermined minimum is 5 hours.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
     <string name="dia_meaningisequaltodiapump">It is equal to the DIA parameter used in your pump.</string>
     <string name="dia_valuemustbedetermined">You have to determine your individual value (but not less than 5 hours).</string>
-    <string name="hypott">Hypo temp target</string>
+    <string name="hypott_label">Topic: Hypo Temp-Target</string>
     <string name="hypott_whenhypott">Why is it useful to set a hypo TT?</string>
-    <string name="hypott_goinglow">Prevent to be low.</string>
-    <string name="hypott_havinglow">To help recovering from a low BG.</string>
-    <string name="hypott_preventoversmb">To prevent SMB after a hypo rise from fast carbs</string>
+    <string name="hypott_goinglow">Prevent BG from going low.</string>
+    <string name="hypott_preventoversmb">To prevent SMB enactment after a hypo rise from fast carbs.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Which profile can be used and configured offline?</string>
-    <string name="offlineprofile">Offline profile</string>
-    <string name="offlineprofile_nsprofile">NS Profile can be used but not configured</string>
+    <string name="offlineprofile_label">Topic: Offline Profile</string>
+    <string name="offlineprofile_nsprofile">NS Profile can be used, but not configured.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect">Taking off pump</string>
+    <string name="pumpdisconnect_label">Topic: Disconnecting from the Pump</string>
     <string name="pumpdisconnect_whattodo">What to do when taking the pump off?</string>
-    <string name="pumpdisconnect_letknow">Let loop know that there is no insulin running to your body by clicking disconnect pump.</string>
-    <string name="pumpdisconnect_dontchnage">Don\'t change anything in loop, just take it off.</string>
+    <string name="pumpdisconnect_letknow">Let the loop know that there is no insulin being delivered to your body by clicking disconnect pump.</string>
+    <string name="pumpdisconnect_dontchnage">Don\'t change anything in loop, just take the pump off.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
+    <string name="objectives_label">Topic: AndroidAPS Settings</string>
     <string name="objectives_howtosave">What are best practices to backup your settings?</string>
-    <string name="objectives_writetopaper">Write every setting you did to a paper and make a hardcopy of it.</string>
     <string name="objectives_exportsettings">Locally export them from Maintenance menu.</string>
-    <string name="objectives_storeelsewhere">Store exported file to another place like email, Dropbox, Google drive …</string>
+    <string name="objectives_storeelsewhere">Store exported file to another place like email, Dropbox, Google drive…</string>
     <string name="objectives_doexportonstart">Export them right after installation of AAPS.</string>
     <string name="objectives_doexportafterchange">Export them after every change of a setting.</string>
     <string name="objectives_doexportafterfirtssettings">Export them when you finish initial settings.</string>
     <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
-    <string name="noisycgm">Noisy CGM</string>
+    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
+    <string name="noisycgm_label">Topic: Noisy CGM Readings</string>
     <string name="noisycgm_whattodo">What to do when you see CGM signals are too noisy?</string>
     <string name="nothing">Nothing, the loop will deal with it.</string>
-    <string name="noisycgm_pause">Pause closed loop mode to avoid overdosing.</string>
-    <string name="noisycgm_replacesensor">Replace sensor</string>
-    <string name="noisycgm_turnoffcgmreceiver">Turn off CGM receiver.</string>
+    <string name="noisycgm_pause">Pause closed-loop mode to avoid overdosing.</string>
+    <string name="noisycgm_replacesensor">Replace the CGM sensor.</string>
+    <string name="noisycgm_turnoffphone">Turn off the phone.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
     <string name="noisycgm_checksmoothing">Check if your CGM app smoothes data.</string>
-    <string name="exercise">Exercise</string>
-    <string name="exercise_whattodo">How to help the system deal with exercise</string>
-    <string name="exercise_setactivitytt">Set activity temp target</string>
-    <string name="exercise_switchprofilebelow100">Do a profile switch below 100%</string>
-    <string name="exercise_switchprofileabove100">Do profile switch above 100%</string>
-    <string name="exercise_stoploop">Stop loop</string>
-    <string name="exercise_doitbeforestart">Help before start exercise</string>
-    <string name="exercise_doitafterstart">Help after start exercise</string>
+    <string name="exercise_label">Topic: Exercise</string>
+    <string name="exercise_whattodo">How can you help the system deal with exercise?</string>
+    <string name="exercise_setactivitytt">Set an activity temp-target.</string>
+    <string name="exercise_switchprofilebelow100">Do a profile switch below 100%.</string>
+    <string name="exercise_switchprofileabove100">Do a profile switch above 100%.</string>
+    <string name="exercise_stoploop">Stop the loop.</string>
+    <string name="exercise_doitbeforestart">Set activity temp-target before the start of exercise.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="suspendloop_doigetinsulin">Do I get insuling when loop is suspended?</string>
-    <string name="suspendloop_yes">Yes, common basal rate</string>
-    <string name="suspendloop_no">No, delivering of insulin is stopped</string>
-    <string name="basaltest">Basal and ISF, IC testing</string>
-    <string name="basaltest_when">When should I test basals, ISF and IC?</string>
-    <string name="basaltest_beforeloop">Before I start looping</string>
-    <string name="basaltest_havingregularhypo">When having regular hypos</string>
-    <string name="basaltest_havingregularhyper">When having regular hypers</string>
+    <string name="suspendloop_label">Topic: Suspended Loop</string>
+    <string name="suspendloop_doigetinsulin">Do I get insulin when loop is suspended?</string>
+    <string name="suspendloop_yes">Yes, the common basal rate.</string>
+    <string name="suspendloop_no">No, delivery of insulin is stopped.</string>
+    <string name="basaltest_label">Topic: Basal, ISF, and IC Testing</string>
+    <string name="basaltest_when">When should I validate basals, ISF, and IC values?</string>
+    <string name="basaltest_beforeloop">Before I start looping.</string>
+    <string name="basaltest_havingregularhypo">When having regular hypos BG\'s.</string>
+    <string name="basaltest_havingregularhyper">When having regular hypers BG\'s.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
-    <string name="prerequisites">Prerequisites</string>
+    <string name="prerequisites_label">Topic: Prerequisites</string>
     <string name="prerequisites_what">What do I need?</string>
-    <string name="prerequisites_determinedcorrectprofile">Determined correct profile (Basals, IC, ISF, DIA)</string>
-    <string name="prerequisites_computer">Computer to create an APK</string>
-    <string name="prerequisites_phone">Supported phone</string>
-    <string name="prerequisites_car">Car</string>
-    <string name="prerequisites_nightscout">Nightscout to pass objectives</string>
-    <string name="prerequisites_tidepoolaccount">Tidepool account</string>
-    <string name="prerequisites_googleaccount">Google account</string>
-    <string name="prerequisites_githubaccount">Github account</string>
-    <string name="prerequisites_beanandroiddeveloper">To be an Android developer</string>
-    <string name="prerequisites_own670g">Own a 670g pump</string>
+    <string name="prerequisites_determinedcorrectprofile">Determined correct profile (Basals, IC, ISF, DIA).</string>
+    <string name="prerequisites_computer">A computer to create an APK.</string>
+    <string name="prerequisites_phone">A supported phone.</string>
+    <string name="prerequisites_car">A Car.</string>
+    <string name="prerequisites_nightscout">Nightscout to pass the objectives.</string>
+    <string name="prerequisites_tidepoolaccount">A Tidepool account.</string>
+    <string name="prerequisites_googleaccount">A Google account.</string>
+    <string name="prerequisites_githubaccount">A Github account.</string>
+    <string name="prerequisites_beanandroiddeveloper">Need to be an Android developer.</string>
+    <string name="prerequisites_own670g">A MiniMed 670G pump.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
-    <string name="prerequisites_smartwatch">Smartwatch</string>
-    <string name="prerequisites_supportedcgm">Supported CGM</string>
-    <string name="update_update">Updating of AndroidAPS</string>
+    <string name="prerequisites_smartwatch">A Smartwatch.</string>
+    <string name="prerequisites_supportedcgm">A Supported CGM.</string>
+    <string name="update_label">Topic: Updating of AndroidAPS</string>
     <string name="whatistrue">What is true?</string>
-    <string name="update_git">You need to have Git installed</string>
-    <string name="update_asap">Update as soon as new version is released</string>
-    <string name="update_keys">Use the same signing keys</string>
-    <string name="update_neverupdate">Never update if system is working well</string>
-    <string name="update_askfriend">Ask your friend for new APK</string>
+    <string name="update_git">You need to have Git installed.</string>
+    <string name="update_asap">Update as soon as new version is released.</string>
+    <string name="update_keys">You can use the same signing keys.</string>
+    <string name="update_neverupdate">Never update if the system is working well.</string>
+    <string name="update_askfriend">Ask your friend for the new APK.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
-    <string name="troubleshooting">Troubleshooting</string>
+    <string name="troubleshooting_label">Topic: Troubleshooting</string>
     <string name="troubleshooting_wheretoask">Where to look for help?</string>
-    <string name="troubleshooting_fb">Facebook group</string>
-    <string name="troubleshooting_wiki">Wiki</string>
-    <string name="troubleshooting_gitter">Gitter</string>
-    <string name="troubleshooting_googlesupport">Google support</string>
-    <string name="troubleshooting_yourendo">Your endo</string>
+    <string name="troubleshooting_fb">Join the AndroidAPS Facebook group.</string>
+    <string name="troubleshooting_wiki">Visit the AndroidAPS Wiki.</string>
+    <string name="troubleshooting_gitter">Visit AndroidAPS Gitter Room.</string>
+    <string name="troubleshooting_googlesupport">Visit AndroidAPS Google support</string>
+    <string name="troubleshooting_yourendo">Speak to your endocrinologist.</string>
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
-    <string name="insulin">Insulin</string>
-    <string name="insulin_ultrarapid">Which insulin can be used with Ultra-Rapid-Oref plugin?</string>
-    <string name="insulin_fiasp">Fiasp</string>
-    <string name="insulin_novorapid">Novorapid</string>
-    <string name="insulin_humalog">Humalog</string>
-    <string name="insulin_actrapid">Actrapid</string>
+    <string name="insulin_label">Topic: Insulin</string>
+    <string name="insulin_ultrarapid">Which brand of insulin can be used with Ultra-Rapid-Oref plugin?</string>
+    <string name="insulin_fiasp">Fiasp®</string>
+    <string name="insulin_novorapid">NovoRapid®</string>
+    <string name="insulin_humalog">Humalog®</string>
+    <string name="insulin_actrapid">Actrapid®</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity">Sensitivity plugin</string>
+    <string name="sensitivity_label">Topic: Sensitivity Plugin</string>
     <string name="sensitivity_which">Which sensitivity plugin has user defined time range for detection?</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">Which sensitivity plugin must be used for UAM?</string>
-    <string name="wrongcarbs">Wrong carbs</string>
+    <string name="sensitivityuam_which">Which sensitivity plugin must be used for the UAM feature?</string>
+    <string name="wrongcarbs_label">Topic: Wrong Carb Entries</string>
     <string name="wrongcarbs_whattodo">You see you have entered wrong carbs. What should you do?</string>
-    <string name="wrongcarbs_treatmentstab">Go to treatments, delete wrong carbs and enter new carbs</string>
-    <string name="extendedcarbs">Food with fat and protein</string>
-    <string name="extendedcarbs_handling">What to do if your food contains larger amount of fat or proteins?</string>
-    <string name="extendedcarbs_useextendedcarbs">Recalculate fat and proteins to carbs and use \"Extended carbs\" feature to tell system about it</string>
-    <string name="extendedcarbs_add">Recalculate fat and proteins to carbs and add it to bolus calculation</string>
-    <string name="extendedcarbs_useextendedbolus">Use extended bolus to cover fat and proteins</string>
-    <string name="nsclient_monitoring">Monitoring children</string>
+    <string name="wrongcarbs_treatmentstab">Go to Treatments, delete wrong carbs and enter new carbs.</string>
+    <string name="wrongcarbs_addfakeinsulin">Add fake insulin by using Refill function</string>
+    <string name="extendedcarbs_label">Topic: Food with Fat and Protein</string>
+    <string name="extendedcarbs_handling">What to do if your food contains a large amount of fat and\/or proteins?</string>
+    <string name="extendedcarbs_useextendedcarbs">Recalculate fat and proteins to carbs and use \"Extended carbs\" feature.</string>
+    <string name="extendedcarbs_add">Recalculate fat and proteins to carbs and add it to bolus calculation.</string>
+    <string name="extendedcarbs_useextendedbolus">Use extended bolus to cover fat and proteins.</string>
+    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
+    <string name="nsclient_label">Topic: Monitoring Children</string>
     <string name="nsclient_howcanyou">How can you monitor AAPS of your child remotely?</string>
-    <string name="nightscout">Nightscout</string>
-    <string name="dexcomfollow">Dexcom follow if you are using original Dexcom app</string>
-    <string name="dexcomfollowxdrip">Dexcom follow if you are using xDrip</string>
-    <string name="xdripfollower">xDrip in follower mode</string>
-    <string name="looponiphone">Loop app on iPhone</string>
-    <string name="spikeiphone">Spike on iPhone</string>
-    <string name="isf_increasingvalue">Assume you have high glycemia. Increasing ISF number will lead to giving less insulin if you try to correct high glycemia by bolus wizard</string>
-    <string name="isf_decreasingvalue">Assume you have high glycemia. Decreasing ISF number will lead to giving less insulin if you try to correct high glycemia by bolus wizard</string>
-    <string name="isf_noeffect">Changing ISF has no effect on amount of insulin given by APS when trying to correct high glycemia</string>
-    <string name="isf_preferences">You have to enter ISF in preferences</string>
-    <string name="isf_profile">Changing ISF in profile is enough to apply the change</string>
+    <string name="nsclient_nightscout">Using a Nightscout site.</string>
+    <string name="nsclient_dexcomfollow">Dexcom Follow app if you are using the original Dexcom app (BG only).</string>
+    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow if you are using the xDrip app.</string>
+    <string name="nsclient_xdripfollower">xDrip running in follower mode.</string>
+    <string name="nsclient_looponiphone">Loop app on iPhone.</string>
+    <string name="nsclient_spikeiphone">Spike app on iPhone.</string>
+    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_label">Topic: Insulin Sensitivity Factor</string>
+    <string name="isf_increasingvalue">Increasing ISF number will lead to less insulin delivery if you are trying to lower your BG with the bolus wizard.</string>
+    <string name="isf_decreasingvalue">Decreasing ISF number will lead to less insulin delivery if you are trying to lower your BG with the bolus wizard.</string>
+    <string name="isf_noeffect">Changing ISF has no effect on amount of insulin given by AAPS when trying to correct hyperglycemia.</string>
+    <string name="isf_preferences">You have to enter ISF in Preferences.</string>
+    <string name="isf_profile">Changing the ISF value in your profile is enough to apply the change.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_increasingvalue">Increasing IC value will lead to giving less insulin for the same amount of carbs</string>
-    <string name="ic_decreasingvalue">Decreasing IC value will lead to giving less insulin for the same amount of carbs</string>
-    <string name="ic_noeffect">Assume you have no active carbs. Changing IC will lead to different amount of insuling to correct your glycemia</string>
-    <string name="ic_different">IC will be different if you count bread unit as 10g or 12g</string>
-    <string name="ic_meaning">IC meaning is: How much bread units is covered by 1U of insulin</string>
+    <string name="ic_label">Topic: The IC Value</string>
+    <string name="ic_increasingvalue">Increasing the IC value will lead to less insulin delivery for the same amount of carbs.</string>
+    <string name="ic_decreasingvalue">Decreasing the IC value will lead to less insulin delivery for the same amount of carbs.</string>
+    <string name="ic_noeffect">Assume you have 0 COB. Changing IC will lead to a different amount of insulin to correct your BG number.</string>
+    <string name="ic_different">IC will be different if you count bread unit as 10g or 12g.</string>
+    <string name="ic_meaning">IC meaning is: How many bread units are covered by 1U of insulin.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
-    <string name="profileswitch_pctwillchange">By specifying 90% in profile switch</string>
-    <string name="profileswitch_basalhigher">Basals will be 10% higher</string>
-    <string name="profileswitch_basallower">Basals will be 10% lower</string>
-    <string name="profileswitch_ichigher">IC value will be 10% higher</string>
-    <string name="profileswitch_iclower">IC value will be 10% lower</string>
-    <string name="profileswitch_isfhigher">ISF value will be 10% higher</string>
-    <string name="profileswitch_isflower">ISF value will be 10% lower</string>
-    <string name="profileswitch_overall">You will get 10% less insulin in total</string>
-    <string name="profileswitch_targethigher">Target wiil be 10% higher</string>
-    <string name="profileswitch_targetlower">Target will be 10% lower</string>
-    <string name="profileswitch_targetbottom">Only bottom target will be 10% lower</string>
-    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
+    <string name="profileswitch_label">Topic: Profile Switching</string>
+    <string name="profileswitch_pctwillchange"> When specifying 90% in profile switch…</string>
+    <string name="profileswitch_basalhigher">Basals will be 10% higher.</string>
+    <string name="profileswitch_basallower">Basals will be 10% lower.</string>
+    <string name="profileswitch_ichigher">IC value will be 10% higher.</string>
+    <string name="profileswitch_iclower">IC value will be 10% lower.</string>
+    <string name="profileswitch_isfhigher">ISF value will be 10% higher.</string>
+    <string name="profileswitch_isflower">ISF value will be 10% lower.</string>
+    <string name="profileswitch_overall">You will get 10% less insulin in total.</string>
+    <string name="profileswitch_targethigher">Target wiil be 10% higher.</string>
+    <string name="profileswitch_targetlower">Target will be 10% lower.</string>
+    <string name="profileswitch_targetbottom">Only bottom target will be 10% lower.</string>
     <string name="profileswitch_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
+    <string name="profileswitchtime_iwant">I want to do a profile switch because I had to wake up 1h earlier than usually, so it makes more sense to announce the change by the time shift with a profile switch. What number should I use?</string>
+    <string name="profileswitchtime_1">1</string>
+    <string name="profileswitchtime__1">-1</string>
+    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
+    <string name="profileswitchtime_60">60</string>
+    <string name="profileswitchtime__60">-60</string>
+    <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
+    <string name="basalhelp_label">Topic: Help with basal rates</string>
+    <string name="basalhelp_where">Where to go for help with basalrate etc.</string>
+    <string name="basalhelp_diabetesteam">Your diabetes team</string>
+    <string name="basalhelp_google">Google</string>
+    <string name="basalhelp_facebook">Facebook</string>
 
 </resources>
diff --git a/app/src/main/res/values/objectives.xml b/app/src/main/res/values/objectives.xml
new file mode 100644
index 0000000000..028772ef58
--- /dev/null
+++ b/app/src/main/res/values/objectives.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="key_objectiveuseprofileswitch" translatable="false">ObjectivesProfileSwitchUsed</string>
+    <string name="key_objectiveusedisconnect" translatable="false">ObjectivesDisconnectUsed</string>
+    <string name="key_objectiveusereconnect" translatable="false">ObjectivesReconnectUsed</string>
+    <string name="key_objectiveusetemptarget" translatable="false">ObjectivesTempTargetUsed</string>
+    <string name="key_objectiveuseactions" translatable="false">ObjectivesActionsUsed</string>
+    <string name="key_objectiveuseloop" translatable="false">ObjectivesLoopUsed</string>
+    <string name="key_objectiveusescale" translatable="false">ObjectivesScaleUsed</string>
+    <string name="key_objectives_request_code" translatable="false">objectives_request_code</string>
+    <string name="key_ObjectivesbgIsAvailableInNS" translatable="false">ObjectivesbgIsAvailableInNS</string>
+    <string name="key_ObjectivespumpStatusIsAvailableInNS" translatable="false">ObjectivespumpStatusIsAvailableInNS</string>
+    <string name="key_ObjectivesmanualEnacts" translatable="false">ObjectivesmanualEnacts</string>
+
+    <string name="objectives_button_back">Back</string>
+    <string name="objectives_button_start">Start</string>
+    <string name="objectives_button_verify">Verify</string>
+    <string name="nth_objective">%1$d. Objective</string>
+    <string name="objectivenotstarted">Objective %1$d not started</string>
+    <string name="objectivenotfinished">Objective %1$d not finished</string>
+    <string name="objectives_0_objective">Setting up visualization and monitoring, and analyzing basals and ratios</string>
+    <string name="objectives_0_gate">Verify that BG is available in Nightscout, and pump insulin data is being uploaded</string>
+    <string name="objectives_openloop_objective">Starting on an open loop</string>
+    <string name="objectives_openloop_gate">Run in Open Loop mode for a few days and manually enact lots of temp basals. Set up and use temporary and default temporary targets (e.g. for activity or hypo treatment carbs)</string>
+    <string name="objectives_maxbasal_objective">Understanding your open loop, including its temp basal recommendations</string>
+    <string name="objectives_maxbasal_gate">Based on that experience, decide what max basal should be, and set it on the pump and preferences</string>
+    <string name="objectives_maxiobzero_objective">Starting to close the loop with Low Glucose Suspend</string>
+    <string name="objectives_maxiobzero_gate">Run in closed loop with max IOB = 0 for a few days without too many LGS events</string>
+    <string name="objectives_maxiob_objective">Tuning the closed loop, raising max IOB above 0 and gradually lowering BG targets</string>
+    <string name="objectives_maxiob_gate">Run for a few days, and at least one night with no low BG alarms, before dropping BG</string>
+    <string name="objectives_autosens_objective">Adjust basals and ratios if needed, and then enable auto-sens</string>
+    <string name="objectives_autosens_gate">1 week successful daytime looping with regular carb entry</string>
+    <string name="objectives_ama_objective">Enabling additional features for daytime use, such as advanced meal assist</string>
+    <string name="objectives_smb_objective">Enabling additional features for daytime use, such as SMB</string>
+    <string name="objectives_smb_gate">You must read the wiki and rise maxIOB to get SMBs working fine! A good start is maxIOB=average mealbolus + 3 x max daily basal</string>
+    <string name="objectives_bgavailableinns">BG available in NS</string>
+    <string name="objectives_pumpstatusavailableinns">Pump status available in NS</string>
+    <string name="objectives_manualenacts">Manual enacts</string>
+    <string name="accomplished">Accomplished: %1$s</string>
+    <string name="objectives_usage_objective">Learn how to control AndroidAPS</string>
+    <string name="objectives_usage_gate">Perform different actions in AndroidAPS</string>
+    <string name="objectives_useprofileswitch">Set profile 90% for 10 min (Long-press profile name on Overview)</string>
+    <string name="objectives_usedisconnectpump">Simulate shower. Disconnect pump for 1h (Long-press on Open Loop)</string>
+    <string name="objectives_usereconnectpump">... and reconnect back the same way</string>
+    <string name="objectives_usetemptarget">Create custom temporary target with 10 min duration (Long-press on your current target)</string>
+    <string name="objectives_useactions">In Config Builder enable Actions plugin, make it visible and display its content from top menu</string>
+    <string name="objectives_useloop">Display content of Loop plugin</string>
+    <string name="objectives_usescale">Use scale function by long-pressing BG chart</string>
+    <string name="objectives_button_enter">Enter</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Enter code obtained from developers to bypass the rest of objectives</string>
+    <string name="codeaccepted">Code accepted</string>
+    <string name="codeinvalid">Code invalid</string>
+    <string name="objectives_exam_objective">Prove your knowledge</string>
+    <string name="objectives_exam_gate">Study and answer questions correctly</string>
+    <string name="answerdisabledto">Answering disabled to: %1$s</string>
+    <string name="wronganswer">Wrong answer!</string>
+    <string name="unfinshed_button">Next unfinished</string>
+    <string name="requestcode">Request code: %1$s</string>
+    <string name="objectives_hint">(check all correct answers)</string>
+    <string name="disconnectpump_hint">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-to-do-when-taking-a-shower-or-bath</string>
+    <string name="usetemptarget_hint">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#the-homescreen</string>
+    <string name="useaction_hint">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#config-builder</string>
+    <string name="usescale_hint">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#the-homescreen</string>
+
+    <plurals name="objective_days">
+        <item quantity="one">%1$d day</item>
+        <item quantity="other">%1$d days</item>
+    </plurals>
+    <plurals name="objective_hours">
+        <item quantity="one">%1$d hour</item>
+        <item quantity="other">%1$d hours</item>
+    </plurals>
+    <plurals name="objective_minutes">
+        <item quantity="one">%1$d minute</item>
+        <item quantity="other">%1$d minutes</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 13335447f3..2d22980432 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -79,9 +79,6 @@
     <string name="description_xdrip_status_line">Show information about your loop on your xDrip+ watchface.</string>
     <string name="description_sms_communicator">Remote control AndroidAPS using SMS commands.</string>
 
-    <string name="objectives_button_back">Back</string>
-    <string name="objectives_button_start">Start</string>
-    <string name="objectives_button_verify">Verify</string>
     <string name="nsprofileview_units_label">Units</string>
     <string name="nsprofileview_dia_label">DIA</string>
     <string name="nsprofileview_ic_label">IC</string>
@@ -205,9 +202,6 @@
     <string name="unsupportedclientver">Unsupported version of NSClient</string>
     <string name="unsupportednsversion">Unsupported version of Nightscout</string>
     <string name="nsclientnotinstalled">NSClient not installed. Record lost!</string>
-    <string name="objectives_bgavailableinns">BG available in NS</string>
-    <string name="objectives_pumpstatusavailableinns">Pump status available in NS</string>
-    <string name="objectives_manualenacts">Manual enacts</string>
     <string name="loopdisabled">LOOP DISABLED BY CONSTRAINTS</string>
     <string name="treatments_wizard_basaliob_label">Basal IOB</string>
     <string name="bolusconstraintapplied">Bolus constraint applied</string>
@@ -348,21 +342,6 @@
     <string name="overview_bolusprogress_stoppressed">STOP PRESSED</string>
     <string name="waitingforpump">Waiting for pump</string>
     <string name="overview_bolusprogress_goingtodeliver">Going to deliver %1$.2fU</string>
-    <string name="objectives_0_objective">Setting up visualization and monitoring, and analyzing basals and ratios</string>
-    <string name="objectives_0_gate">Verify that BG is available in Nightscout, and pump insulin data is being uploaded</string>
-    <string name="objectives_openloop_objective">Starting on an open loop</string>
-    <string name="objectives_openloop_gate">Run in Open Loop mode for a few days and manually enact lots of temp basals. Set up and use temporary and default temporary targets (e.g. for activity or hypo treatment carbs)</string>
-    <string name="objectives_maxbasal_objective">Understanding your open loop, including its temp basal recommendations</string>
-    <string name="objectives_maxbasal_gate">Based on that experience, decide what max basal should be, and set it on the pump and preferences</string>
-    <string name="objectives_maxiobzero_objective">Starting to close the loop with Low Glucose Suspend</string>
-    <string name="objectives_maxiobzero_gate">Run in closed loop with max IOB = 0 for a few days without too many LGS events</string>
-    <string name="objectives_maxiob_objective">Tuning the closed loop, raising max IOB above 0 and gradually lowering BG targets</string>
-    <string name="objectives_maxiob_gate">Run for a few days, and at least one night with no low BG alarms, before dropping BG</string>
-    <string name="objectives_autosens_objective">Adjust basals and ratios if needed, and then enable auto-sens</string>
-    <string name="objectives_autosens_gate">1 week successful daytime looping with regular carb entry</string>
-    <string name="objectives_ama_objective">Enabling additional features for daytime use, such as advanced meal assist</string>
-    <string name="objectives_smb_objective">Enabling additional features for daytime use, such as SMB</string>
-    <string name="objectives_smb_gate">You must read the wiki and rise maxIOB to get SMBs working fine! A good start is maxIOB=average mealbolus + 3 x max daily basal</string>
     <string name="youareonallowedlimit">You reached allowed limit</string>
     <string name="noprofileselected">No profile selected</string>
     <string name="smscommunicator_loophasbeendisabled">Loop has been disabled</string>
@@ -623,11 +602,8 @@
     <string name="enablesuperbolus">Enable superbolus in wizard</string>
     <string name="enablesuperbolus_summary">Enable superbolus functionality in wizard. Do not enable until you learn what it really does. IT MAY CAUSE INSULIN OVERDOSE IF USED BLINDLY!</string>
     <string name="key_show_statuslights" translatable="false">key_show_statuslights</string>
-    <string name="key_show_statuslights_easy" translatable="false">key_show_statuslights_easy</string>
     <string name="key_show_statuslights_extended" translatable="false">key_show_statuslights_extended</string>
     <string name="show_statuslights">Show status lights on home screen</string>
-    <string name="show_statuslights_easy">Show original status lights on home screen</string>
-    <string name="show_statuslights_easy_summary">Enable original status lights for cage, iage, sage, reservoir and battery level on home screen.</string>
     <string name="show_statuslights_extended">Show extended status lights on home screen</string>
     <string name="show_statuslights_extended_summary">Enable extended status lights for cage, iage, sage, reservoir and battery level on home screen.</string>
     <string name="key_statuslights_res_warning" translatable="false">key_statuslights_res_warning</string>
@@ -725,7 +701,7 @@
     <string name="valuesnotstored">Values not stored!</string>
     <string name="combopump" translatable="false">Accu-Chek Combo</string>
     <string name="combopump_shortname" translatable="false">COMBO</string>
-    <string name="ns_localbroadcasts">Enable broadcasts to other apps (like xDrip).</string>
+    <string name="ns_localbroadcasts">Enable broadcasts to other apps (like xDrip). Do not enable if you have more than one instance of AAPS or NSClient installed!</string>
     <string name="ns_localbroadcasts_title">Enable local Broadcasts.</string>
     <string name="careportal_activity_label">ACTIVITY &amp; FEEDBACK</string>
     <string name="careportal_carbsandbolus_label">CARBS &amp; BOLUS</string>
@@ -996,8 +972,6 @@
     <string name="profileswitch_ismissing">ProfileSwitch missing. Please do a profile switch or press \"Activate Profile\" in the LocalProfile.</string>
     <string name="combo_bolus_count">Bolus count</string>
     <string name="combo_tbr_count">TBR count</string>
-    <string name="objectivenotstarted">Objective %1$d not started</string>
-    <string name="objectivenotfinished">Objective %1$d not finished</string>
     <string name="pumpisnottempbasalcapable">Pump is not temp basal capable</string>
     <string name="novalidbasalrate">No valid basal rate read from pump</string>
     <string name="closedmodedisabledinpreferences">Closed loop mode disabled in preferences</string>
@@ -1145,7 +1119,6 @@
     <string name="completed_well_done">Completed, well done!</string>
     <string name="not_completed_yet">Not completed yet</string>
     <string name="time_elapsed">Time elapsed</string>
-    <string name="nth_objective">%1$d. Objective</string>
     <string name="poctech">Poctech</string>
     <string name="description_source_poctech">Receive BG values from Poctech app</string>
     <string name="description_source_tomato">Receive BG values from Tomato app (MiaoMiao device)</string>
@@ -1519,7 +1492,7 @@
     <string name="rileylink_state_not_started">Not Started</string>
     <string name="rileylink_state_rl_init">RileyLink Initialization…</string>
     <string name="rileylink_state_rl_error">RileyLink Error</string>
-    <string name="rileylink_state_pc_tune_up">Tunning up RileyLink and Pump</string>
+    <string name="rileylink_state_pc_tune_up">Tuning up RileyLink and Pump</string>
     <string name="rileylink_state_pc_error">Problem connecting to Pump</string>
     <string name="rileylink_state_connected">Connected</string>
 
@@ -1601,7 +1574,7 @@
     <string name="medtronic_cmd_desc_set_bolus">Set Bolus</string>
 
 
-    <string name="insulinFromCob"><![CDATA[COB insulin: <font color=\'%1$s\'>%2$.1fg %3$.2fU</font>]]></string>
+    <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus constraint applied: %2$.2fU to %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Slow carbs absorption detected: %2$d%% of time. Double check your calculation. COB can be overestimated thus more insulin could be given !!!!!</font>]]></string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
@@ -1610,55 +1583,10 @@
     <string name="deliverpartofboluswizard">Bolus wizard performs calculation but only this part of calculated insulin is delivered. Useful with SMB algorithm.</string>
     <string name="loading">Loading ...</string>
     <string name="snooze">Snooze</string>
-
     <string name="time_range">Time range</string>
     <string name="timerange_value">Time is between %1$s and %2$s</string>
     <string name="between">Between </string>
 
-    <string name="accomplished">Accomplished: %1$s</string>
-    <string name="objectives_usage_objective">Learn how to control AndroidAPS</string>
-    <string name="objectives_usage_gate">Perform different actions in AndroidAPS</string>
-    <string name="objectives_useprofileswitch">Set profile 90% for 10 min (Long-press profile name on Overview)</string>
-    <string name="key_objectiveuseprofileswitch" translatable="false">ObjectivesProfileSwitchUsed</string>
-    <string name="key_objectiveusedisconnect" translatable="false">ObjectivesDisconnectUsed</string>
-    <string name="key_objectiveusereconnect" translatable="false">ObjectivesReconnectUsed</string>
-    <string name="key_objectiveusetemptarget" translatable="false">ObjectivesTempTargetUsed</string>
-    <string name="key_objectiveuseactions" translatable="false">ObjectivesActionsUsed</string>
-    <string name="key_objectiveuseloop" translatable="false">ObjectivesLoopUsed</string>
-    <string name="key_objectiveusescale" translatable="false">ObjectivesScaleUsed</string>
-    <string name="objectives_usedisconnectpump">Simulate shower. Disconnect pump for 1h (Long-press on Open Loop)</string>
-    <string name="objectives_usereconnectpump">... and reconnect back the same way</string>
-    <string name="objectives_usetemptarget">Create custom temporary target with 10 min duration (Long-press on your current target)</string>
-    <string name="objectives_useactions">In Config Builder enable Actions plugin, make it visible and display its content from top menu</string>
-    <string name="objectives_useloop">Display content of Loop plugin</string>
-    <string name="objectives_usescale">Use scale function by long-pressing BG chart</string>
-    <string name="objectives_button_enter">Enter</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Enter code obtained from developers to bypass the rest of objectives</string>
-    <string name="codeaccepted">Code accepted</string>
-    <string name="codeinvalid">Code invalid</string>
-    <string name="key_ObjectivesbgIsAvailableInNS" translatable="false">ObjectivesbgIsAvailableInNS</string>
-    <string name="key_ObjectivespumpStatusIsAvailableInNS" translatable="false">ObjectivespumpStatusIsAvailableInNS</string>
-    <string name="key_ObjectivesmanualEnacts" translatable="false">ObjectivesmanualEnacts</string>
-    <string name="objectives_exam_objective">Prove your knowledge</string>
-    <string name="objectives_exam_gate">Study and answer questions correctly</string>
-    <string name="answerdisabledto">Answering disabled to: %1$s</string>
-    <string name="wronganswer">Wrong answer!</string>
-    <string name="unfinshed_button">Next unfinished</string>
     <string name="close">Close</string>
-    <string name="key_objectives_request_code" translatable="false">objectives_request_code</string>
-    <string name="requestcode">Request code: %1$s</string>
-    <string name="objectives_hint">(check all correct answers)</string>
 
-    <plurals name="objective_days">
-        <item quantity="one">%1$d day</item>
-        <item quantity="other">%1$d days</item>
-    </plurals>
-    <plurals name="objective_hours">
-        <item quantity="one">%1$d hour</item>
-        <item quantity="other">%1$d hours</item>
-    </plurals>
-    <plurals name="objective_minutes">
-        <item quantity="one">%1$d minute</item>
-        <item quantity="other">%1$d minutes</item>
-    </plurals>
 </resources>
diff --git a/app/src/main/res/xml/pref_automation.xml b/app/src/main/res/xml/pref_automation.xml
index 2a590bbaa1..933a11fd54 100644
--- a/app/src/main/res/xml/pref_automation.xml
+++ b/app/src/main/res/xml/pref_automation.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:validate="http://schemas.android.com/apk/res-auto">
-    <ListPreference
-        android:title="@string/locationservice"
-        android:defaultValue="PASSIVE"
-        android:entries="@array/location"
-        android:entryValues="@array/locationValues"
-        android:key="@string/key_location" />
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory android:title="@string/automation">
+
+        <ListPreference
+            android:defaultValue="PASSIVE"
+            android:entries="@array/location"
+            android:entryValues="@array/locationValues"
+            android:key="@string/key_location"
+            android:title="@string/locationservice" />
+
+    </PreferenceCategory>
+
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_overview.xml b/app/src/main/res/xml/pref_overview.xml
index 996f5591cd..7f1823de81 100644
--- a/app/src/main/res/xml/pref_overview.xml
+++ b/app/src/main/res/xml/pref_overview.xml
@@ -167,13 +167,6 @@
                 android:key="@string/key_show_statuslights"
                 android:title="@string/show_statuslights" />
 
-            <SwitchPreference
-                android:defaultValue="false"
-                android:dependency="@string/key_show_statuslights"
-                android:key="@string/key_show_statuslights_easy"
-                android:summary="@string/show_statuslights_easy_summary"
-                android:title="@string/show_statuslights_easy" />
-
             <SwitchPreference
                 android:defaultValue="false"
                 android:dependency="@string/key_show_statuslights"
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.java
similarity index 88%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableTest.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.java
index 81d0e13688..bc94fe0f30 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.java
@@ -18,14 +18,14 @@ import static org.junit.Assert.*;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({MainApp.class, SP.class, L.class})
-public class MessageHashTableTest {
+public class MessageHashTableRTest {
 
     @Test
     public void runTest() {
         AAPSMocker.mockMainApp();
         AAPSMocker.mockSP();
         AAPSMocker.mockL();
-        MessageHashTable messageHashTable = new MessageHashTable();
+        MessageHashTableR messageHashTable = MessageHashTableR.INSTANCE;
         MessageBase testMessage = messageHashTable.findMessage(0x41f2);
         assertEquals("CMD_HISTORY_ALL", testMessage.getMessageName());
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.java
similarity index 81%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_v2Test.java
rename to app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.java
index 9fa40854a4..33c64510cd 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_v2Test.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.java
@@ -18,7 +18,7 @@ import static org.junit.Assert.*;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({MainApp.class, SP.class, L.class})
-public class MessageHashTable_v2Test {
+public class MessageHashTable_rv2Test {
     @Test
     public void runTest() {
         AAPSMocker.mockMainApp();
@@ -27,16 +27,16 @@ public class MessageHashTable_v2Test {
         AAPSMocker.mockL();
         AAPSMocker.mockBus();
 
-        MessageHashTable_v2 packet = new MessageHashTable_v2();
+        MessageHashTableRv2 hashTableRv2 = MessageHashTableRv2.INSTANCE;
 
         MessageBase forTesting = new MsgStatusAPS_v2();
-        MessageBase testPacket = MessageHashTable_v2.findMessage(forTesting.getCommand());
+        MessageBase testPacket = MessageHashTableRv2.INSTANCE.findMessage(forTesting.getCommand());
         assertEquals(0xE001, testPacket.getCommand());
         // try putting another command
         MessageBase testMessage = new MessageBase();
         testMessage.SetCommand(0xE005);
-        packet.put(testMessage);
-        assertEquals(0xE005, packet.findMessage(0xE005).getCommand());
+        hashTableRv2.put(testMessage);
+        assertEquals(0xE005, hashTableRv2.findMessage(0xE005).getCommand());
     }
 
     byte[] createArray(int length, byte fillWith){
diff --git a/build.gradle b/build.gradle
index 6513ece66e..8b9295e9e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,17 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.41'
-    ext.butterknifeVersion = '10.1.0'
+    ext.kotlin_version = '1.3.50'
     repositories {
         google()
         jcenter()
-        //maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.0'
-        classpath 'com.google.gms:google-services:4.3.0'
+        classpath 'com.google.gms:google-services:4.3.2'
         classpath 'io.fabric.tools:gradle:1.31.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/crowdin.yml b/crowdin.yml
index 8dd3a64144..7d92dfb8bc 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -3,3 +3,7 @@ files:
     translation: /app/src/main/res/values-%android_code%/strings.xml
   - source: /app/src/main/res/values/insight_*.xml
     translation: /app/src/main/res/values-%android_code%/%original_file_name%
+  - source: /app/src/main/res/values/exam.xml
+    translation: /app/src/main/res/values-%android_code%/%original_file_name%
+  - source: /app/src/main/res/values/objectives.xml
+    translation: /app/src/main/res/values-%android_code%/%original_file_name%