From 468b645486e42e8a6f5ebaa6be51745b13c0c4e2 Mon Sep 17 00:00:00 2001
From: "Markus M. May" <triplem@javafreedom.org>
Date: Thu, 28 Jun 2018 22:36:08 +0200
Subject: [PATCH 1/7] Do calculations in a central place

---
 .../androidaps/plugins/Overview/OverviewFragment.java     | 8 ++++----
 app/src/main/java/info/nightscout/utils/DateUtil.java     | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
index eb13cf5ef8..d1cbf71c05 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
@@ -839,7 +839,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                             if (wizard.superBolus) {
                                 final LoopPlugin loopPlugin = LoopPlugin.getPlugin();
                                 if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                                    loopPlugin.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000);
+                                    loopPlugin.superBolusTo(System.currentTimeMillis() + DateUtil.hourToMs(2));
                                     MainApp.bus().post(new EventRefreshOverview("WizardDialog"));
                                 }
                                 ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 120, true, profile, new Callback() {
@@ -1426,12 +1426,12 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 predHours = Math.max(0, predHours);
                 hoursToFetch = rangeToDisplay - predHours;
                 toTime = calendar.getTimeInMillis() + 100000; // little bit more to avoid wrong rounding - Graphview specific
-                fromTime = toTime - hoursToFetch * 60 * 60 * 1000L;
-                endTime = toTime + predHours * 60 * 60 * 1000L;
+                fromTime = toTime - DateUtil.hourToMs(hoursToFetch);
+                endTime = toTime + DateUtil.hourToMs(predHours);
             } else {
                 hoursToFetch = rangeToDisplay;
                 toTime = calendar.getTimeInMillis() + 100000; // little bit more to avoid wrong rounding - Graphview specific
-                fromTime = toTime - hoursToFetch * 60 * 60 * 1000L;
+                fromTime = toTime - DateUtil.hourToMs(hoursToFetch);
                 endTime = toTime;
             }
 
diff --git a/app/src/main/java/info/nightscout/utils/DateUtil.java b/app/src/main/java/info/nightscout/utils/DateUtil.java
index 7d7db3f5a7..ca13381e37 100644
--- a/app/src/main/java/info/nightscout/utils/DateUtil.java
+++ b/app/src/main/java/info/nightscout/utils/DateUtil.java
@@ -180,4 +180,8 @@ public class DateUtil {
         return date - date % 1000;
     }
 
+    public static long hourToMs(long hour) {
+        return hour * 60 * 60 * 1000L;
+    }
+
 }

From 6bc60cd8a850fe0911d2b1479beea953216be3a4 Mon Sep 17 00:00:00 2001
From: "Markus M. May" <triplem@javafreedom.org>
Date: Sun, 1 Jul 2018 13:50:37 +0200
Subject: [PATCH 2/7] Rework to use already existing method

---
 .../androidaps/plugins/Overview/OverviewFragment.java    | 9 +++++----
 app/src/main/java/info/nightscout/utils/DateUtil.java    | 5 -----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
index d1cbf71c05..c1f6f5b82d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
@@ -119,6 +119,7 @@ import info.nightscout.utils.OKDialog;
 import info.nightscout.utils.Profiler;
 import info.nightscout.utils.SP;
 import info.nightscout.utils.SingleClickButton;
+import info.nightscout.utils.T;
 import info.nightscout.utils.ToastUtils;
 
 import static info.nightscout.utils.DateUtil.now;
@@ -839,7 +840,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                             if (wizard.superBolus) {
                                 final LoopPlugin loopPlugin = LoopPlugin.getPlugin();
                                 if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                                    loopPlugin.superBolusTo(System.currentTimeMillis() + DateUtil.hourToMs(2));
+                                    loopPlugin.superBolusTo(System.currentTimeMillis() + T.hours(2).msecs());
                                     MainApp.bus().post(new EventRefreshOverview("WizardDialog"));
                                 }
                                 ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 120, true, profile, new Callback() {
@@ -1426,12 +1427,12 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 predHours = Math.max(0, predHours);
                 hoursToFetch = rangeToDisplay - predHours;
                 toTime = calendar.getTimeInMillis() + 100000; // little bit more to avoid wrong rounding - Graphview specific
-                fromTime = toTime - DateUtil.hourToMs(hoursToFetch);
-                endTime = toTime + DateUtil.hourToMs(predHours);
+                fromTime = toTime - T.hours(hoursToFetch).msecs();
+                endTime = toTime + T.hours(predHours).msecs();
             } else {
                 hoursToFetch = rangeToDisplay;
                 toTime = calendar.getTimeInMillis() + 100000; // little bit more to avoid wrong rounding - Graphview specific
-                fromTime = toTime - DateUtil.hourToMs(hoursToFetch);
+                fromTime = toTime - T.hours(hoursToFetch).msecs();
                 endTime = toTime;
             }
 
diff --git a/app/src/main/java/info/nightscout/utils/DateUtil.java b/app/src/main/java/info/nightscout/utils/DateUtil.java
index ca13381e37..c2164fd40e 100644
--- a/app/src/main/java/info/nightscout/utils/DateUtil.java
+++ b/app/src/main/java/info/nightscout/utils/DateUtil.java
@@ -179,9 +179,4 @@ public class DateUtil {
     public static long roundDateToSec(long date) {
         return date - date % 1000;
     }
-
-    public static long hourToMs(long hour) {
-        return hour * 60 * 60 * 1000L;
-    }
-
 }

From bb301717772025bd89bc245dbba35da1e1d7b279 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 2 Jul 2018 10:53:09 +0200
Subject: [PATCH 3/7] fix typo in poctech driver

---
 .../java/info/nightscout/androidaps/Services/DataService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/Services/DataService.java b/app/src/main/java/info/nightscout/androidaps/Services/DataService.java
index 9f3873cb93..ca7d760cc4 100644
--- a/app/src/main/java/info/nightscout/androidaps/Services/DataService.java
+++ b/app/src/main/java/info/nightscout/androidaps/Services/DataService.java
@@ -289,7 +289,7 @@ public class DataService extends IntentService {
                 bgReading.direction = json.getString("direction");
                 bgReading.date = json.getLong("date");
                 bgReading.raw = json.getDouble("raw");
-                if (JsonHelper.safeGetString(json, "utils", Constants.MGDL).equals("mmol/L"))
+                if (JsonHelper.safeGetString(json, "units", Constants.MGDL).equals("mmol/L"))
                     bgReading.value = bgReading.value * Constants.MMOLL_TO_MGDL;
                 boolean isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "Poctech");
                 if (isNew && SP.getBoolean(R.string.key_dexcomg5_nsupload, false)) {

From 4919986dc04153cfcc217c1b584764fb3a154c29 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 2 Jul 2018 12:18:49 +0200
Subject: [PATCH 4/7] setup wizard for pumpcontrol

---
 .../androidaps/setupwizard/SWDefinition.java  | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
index a8402dc1a5..c1669b73d0 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java
@@ -19,6 +19,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import info.nightscout.androidaps.BuildConfig;
+import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.PreferencesActivity;
 import info.nightscout.androidaps.R;
@@ -87,7 +88,7 @@ public class SWDefinition {
     }
 
     SWDefinition() {
-        if (BuildConfig.FLAVOR.equals("full"))
+        if (BuildConfig.FLAVOR.equals("full") || BuildConfig.FLAVOR.equals("pumpcontrol"))
             SWDefinitionFull();
         else if (BuildConfig.FLAVOR.equals("nsclient"))
             SWDefinitionNSClient();
@@ -368,6 +369,7 @@ public class SWDefinition {
                         })
                         .visibility(() -> MainApp.getConfigBuilder().getActiveAPS() != null && ((PluginBase) MainApp.getConfigBuilder().getActiveAPS()).getPreferencesId() > 0))
                 .validator(() -> MainApp.getConfigBuilder().getActiveAPS() != null)
+                .visibility(() -> Config.APS)
         )
         .add(new SWScreen(R.string.configbuilder_loop)
                 .skippable(false)
@@ -386,7 +388,7 @@ public class SWDefinition {
                         })
                         .visibility(() -> !LoopPlugin.getPlugin().isEnabled(PluginType.LOOP)))
                 .validator(() -> LoopPlugin.getPlugin().isEnabled(PluginType.LOOP))
-                .visibility(() -> !LoopPlugin.getPlugin().isEnabled(PluginType.LOOP))
+                .visibility(() -> !LoopPlugin.getPlugin().isEnabled(PluginType.LOOP) && Config.APS)
         )
         .add(new SWScreen(R.string.configbuilder_sensitivity)
                 .skippable(false)
@@ -428,18 +430,18 @@ public class SWDefinition {
                         })
                         .visibility(() -> !ObjectivesPlugin.getPlugin().isFragmentVisible()))
                 .validator(() -> ObjectivesPlugin.getPlugin().isEnabled(PluginType.CONSTRAINTS))
-                .visibility(() -> !ObjectivesPlugin.getPlugin().isFragmentVisible())
+                .visibility(() -> !ObjectivesPlugin.getPlugin().isFragmentVisible() && Config.APS)
         )
         .add(new SWScreen(R.string.objectives)
-                        .skippable(false)
-                        .add(new SWInfotext()
-                                .label(R.string.startobjective))
-                        .add(new SWBreak())
-                        .add(new SWFragment(this)
-                                .add(new ObjectivesFragment()))
-                        .validator(() -> ObjectivesPlugin.getPlugin().objectives.get(0).isStarted())
-                        .visibility(() -> !ObjectivesPlugin.getPlugin().objectives.get(0).isStarted())
-                )
+                .skippable(false)
+                .add(new SWInfotext()
+                        .label(R.string.startobjective))
+                .add(new SWBreak())
+                .add(new SWFragment(this)
+                        .add(new ObjectivesFragment()))
+                .validator(() -> ObjectivesPlugin.getPlugin().objectives.get(0).isStarted())
+                .visibility(() -> !ObjectivesPlugin.getPlugin().objectives.get(0).isStarted() && Config.APS)
+        )
         ;
     }
 

From 917ddf0cbe0d453c2a0a899dc20c386f8ac7093e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 2 Jul 2018 15:04:09 +0200
Subject: [PATCH 5/7] CS translations

---
 .../main/res/layout/activity_setupwizard.xml  |   4 +-
 app/src/main/res/values-cs/strings.xml        | 132 +++++++++++++++++-
 app/src/main/res/values-es/strings.xml        |   2 +-
 app/src/main/res/values/strings.xml           |  13 +-
 4 files changed, 139 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/layout/activity_setupwizard.xml b/app/src/main/res/layout/activity_setupwizard.xml
index 79dd6ed6f7..8510abd33f 100644
--- a/app/src/main/res/layout/activity_setupwizard.xml
+++ b/app/src/main/res/layout/activity_setupwizard.xml
@@ -74,7 +74,7 @@
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
             android:onClick="showPreviousPage"
-            android:text="@string/setupwizard_previous"
+            android:text="@string/previous_button"
             android:textColor="#FFFFFF" />
 
         <View
@@ -88,7 +88,7 @@
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
             android:onClick="showNextPage"
-            android:text="@string/setupwizard_next"
+            android:text="@string/next_button"
             android:textColor="#FFFFFF" />
 
         <Button
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 5094c94624..61b98d75c9 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -289,7 +289,7 @@
     <string name="quickwizard">Rychlý bolus</string>
     <string name="quickwizardsettings">Nastavení rychlých bolusů</string>
     <string name="mealbolus">Bolus</string>
-    <string name="ko_lang">Korean</string>
+    <string name="ko_lang">Korejština</string>
     <string name="correctionbous">Korekce</string>
     <string name="actions">Akce</string>
     <string name="androidaps_start">AndroidAPS restartován</string>
@@ -931,4 +931,134 @@
     <string name="openapsama_current_basal_safety_multiplier">Max násobitel současného bazálu</string>
     <string name="value_unavailable_short">---</string>
     <string name="ns_autobackfill_title">Doplňování glykémíí z NS</string>
+    <string name="description_actions">Přístup k běžně používaným úkonům</string>
+    <string name="description_careportal">Zadávání událostí pro management diabetu</string>
+    <string name="description_config_builder">Nastavení konfigurace (povolování součástí systému)</string>
+    <string name="description_objectives">Výukový program</string>
+    <string name="description_food">Zobrazení jídel definovaných v NS</string>
+    <string name="description_insulin_rapid">Předvolba pro Novorapid</string>
+    <string name="description_insulin_ultra_rapid">Předvolba pro Fiasp</string>
+    <string name="description_insulin_free_peak">Možnost definice vrcholu účinnosti insulínu pro pokročilé uživatele</string>
+    <string name="description_loop">Povolení nebo zakázání smyčky</string>
+    <string name="description_ns_client">Synchronizace dat s Nightscoutem</string>
+    <string name="description_ma">Stav algoritmu v roce 2016</string>
+    <string name="description_ama">Stav algoritmu v roce 2017</string>
+    <string name="description_smb">Nejnovější algoritmus pro pokročilé uživatele</string>
+    <string name="description_overview">Zobrazení stavu a informací. Přístup k nejběžnejším ovládacím prvkům</string>
+    <string name="description_persistent_notification">Zobrazení průběžného oznámení v Androidu s krátkým přehledem, co smyčka právě dělá</string>
+    <string name="description_profile_local">Definice profilu přístupného pouze v AndroidAPS (a i bez internetu)</string>
+    <string name="description_profile_nightscout">Použití profilu definovaného v Nightscoutu</string>
+    <string name="description_profile_simple">Jednoduchý profil s jedním časovým pásmem</string>
+    <string name="description_pump_combo">Ovladač pumpy pro Accu-Check Combo. Vyžaduje nainstalovanou aplikaci Ruffy</string>
+    <string name="description_pump_dana_r">Ovladač pumpy pro DanaR</string>
+    <string name="description_pump_dana_r_korean">Ovladač pumpy pro korejskou verzi DanaR</string>
+    <string name="description_pump_dana_r_v2">Ovladač pumpy pro DanaR s upgradovaným firmwarem</string>
+    <string name="description_pump_dana_rs">Ovladač pumpy pro DanaRS</string>
+    <string name="description_pump_insight">Ovladač pumpy pro Accu-Check Insight. Vyžaduje nainstalovanou aplikaci SightRemote</string>
+    <string name="description_pump_mdi">Ovladač pumpy pro uživatele inzulínových per</string>
+    <string name="description_pump_virtual">Ovladač pumpy pro uživatele bez podporované pumpy (Otevřená smyčka)</string>
+    <string name="description_sensitivity_aaps">Citlivost je počítána stejným způsobem jako v Oref0, ale je možné specifikovat dobu do minulosti. Minimální absorbce sacharidů je počítána dynamicky z maximální doby absorbce definované v nastavení.</string>
+    <string name="description_sensitivity_oref0">Citlivost je počítána za 24h a sacharidy, pokud nejsou absorbované, jsou oříznuty po čase definovaném v nastavení.</string>
+    <string name="description_sensitivity_oref1">Citlivost je počítána za 8h a sacharidy, pokud nejsou absorbované, jsou oříznuty po čase definovaném v nastavení. Je také zároveň vyhodnocováno UAM (neoznámené jídlo)</string>
+    <string name="description_sensitivity_weighted_average">Cislivost je počítána jako vážený průměr z odchylek. Novější mají vyšší prioritu. Minimální absorbce sacharidů je počítána dynamicky z maximální doby absorbce definované v nastavení. Tento algoritmus sleduje nejrychlejí změny citlivosti.</string>
+    <string name="description_source_dexcom_g5">Příjem glykémií z modifikované Dexcom G5 aplikace</string>
+    <string name="description_source_glimp">Příjem glykémií z Glimpu</string>
+    <string name="description_source_mm640g">Příjem glykémií z Uploaderu 640G</string>
+    <string name="description_source_ns_client">Příjem glykémií z Nightscoutu</string>
+    <string name="description_source_xdrip">Příjem glykémií z xDripu</string>
+    <string name="description_treatments">Ukládá všechny ošetření do databáze.</string>
+    <string name="description_wear">Zobrazování stavu a řízení AndroidAPS z hodinek s WearOS</string>
+    <string name="description_xdrip_status_line">Zobrazování informací o smyčce na xDrip+ watchfacu</string>
+    <string name="description_sms_communicator">Vzdálené řizení pomocí SMS příkazů</string>
+    <string name="configbuilder_pump_description">Jakou pumpu chcete používat s AndroidAPS?</string>
+    <string name="configbuilder_treatments_description">Jaký plugin chcete používat pro ukládání informací?</string>
+    <string name="configbuilder_profile_description">Jaký profil má AndroidAPS používat?</string>
+    <string name="configbuilder_aps_description">Jaký algorimus má AndroidAPS používat?</string>
+    <string name="configbuilder_general_description">Obecné pluginy, které by se Vám mohly hodit.</string>
+    <string name="configbuilder_constraints_description">Jaká omezení byla použita?</string>
+    <string name="configbuilder_loop_description">Interagrace smyčky do AndroidAPS.</string>
+    <string name="configbuilder_bgsource_description">Odkud má získávat AndroidAPS glykémie?</string>
+    <string name="pl_lang">Polština</string>
+    <string name="objectives_7_gate">Přečíst si wiki 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="deletefuturetreatments">Smazat události v budoucnosti</string>
+    <string name="configbuilder_insulin_description">Jaký druh inzulínu používáte?</string>
+    <string name="configbuilder_sensitivity_description">Jaký druh algoritmu pro detekci citlivosti chcete použít?</string>
+    <string name="sensitivityoref1">Sensitivita Oref1</string>
+    <string name="keep_screen_on_title">Nechat obrazovku zapnutou</string>
+    <string name="keep_screen_on_summary">Zabránit Androidu ve zhasínání obrazovky. Bez připojení do nabíječky vybije velice rychle baterii!</string>
+    <string name="poctech_upload">Nastavení nahrávání z Poctech</string>
+    <string name="maximumbasalvaluereplaced">Hodnota bazálu nahrazena maximální možnou</string>
+    <string name="combo_error_bolus_verification_failed">Podání bolusu a kontrola historie pumpy selhala. Zkontrolujte pumpu ručně. Pokus bolus proběhl, načte se při přístím připojení automaticky.</string>
+    <string name="next_button">Další</string>
+    <string name="previous_button">Zpět</string>
+    <string name="skip_button">Přeskočit</string>
+    <string name="nav_setupwizard">Průvodce nastavením</string>
+    <string name="setupwizard_finish">Dokončit</string>
+    <string name="setupwizard_language_prompt">Vyberte jazyk</string>
+    <string name="ga_lang">Irština</string>
+    <string name="wear_wizard_settings">Nastavení wizardu</string>
+    <string name="wear_display_settings">Nastavení zobrazení</string>
+    <string name="wear_wizard_settings_summary">Kalkulace použité ve výsledku wizardu:</string>
+    <string name="wear_general_settings">Obecné nastavení</string>
+    <string name="enable_nsclient">Povolit NSClient</string>
+    <string name="welcometosetupwizard">Vítejte v průvodci nastavením. Provede Vás procesem nastavení programu.</string>
+    <string name="pumpsetup">Nastavení pumpy</string>
+    <string name="readstatus">Načíst status</string>
+    <string name="adjustprofileinns">Změny musí být prováděny v NS</string>
+    <string name="exitwizard">Přeskočit průvodce</string>
+    <string name="setupwizard_loop_description">Stikněte tlačitko níže pro povolení AndroidAPS navrhovat nebo provádět změny bazálu</string>
+    <string name="setupwizard_objectives_description">Stikněte tlačitko níže pro povolení Cílů. Po zkončení průvodce přejděte na záložku Cílů, abyste získali všechny funkce AndroidAPS.</string>
+    <string name="enableobjectives">Povolit Cíle</string>
+    <string name="apssetup">Nastavení APS</string>
+    <string name="sensitivitysetup">Nastavení senzitivity</string>
+    <string name="setupwizard_sensitivity_description">Plugin senzitivita slouží k detekci změn v senzitivitě a k počítání COB. Více informací zde:</string>
+    <string name="nsclientinfotext">NSClient slouží ke s pojení s Nightscoutem. Nastavení můžete nyní přeskočit, ale nebudete schopni dokončit cíle, dokud nastavení neprovedete.</string>
+    <string name="diawarning">Pozor: Nové inzulínové profilyvyžadují DIA minimálně 5h. DIA 5-6 hodin odpovídá zhruba nastavení 3h na starších typech profilů nebo v pumpě.</string>
+    <string name="bgsourcesetup">Konfigurace zdroje glykémií</string>
+    <string name="setupwizard_profile_description">Vyberte zdroj profilů. Pokud jde o dítě, využijte nejspíš NS profil. Pokud Vás nikdo přes NS nesleduje, budete patrně preferovat Místní profil. Uvědomte si, že nastavujete pouze zdroj profilů. Na to aby se opravdu profil začal používat, je třeba provést aktivaci profilu použitím \"Přepnutí profilu\"</string>
+    <string name="setupwizard_aps_description">Vyberte jeden z algoritmů. Jsou setříděné od nejstaršího po nejnovější. Novější je obvikle lepší a agresivnější, ale vyžaduje přesnější nastavení. Proto pokud se smyčkou začínáte, mely byste nejříve vybrat jen AMA a ne ten posldní. Nezapomeňte si přečíst dokumentaci OpenAPS a provést nastavení, než ho začnete používat.</string>
+    <string name="startobjective">Spusťte první cíl</string>
+    <string name="permission">Povolení</string>
+    <string name="askforpermission">Získat povolení</string>
+    <string name="needlocationpermission">Aplikace vyžaduje povolení \"umístění\", aby mohla vyhledávat BT zařízení</string>
+    <string name="needstoragepermission">Aplikace vyžaduje přístup k úložišti, aby mohla ukládat logy.</string>
+    <string name="request">Požadavek</string>
+    <string name="insulinsourcesetup">Nastavení inzulínu</string>
+    <string name="exit">Konec</string>
+    <string name="danar_useroptions">Uživatelská nastavení</string>
+    <string name="danar_timedisplay">Formát času</string>
+    <string name="danar_buttonscroll">Posun při stisknutí tlačítka</string>
+    <string name="danar_beep">Zvuk při stisknutí tlačítka</string>
+    <string name="danar_pumpalarm">Alarm</string>
+    <string name="danar_pumpalarm_sound">Zvuk</string>
+    <string name="danar_pumpalarm_vibrate">Vibrace</string>
+    <string name="danar_pumpalarm_both">Oboje</string>
+    <string name="danar_screentimeout">Čas před vypnutím dipleje [s]</string>
+    <string name="danar_backlight">Podsvícení [s]</string>
+    <string name="danar_glucoseunits">Jednotky</string>
+    <string name="danar_saveuseroptions">Uložit do pumpy</string>
+    <string name="option_on">ZAP</string>
+    <string name="option_off">VYP</string>
+    <string name="danar_lowreservoir">Nízký stav zásobníku [U]</string>
+    <string name="danar_shutdown">Vypnutí [h]</string>
+    <string name="open_navigation">Otevřít menu</string>
+    <string name="close_navigation">Zavřít menu</string>
+    <string name="nav_plugin_preferences">Nastavení pluginu</string>
+    <string name="completed_well_done">Hotovo, gratulujeme!</string>
+    <string name="not_completed_yet">Nedokončeno</string>
+    <string name="time_elapsed">Čas</string>
+    <string name="nth_objective">%1$d. cíl</string>
+    <string name="poctech">Poctech</string>
+    <string name="description_source_poctech">Získávat glykémie z aplikace Poctech</string>
+    <string name="high_temptarget_raises_sensitivity_title">Vysoký dočasný cíl zvýší senzitivitu</string>
+    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Zvýšní senzitivity pro dočasné cíle >= 5.5]]></string>
+    <string name="low_temptarget_lowers_sensitivity_title">Nízký dočasný cíl zníží senzitivitu</string>
+    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Nižší senzitivita pro dočasné cíle < 5.5]]></string>
+    <string name="combo_invalid_setup">Chybné nastavení pumpy. Projděte si dokumentaci a presvěčte se, že menu Quick Info se zmenuje QUICK INFO, za použití 360 configuration software</string>
+    <string name="custom">Volitelný</string>
+    <string name="largetimedifftitle">Velký rozdíl v času</string>
+    <string name="largetimediff">"Velký rozdíl v času: 4as v pumpě se liší alespoň o 1,5 h. Prosím upravte čas v pumpě ručně a vymažte historri pumpy, pokud je to třeba, prípadně pozastavte smyčku alespoň na \"DIA\" hodin "</string>
+    <string name="careportal_removestartedevents">Vyčistit události \"AndroidAPS restartován\"</string>
+    <string name="storedsettingsfound">Nalezeno uložené nastavení</string>
+    <string name="allow_hardware_pump_text">POZOR: Pokud aktivuje a připojíte skutečnou pumpu, AndroidAPS nakopíruje (a bude udržovat) nastavení bazálu z aktivního profilu do pumpy. Nastavení bazálu v pumpě bude přepsáno. Pokud si nejste jistý nebo nechcete přepsat bazály v pumpě, stiskněte Zrušit a opakujte přepnutí na jinou pumpu později.</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index aa5734631d..151c63cbe2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -334,7 +334,7 @@
     <string name="sv_lang">Sueco</string>
     <string name="openapsma_maxbasal_title">Max U/h para el perfil base</string>
     <string name="openapsma_maxiob_title">"Max IOB basal OpenAPs puede emitir "</string>
-    <string name="smscommunicator_calibratiónreplywithcode">Para enviar calibracion %1$.2f responder con código %2$s</string>
+    <string name="smscommunicator_calibrationreplywithcode">Para enviar calibracion %1$.2f responder con código %2$s</string>
     <string name="bolusrequested" formatted="false">Entregaré %.2fU</string>
     <string name="danarprofile_dia_summary">Duración de acitividad de insulina</string>
     <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a55e0ed1be..1fe896da1c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
     <string name="description_actions">Some buttons to quickly access common features</string>
     <string name="description_careportal">Enter advanced log book entries.</string>
     <string name="description_config_builder">Used for configuring the active plugins</string>
-    <string name="description_objectives">Helps you to get started with AndroidAPS</string>
+    <string name="description_objectives">Learning program</string>
     <string name="description_food">Displays the food presets defined in Nightscout</string>
     <string name="description_insulin_rapid">Insulin preset for Humalog and NovoRapid / NovoLog</string>
     <string name="description_insulin_ultra_rapid">Insulin preset for Fiasp</string>
@@ -1063,14 +1063,11 @@
     <string name="time">Time</string>
     <string name="key_show_notes_entry_dialogs" translatable="false">show_notes_entry_dialogs</string>
     <string name="overview_show_notes_field_in_dialogs_title">Show notes field in treatment dialogs</string>
-    <string name="title_activity_setup_wizard">SetupWizardActivity</string>
+    <string name="title_activity_setup_wizard" translatable="false">SetupWizardActivity</string>
     <string name="next_button">Next</string>
     <string name="previous_button">Prev</string>
     <string name="skip_button">Skip</string>
     <string name="nav_setupwizard">Setup Wizard</string>
-    <string name="setupwizard_next">Next</string>
-    <string name="setupwizard_previous">Prev</string>
-    <string name="setupwizard_skip">Skip</string>
     <string name="setupwizard_finish">FINISH</string>
     <string name="setupwizard_language_prompt">Select your language</string>
     <string name="key_language" translatable="false">language</string>
@@ -1147,8 +1144,8 @@
     <string name="danar_pumpalarm_sound">Sound</string>
     <string name="danar_pumpalarm_vibrate">Vibrate</string>
     <string name="danar_pumpalarm_both">Both</string>
-    <string name="danar_screentimeout">LCD on time(seconds)</string>
-    <string name="danar_backlight">Backlight on time(seconds)</string>
+    <string name="danar_screentimeout">LCD on time [s]</string>
+    <string name="danar_backlight">Backlight on time [h]</string>
     <string name="danar_glucoseunits">Glucose units</string>
     <string name="danar_shutdown">Shutdown(hours)</string>
     <string name="danar_lowreservoir">Low reservoir (Units)</string>
@@ -1170,7 +1167,7 @@
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Raise sensitivity for temptargets >= 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Low temptarget lowers sensitivity</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Lower sensitivity for temptargets < 100]]></string>
-    <string name="combo_invalid_setup">Invalid pump setup, check the docs and verify that the Quick Info menu is named "QUICK INFO" using the 360 configuration software.</string>
+    <string name="combo_invalid_setup">Invalid pump setup, check the docs and verify that the Quick Info menu is named QUICK INFO using the 360 configuration software.</string>
     <string name="custom">Custom</string>
     <string name="key_lockscreen" translatable="false">lockscreen</string>
     <string name="largetimedifftitle">Large Time Difference</string>

From 60e9ea05a86072fc889059fc6959a2e6d0b5ee06 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 2 Jul 2018 15:52:20 +0200
Subject: [PATCH 6/7] fix objectives typo

---
 .../plugins/ConstraintsObjectives/objectives/Objective4.java    | 2 +-
 .../plugins/ConstraintsObjectives/objectives/Objective8.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective4.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective4.java
index 7700c94cb6..36a98babc1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective4.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective4.java
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.plugins.ConstraintsSafety.SafetyPlugin;
 public class Objective4 extends Objective {
 
     public Objective4() {
-        super(3, R.string.objectives_3_objective, R.string.objectives_4_gate);
+        super(3, R.string.objectives_3_objective, R.string.objectives_3_gate);
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective8.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective8.java
index 70d75fd900..376d5fb7a2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective8.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/objectives/Objective8.java
@@ -7,7 +7,7 @@ import info.nightscout.androidaps.R;
 public class Objective8 extends Objective {
 
     public Objective8() {
-        super(7, R.string.objectives_7_objective, 0);
+        super(7, R.string.objectives_7_objective, R.string.objectives_7_gate);
     }
 
     @Override

From 375025f7f0d4ebd30d5b0dd62ab96fa9653bdacb Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 2 Jul 2018 15:55:52 +0200
Subject: [PATCH 7/7] remove unused string

---
 app/src/main/res/values-bg/strings.xml |  9 ---
 app/src/main/res/values-cs/strings.xml | 14 -----
 app/src/main/res/values-de/strings.xml |  9 ---
 app/src/main/res/values-el/strings.xml |  8 ---
 app/src/main/res/values-es/strings.xml | 14 -----
 app/src/main/res/values-fr/strings.xml | 11 ----
 app/src/main/res/values-ga/strings.xml | 28 ----------
 app/src/main/res/values-it/strings.xml |  6 --
 app/src/main/res/values-ko/strings.xml |  8 ---
 app/src/main/res/values-nl/strings.xml | 16 +-----
 app/src/main/res/values-pl/strings.xml | 14 -----
 app/src/main/res/values-ro/strings.xml | 16 ------
 app/src/main/res/values-ru/strings.xml |  8 ---
 app/src/main/res/values-sv/strings.xml | 77 --------------------------
 app/src/main/res/values/strings.xml    | 13 -----
 wear/src/main/res/values/strings.xml   |  7 ---
 16 files changed, 1 insertion(+), 257 deletions(-)

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 17a44d8fee..1cdbfd1393 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -12,8 +12,6 @@
     <string name="danar_bt_name_title">DanaR Bluetooth устройство</string>
     <string name="ns_sync_use_absolute_title">Използване на абсолютни стойности за базал</string>
     <string name="alert_dialog_storage_permission_text">Рестартирайте телефона или AndroidAPS от системните настройки или Android APS няма да записва проблемите (което е важно за работата на алгоритъма)!</string>
-    <string name="objectives_objective_label_string">Цел:</string>
-    <string name="objectives_gate_label_string">Действие:</string>
     <string name="objectives_button_start">Стартирай</string>
     <string name="objectives_button_verify">Провери</string>
     <string name="nsprofileview_units_label">Единици</string>
@@ -83,7 +81,6 @@
     <string name="configbuilder_aps">Алгоритъм за APS</string>
     <string name="configbuilder_general">Общи</string>
     <string name="days">дни</string>
-    <string name="objectives_minimalduration">Минимална продължителност</string>
     <string name="constraints">Ограничения</string>
     <string name="loop">Loop</string>
     <string name="configbuilder_loop">Loop</string>
@@ -197,7 +194,6 @@
     <string name="connected">Свързана</string>
     <string name="disconnected">Не е сврзана</string>
     <string name="danar_pump_settings">DanaR настройки</string>
-    <string name="nightscout">Nightscout</string>
     <string name="end_user_license_agreement">End User License Agreement</string>
     <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">Разбирам и приемам</string>
@@ -425,7 +421,6 @@
     <string name="copied_to_clipboard">Копирано</string>
     <string name="nav_show_logcat">Покажи лог</string>
     <string name="overview_calibration">Калибрация</string>
-    <string name="overview_calibration_bg_label">Калибрация</string>
     <string name="send_calibration" formatted="false">Изпрати калибрация %.1f на xDrip?</string>
     <string name="xdripnotinstalled">xDrip+ не е инсталиран</string>
     <string name="calibrationsent">Калибрацията е изпратена към xDrip</string>
@@ -470,8 +465,6 @@
     <string name="adult">Възрастен</string>
     <string name="patientage_summary">Изберете възраст за определяне лимитите на безопасност</string>
     <string name="Glimp">Glimp</string>
-    <string name="batteryoptimalizationerror">Устройството изглежда не подържа изключване на оптимизиране на батерията!</string>
-    <string name="pleaseallowpermission">Моля, добавете рарешение</string>
     <string name="needwhitelisting" formatted="false">%s се нуждае от зключване на оптимизиране на батерията за пълна функционалност</string>
     <string name="loopsuspended">Loop изключен</string>
     <string name="loopsuspendedfor" formatted="false">Изключен (%d мин)</string>
@@ -499,7 +492,6 @@
     <string name="fastactinginsulin">Бързодействащ инсулин</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
     <string name="insulin_shortname">ИНС</string>
-    <string name="fastactinginsulinprolonged">Бързодействащ инсулин с удължение</string>
     <string name="enablesuperbolus">Разреши използването на Суперболус</string>
     <string name="enablesuperbolus_summary">Разреши функцията суперболус в съветника. Не я разрешавайте докато не научите какво наистина прави. ТОВА МОЖЕ ДА СЪЗДАДЕ ОПАСНОСТ ОТ ПРЕДОЗИРАНЕ С ИНСУЛИН.</string>
     <string name="iob">IOB</string>
@@ -626,7 +618,6 @@
     <string name="closedmodeenabled">Closed Loop е позволен</string>
     <string name="combo_activity_reading_pump_history">Чете историята на помпата</string>
     <string name="combo_activity_setting_basal_profile">Настройва базалният профил</string>
-    <string name="combo_error_bolus_recovery_progress">Опитва се да възстанови връзката</string>
     <string name="danar_setbasalstep001">Задайте стъпка на базала 0.01 Е/ч</string>
     <string name="DexcomG5">Dexcom G5 приложение (модифицирано)</string>
     <string name="dexcomg5_nsupload_title">Качвай данните за КЗ в NS</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 61b98d75c9..9d83680f00 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -70,7 +70,6 @@
     <string name="loop_smbsetbypump_label">SMB provedené pumpou</string>
     <string name="loopdisabled">SMYČKA ZAKÁZÁNA OMEZENÍM</string>
     <string name="objectives_manualenacts">Ručně spuštěno</string>
-    <string name="objectives_minimalduration">Minimální trvání</string>
     <string name="nav_exit">Ukončit</string>
     <string name="nav_preferences">Nastavení</string>
     <string name="nav_refreshtreatments">Aktualizuj ošetření z NS</string>
@@ -88,8 +87,6 @@
     <string name="objectives">Cíle</string>
     <string name="objectives_button_start">Začátek</string>
     <string name="objectives_button_verify">Kontrola</string>
-    <string name="objectives_gate_label_string">Splnit:</string>
-    <string name="objectives_objective_label_string">Cíl:</string>
     <string name="ok">OK</string>
     <string name="openapsma_currenttemp_label">Současný bazál</string>
     <string name="openapsma_disabled">Modul zakázán</string>
@@ -179,7 +176,6 @@
     <string name="disconnected">Odpojeno</string>
     <string name="danar_bt_name_title">DanaR Bluetooth zařízení</string>
     <string name="danar_pump_settings">DanaR nastavení</string>
-    <string name="nightscout">Nightscout</string>
     <string name="absolute">Absolutní</string>
     <string name="comment">Komentář</string>
     <string name="connectionerror">Chyba připojování pumpy</string>
@@ -410,7 +406,6 @@
     <string name="error_phone_not_valid">Neplatné telefonní číslo</string>
     <string name="calibrationsent">Kalibrace odeslána do xDripu</string>
     <string name="overview_calibration">Kalibrace</string>
-    <string name="overview_calibration_bg_label">Kalibrační glykémie</string>
     <string name="send_calibration">Poslat do xDripu kalibraci %.1f ?</string>
     <string name="xdripnotinstalled">xDrip+ není nainstalován</string>
     <string name="smscommunicator_calibrationfailed">xDrip nepřijímá kalibrace</string>
@@ -462,7 +457,6 @@
     <string name="wear_detailedIOB_title">Zobrazit detailní IOB</string>
     <string name="wear_settings">Nastavení hodinek</string>
     <string name="Glimp">Glimp</string>
-    <string name="batteryoptimalizationerror">Zařízení patrně nepodporuje vyloučení z optimalizace baterie.</string>
     <string name="disconnectpumpfor1h">Odpojit pumpu na 1 h</string>
     <string name="disconnectpumpfor2h">Odpojit pumpu na 2 h</string>
     <string name="disconnectpumpfor15m">Odpojit pumpu na 15 min</string>
@@ -472,7 +466,6 @@
     <string name="loopsuspended">Smyčka pozastavena</string>
     <string name="loopsuspendedfor" formatted="false">Pozastaveno (%d min)</string>
     <string name="needwhitelisting">%s potřebuje vypnout optimalizace baterie pro optimální výkon</string>
-    <string name="pleaseallowpermission">Prosím povolte oprávnění</string>
     <string name="resume">Uvolnit</string>
     <string name="suspendloopfor10h">Pozastavit smyčku na 10 h</string>
     <string name="suspendloopfor1h">Pozastavit smyčku na 1 h</string>
@@ -488,7 +481,6 @@
     <string name="restartingapp">Ukončuji aplikaci, aby se nastavení projevilo.</string>
     <string name="configbuilder_insulin">Inzulín</string>
     <string name="fastactinginsulin">Rychlý inzulín</string>
-    <string name="fastactinginsulinprolonged">Rychlý inzulín prodloužený</string>
     <string name="insulin_shortname">INZ</string>
     <string name="loopsuperbolusfor">Superbolus (%d m)</string>
     <string name="treatments_wizard_bgtrend_label">15min trend</string>
@@ -706,7 +698,6 @@
     <string name="combo_pump_cartridge_low_warrning">V zásobníku je málo inzulínu</string>
     <string name="combo_pump_battery_low_warrning">Slabá baterie v pumpě</string>
     <string name="combo_is_in_error_state">Pumpa hlásí chybu E%1$d: %2$s</string>
-    <string name="combo_error_bolus_recovery_progress">Pokouším se obnovit spojení</string>
     <string name="combo_error_no_bolus_delivered">Provádění bolusu selhalo. Zdá se, že žádný bolus nebyl podán. Zkontrolujte pumpu a případně pošlete bolus znovu. Jako bezpečnostní opatření podání bolusu není opakováno.</string>
     <string name="combo_error_partial_bolus_delivered">Pouze %1$.2f U z bolusu %2$.2f bylo podáno díky chybě. Zkontrolujte pumpu a proveďte nápravu.</string>
     <string name="combo_pump_tbr_cancelled_warrning">Varování o ukončeném dočasném bazálu bylo potvrzeno.</string>
@@ -741,8 +732,6 @@
     <string name="insight_history_busy">ZANEPRÁZDNĚN</string>
     <string name="insight_history_syncing">SYNCHRONIZUJI</string>
     <string name="insight_history_idle">NEČINNÝ</string>
-    <string name="insight_actually_cancel_tbr_summary">Momentálně zruší dočasný bazál (spouští alarm na pumpě) místo nastavení 90% na 1 min</string>
-    <string name="insight_use_real_tbr_cancels">Použít skutečné ukončení dočasného bazálu</string>
     <string name="insight_stay_always_connected">Zůstat stále připojený</string>
     <string name="insight_not_connected_to_companion_app">Nepřipojen k podpůrné aplikaci!</string>
     <string name="insight_companion_app_not_installed">Podpůrná aplikace patrně není nainstalovaná!</string>
@@ -840,8 +829,6 @@
     <string name="alert_w32">Varování W32: Nízký stav baterie</string>
     <string name="alert_w33">Varování W33: Chybný datum/čas</string>
     <string name="alert_w34">Varování W34: Konec záruky</string>
-    <string name="alert_w36">Varování W36: Ukončení dočasného bazálu</string>
-    <string name="alert_w38">Varování W38: Bolus přerušen</string>
     <string name="alert_m20">Údržba M20: Není vložený zásobník</string>
     <string name="alert_m21">Údržba M21: Zásobník prázdný</string>
     <string name="alert_m22">Údržba M22: Prázdná baterie</string>
@@ -991,7 +978,6 @@
     <string name="combo_error_bolus_verification_failed">Podání bolusu a kontrola historie pumpy selhala. Zkontrolujte pumpu ručně. Pokus bolus proběhl, načte se při přístím připojení automaticky.</string>
     <string name="next_button">Další</string>
     <string name="previous_button">Zpět</string>
-    <string name="skip_button">Přeskočit</string>
     <string name="nav_setupwizard">Průvodce nastavením</string>
     <string name="setupwizard_finish">Dokončit</string>
     <string name="setupwizard_language_prompt">Vyberte jazyk</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5a92850be1..d7e21bf808 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -121,8 +121,6 @@
     <string name="openapsma_lastenact_label">Zuletzt abgegeben</string>
     <string name="openapsma_disabled">Plugin ist deaktiviert</string>
     <string name="openapsma_currenttemp_label">Aktuelle TBR</string>
-    <string name="objectives_gate_label_string">Beschränkung:</string>
-    <string name="objectives_objective_label_string">Ziel:</string>
     <string name="objectives">Zielsetzungen</string>
     <string name="noprofileset">KEIN PROFIL GESETZT</string>
     <string name="nsclientnotinstalled">Nightscout-Client ist nicht installiert. Eintrag verloren!</string>
@@ -153,7 +151,6 @@
     <string name="objectives_manualenacts">Manuelle Aktionen</string>
     <string name="carbsconstraintapplied">Kohlenhydrat-Beschränkung erreicht</string>
     <string name="nav_resetdb">Datenbanken zurücksetzen</string>
-    <string name="objectives_minimalduration">Minimale Dauer</string>
     <string name="nav_refreshtreatments">Erneure Behandlungen von NS</string>
     <string name="nav_exit">Exit</string>
     <string name="missing">Fehlend</string>
@@ -169,7 +166,6 @@
     <string name="openapsma_maxbasal_summary">Dieser Wert wird \"max basal\" in OpenAPS genannt</string>
     <string name="openapsma_maxiob_summary">Maximale Menge von nicht Bolus-IOB, die OpenAPs abgeben kann</string>
     <string name="bg_lang">Bulgarian</string>
-    <string name="nightscout">Nightscout</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="absolute">Absolut</string>
     <string name="smscommunicator_bolusfailed">Bolus fehlgeschlagen</string>
@@ -334,7 +330,6 @@
     <string name="basal_short">BAS</string>
     <string name="basal_step">Basal-Schritt</string>
     <string name="basalvaluebelowminimum">Wert der Basalrate unter Minimum. Profil nicht gesetzt!</string>
-    <string name="batteryoptimalizationerror">Smartphone untertützt anscheinend das Deaktivieren der Akku-Leistungsoptimierung nicht!</string>
     <string name="bolus_step">Bolus-Schritt</string>
     <string name="bolusrequested">Werde %.2f IE abgeben</string>
     <string name="careportal_activity_label">AKTIVITÄT &amp; FEEDBACK</string>
@@ -396,7 +391,6 @@
     <string name="extendedbolus">Verlängerter Bolus</string>
     <string name="fastactinginsulin">Fast Acting Insulin</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
-    <string name="fastactinginsulinprolonged">Fast Acting Insulin Prolonged</string>
     <string name="gettingpumpstatus">Pumpenstatus wird geladen</string>
     <string name="hours">Stunden</string>
     <string name="initializing">Initialisierung &#8230;</string>
@@ -445,7 +439,6 @@
     <string name="openapsma_scriptdebugdata_label">Skript Debug</string>
     <string name="valueoutofrange">Wert %1$s ist außerhalb des festen Limits</string>
     <string name="overview_calibration">Kalibrierung</string>
-    <string name="overview_calibration_bg_label">Kalibrierung</string>
     <string name="overview_editquickwizard_buttontext">Button-Text:</string>
     <string name="overview_extendedbolus_cancel_button">Verlängerten Bolus abbrechen</string>
     <string name="overview_newtempbasal_basalabsolute">Basal Wert [IE/h]</string>
@@ -498,7 +491,6 @@
     <string name="openapsma_autosensdata_label">Autosens-Daten</string>
     <string name="openapsma_maxbasal_title">Max IE/h, die als TBR gesetzt werden können</string>
     <string name="openapsma_maxiob_title">Maximales Basal-IOB, das OpenAPS abgeben darf [IE]</string>
-    <string name="pleaseallowpermission">Bitte Rechte gewähren</string>
     <string name="prefs_range_summary">Hoch- und Niedrig-Werte für die Übersicht- und die Smartwatch-Anzeige</string>
     <string name="prefs_range_title">Zielbereich für die Grafikanzeige</string>
     <string name="sensitivity_warning">Stelle bei aktivierter Autosense-Funktion sicher, dass du alle gegessenen Kohlenhydrate eingibst. Ansonsten können die Kohlenhydrate-Abweichung zu falschen Resistenz-/Empfindlichkeitswerten führen!</string>
@@ -672,7 +664,6 @@
     <string name="bolus_frequency_exceeded">Ein gleich großer Bolus wurde in den letzten zwei Minuten angefordert. Dies ist nicht zulässig, um ungewollte Doppelboli zu verhindern und vor eventuellen Bugs zu schützen.</string>
     <string name="combo_activity_reading_pump_history">Historie wird gelesen</string>
     <string name="combo_activity_setting_basal_profile">Basalratenprofil wird aktualisiert</string>
-    <string name="combo_error_bolus_recovery_progress">Verbindung wird wieder hergestellt</string>
     <string name="combo_error_bolus_verification_failed">Der abgegebene Bolus konnte nicht bestätigt werden. Bitte prüfe auf der Pumpe, ob ein Bolus abgegeben wurde. Sofern ein Bolus abgegeben wurde wird dieser zu den Behandlungen hinzugefügt sobald erneut eine Verbindung zur Pumpe zustande kommt.</string>
     <string name="combo_error_no_bolus_delivered">Die Bolusabgabe ist fehlgeschlagen: Es wurde scheinbar kein Bolus abgegeben. Bitte prüfe auf der Pumpe, ob ein Bolus abgegeben wurde. Um doppelte Boli durch Programmfehler zu vermeiden, werden Boli nicht automatisch wiederholt.</string>
     <string name="combo_error_partial_bolus_delivered">Wegen eines Fehlers wurden nur %1$.2f IE von den angeforderten %2$.2f IE abgegeben. Bitte prüfe den abgegebenen Bolus auf der Pumpe.</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index cc10da9117..3dbc1dff28 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -12,8 +12,6 @@
     <string name="danar_bt_name_title">DanaR συσκευή Bluetooth</string>
     <string name="ns_sync_use_absolute_title">"Χρησιμοποιείτε πάντα απόλυτες τιμές βασικού "</string>
     <string name="alert_dialog_storage_permission_text">"Παρακαλώ κάντε reboot στο τηλέφώνο ή restart στο AndroidAPS από τις Ρυθμίσεις Συστήματος, αλλιώς το AndroidAPS δεν θα έχει καταγραφή (επαληθεύστε ότι οι αλγόριθμοι δουλεύουν σωστά)! "</string>
-    <string name="objectives_objective_label_string">Στόχοι:</string>
-    <string name="objectives_gate_label_string">Δράση:</string>
     <string name="objectives_button_start">Έναρξη</string>
     <string name="objectives_button_verify">Επικύρωση</string>
     <string name="nsprofileview_units_label">Μονάδες</string>
@@ -84,7 +82,6 @@
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_general">Γενικά</string>
     <string name="days">ημέρες</string>
-    <string name="objectives_minimalduration">Ελάχ.Διάρκεια</string>
     <string name="constraints">Περιορισμοί</string>
     <string name="loop">Κύκλωμα</string>
     <string name="configbuilder_loop">Κύκλωμα</string>
@@ -193,7 +190,6 @@
     <string name="connected">Συνδέθηκε</string>
     <string name="disconnected">Αποσύνδεση</string>
     <string name="danar_pump_settings">Ρυθμίσεις αντλίας DanaR</string>
-    <string name="nightscout">Nightscout</string>
     <string name="end_user_license_agreement">Άδεια χρήσης τελικού χρήστη</string>
     <string name="end_user_license_agreement_text">ΔΕΝ ΠΡΕΠΕΙ ΝΑ ΧΡΗΣΙΜΟΠΟΙΗΘΕΙ ΓΙΑ ΝΑ ΚΑΝΕΤΕ ΙΑΤΡΙΚΗ ΑΠΟΦΑΣΗ ΔΕΝ ΥΠΑΡΧΕΙ ΕΓΓΥΗΣΗ ΓΙΑ ΤΟ ΠΡΟΓΡΑΜΜΑ, ΣΤΟ ΒΑΘΜΟ ΠΟΥ ΕΠΙΤΡΕΠΕΤΑΙ ΑΠΟ ΤΟ ΕΦΑΡΜΟΣΤΕΟ ΔΙΚΑΙΟ. ΕΚΤΟΣ ΟΠΟΙΑΣΔΗΠΟΤΕ ΔΙΑΒΑΘΜΙΣΜΕΝΗ ΚΑΤΑ ΤΗΝ ΕΓΓΡΑΦΗ ΤΩΝ ΚΑΤΟΧΟΙ ΠΝΕΥΜΑΤΙΚΩΝ ΔΙΚΑΙΩΜΑΤΩΝ ΚΑΙ / Η ΑΛΛΑ ΜΕΡΗ ΠΑΡΕΧΟΝΤΑΙ ΤΟ ΠΡΟΓΡΑΜΜΑ \"ΩΣ ΕΧΕΙ\" ΧΩΡΙΣ ΕΓΓΥΗΣΗ ΟΠΟΙΟΥΔΗΠΟΤΕ ΕΙΔΟΥΣ, ΕΞΑΙΡΟΥΜΕΝΕΣ Ή ΣΙΩΠΗΡΕΣ, ΣΥΜΠΕΡΙΛΑΜΒΑΝΟΜΕΝΩΝ, ΕΝΔΕΙΚΤΙΚΑ, ΤΩΝ ΣΙΩΠΗΡΩΝ ΕΓΓΥΗΣΕΩΝ ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ΚΑΙ ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ . Ο ΟΛΟΚΛΗΡΩΜΕΝΟΣ ΚΙΝΔΥΝΟΣ ΟΣΟΝ ΑΦΟΡΑ ΤΗΝ ΠΟΙΟΤΗΤΑ ΚΑΙ ΤΗΝ ΑΠΟΔΟΣΗ ΤΟΥ ΠΡΟΓΡΑΜΜΑΤΟΣ ΕΙΝΑΙ ΔΙΚΟ ΣΑΣ. ΕΑΝ ΤΟ ΠΡΟΓΡΑΜΜΑ ΔΕΝ ΕΙΝΑΙ ΕΛΑΤΤΩΜΑΤΙΚΟ, ΠΡΕΠΕΙ ΝΑ ΕΞΕΤΑΣΤΕ ΤΟ ΚΟΣΤΟΣ ΟΛΩΝ ΤΩΝ ΑΠΑΡΑΙΤΗΤΩΝ ΣΥΝΤΗΡΗΣΕΩΝ, ΕΠΙΣΚΕΥΩΝ Ή ΔΙΟΡΘΩΣΕΩΝ</string>
     <string name="end_user_license_agreement_i_understand">ΚΑΤΑΛΑΒΑ ΚΑΙ ΣΥΜΦΩΝΩ</string>
@@ -415,7 +411,6 @@
     <string name="copied_to_clipboard">Αντιγράφτηκε στο Πρόχειρο</string>
     <string name="nav_show_logcat">Εμφάνιση αρχείου καταγραφής</string>
     <string name="overview_calibration">Βαθμονόμηση</string>
-    <string name="overview_calibration_bg_label">Βαθμονόμηση</string>
     <string name="send_calibration" formatted="false">"Να στείλω την βαθμονόμηση %.1f στο xDrip? "</string>
     <string name="xdripnotinstalled">xDrip+ μη εγκατεστημένο</string>
     <string name="calibrationsent">Η βαθμονόμηση εστάλει στο xDrip</string>
@@ -467,8 +462,6 @@
     <string name="adult">Ενήλικας</string>
     <string name="patientage_summary">Παρακαλώ επιλέξτε ηλικία χρήστη για να ορισθούν όρια ασφαλείας</string>
     <string name="Glimp">Glimp</string>
-    <string name="batteryoptimalizationerror">Η συσκευή πιθανώς δεν υποστηρίζει αποκλεισμό από τη βελτιστοποίηση της μπαταρίας!</string>
-    <string name="pleaseallowpermission">Παρακαλώ Επιτρέψτε Άδεια</string>
     <string name="needwhitelisting" formatted="false">Το %s πρέπει να απενεργοποιήσει τη βελτιστοποίηση της μπαταρίας για βέλτιστη απόδοση</string>
     <string name="loopsuspended">Κύκλωμα σε παύση</string>
     <string name="loopsuspendedfor" formatted="false">Παύση (%d m)</string>
@@ -497,7 +490,6 @@
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
     <string name="ultrafastactinginsulincomment">Fiasp</string>
     <string name="insulin_shortname">INS</string>
-    <string name="fastactinginsulinprolonged">Ταχείας Δράσης Ινσουλίνη Παρατεταμένη</string>
     <string name="enablesuperbolus">Ενεργοποίηση superbolus</string>
     <string name="enablesuperbolus_summary">"Ενεργοποιήστε το superbolus.Μην το κάνετε μέχρι να μάθετε τι ακριβώς κάνει. ΜΠΟΡΕΙ ΝΑ ΕΓΧΥΣΕΙ ΠΑΡΑΠΑΝΩ ΔΟΣΕΙΣ ΙΝΣΟΥΛΙΝΗΣ ΑΝ ΧΡΗΣΙΜΟΠΟΙΗΘΕΙ ΛΑΝΘΑΣΜΕΝΑ! "</string>
     <string name="iob">IOB</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 151c63cbe2..c3dd7622ef 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -11,8 +11,6 @@
     <string name="danar_bt_name_title">DanaR dispositivo Bluetooth</string>
     <string name="ns_sync_use_absolute_title">Usar siempre valor basal absoluto</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 (importantes para trazar y verificar que el algoritmo funcione correctamente)</string>
-    <string name="objectives_objective_label_string">Objetivo:</string>
-    <string name="objectives_gate_label_string">Meta:</string>
     <string name="objectives_button_start">Inicio</string>
     <string name="objectives_button_verify">Verificar</string>
     <string name="nsprofileview_units_label">Unidades</string>
@@ -83,7 +81,6 @@
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_general">General</string>
     <string name="days">días</string>
-    <string name="objectives_minimalduration">Duración mínima</string>
     <string name="constraints">Restricciones</string>
     <string name="loop">Loop</string>
     <string name="configbuilder_loop">Loop</string>
@@ -194,7 +191,6 @@
     <string name="connected">Conectado</string>
     <string name="disconnected">Desconectado</string>
     <string name="danar_pump_settings">Ajustes de la bomba DanaR</string>
-    <string name="nightscout">Nightscout</string>
     <string name="end_user_license_agreement">Acuerdo de licencia de usuario final</string>
     <string name="end_user_license_agreement_text">No deben utilizarse para tomar decisiones médicas. NO HAY GARANTÍA PARA EL PROGRAMA, la extensión permitida por la legislación aplicable. Excepto cuando se indique de otra forma por escrito, los tenedores del copyright y / u otras partes proporcionan el programa \"tal cual\" sin garantía de ningún tipo, ya sea expresa o implícita, incluyendo, pero no limitado a, las garantías implícitas de COMERCIALIZACIÓN E IDONEIDAD PARA UN FIN DETERMINADO . TODO EL RIESGO EN CUANTO A LA CALIDAD Y RENDIMIENTO DEL PROGRAMA ES CON USTED. SI EL PROGRAMA TIENE UN ERROR, asume el coste de cualquier servicio, reparación o corrección.</string>
     <string name="end_user_license_agreement_i_understand">Entiendo y acepto</string>
@@ -435,7 +431,6 @@
     <string name="copied_to_clipboard">Copiado al clipboard</string>
     <string name="nav_show_logcat">mostrar log</string>
     <string name="overview_calibration">Calibración</string>
-    <string name="overview_calibration_bg_label">Calibración</string>
     <string name="send_calibration" formatted="false">Mandar calibración %.1f a xDrip?</string>
     <string name="xdripnotinstalled">xDrip+ no instalado</string>
     <string name="calibrationsent">Calibración mandada a xDrip</string>
@@ -487,8 +482,6 @@
     <string name="adult">Adulto</string>
     <string name="patientage_summary">Por favor elige edad del paciente para emplear limites de seguridad</string>
     <string name="Glimp">Glimp</string>
-    <string name="batteryoptimalizationerror">Aparato parece no soportar optimización de bateria whitelisting!</string>
-    <string name="pleaseallowpermission">Por favor conceda permiso</string>
     <string name="needwhitelisting" formatted="false">%s necesita optimización de bateria whitelisting para funcionar bien</string>
     <string name="loopsuspended">Loop desactivado</string>
     <string name="loopsuspendedfor" formatted="false">desactivado (%d m)</string>
@@ -517,7 +510,6 @@
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
     <string name="ultrafastactinginsulincomment">Fiasp</string>
     <string name="insulin_shortname">INS</string>
-    <string name="fastactinginsulinprolonged">Insulina acción rápida prolongada</string>
     <string name="enablesuperbolus">activar superbolo en wizard</string>
     <string name="enablesuperbolus_summary">Activar función superbolo en wizard. No lo actives hasta que hayas aprendido lo que realmente hace. PUEDE CAUSAR SOBREDOSIS DE INSULINA usandolo sin precaución!</string>
     <string name="iob">IOB</string>
@@ -717,7 +709,6 @@
     <string name="combo_pump_tbr_cancelled_warrning">TBR cancelada, advertencia acceptada</string>
     <string name="combo_error_no_bolus_delivered">Emisión del bolo fallada. Ningún bolo se ha emitido. Para asegurarse, por favor controle la bomba para evitar bolo doble. Para evitar bugs no se reinician bolos automaticamente.</string>
     <string name="combo_error_partial_bolus_delivered">"Solo %1$.2f U del bolo mandado de %2$.2f U ha sido emitido por causa de un error. Por favorn controla la bomba para confirmar y toma acciones apropiadas. "</string>
-    <string name="combo_error_bolus_recovery_progress">Reestablecido conexión fallada.</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">"No hay suficiente insulina en el deposito para emitir bolo. "</string>
     <string name="extendedbolusdeliveryerror">"Error al emitir bolo prolongado. "</string>
     <string name="pump_unreachable_threshold">Bomba no alcanzable durante [min]</string>
@@ -737,7 +728,6 @@
     <string name="overview_show_iob">Insulina activa IOB</string>
     <string name="overview_show_deviations">Desviaciones</string>
     <string name="overview_show_sensitivity">Sensibilidad</string>
-    <string name="ns_autobackfill">Autorelleno de lecturas perdidas de BG</string>
     <string name="bolusrecordedonly">El Bolo solo será anotado</string>
     <string name="category">Categoría</string>
     <string name="subcategory">Subcategoría</string>
@@ -801,14 +791,10 @@
     <string name="insight_companion_app_not_installed">Companion app parece no instalada!</string>
     <string name="insight_not_connected_to_companion_app">¡La aplicación Companion no parece estar instalada!</string>
     <string name="insight_stay_always_connected">Permanecer siempre conectado</string>
-    <string name="insight_use_real_tbr_cancels">Usar cancelación Basal Temporal (TBR) real</string>
-    <string name="insight_actually_cancel_tbr_summary">Actualmente, cancelar una Basal Temporal TBR (crea una alarma de bomba) en su lugar  establecer el 90% durante 1 minuto</string>
     <string name="alert_w31">Advertencia W31: Cartucho insulina bajo</string>
     <string name="alert_w32">Advertencia W32: Bateria baja</string>
     <string name="alert_w33">Advertencia W33: Fecha/hora inválida</string>
     <string name="alert_w34">Advertencia W34: Final de garantía</string>
-    <string name="alert_w36">Advertencia W36: Basal Temporal cancelada</string>
-    <string name="alert_w38">Warning W38: Bolo cancelado</string>
     <string name="alert_w39">Warning W39: Adevertencia tiempo de prestamo</string>
     <string name="loop_smbsetbypump_label">SMB administrado por bomba</string>
     <string name="combo_pump_state_initializing">Inicializando</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 834b9fe5eb..c9a8347adc 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -12,9 +12,7 @@
     <string name="danar_bt_name_title">Dispositif Bluetooth DanaR</string>
     <string name="ns_sync_use_absolute_title">utiliser toujours les valeurs absolues du basal</string>
     <string name="alert_dialog_storage_permission_text">Rebootez votre smartphone ou redémarrez AndroidAPS depuis les paramètres système sinon AndroidAPS ne sera pas connecté ( important de suivre et vérifier que les algorithmes fonctionnent correctement)!</string>
-    <string name="objectives_objective_label_string">Objectif:</string>
     <string name="objectives_button_start">Activer</string>
-    <string name="objectives_gate_label_string">Gate :</string>
     <string name="objectives_button_verify">Vérifier</string>
     <string name="nsprofileview_units_label">Unités</string>
     <string name="nsprofileview_dia_label">Durée d’Action</string>
@@ -79,7 +77,6 @@
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_general">Général</string>
     <string name="days">Jours</string>
-    <string name="objectives_minimalduration">Durée minimale</string>
     <string name="constraints">Restrictions</string>
     <string name="loop">Loop</string>
     <string name="configbuilder_loop">Loop</string>
@@ -193,7 +190,6 @@
     <string name="connected">Connectée</string>
     <string name="disconnected">Déconnectée</string>
     <string name="danar_pump_settings">Paramètres pompe DanaR</string>
-    <string name="nightscout">Nightscout</string>
     <string name="end_user_license_agreement">Contrat de Licence pour Utilisateur Final</string>
     <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">JE COMPRENDS ET J\'ACCEPTE LES CONDITIONS DU CONTRAT</string>
@@ -414,7 +410,6 @@
     <string name="copied_to_clipboard">Copier dans le Presse-Papiers</string>
     <string name="nav_show_logcat">Afficher le journal</string>
     <string name="overview_calibration">Étalonnage</string>
-    <string name="overview_calibration_bg_label">Étalonnage</string>
     <string name="send_calibration" formatted="false">Transmettre l\'étalonnage %.1f à xDrip?</string>
     <string name="xdripnotinstalled">xDrip+ n\'est pas installé</string>
     <string name="calibrationsent">Étalonnage envoyé à xDrip</string>
@@ -466,8 +461,6 @@
     <string name="adult">Adulte</string>
     <string name="patientage_summary">Veuillez sélectionner l’âge du patient pour paramétrer les limites de sécurité svp</string>
     <string name="Glimp">Glimp</string>
-    <string name="batteryoptimalizationerror">Le dispositif n’apparaît pas pour renforcer la liste blanche de l’optimisation de batterie!</string>
-    <string name="pleaseallowpermission">Autorisez l\'accès svp</string>
     <string name="needwhitelisting">%s a besoin de la liste blanche de l\’optimisation batterie  pour une bonne performance</string>
     <string name="loopsuspended">Loop suspendu</string>
     <string name="loopsuspendedfor" formatted="false">Suspendu (%d m)</string>
@@ -496,7 +489,6 @@
     <string name="fastactinginsulincomment">Novorapid, Humalog, Apidra</string>
     <string name="ultrafastactinginsulincomment">Fiasp</string>
     <string name="insulin_shortname">INS</string>
-    <string name="fastactinginsulinprolonged">Insuline Rapide à Action Prolongée</string>
     <string name="enablesuperbolus">Activer les Superbolus dans l’assistant</string>
     <string name="enablesuperbolus_summary">Activer la fonctionalité superbolus dans l’assistant. Ne pas l’activez jusqu’au moment où vous appreniez comment il fonctionne réellement. IL PEUT PROVOQUER UNE OVERDOSE D’INSULINE SI UTILISÉ AVEUGLÉMENT!</string>
     <string name="iob">" IR"</string>
@@ -716,7 +708,6 @@
     <string name="combo_pump_tbr_cancelled_warrning">TBR ANNULÉ warning confirmé</string>
     <string name="combo_error_no_bolus_delivered">Administration bolus échouée. Il semble qu’aucun bolus n’a été administré. Pour être sûr, Veuillez vérifier la pompe pour éviter un double bolus ensuite re bolusez une nouvelle fois</string>
     <string name="combo_error_partial_bolus_delivered">Seulement %1$.2f U de %2$.2f U du bolus demandé a été administré dû à une erreur. Veuillez svp vérifier la pompe pour contrôler cela et prendre les mesures appropriées</string>
-    <string name="combo_error_bolus_recovery_progress">"Reconnexion après perte de connexion "</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">Pas assez d\'insuline restante dans le réservoir pour le bolus</string>
     <string name="extendedbolusdeliveryerror">Erreur administration bolus étendu</string>
     <string name="insightpump_shortname">Insight</string>
@@ -736,8 +727,6 @@
     <string name="insight_total_with">total</string>
     <string name="insight_upfront_with">en amont avec</string>
     <string name="insight_stay_always_connected">Rester toujours connectée</string>
-    <string name="insight_use_real_tbr_cancels">"Utiliser les vrais annulations TBR "</string>
-    <string name="insight_actually_cancel_tbr_summary">Annuler réellement TBR (creation d\'alarme pompe)au lieu de programmer 90% ou 110% du TBR pour 15 minutes</string>
     <string name="insight_history_idle">EN VEILLE</string>
     <string name="insight_history_syncing">SYNCHRONISATION</string>
     <string name="insight_history_busy">CHARGÉ</string>
diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml
index f9004721b5..e7d78ec815 100644
--- a/app/src/main/res/values-ga/strings.xml
+++ b/app/src/main/res/values-ga/strings.xml
@@ -30,9 +30,7 @@
     <string name="danarpump">DanaR</string>
     <string name="days">lá</string>
     <string name="date">Dáta</string>
-    <string name="device">Gléas</string>
     <string name="disconnected">Dínasctha</string>
-    <string name="combo_pump_state_disconnected">Dínasctha</string>
     <string name="overview_quickwizard_item_edit_button">In eagar</string>
     <string name="en_lang">Bearla (English)</string>
     <string name="danar_error">earráid</string>
@@ -40,7 +38,6 @@
     <string name="overview_shortname">BAILE</string>
     <string name="combo_reservoir_low">Íseal</string>
     <string name="mute">Balbh</string>
-    <string name="nsclient">NSClient</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_title">NSClient</string>
     <string name="virtualpump_resultok">OK</string>
@@ -58,7 +55,6 @@
     <string name="objectives_button_start">Tosaigh</string>
     <string name="overview_bolusprogress_stop">Stad</string>
     <string name="nsclientinternal_url">URL:</string>
-    <string name="up">Suas</string>
     <string name="result">Toradh</string>
     <string name="el_lang">Gréigis</string>
     <string name="configbuilder_general">Ginearálta</string>
@@ -98,7 +94,6 @@
     <string name="success">Rathúlacht</string>
     <string name="nsprofileview_units_label">Aonaid</string>
     <string name="units">Aonaid:</string>
-    <string name="treatments_wizard_unit_label">A</string>
     <string name="suspendloopfor10h">Fionraí lúb do 10 u</string>
     <string name="suspendloopfor1h">Fionraí lúb do 1 u</string>
     <string name="suspendloopfor2h">Fionraí lúb do 2 u</string>
@@ -114,7 +109,6 @@
     <string name="treatments_insulin_label_string">Inslin:</string>
     <string name="careportal_insulinage_label">Inslin aois</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
-    <string name="nsclientinternal_devicename_title">Gléas ainm</string>
     <string name="child">Páiste</string>
     <string name="overview_calculator_label">Áireamhán</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -132,7 +126,6 @@
     <string name="overview_editquickwizardlistactivity_add">Cuir</string>
     <string name="adult">Duine fásta</string>
     <string name="overview_calibration">Calabrú</string>
-    <string name="overview_calibration_bg_label">Calabrú</string>
     <string name="danar_carbohydrate">carbaihiodráit</string>
     <string name="danar_history_carbohydrates">Carbaihiodráití</string>
     <string name="closedloop">Lúb dúnta</string>
@@ -141,7 +134,6 @@
     <string name="overview_bolusprogress_delivered">Seachadta</string>
     <string formated="false" name="bolusdelivering">Seachadadh %.2fA</string>
     <string name="deliver_now">Seachadadh anois</string>
-    <string name="disconnectpumpfor10h">Dhícheangal Caidéil do 10 u</string>
     <string name="disconnectpumpfor1h">Dhícheangal Caidéil do 1 u</string>
     <string name="disconnectpumpfor2h">Dhícheangal Caidéil do 2 u</string>
     <string name="disconnectpumpfor3h">Dhícheangal Caidéil do 3 u</string>
@@ -159,7 +151,6 @@
     <string name="openapsma_glucosestatus_label">Glúcóis stádas</string>
     <string name="de_lang">Gearmáinis</string>
     <string name="Glimp">Glimp</string>
-    <string name="combo_history">Stair</string>
     <string name="loopenabled">Lúb cumasaithe</string>
     <string name="key_ns_create_announcements_from_errors">ns_create_announcements_from_errors</string>
     <string name="nsclientinternal_shortname">NSCI</string>
@@ -181,7 +172,6 @@
     <string name="teenage">Déagóirí</string>
     <string name="treatments">Cóireálacha</string>
     <string name="configbuilder_treatments">Cóireálacha</string>
-    <string name="visible">Infheicthe</string>
     <string name="overview_editquickwizard_valid">Bailí:</string>
     <string name="objectives_button_verify">Fhíorú</string>
     <string formated="false" name="loopsuspendedfor">Ar fionraí (%d n)</string>
@@ -193,19 +183,13 @@
     <string name="serialnumber">Sraithuimhir</string>
     <string name="combo_pump_action_refreshing">Athnuaigh</string>
     <string name="combo_activity_checking_pump_state">Athnuaigh caidéil stáit</string>
-    <string name="combo_pump_never_connected">Riamh</string>
     <string name="combo_pump_state_initializing">Tosaithe</string>
     <string name="combo_reservoir_normal">Gnáth</string>
-    <string formated="false" name="combo_tdd_average">Meán: %3.1f A</string>
-    <string formated="false" name="combo_tdd_maximum">Uasmhéid: %3.1f A</string>
-    <string formated="false" name="combo_tdd_minimum">Íosmhéid: %3.1f A</string>
     <string name="combo_pump_state_suspended_due_to_error">Ar fionraí ag earráid</string>
     <string name="initializing">Tosaithe ...</string>
     <string name="combo_actvity_reading_basal_profile">Léigh próifíl bunaidh</string>
     <string name="combo_activity_reading_pump_history">Léigh stair caidéil</string>
-    <string name="enabled">Cumasaithe</string>
     <string formated="false" name="combo_pump_action_setting_tbr">Socrú BRS (%1$d%% / %2$d nóim)</string>
-    <string name="combo_pump_action_initializing">Tosaithe</string>
     <string name="combo_pump_action_cancelling_tbr">Cealú BRS</string>
     <string name="combo_pump_battery_low_warrning">Is ceallraí Caidéil íseal</string>
     <string name="combo_pump_cartridge_low_warrning">Is leibhéal cartús íseal</string>
@@ -218,7 +202,6 @@
     <string name="treatments_carbs_label_string">Carbí:</string>
     <string name="careportal_carbsandbolus_label">CARBÍ &amp; BÓLAS</string>
     <string formated="false" name="danar_history_connectingfor">Ag nascadh le %d s</string>
-    <string name="circadian_percentage_profile_shortname">CPP</string>
     <string name="comment">Tuairim</string>
     <string name="danar_bt_name_title">DanaR Bluetooth gléas</string>
     <string name="cs_lang">Seice</string>
@@ -235,15 +218,12 @@
     <string name="loopdisabled">LÚB DÍCHUMASAITHE LE SRIANTA</string>
     <string name="lowbattery">Ceallraí Íseal</string>
     <string name="nsclientinternal_url_title">Nightscout URL</string>
-    <string name="nightscout">Nightscout</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
     <string name="careportal_note">Nóta</string>
     <string name="careportal_newnstreatment_notes_label">Nótaí</string>
-    <string name="fastactinginsulinprolonged">Fast Acting Insulin Prolonged</string>
     <string name="DexcomG5">DexcomG5 App (patched)</string>
     <string name="disableloop">Díchumasaigh lúb</string>
     <string name="enableloop">Cumasaigh lúb</string>
-    <string name="objectives_gate_label_string">Geata:</string>
     <string name="careportal_newnstreatment_glucosetype">Glúcóis cineál</string>
     <string name="careportal_insulincartridgechange">Athrú Cartús Inslin</string>
     <string name="invalidprofile">Próifíl neamhbhailí !!!</string>
@@ -260,7 +240,6 @@
     <string name="danar_dailyunits">Aonaid lá</string>
     <string name="delta">Deilte</string>
     <string name="sms_delta">Deilte:</string>
-    <string name="prefs_delta_title">Socruithe Deilte</string>
     <string name="app_name">AndroidAPS</string>
     <string name="bolus">Bólas</string>
     <string name="bolusstopped">Bólas stopadh</string>
@@ -271,7 +250,6 @@
     <string formated="false" name="combo_no_pump_connection">Níl nasc le haghaidh %d nóim</string>
     <string name="combo_notification_check_time_date">Is nuashonrú gá clog Caidéil</string>
     <string name="combo_programming_bolus">Cláir Caidéil bólas</string>
-    <string name="combo_pump_alerts">Foláirimh</string>
     <string name="combo_pump_activity_label">Gníomhaíocht</string>
     <string name="treatments_activity_string">Gníom.:</string>
     <string name="activity">Gníomhaíocht</string>
@@ -279,14 +257,12 @@
     <string name="activity_target">Gníomhaíocht sprioc</string>
     <string name="combo_warning">Rabhadh</string>
     <string name="danar_history">Stair le Caidéil</string>
-    <string name="dev">GLÉ</string>
     <string name="executing">Feidhmiú</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="mdi">MDI</string>
     <string name="nav_about">Faoi</string>
     <string name="careportal_newnstreatment_absolute_label">Iomlán</string>
     <string name="absolute">Iomlán</string>
-    <string name="nsprofileview_activeprofile_label">Próifíl gníomhach</string>
     <string name="danar_history_alarm">Aláraim</string>
     <string name="apsmode_title">APS mód</string>
     <string name="apsselected">APS  roghnaithe</string>
@@ -294,26 +270,22 @@
     <string name="basal">Bunaidh</string>
     <string name="danar_stats_basalrate">Bunaidh</string>
     <string name="sms_basal">Bunaidh:</string>
-    <string name="basalshortlabel">BUN</string>
     <string name="basal_short">BUN</string>
     <string name="xdripstatus_shortname">xds</string>
     <string name="sms_bolus">Bólas:</string>
     <string name="danar_stats_bolus">Bólas</string>
-    <string name="overview_bolus_label">Bólas</string>
     <string name="danar_ebolus">Bólas E</string>
     <string formated="false" name="overview_bolusprogress_goingtodeliver">Ag dul a sheachadadh %.2fA</string>
     <string name="danar_dsbolus">Bólas DS</string>
     <string name="danar_debolus">Bólas DE</string>
     <string name="danar_sbolus">Bólas S</string>
     <string name="smscommunicator_shortname">SMS</string>
-    <string name="nav_backup">Cúltaca</string>
     <string name="basal_rate">Bunaidh ráta</string>
     <string name="basal_step">Bunaidh Céim</string>
     <string name="overview_newtempbasal_basaltype_label">Bunaidh cineál</string>
     <string name="overview_newtempbasal_basalpercent">Bunaidh luach [%]</string>
     <string name="overview_newtempbasal_basalabsolute">Bunaidh luach [A/u]</string>
     <string name="pump_basebasalrate_label">Bunaidh ráta bonn</string>
-    <string name="base_profile_label">Próifíl bonn</string>
     <string formated="false" name="bolusdelivered">Seachadta %.2fA Bólas go rathúil</string>
     <string formated="false" name="smscommunicator_bolusdelivered">Seachadta %.2fA Bólas go rathúil</string>
     <string name="bolus_step">Bólas Céim</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 5a0d72f608..c43fe86094 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -164,7 +164,6 @@
     <string name="exported">Esportare Preferenze</string>
     <string name="failedupdatebasalprofile">Errore caricamento profilo Basal</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
-    <string name="fastactinginsulinprolonged">L\'insulina ad azione rapida prolungata</string>
     <string name="fastactinginsulin">Velocita\' insulina</string>
     <string name="filenotfound">File non coretto</string>
     <string name="gettingpumpstatus">Stato Micro</string>
@@ -202,7 +201,6 @@
     <string name="nav_preferences">Preferenze</string>
     <string name="nav_refreshtreatments">Ricaricare</string>
     <string name="nav_resetdb">Reset Databases</string>
-    <string name="nightscout">Nightscout</string>
     <string name="noapsselected">APS selezionato o Provaider non corretto</string>
     <string name="nobtadapter">No bluetooth riconosciuto</string>
     <string name="nochangerequested">Non cambiare requisiti</string>
@@ -237,9 +235,6 @@
     <string name="objectives_bgavailableinns">BG disponibile in NS</string>
     <string name="objectives_button_start">Avvio</string>
     <string name="objectives_button_verify">Verificato</string>
-    <string name="objectives_gate_label_string">Gate:</string>
-    <string name="objectives_minimalduration">Durata minima</string>
-    <string name="objectives_objective_label_string">Obbiettivo</string>
     <string name="objectives_pumpstatusavailableinns">Micro disponibile in NS</string>
     <string name="objectives_shortname">OBJ</string>
     <string name="occlusion">Occlusione</string>
@@ -280,7 +275,6 @@
     <string name="overview_bolusprogress_stop">Stop</string>
     <string name="overview_calculator_label">Calcolatore</string>
     <string name="overview_calibration">Calibrazione</string>
-    <string name="overview_calibration_bg_label">Calibrazione BG</string>
     <string name="overview_editquickwizard_buttontext">Tasto testo:</string>
     <string name="overview_editquickwizard_carbs">Carboidrati:</string>
     <string name="overview_editquickwizard_valid">Valido:</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 21e0f5701d..670e4aae02 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -12,8 +12,6 @@
     <string name="danar_bt_name_title">다나R 블루투스</string>
     <string name="ns_sync_use_absolute_title">기초주입량 절대값 사용하기</string>
     <string name="alert_dialog_storage_permission_text">폰을 재부팅하고나 AndroidAPS를 재시작하세요 \n그렇지 않으면 로그가 기록이되지 않습니다.(알고리즘이 제대로 작동하는지 확인하기 위해 로그가 필요합니다.)!</string>
-    <string name="objectives_objective_label_string">목표:</string>
-    <string name="objectives_gate_label_string">방법:</string>
     <string name="objectives_button_start">시작</string>
     <string name="objectives_button_verify">확인</string>
     <string name="nsprofileview_units_label">단위</string>
@@ -83,7 +81,6 @@
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_general">일반</string>
     <string name="days">일</string>
-    <string name="objectives_minimalduration">최소기간</string>
     <string name="constraints">제한</string>
     <string name="loop">Loop</string>
     <string name="configbuilder_loop">Loop</string>
@@ -199,7 +196,6 @@
     <string name="connected">연결됨</string>
     <string name="disconnected">연결 끊김</string>
     <string name="danar_pump_settings">다나R 펌프 설정</string>
-    <string name="nightscout">Nightscout</string>
     <string name="end_user_license_agreement">최종 사용자 라이선스 동의서</string>
     <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">모두 이해하였고 동의합니다.</string>
@@ -428,7 +424,6 @@
     <string name="copied_to_clipboard">클립보드에 복사되었습니다</string>
     <string name="nav_show_logcat">로그 보기</string>
     <string name="overview_calibration">보정</string>
-    <string name="overview_calibration_bg_label">혈당 보정</string>
     <string name="send_calibration" formatted="false">보정값 %.1f을 xDrip에 전송하시겠습니까?</string>
     <string name="xdripnotinstalled">xDrip+가 설치되지 않았습니다</string>
     <string name="calibrationsent">보정이 xDrip으로 전송되었습니다</string>
@@ -480,8 +475,6 @@
     <string name="adult">성인</string>
     <string name="patientage_summary">안전제한을 설정하기 위해 당뇨인의 나이를 선택하세요</string>
     <string name="Glimp">Glimp</string>
-    <string name="batteryoptimalizationerror">Device does not appear to support battery optimization whitelisting!</string>
-    <string name="pleaseallowpermission">권한을 허용하세요.</string>
     <string name="loopsuspended">Loop 일시중지</string>
     <string name="loopsuspendedfor" formatted="false">일시중지중 (%d분)</string>
     <string name="loopsuperbolusfor" formatted="false">수퍼 식사주입 (%d분)</string>
@@ -509,7 +502,6 @@
     <string name="fastactinginsulincomment">노보래피드, 휴마로그, 에피드라</string>
     <string name="ultrafastactinginsulincomment">피아스프(Fiasp)</string>
     <string name="insulin_shortname">INS</string>
-    <string name="fastactinginsulinprolonged">Fast Acting Insulin Prolonged</string>
     <string name="enablesuperbolus">마법사에서 수퍼 식사주입 활성화하기</string>
     <string name="enablesuperbolus_summary">마법사에서 수퍼 식사주입 기능을 활성화합니다. 어떤 기능인지 확실히 알기전까지 활성화 하지 마세요. 제대로 알지 못하고 사용하면 일슐린이 과다 주입될 수 있습니다!</string>
     <string name="iob">IOB</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index ed8e526d76..e826d1a821 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -58,7 +58,6 @@
     <string name="basal">Basaal</string>
     <string name="basal_short">BAS</string>
     <string name="batterydischarged">Pomp Batterij Leeg</string>
-    <string name="batteryoptimalizationerror">Toestel ondersteund klaarblijkelijk geen baterij optimalisatie vrijschakeling!</string>
     <string name="bg_lang">български</string>
     <string name="bolus">Bolus</string>
     <string name="bolus_step">Bolus Stap</string>
@@ -309,7 +308,6 @@
     <string name="nosuccess">Niet geslaagd - controleer de telefoon</string>
     <string name="notavailable">Niet beschikbaar</string>
     <string name="nowritepermission">NSCLIENT heeft geen schrijfrechten. Verkeerd API geheim?</string>
-    <string name="nightscout">Nightscout</string>
     <string name="ok">Ok</string>
     <string name="danar_stats_basalrate">Basaal</string>
     <string name="loopdisabled">Loop gedeactiveerd door doelen tab</string>
@@ -430,7 +428,6 @@
     <string name="overview_tempbasal_button">Tijdelijk basaal</string>
     <string name="tempbasal">Tijdelijk basaal</string>
     <string name="temptarget">Tijdelijk streefdoel</string>
-    <string name="objectives_gate_label_string">Actie</string>
     <string name="objectives_button_start">Start</string>
     <string name="objectives_button_verify">Controleer</string>
     <string name="queue">Wachtend:</string>
@@ -440,7 +437,6 @@
     <string name="profile">Profiel</string>
     <string name="percent">Percent</string>
     <string name="patientage_summary">Kies leeftijd van de patient voor veiligheids limieten</string>
-    <string name="pleaseallowpermission">Sta wijzigingen toe</string>
     <string name="target_range">Streefdoel:</string>
     <string name="overview_extendedbolus_button">Vertraagde bolus</string>
     <string name="overview_extendedbolus_cancel_button">Annuleer vertraagde bolus</string>
@@ -449,7 +445,6 @@
     <string name="refresheventsfromnightscout">Haal wijzigingen op van NS</string>
     <string name="reloadprofile">Herlaad profiel</string>
     <string name="restartingapp">Sluiten van applicatie om instellingen bij te werken</string>
-    <string name="objectives_objective_label_string">Doel:</string>
     <string name="smscommunicator_remotebolusnotallowed">Bolus via sms niet toegestaan</string>
     <string name="smscommunicator_missingsmspermission">Geen SMS bevoegdheid</string>
     <string name="smscommunicator_remotecommandsallowed">Sta SMS bevelen toe</string>
@@ -471,7 +466,6 @@
     <string name="overview_editquickwizard_valid">Beschikbaarheid:</string>
     <string name="overview_editquickwizard_carbs">Koolhydraten:</string>
     <string name="overview_editquickwizard_buttontext">Naam:</string>
-    <string name="overview_calibration_bg_label">Kalibratie</string>
     <string name="overview_calculator_label">Bolus wizard</string>
     <string name="danar_ebolus">E bolus</string>
     <string name="danar_dsbolus">DS bolus</string>
@@ -493,7 +487,6 @@
     <string name="delta">Verschil</string>
     <string name="dia">DIA:</string>
     <string name="enacted">Uitgevoerd</string>
-    <string name="fastactinginsulinprolonged">Fast Acting Insulin Prolonged</string>
     <string name="long_avgdelta">Groot gemiddeld verschil</string>
     <string name="low_mark">LAAG grens</string>
     <string name="noapsselected">GEEN APS GESLECTEERD OF TOEGEKENT RESULTAAT</string>
@@ -513,7 +506,6 @@
     <string name="oaps_shortname">OAPS</string>
     <string name="objectives_6_objective">Activeren van extra functies tijdens de dag zoals AMA</string>
     <string name="objectives_manualenacts">Manuele correcties</string>
-    <string name="objectives_minimalduration">Minimale tijdsduur</string>
     <string name="objectives_pumpstatusavailableinns">Pomp status beschikbaar op NS</string>
     <string name="objectives_shortname">DOEL</string>
     <string name="occlusion">Afsluiting</string>
@@ -685,8 +677,7 @@
 	<string name="combo_pump_state_label">Status</string>
     <string name="combo_no_pump_connection">Geen verbinding gedurende %d minuten</string>
     <string name="combo_tbr_remaining">%1$d%% (%2$d min resterend)</string>
-    <string name="combo_error_bolus_recovery_progress">Herstel van verbroken verbindng</string>
-	<string name="combo_warning">Waarschuwing</string>
+    <string name="combo_warning">Waarschuwing</string>
 	<string name="combo_notification_check_time_date">Pomp klok moet bijgesteld worden</string>
 	<string name="combo_reservoir_empty">Leeg</string>
 	<string name="combo_reservoir_low">Bijna leeg</string>
@@ -802,7 +793,6 @@
     <string name="loop_smbsetbypump_label">SMB op de pomp ingesteld</string>
     <string name="overview_show_sensitivity">Gevoeligheid</string>
     <string name="overview_show_deviations">Afwijkingen</string>
-    <string name="don_t_bolus_record_only">Geef geen bolus, enkel opslaan in database</string>
     <string name="overview_show_basals">Basalen</string>
     <string name="value_unavailable_short">n/a</string>
     <string name="wear_wizard_settings">Wizard instellingen</string>
@@ -810,8 +800,6 @@
     <string name="wear_display_settings">Scherm instellingen</string>
     <string name="wear_general_settings">Algemene instellingen</string>
     <string name="alert_w31">Waarschuwing W31: Patroon bijna leeg</string>
-    <string name="alert_w38">Waarschuwing W38: Bolus geannuleerd</string>
-    <string name="alert_w36">Waarschuwing W36: Tijdelijk basaal geannuleerd</string>
     <string name="alert_w32">Waarschuwing W32: Batterij niveau laag</string>
     <string name="alert_w33">Waarschuwing W33: Datum/tijd onjuist</string>
     <string name="alert_w34">Waarschuwing W34: Einde van garantie periode</string>
@@ -908,11 +896,9 @@
     <string name="hardlimit">max limiet (SC)</string>
     <string name="unsafeusage">Onveilig gebruik</string>
     <string name="closed_loop_disabled_on_dev_branch">Dev cersie actief. Closed loop gedeactiveerd</string>
-    <string name="insight_actually_cancel_tbr_summary">Anneuleren van een TBR zorgt voor een alarm op de pomp, daarom wordt pomp op 90% gezet voor 1 minuut</string>
     <string name="insight_waiting_for_code">Wacht op confirmatie van code</string>
     <string name="insight_incompatible_compantion_app_we_need_version">Incompatiebele hulp app, we hebben deze versie nodig</string>
     <string name="insight_app_binding">app koppeling</string>
-    <string name="insight_use_real_tbr_cancels">Gebruik echte  TBR uischakelingen</string>
     <string name="insight_not_connected_to_companion_app">Niet verbonden met de hulpapp!</string>
     <string name="insight_companion_app_not_installed">Hulp app lijkt niet geïnstalleerd</string>
     <string name="record_pump_site_change">Markeer een infuuwissel in NS</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index fe895d9232..c63f24e2fd 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -14,8 +14,6 @@
     <string name="ns_sync_use_absolute_title">Zawsze używaj wartości bezwzględnych bazy</string>
     <string name="alert_dialog_storage_permission_text">Proszę uruchomić ponownie telefon lub zrestartować AndroidAPS w ustawieniach systemu telefonu \inaczej AndroidAPS nie będzie otrzymywał logowań (ważne ze względu na śledzenie i sprawdzanie poprawności działania algorytmów)!</string>
 
-    <string name="objectives_objective_label_string">Zadanie:</string>
-    <string name="objectives_gate_label_string">Bramka:</string>
     <string name="objectives_button_start">Start</string>
     <string name="objectives_button_verify">Sprawdź</string>
     <string name="nsprofileview_units_label">Jednostki</string>
@@ -81,17 +79,13 @@
     <string name="treatments">Leczenie</string>
     <string name="virtualpump">Pompa wirtualna</string>
     <string name="careportal">PortalOpieki</string>
-
-
     <string name="configbuilder_pump">Pompa</string>
     <string name="configbuilder_treatments">Leczenie</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_general">Ogólne</string>
     <string name="days">dni</string>
-    <string name="objectives_minimalduration">Minimalny czas</string>
     <string name="constraints">Ograniczenia</string>
-
     <string name="loop">Pętla</string>
     <string name="configbuilder_loop">Pętla</string>
     <string name="loop_aps_label">APS</string>
@@ -215,7 +209,6 @@
     <string name="connected">Połączono</string>
     <string name="disconnected">Rozłączono</string>
     <string name="danar_pump_settings">Ustawienia pompy DanaR</string>
-    <string name="nightscout">Nightscout</string>
     <string name="end_user_license_agreement">Umowa licencyjna użytkownika końcowego</string>
     <string name="end_user_license_agreement_text">NIE MOŻE BY WYKORZYSTYWANY DO PODEJMOWANIA DECYZJI MEDYCZNYCH. NIE MA ŻADNEJ GWARANCJI NA PROGRAM, W ZAKRESIE DOZWOLONYM PRZEZ OBOWIĄZUJĄCE PRAWO. Z WYJĄTKIEM PRZYPADKÓW, GDY W INNY SPOSÓB PISMO OŚWIADCZENIA PRAW AUTORSKICH I / LUB INNYCH STRON, PRZEDSTAWIAĆ PROGRAM "W STANIE TAKIM, W JAKIM SIĘ ZNAJDUJE" BEZ JAKIEJKOLWIEK GWARANCJI, WYRAŹNEJ LUB DOMNIEMANEJ, W TYM MIĘDZY INNYMI DOMNIEMANYCH GWARANCJI PRZYDATNOŚCI HANDLOWEJ I PRZYDATNOŚCI DO OKREŚLONEGO CELU. CAŁKOWITE RYZYKO ZWIĄZANE Z JAKOŚCIĄ I WYNIKIEM PROGRAMU JEST PO PAŃSTWA STRONIE. W PRZYPADKU USZKODZENIA PROGRAMU UŻYTKOWNIK PONOSI KOSZT CAŁEGO NIEZBĘDNEGO SERWISU, NAPRAWY LUB POPRAWEK. W PRZYPADKU NIEPOROZUMIEŃ ZASTOSOWANIE PRAWNE MA UMOWA W ANGIELSKIEJ WERSJI JĘZYKOWEJ!!!</string>
     <string name="end_user_license_agreement_i_understand">ROZUMIEM I WYRAŻAM ZGODĘ</string>
@@ -449,7 +442,6 @@
     <string name="copied_to_clipboard">Skopiowane do schowka</string>
     <string name="nav_show_logcat">Pokaż log</string>
     <string name="overview_calibration">Kalibracja</string>
-    <string name="overview_calibration_bg_label">Kalibracja</string>
     <string name="send_calibration" formatted="false">Wysłać kalibrację %.1f do xDrip?</string>
     <string name="xdripnotinstalled">xDrip+ nie zainstalowany</string>
     <string name="calibrationsent">Kalibracja przesłana do xDrip</string>
@@ -502,8 +494,6 @@
     <string name="resistantadult">Osoba dorosła insulino odporna</string>
     <string name="patientage_summary">Proszę wybierz wiek pacjenta w celu ustawienia wartości bezpieczeństwa</string>
     <string name="Glimp">Glimp</string>
-    <string name="batteryoptimalizationerror">Wygląda na to, że urządzenie nie obsługuje białej listy optymalizacji baterii!</string>
-    <string name="pleaseallowpermission">Przoszę udzielić pozwolenia </string>
     <string name="needwhitelisting">%s Potrzebuję wpisu na białąlistę optymalizacji baterii w celu zapewnienia poprawnego działania</string>
     <string name="loopsuspended">Pętla wstrzymana</string>
     <string name="loopsuspendedfor" formatted="false">Wstrzymana (%d m)</string>
@@ -532,7 +522,6 @@
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
     <string name="ultrafastactinginsulincomment">Fiasp</string>
     <string name="insulin_shortname">INS</string>
-    <string name="fastactinginsulinprolonged">Szybko działająca insulina przedłużona</string>
     <string name="enablesuperbolus">Zezwalaj na superbolus w kreatorze</string>
     <string name="enablesuperbolus_summary">Zezwalaj na funkcjonalność Superbolus w kreatorze. Nie zezwalaj dopuki nie nauczysz się co ta funkcjonalność wprowadza. MOŻE SPOWODOWAĆ PRZEDAWKOWANIE INSULINY JEŻELI UŻYTE BEZ WIEDZY!</string>
     <string name="iob">IOB</string>
@@ -748,7 +737,6 @@
     <string name="combo_error_no_connection_no_bolus_delivered">Pompa nie została odnaleziona. Nie podano bolusa</string>
     <string name="combo_error_no_bolus_delivered">Podanie bolusa nie powiodło się. Wygląda na to, że bolus nie został dostarczony. Aby upewnić się, sprawdź pompę, aby uniknąć podwójnego bolusa, a następnie ponownie podaj bolus. Aby uniknąć błędów, bolusy nie są automatycznie ponawiane.</string>
     <string name="combo_error_partial_bolus_delivered">Only %1$.2f U z zamierzonego bolusa %2$.2f U zostało dostarczone z powodu błędu. Sprawdź pompę, aby sięupewnić i podejmij odpowiednie działania.</string>
-    <string name="combo_error_bolus_recovery_progress">Odzyskiwanie po utracie połączenia</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">Za mało insuliny na bolus pozostało w zbiorniku</string>
     <string name="extendedbolusdeliveryerror">Błąd dostarczania bolusa przedłużonego</string>
     <string name="insightpump_shortname">Wgląd</string>
@@ -768,8 +756,6 @@
     <string name="insight_total_with">total with</string>
     <string name="insight_upfront_with">upfront with</string>
     <string name="insight_stay_always_connected">Stay always connected</string>
-    <string name="insight_use_real_tbr_cancels">Use Real TBR cancels</string>
-    <string name="insight_actually_cancel_tbr_summary">Actually cancel a TBR (creates pump alarm) instead of setting 90% for 1 minute</string>
     <string name="insight_history_idle">BEZCZYNNY</string>
     <string name="insight_history_syncing">SYNCHRONIZUJE</string>
     <string name="insight_history_busy">ZAJĘTY</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 3fa72b73e6..1ed0ce48aa 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -14,8 +14,6 @@
     <string name="ns_sync_use_absolute_title">Folosesțe întotdeauna valori absolute ale bazalei</string>
     <string name="alert_dialog_storage_permission_text">Restartați telefonul sau reporniți aplicația AndroidAPS din System Settings \naltfel AndroidAPS nu va putea face loguri (importante pentru verificarea corectitudinii funcționării algoritmului)!</string>
 
-    <string name="objectives_objective_label_string">Obiectiv:</string>
-    <string name="objectives_gate_label_string">Poartă:</string>
     <string name="objectives_button_start">Start</string>
     <string name="objectives_button_verify">Verifică</string>
     <string name="nsprofileview_units_label">Unități</string>
@@ -74,17 +72,13 @@
     <string name="treatments">Tratamente</string>
     <string name="virtualpump">Pompă virtuală</string>
     <string name="careportal">Careportal</string>
-
-
     <string name="configbuilder_pump">Pompă</string>
     <string name="configbuilder_treatments">Tratamente</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_general">General</string>
     <string name="days">zile</string>
-    <string name="objectives_minimalduration">Durată minimă</string>
     <string name="constraints">Constrângeri</string>
-
     <string name="loop">Loop</string>
     <string name="configbuilder_loop">Loop</string>
     <string name="loop_aps_label">APS</string>
@@ -170,7 +164,6 @@
     <string name="connected">Conectat</string>
     <string name="disconnected">Deconectat</string>
     <string name="danar_pump_settings">Setări pompă DanaR</string>
-    <string name="nightscout">Nightscout</string>
     <string name="end_user_license_agreement">Licență utilizator final</string>
     <string name="end_user_license_agreement_text">NU TREBUIE SĂ FOLOSIȚI PENTRU LUAREA DE DECIZII MEDICALE. NU EXISTĂ RĂSPUNDERE LEGALĂ SAU GARANȚIE PENTRU ACEST PROGRAM, ÎN LIMITA APLICABILĂ A LEGII. CU EXCEPTIA CAZURILOR SPECIAL MENȚIONATE, AUTORUL ȘI/SAU ALTE PERSOANE IMPLICATE PUN LA DISPOZIȚIE ACEST PROGRAM FĂRĂ NICIO GARANȚIE, IMPLICITĂ SAU EXPLICITĂ, INCLUZÂND, DAR FĂRĂ A SE LIMITA LA, GARANȚIILE LEGATE DE VĂNZAREA SAU POTRIVIREA PENTRU UN ANUME SCOP. ÎNTREGUL RISC LEGAT DE CALITATEA ȘI PERFORMANȚA ACESTUI PROGRAM CAD ÎN RESPONSABILITATEA DUMNEAVOASTRĂ. DACĂ PROGRAMUL SE DOVEDEȘTE A FI DEFECT, DUMNEAVOASTRĂ VĂ ASUMAȚI ÎNTREAGA RĂSPUNDERE, PRECUM ȘI TOATE COSTURILE LEGATE DE SERVICE, REPARAȚII SAU CORECȚII.</string>
     <string name="end_user_license_agreement_i_understand">ÎNȚELEG ȘI SUNT DE ACORD</string>
@@ -397,7 +390,6 @@
     <string name="copied_to_clipboard">Copiat în clipboard</string>
     <string name="nav_show_logcat">Afișează istoricul</string>
     <string name="overview_calibration">Calibrare</string>
-    <string name="overview_calibration_bg_label">Glicemie calibrare</string>
     <string name="send_calibration" formatted="false">Trimite calibrarea %.1f către xDrip?</string>
     <string name="xdripnotinstalled">xDrip+ nu este instalat.</string>
     <string name="calibrationsent">Calibrare trimisă către xDrip</string>
@@ -449,8 +441,6 @@
     <string name="adult">Adult</string>
     <string name="patientage_summary">Vă rog să selectați vârsta pacientului în vederea stabilirii valorilor maxime admise de siguranță</string>
     <string name="Glimp">Glimp</string>
-    <string name="batteryoptimalizationerror">Se pare că dispozitivul nu suportă excluderea din lista de optimizare a bateriei!</string>
-    <string name="pleaseallowpermission">Vă rog să activați permisiunea</string>
     <string name="needwhitelisting">%s necesită excluderea din lista de optimizare a bateriei pentru funcționare corespunzătoare</string>
     <string name="loopsuspended">Buclă suspendată</string>
     <string name="loopsuspendedfor" formatted="false">Suspendată (%d m)</string>
@@ -477,7 +467,6 @@
     <string name="fastactinginsulin">Insulină rapidă</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
     <string name="insulin_shortname">INS</string>
-    <string name="fastactinginsulinprolonged">Insulină rapidă cu efect prelungit</string>
     <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="iob">IOB</string>
@@ -742,7 +731,6 @@
     <string name="combo_error_no_connection_no_bolus_delivered">Pompa nu poate fi contactată. Nu s-a livrat niciun bolus</string>
     <string name="combo_error_no_bolus_delivered">Livrare eșuată. Se pare că nu a fost livrat bolusul. Pentru siguranță, verificați în pompă pentru a evita bolusarea dublă. Pentru evitarea greșelilor, bolusurile nu sunt retrimise automat.</string>
     <string name="combo_error_partial_bolus_delivered">Doar %1$.2f U din totalul cerut de %2$.2f U a fost livrat din cauza unei erori. Verificați pompa pentru confirmare și acționați corespunzător.</string>
-    <string name="combo_error_bolus_recovery_progress">Revenire după pierderea conexiunii</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">Nu este suficientă insulină în rezervor</string>
     <string name="extendedbolusdeliveryerror">Eroare de livrare a bolusului extins</string>
     <string name="insightpump_shortname">Insight</string>
@@ -762,8 +750,6 @@
     <string name="insight_total_with">total cu</string>
     <string name="insight_upfront_with">față de</string>
     <string name="insight_stay_always_connected">Rămâneți conectat permanent</string>
-    <string name="insight_use_real_tbr_cancels">Se folosesc anulări de RBT</string>
-    <string name="insight_actually_cancel_tbr_summary">Anulare reală a unei RBT (generează alarmă a pompei) în loc de a seta 90% pentru 1 minut</string>
     <string name="insight_history_idle">LIBER</string>
     <string name="insight_history_syncing">SINCRONIZARE</string>
     <string name="insight_history_busy">OCUPAT</string>
@@ -856,8 +842,6 @@
     <string name="alert_w32">Atenționare W32: Baterie aproape terminată</string>
     <string name="alert_w33">Atenționare W33: Timp/dată invalide</string>
     <string name="alert_w34">Atenționare W34: Sfârșitul garanției</string>
-    <string name="alert_w36">Atenționare W36: RBT terminat</string>
-    <string name="alert_w38">Atenționare W38: Bolus anulat</string>
     <string name="alert_w39">Atenționare W39: Alertă timp închiriere</string>
     <string name="alert_m20">Mentenanță M20: Rezervorul nu este inserat</string>
     <string name="alert_m21">Mentenanță M21: Rezervol gol</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c83690ce7a..458be997cb 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -20,7 +20,6 @@
     <string name="basal_step">шаг базала</string>
     <string name="basalvaluebelowminimum">значение базала ниже минимума. профиль не создан!</string>
     <string name="batterydischarged">батарея помпы разряжена</string>
-    <string name="batteryoptimalizationerror">по-видимому устройство не поддерживается белым списком оптимизации батареи</string>
     <string name="bg_lang">болгарский</string>
     <string name="bolus">болюс</string>
     <string name="bolus_step">шаг болюса</string>
@@ -200,7 +199,6 @@
     <string name="failedupdatebasalprofile">не удалось обновить базальный профиль</string>
     <string name="fastactinginsulin">быстродействующий инсулин</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
-    <string name="fastactinginsulinprolonged">пролонгированный инсулин быстрого действия</string>
     <string name="filenotfound">файл не найден</string>
     <string name="fillbolus_title">заполнить стандартное количество инсулина</string>
     <string name="fillwarning">убедитесь что количество соответствует характеристикам вашей инфузионной системы</string>
@@ -245,7 +243,6 @@
     <string name="nav_resetdb">обнулить базы</string>
     <string name="nav_show_logcat">показать лог</string>
     <string name="needwhitelisting" formatted="false">%s необходимо включить в белый список для корректной работы</string>
-    <string name="nightscout">Nightscout</string>
     <string name="noapsselected">APS не выбрана или не выдала результат</string>
     <string name="nobtadapter">адаптер блутус не найден</string>
     <string name="nochangerequested">изменения не запрошены</string>
@@ -296,10 +293,7 @@
     <string name="objectives_bgavailableinns">гликемия доступна в NS</string>
     <string name="objectives_button_start">старт</string>
     <string name="objectives_button_verify">проверка</string>
-    <string name="objectives_gate_label_string">действие</string>
     <string name="objectives_manualenacts">ввод вручную</string>
-    <string name="objectives_minimalduration">минимальная продолжительность</string>
-    <string name="objectives_objective_label_string">Цель:</string>
     <string name="objectives_pumpstatusavailableinns">статус помпы доступен в NS</string>
     <string name="objectives_shortname">ЦЕЛИ</string>
     <string name="occlusion">закупорка</string>
@@ -351,7 +345,6 @@
     <string name="overview_bolusprogress_stoppressed">нажат стоп</string>
     <string name="overview_calculator_label">калькулятор</string>
     <string name="overview_calibration">калибровка</string>
-    <string name="overview_calibration_bg_label">калибровка СК</string>
     <string name="overview_editquickwizard_buttontext">текст на кнопке</string>
     <string name="overview_editquickwizard_carbs">углеводы:</string>
     <string name="overview_editquickwizard_valid">использовать до:</string>
@@ -367,7 +360,6 @@
     <string name="patientage_summary">выберите возраст пациента для определения ограничителей безопасности</string>
     <string name="paused">на паузе</string>
     <string name="percent">процент</string>
-    <string name="pleaseallowpermission">предоставьте разрешение</string>
     <string name="prefs_range_summary">нижняя и верхняя граница диаграммы в отчетах и Smartwatch (mmol/l)</string>
     <string name="prefs_range_title">диапазон для визуализации</string>
     <string name="primefill">прайм/заполнение</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 98edad9381..83804662a6 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -15,14 +15,10 @@
     <string name="androidaps_start">AndroidAPS startar</string>
     <string name="approachingdailylimit">Maximal daglig dos snart nådd</string>
     <string name="apsmode_title">APS-läge</string>
-    <string name="avgdelta">Medeldelta</string>
     <string name="basal">Basal</string>
     <string name="basal_rate">Basal:</string>
     <string name="basal_step">Basalsteg</string>
-    <string name="basalmissing">Basal saknas i profil. Använder standardvärde.</string>
-    <string name="basalshortlabel">BR</string>
     <string name="basalvaluebelowminimum">Basal understiger miniminivå. Profilen sattes inte.</string>
-    <string name="base_profile_label">Basalprofil:</string>
     <string name="batterydischarged">Pumpbatteri urladdat</string>
     <string name="bolus">Bolus</string>
     <string name="bolus_step">Bolussteg</string>
@@ -78,8 +74,6 @@
     <string name="careportal_temporarytargetcancel">Temp mål avbrutet</string>
     <string name="changeyourinput">Ändra inmatning</string>
     <string name="child">Barn</string>
-    <string name="circadian_percentage_profile">Cirkadisk Profil Procent</string>
-    <string name="circadian_percentage_profile_shortname">CPP</string>
     <string name="clear_queue">Töm kö</string>
     <string name="clearlog">Töm logg</string>
     <string name="closedloop">Closed Loop</string>
@@ -95,7 +89,6 @@
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_pump">Pump</string>
     <string name="configbuilder_shortname">Konf</string>
-    <string name="configbuilder_tempbasals">Tempbasaler</string>
     <string name="configbuilder_treatments">Behandlingar</string>
     <string name="confirmation">Bekräfta</string>
     <string name="connected">Ansluten</string>
@@ -152,7 +145,6 @@
     <string name="days">dagar</string>
     <string name="deliver_now">Synkronisera nu</string>
     <string name="delta">Delta</string>
-    <string name="dev">DEV</string>
     <string name="devicenotfound">Vald enhet kan inte nås</string>
     <string name="dia">DIA:</string>
     <string name="disabledloop">Loop frånkopplad</string>
@@ -160,18 +152,12 @@
     <string name="disableloop">Stäng av loop</string>
     <string name="disconnected">Frånkopplad</string>
     <string name="disconnecting">Kopplar från</string>
-    <string name="disconnectpumpfor10h">Koppla ifrån pump i 10 h</string>
     <string name="disconnectpumpfor2h">Koppla loss pump i 2 h</string>
     <string name="disconnectpumpfor30m">Koppla loss pump i 30 min</string>
     <string name="disconnectpumpfor3h">Koppla loss pump i 3 h</string>
     <string name="dismiss">TA BORT</string>
-    <string name="do_not_track_profile_switch">Ignorera profilbyten</string>
-    <string name="do_not_track_profile_switch_summary">Alla profilbyten ignoreras och aktiv profil används alltid</string>
-    <string name="dont_show_again">Visa inte detta igen</string>
     <string name="duration">Duration</string>
     <string name="eatingsoon">Äta snart</string>
-    <string name="edit_base_basal">Ändra grundbasal:</string>
-    <string name="enabled">Startad</string>
     <string name="enableloop">Starta loop</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>
@@ -210,10 +196,8 @@
     <string name="loop">Loop</string>
     <string name="loop_aps_label">APS</string>
     <string name="loop_constraintsprocessed_label">Efter begränsningar</string>
-    <string name="loop_setbypump_label">Inställning i pump</string>
     <string name="loop_shortname">Loop</string>
     <string name="loopdisabled">LOOP STOPPAD PGA BEGRÄNSNINGAR</string>
-    <string name="loopmenu">Loop meny</string>
     <string name="loopsuperbolusfor" formatted="false">Superbolus (%d min)</string>
     <string name="loopsuspended">Loop pausad</string>
     <string name="low_mark">LÅG-markering</string>
@@ -223,7 +207,6 @@
     <string name="mealbolus">Måltid</string>
     <string name="missing">Saknas:</string>
     <string name="nav_about">Om</string>
-    <string name="nav_backup">Backup</string>
     <string name="nav_exit">Avsluta</string>
     <string name="nav_export">Exportera inställningar</string>
     <string name="nav_import">Importera inställningar</string>
@@ -231,8 +214,6 @@
     <string name="nav_refreshtreatments">Uppdatera från Nightscout</string>
     <string name="nav_resetdb">Återställ databaserna</string>
     <string name="nav_show_logcat">Visa logg</string>
-    <string name="nav_test_alert">Testa alarm</string>
-    <string name="nightscout">Nightscout</string>
     <string name="noapsselected">INGEN APS VALD</string>
     <string name="nobtadapter">Ingen Bluetooth-adapter funnen</string>
     <string name="nochangerequested">Ingen ändring behövs</string>
@@ -254,9 +235,6 @@
     <string name="nsalarm_high">Hög</string>
     <string name="nsalarm_low">Låg</string>
     <string name="nsalarm_staledata">BG-data saknas</string>
-    <string name="nsclient">NSClient</string>
-    <string name="nsclientinternal_devicename_dialogtitle">Ange enhetens namn</string>
-    <string name="nsclientinternal_devicename_title">Enhetens namn</string>
     <string name="nsclientinternal_secret_dialogmessage">Ange Nightscout API secret (min 12 tecken)</string>
     <string name="nsclientinternal_secret_dialogtitle">Nightscout API secret</string>
     <string name="nsclientnotinstalled">NSClient är inte installerad. Data förlorad!</string>
@@ -266,7 +244,6 @@
     <string name="nsclientinternal_title">NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_secret_title">Nightscout API secret</string>
-    <string name="nsprofileview_activeprofile_label">Aktiv profil</string>
     <string name="nsprofileview_basal_label">Basal</string>
     <string name="nsprofileview_dia_label">DIA</string>
     <string name="nsprofileview_ic_label">IC</string>
@@ -293,13 +270,10 @@
     <string name="wear_detailedIOB_summary">Visa IOB med bolus och basal på klocka</string>
     <string name="wear">Klocka (Wear)</string>
     <string name="waitingforpumpresult">Väntar på resultat</string>
-    <string name="waitingforpumpclicktorefresh">Väntar på pump. Klicka för att uppdatera.</string>
     <string name="waitingforpump">Väntar på pump</string>
     <string name="vitualpump_label">Virtuell pump</string>
-    <string name="visible">Synlig</string>
     <string name="virtualpump_uploadstatus_title">Ladda upp status till Nightscout</string>
     <string name="pump_tempbasal_label">Temp basal</string>
-    <string name="virtualpump_sqlerror">SQL-fel</string>
     <string name="virtualpump_shortname">vPump</string>
     <string name="virtualpump_settings">Inställningar för Virtuell pump</string>
     <string name="virtualpump_resultok">OK</string>
@@ -312,7 +286,6 @@
     <string name="virtualpump">Virtuell pump</string>
     <string name="uploading">Laddar upp</string>
     <string name="updatingbasalrates">Uppdaterar basalhastigheter</string>
-    <string name="up">Upp</string>
     <string name="unsupportednsversion">Osupportad version av Nightscout</string>
     <string name="unsupportedclientver">Osupportad version av NSClient</string>
     <string name="unlock_settings">Lås upp inställningar</string>
@@ -320,8 +293,6 @@
     <string name="treatmentssafety_title">Säkerhetsbegränsingar</string>
     <string name="treatmentssafety_maxcarbs_title">Max tillåtna KH [g]</string>
     <string name="treatmentssafety_maxbolus_title">Max tillåten bolus [E]</string>
-    <string name="treatments_wizard_unit_label">E</string>
-    <string name="treatments_wizard_total_label">TOTAL</string>
     <string name="treatments_wizard_correction_label">Korr</string>
     <string name="treatments_wizard_cob_label">COB</string>
     <string name="treatments_wizard_carbs_label">KH</string>
@@ -340,9 +311,7 @@
     <string name="treatments_activity_string">5m:</string>
     <string name="treatments">Behandlingar</string>
     <string name="treatmentdeliveryerror">Fel vid bolusleverans</string>
-    <string name="temptargetrange_shortname">TT</string>
     <string name="temptarget">Temp mål</string>
-    <string name="tempbasals_shortname">TB</string>
     <string name="tempbasals_realduration_label_string">Dur:</string>
     <string name="tempbasals_netratio_label_string">Tot:</string>
     <string name="tempbasals_netinsulin_label_string">Ins:</string>
@@ -351,7 +320,6 @@
     <string name="tempbasaldeliveryerror">Fel vid justering av tempbasal</string>
     <string name="tempbasal">Temp basal</string>
     <string name="teenage">Tonåring</string>
-    <string name="targetmissing">Mål saknas i profil. Använder standardvärde.</string>
     <string name="target_range">Målområde:</string>
     <string name="suspendloopfor3h">Pausa loop i 3 h</string>
     <string name="suspendloopfor2h">Pausa loop i 2 h</string>
@@ -402,7 +370,6 @@
     <string name="setextendedbolusquestion">Ställ in ny förlängd bolus:</string>
     <string name="setbasalquestion">Acceptera ny tempbasal:</string>
     <string name="send_calibration" formatted="false">Skicka kalibrering %.1f till xDrip?</string>
-    <string name="send">SKICKA</string>
     <string name="save">Spara</string>
     <string name="safety">Säkerhet</string>
     <string name="resume">Återuppta</string>
@@ -415,12 +382,10 @@
     <string name="reloadprofile">Ladda om profil</string>
     <string name="refresheventsfromnightscout">Uppdatera från Nightscout</string>
     <string name="reason">Orsak</string>
-    <string name="ratio_short">RAT</string>
     <string name="rate">Hastighet</string>
     <string name="quickwizardsettings">Kalkylatorinställningar</string>
     <string name="quickwizard">Kalkylator</string>
     <string name="queue">Kö:</string>
-    <string name="pumpsuspendedclicktorefresh">Pump pausad. Klicka för att ladda om status.</string>
     <string name="pumpsuspended">Pump pausad</string>
     <string name="pumpshutdown">Pump avstängd</string>
     <string name="pumperror">Pumpfel</string>
@@ -438,7 +403,6 @@
     <string name="prefs_range_title">Gränsvärden för visualisering</string>
     <string name="prefs_range_summary">Högt och lågt värde för grafen i Översikt och i smartwatch</string>
     <string name="percent">Procent</string>
-    <string name="percentagefactor_hint">Procentfaktor med vilken basalprofilen kommer att bli multiplicerad.</string>
     <string name="paused">Pausad</string>
     <string name="patientage_summary">Vg ange personens ålder för inställningar av gränser</string>
     <string name="patientage">Personens ålder</string>
@@ -453,7 +417,6 @@
     <string name="overview_editquickwizard_valid">Giltig:</string>
     <string name="overview_editquickwizard_carbs">KH:</string>
     <string name="overview_editquickwizard_buttontext">Knapptext:</string>
-    <string name="overview_calibration_bg_label">Kalibrering</string>
     <string name="overview_calibration">Kalibrering</string>
     <string name="overview_calculator_label">Kalkylator</string>
     <string name="overview_bolusprogress_stoppressed">Stopp nedtryckt</string>
@@ -461,17 +424,12 @@
     <string name="overview_bolusprogress_stop">Stopp</string>
     <string name="overview_bolusprogress_goingtodeliver" formatted="false">Kommer tillföra %.2f enheter</string>
     <string name="overview_bolusprogress_delivered">Tillförd</string>
-    <string name="overview_bolus_label">Bolus</string>
     <string name="overview">Översikt</string>
     <string name="openloop_newsuggestion">Ny rekommendation tillgänglig</string>
     <string name="openloop">Open Loop</string>
-    <string name="openapsma_valueoutofrange" formatted="false">Värde %s är utanför gränserna</string>
-    <string name="openapsma_valuelimitedto">%1$.2f begränsad till %2$.2f</string>
     <string name="openapsma_run">Beräkna nu</string>
     <string name="openapsma_request_label">Beräknat behov</string>
     <string name="openapsma_profile_label">Profil</string>
-    <string name="openapsma_nopump">Ingen pump tillgänglig</string>
-    <string name="openapsma_noprofile">Ingen profil tillänglig</string>
     <string name="openapsma_noglucosedata">Ingen glukosdata tillänglig</string>
     <string name="openapsma_mealdata_label">Måltidsdata</string>
     <string name="openapsma_maxiob_title">Maximal basal IOB som OpenAPS kan ge [E]</string>
@@ -506,10 +464,7 @@
     <string name="occlusion">Ocklusion</string>
     <string name="objectives_shortname">Mål</string>
     <string name="objectives_pumpstatusavailableinns">Pumpstatus tillgängligt i Nightscout</string>
-    <string name="objectives_objective_label_string">Mål:</string>
-    <string name="objectives_minimalduration">Minimal duration</string>
     <string name="objectives_manualenacts">Manuella justeringar</string>
-    <string name="objectives_gate_label_string">Spärr:</string>
     <string name="objectives_button_verify">Godkänn</string>
     <string name="objectives_button_start">Starta</string>
     <string name="objectives_bgavailableinns">BG är tillängligt i Nightscout</string>
@@ -530,13 +485,8 @@
     <string name="careportal_pump_label">PUMP</string>
     <string name="careportal_pumpbatterychange">Byte pumpbatteri</string>
     <string name="careportal_sensorage_label">Sensorålder</string>
-    <string name="cpp_sync_setting_missing">måste vara aktiverad för att kunna skicka värden till pumpen.</string>
-    <string name="cpp_valuesnotstored">Värden sparades inte!</string>
     <string name="danar_stats_warning_Message">Kan visa fel om man använder bolus för priming/fyllning!</string>
-    <string name="edit_base_ic">Ändra grund-IC:</string>
-    <string name="edit_base_isf">Ändra grund-ISF:</string>
     <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
-    <string name="isfmissing">ISF saknas i profilen. Använder standardvärde.</string>
     <string name="mmol">mmol/l</string>
     <string name="minago" formatted="false">%d&#160;m</string>
     <string name="mgdl">mg/dl</string>
@@ -572,7 +522,6 @@
     <string name="danar_totaluploaded">Laddade upp totalt %d värden</string>
     <string name="objectives_7_objective">Aktiverar ytterligare funktioner för användning dagtid, t ex SMB.</string>
     <string name="smscommunicator_remotecommandnotallowed">Otillåtet fjärrkommando</string>
-    <string name="timeshift_hint">Tid (i timmar) som profilen kommer att förskjutas.</string>
     <string name="danar_switchtouhmode">Ändra inställningen från E/d till E/tim i pumpen</string>
     <string name="short_avgdelta">Kort medeldelta</string>
     <string name="long_avgdelta">Långt medeldelta</string>
@@ -580,24 +529,13 @@
     <string name="danar_stats_weight">Vikt</string>
     <string name="danar_stats_tbb">Total grundbasal</string>
     <string name="short_tabtitles">Förkorta namnen på flikarna</string>
-    <string name="prefs_delta_title">Deltainställningar</string>
     <string name="danar_model">Modell: %1$02X Protokoll: %2$02X Kod: %3$02X</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">"Standardvärde: 4  Detta är en grundsten i OpenAPS säkerhet. Detta begränsar dina tempbasaler till maximalt 4x din nuvarande basal, oberoende av din max basalhastighet. Detta för att undvika att man av misstag gör farliga inställningar. Om man når taket i denna inställning så kanske ändringar i andra inställningar behövs. De flesta behöver inte ändra denna inställning. "</string>
     <string name="openapsama_autosens_min_summary">Standardvärde: 0.7  Med standardvärdet 0.7 kan autosens justera ner dina basaler, kvoter etc med upp till 30% för att kompensera för t ex tillfällig hög insulinkänslighet.</string>
-    <string name="nsclientinternal_devicename_dialogmessage">"Det kommer att användas för att ange \"Loggat av: \". "</string>
-    <string name="batteryoptimalizationerror">Enheten verkar inte stöda vitlistning av appar för batteriförbrukning</string>
-    <string name="pleaseallowpermission">Tillåt</string>
     <string name="needwhitelisting">%s behöver kunna kringgå batterisparfunktionerna för att fungera korrekt</string>
     <string name="loopsuspendedfor">Pausad (%d min)</string>
-    <string name="fastactinginsulinprolonged">Snabbverkande insulin (förlängd)</string>
-    <string name="icmissing">KH-kvot (IC) saknas i profilen. Använder standardvärde.</string>
-    <string name="nsalarm_summary">För närvarande satt till %f</string>
-    <string name="device">Enhet</string>
     <string name="uploader">Uppladdare</string>
     <string name="configbuilder_sensitivity">Känslighetsavkänning</string>
-    <string name="cpp_notloadedplugins">Alla profiler laddades inte!</string>
-    <string name="wear_overviewnotifications">Notiser från Översikten</string>
-    <string name="wear_overviewnotifications_summary">Sänd notiser från Översikten som bekräftelsemeddelanden på Wear.</string>
     <string name="overview_newtempbasal_basalabsolute">Basal [E/tim]</string>
     <string name="insulin_oref_peak">Peaktid för IOB-kurvan</string>
     <string name="insulin_peak_time">Peaktid [min]</string>
@@ -689,8 +627,6 @@
     <string name="combo_pump_activity_label">Aktivitet</string>
     <string name="combo_no_pump_connection">Ingen anslutning på %d min</string>
     <string name="combo_tbr_remaining">%1$d%% (%2$d min återstår)</string>
-    <string name="combo_pump_action_initializing">Initierar</string>
-    <string name="combo_pump_state_disconnected">Frånkopplad</string>
     <string name="combo_pump_state_suspended_due_to_error">Pausad pga fel</string>
     <string name="combo_pump_state_suspended_by_user">Pausad av användaren</string>
     <string name="combo_pump_state_running">Körs</string>
@@ -698,35 +634,24 @@
     <string name="combo_pump_action_setting_tbr">Sätter tempbasal (%1$d%% / %2$d min)</string>
     <string name="combo_pump_action_bolusing">Ger bolus (%.1f enheter)</string>
     <string name="combo_pump_action_refreshing">Uppdaterar</string>
-    <string name="combo_pump_never_connected">Aldrig</string>
     <string name="combo_pump_unsupported_operation">Önskad åtgärd stöds inte av pumpen</string>
     <string name="combo_low_suspend_forced_notification">Osäker användning: Förlängd- eller kombibolus är aktiv. Loop mode är satt till att bromsa vid lågt BG i 6 timmar. Endast normala bolusar tillåtna i loopläge.</string>
     <string name="combo_force_disabled_notification">Osäker användning: Pumpen använder en annan basalprofil än den första. Loop avstängd. Välj den första profilen på pumpen och uppdatera.</string>
     <string name="bolus_frequency_exceeded">En bolus med samma mängd efterfrågades inom den senaste minuten. För att förhindra att råka ge dubbla bolusar av misstag och ev programfel är detta inte tillåtet.</string>
     <string name="combo_pump_connected_now">Nu</string>
     <string name="combo_activity_reading_pump_history">Läser historik från pumpen</string>
-    <string name="combo_pump_alerts">Larm</string>
     <string name="combo_activity_setting_basal_profile">Sätter basalprofil</string>
     <string name="combo_pump_cartridge_low_warrning">Låg nivå i insulinreservoaren</string>
     <string name="combo_pump_battery_low_warrning">Pumpbatteriet är svagt</string>
     <string name="combo_is_in_error_state">Pumpen visar felet: E%1$d: %2$s</string>
-    <string name="combo_no_alert_data_note">För att läsa pumpens historik, tryck och håll in ALERTS-knappen. VARNING: detta kan aktivera en bugg som orsakar att pumpen vägrar ansluta och kräver att en knapp trycks in på pumpen för att återgå. Det bör därför undvikas.</string>
-    <string name="combo_no_tdd_data_note">"För att läsa pumpens historik, tryck och håll in TDDS-knappen. VARNING: detta kan aktivera en bugg som orsakar att pumpen vägrar ansluta och kräver att en knapp trycks in på pumpen för att återgå. Det bör därför undvikas. "</string>
-    <string name="combo_tdd_minimum">Minimum: %3.1f enheter</string>
-    <string name="combo_tdd_average">Genomsnitt: %3.1f enheter</string>
-    <string name="combo_tdd_maximum">Maximum: %3.1f enheter</string>
     <string name="combo_reservoir_low">Låg</string>
     <string name="combo_reservoir_empty">Tom</string>
     <string name="combo_reservoir_normal">Normal</string>
     <string name="combo_notification_check_time_date">Pumpens klocka behöver ställas om</string>
-    <string name="combo_history">Historik</string>
     <string name="combo_warning">Varning</string>
-    <string name="combo_read_full_history_warning">"Detta kommer att läsa pumpens fulla historik och status. Allt i Mitt Data och basalprogrammen. Bolusar och tempbasaler kommer att läggas till under Behandlingar om de inte redan finns där. Detta kan orsaka att vissa saker läggs in dubbelt eftersom pumpens klocka inte är så exakt. Detta bör inte göras medan loopen är ogång, utan bara när behov uppstår. Om du ändå vill göra detta, tryck och håll in den här knappen igen. VARNING: detta kan aktivera en bugg som orsakar att pumpen vägrar ansluta och kräver att en knapp trycks in på pumpen för att återgå. Det bör därför undvikas. "</string>
-    <string name="combo_read_full_history_confirmation">Är du helt säker på att du vill läsa all pumphistorik och är medveten om konsekvenserna?</string>
     <string name="combo_pump_tbr_cancelled_warrning">Varningen om avbruten tempbasal bekräftad</string>
     <string name="combo_error_no_bolus_delivered">Bolus avbruten. Det verkar som om ingen bolus gavs. För att vara säker, vänligen kontrollera pumpen för att undvika dubbel bolus och prova sedan vid behov igen. För att förhindra fel orsakade av mjukvaran, försöker inte mjukvaran igen automatiskt.</string>
     <string name="combo_error_partial_bolus_delivered">Endast %1$.2f enheter %2$.2f gavs pga ett fel. Vänligen verifiera på pumpen och vidta nödvändiga åtgärder.</string>
-    <string name="combo_error_bolus_recovery_progress">Återansluter efter att ha tappat kontakten</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">Inte tillräckligt med insulin i reservoaren för att ge bolus</string>
     <string name="extendedbolusdeliveryerror">Förlängd bolus misslyckad</string>
     <string name="careportal_carbscorrection">KH-korrektion</string>
@@ -752,7 +677,6 @@
     <string name="insight_total_with">total med</string>
     <string name="insight_upfront_with">direkt med</string>
     <string name="insight_stay_always_connected">Håll alltid ansluten</string>
-    <string name="insight_actually_cancel_tbr_summary">Stoppa temp basal på riktigt (skapar pumplarm) istället för att sätta till 90% i en minut</string>
     <string name="insight_history_idle">REDO</string>
     <string name="insight_history_syncing">SYNKRONISERAR</string>
     <string name="insight_history_busy">UPPTAGEN</string>
@@ -814,7 +738,6 @@
     <string name="category">Kategori</string>
     <string name="subcategory">Underkategori</string>
     <string name="bolusrecordedonly">Bolusen sparas bara i loggboken</string>
-    <string name="ns_autobackfill">Hämta saknade BG från NS</string>
     <string name="loop_smbsetbypump_label">SMB satt i pump</string>
     <string name="overview_show_sensitivity">Känslighet (Sens)</string>
     <string name="overview_show_deviations">Avvikelser (Dev)</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1fe896da1c..d7c4fdf3e6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -53,8 +53,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_objective_label_string">Objective:</string>
-    <string name="objectives_gate_label_string">Gate:</string>
     <string name="objectives_button_start">Start</string>
     <string name="objectives_button_verify">Verify</string>
     <string name="nsprofileview_units_label">Units</string>
@@ -134,7 +132,6 @@
     <string name="configbuilder_general_description">These are some general plugins you might find useful.</string>
     <string name="configbuilder_constraints_description">Which constraints are applied?</string>
     <string name="days">days</string>
-    <string name="objectives_minimalduration">Minimal duration</string>
     <string name="constraints">Constraints</string>
 
     <string name="loop">Loop</string>
@@ -262,7 +259,6 @@
     <string name="connected">Connected</string>
     <string name="disconnected">Disconnected</string>
     <string name="danar_pump_settings">DanaR pump settings</string>
-    <string name="nightscout">Nightscout</string>
     <string name="end_user_license_agreement">End User License Agreement</string>
     <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">I UNDERSTAND AND AGREE</string>
@@ -505,7 +501,6 @@
     <string name="copied_to_clipboard">Copied to clipboard</string>
     <string name="nav_show_logcat">Show log</string>
     <string name="overview_calibration">Calibration</string>
-    <string name="overview_calibration_bg_label">Calibration</string>
     <string name="send_calibration" formatted="false">Send calibration %.1f to xDrip?</string>
     <string name="xdripnotinstalled">xDrip+ not installed</string>
     <string name="calibrationsent">Calibration sent to xDrip</string>
@@ -575,8 +570,6 @@
     <string name="patientage_summary">Please select patient age to setup safety limits</string>
     <string name="key_i_understand" translatable="false">I_understand</string>
     <string name="Glimp">Glimp</string>
-    <string name="batteryoptimalizationerror">Device does not appear to support battery optimization whitelisting!</string>
-    <string name="pleaseallowpermission">Please Allow Permission</string>
     <string name="needwhitelisting">%s needs battery optimalization whitelisting for proper performance</string>
     <string name="loopsuspended">Loop suspended</string>
     <string name="loopsuspendedfor" formatted="false">Suspended (%d m)</string>
@@ -607,7 +600,6 @@
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
     <string name="ultrafastactinginsulincomment">Fiasp</string>
     <string name="insulin_shortname">INS</string>
-    <string name="fastactinginsulinprolonged">Fast Acting Insulin Prolonged</string>
     <string name="key_usesuperbolus" translatable="false">key_usersuperbolus</string>
     <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>
@@ -874,7 +866,6 @@
     <string name="combo_error_no_bolus_delivered">Bolus delivery failed. It appears no bolus was delivered. To be sure, please check the pump to avoid a double bolus and then bolus again. To guard against bugs, boluses are not automatically retried.</string>
     <string name="combo_error_partial_bolus_delivered">Only %1$.2f U of the requested bolus of %2$.2f U was delivered due to an error. Please check the pump to verify this and take appropriate actions.</string>
     <string name="combo_error_bolus_verification_failed">Delivering the bolus and verifying the pump\'s history failed, please check the pump and manually. If a bolus was delivered, it will be added to treatments during the next connection to the pump.</string>
-    <string name="combo_error_bolus_recovery_progress">Recovering from connection loss</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">Not enough insulin for bolus left in reservoir</string>
     <string name="extendedbolusdeliveryerror">Extended bolus delivery error</string>
     <string name="insightpump_shortname">Insight</string>
@@ -894,8 +885,6 @@
     <string name="insight_total_with">total with</string>
     <string name="insight_upfront_with">upfront with</string>
     <string name="insight_stay_always_connected">Stay always connected</string>
-    <string name="insight_use_real_tbr_cancels">Use Real TBR cancels</string>
-    <string name="insight_actually_cancel_tbr_summary">Actually cancel a TBR (creates pump alarm) instead of setting 90% for 1 minute</string>
     <string name="insight_history_idle">IDLE</string>
     <string name="insight_history_syncing">SYNCING</string>
     <string name="insight_history_busy">BUSY</string>
@@ -1066,7 +1055,6 @@
     <string name="title_activity_setup_wizard" translatable="false">SetupWizardActivity</string>
     <string name="next_button">Next</string>
     <string name="previous_button">Prev</string>
-    <string name="skip_button">Skip</string>
     <string name="nav_setupwizard">Setup Wizard</string>
     <string name="setupwizard_finish">FINISH</string>
     <string name="setupwizard_language_prompt">Select your language</string>
@@ -1169,7 +1157,6 @@
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Lower sensitivity for temptargets < 100]]></string>
     <string name="combo_invalid_setup">Invalid pump setup, check the docs and verify that the Quick Info menu is named QUICK INFO using the 360 configuration software.</string>
     <string name="custom">Custom</string>
-    <string name="key_lockscreen" translatable="false">lockscreen</string>
     <string name="largetimedifftitle">Large Time Difference</string>
     <string name="largetimediff">Large time difference:\nTime in pump is off by more than 1.5 hours.\nPlease adjust the time manually on the pump and make sure that reading the history from the pump does not cause unexpected behaviour.\nIf possible, remove the history from the pump before changing the time or disable the closed loop for one DIA after the last wrong history entry but minimum one DIA from now.</string>
     <string name="key_keep_screen_on" translatable="false">keep_screen_on</string>
diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml
index 0256d3a11f..d50cb015e6 100644
--- a/wear/src/main/res/values/strings.xml
+++ b/wear/src/main/res/values/strings.xml
@@ -48,16 +48,9 @@
 
 
     <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip2">AAPSv2</string>
     <string name="label_xdrip_large">AAPS(Large)</string>
     <string name="label_xdrip_big_chart">AAPS(BigChart)</string>
     <string name="label_xdrip_no_chart">AAPS(NoChart)</string>
     <string name="label_xdrip_circle">AAPS(Circle)</string>
-    <string name="label_xdrip_activity">AAPS</string>
-    <string name="app_settings">AAPS Settings</string>
-
-    <string name="title_activity_bolus">BolusActivity</string>
-    <string name="hello_round">Hello Round World!</string>
-    <string name="hello_square">Hello Square World!</string>
 
 </resources>