source -> plugins module

app/src/main/AndroidManifest.xml

@@ -191,7 +191,7 @@
             android:name=".plugins.general.maintenance.activities.LogSettingActivity"
             android:exported="false" />
         <activity
-            android:name=".plugins.source.activities.RequestDexcomPermissionActivity"
+            android:name="info.nightscout.plugins.source.activities.RequestDexcomPermissionActivity"
             android:exported="false" />
 
         <uses-library

app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt

@@ -40,14 +40,14 @@ import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
-import info.nightscout.androidaps.plugins.source.AidexPlugin
+import info.nightscout.plugins.source.AidexPlugin
-import info.nightscout.androidaps.plugins.source.DexcomPlugin
+import info.nightscout.plugins.source.DexcomPlugin
-import info.nightscout.androidaps.plugins.source.EversensePlugin
+import info.nightscout.plugins.source.EversensePlugin
-import info.nightscout.androidaps.plugins.source.GlimpPlugin
+import info.nightscout.plugins.source.GlimpPlugin
-import info.nightscout.androidaps.plugins.source.GlunovoPlugin
+import info.nightscout.plugins.source.GlunovoPlugin
-import info.nightscout.androidaps.plugins.source.IntelligoPlugin
+import info.nightscout.plugins.source.IntelligoPlugin
-import info.nightscout.androidaps.plugins.source.PoctechPlugin
+import info.nightscout.plugins.source.PoctechPlugin
-import info.nightscout.androidaps.plugins.source.TomatoPlugin
+import info.nightscout.plugins.source.TomatoPlugin
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog.show
 import info.nightscout.androidaps.utils.protection.PasswordCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.ProtectionType.BIOMETRIC

app/src/main/java/info/nightscout/androidaps/di/ActivitiesModule.kt

@@ -8,7 +8,7 @@ import info.nightscout.androidaps.activities.PreferencesActivity
 import info.nightscout.androidaps.activities.SingleFragmentActivity
 import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity
 import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity
-import info.nightscout.androidaps.plugins.source.activities.RequestDexcomPermissionActivity
+import info.nightscout.plugins.source.activities.RequestDexcomPermissionActivity
 import info.nightscout.androidaps.setupwizard.SetupWizardActivity
 
 @Module

app/src/main/java/info/nightscout/androidaps/di/PluginsListModule.kt

@@ -33,16 +33,16 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugi
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
-import info.nightscout.androidaps.plugins.source.AidexPlugin
+import info.nightscout.plugins.source.AidexPlugin
-import info.nightscout.androidaps.plugins.source.DexcomPlugin
+import info.nightscout.plugins.source.DexcomPlugin
-import info.nightscout.androidaps.plugins.source.GlimpPlugin
+import info.nightscout.plugins.source.GlimpPlugin
-import info.nightscout.androidaps.plugins.source.GlunovoPlugin
+import info.nightscout.plugins.source.GlunovoPlugin
-import info.nightscout.androidaps.plugins.source.IntelligoPlugin
+import info.nightscout.plugins.source.IntelligoPlugin
-import info.nightscout.androidaps.plugins.source.MM640gPlugin
+import info.nightscout.plugins.source.MM640gPlugin
-import info.nightscout.androidaps.plugins.source.PoctechPlugin
+import info.nightscout.plugins.source.PoctechPlugin
-import info.nightscout.androidaps.plugins.source.RandomBgPlugin
+import info.nightscout.plugins.source.RandomBgPlugin
-import info.nightscout.androidaps.plugins.source.TomatoPlugin
+import info.nightscout.plugins.source.TomatoPlugin
-import info.nightscout.androidaps.plugins.source.XdripPlugin
+import info.nightscout.plugins.source.XdripPlugin
 import info.nightscout.automation.AutomationPlugin
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin

app/src/main/java/info/nightscout/androidaps/di/WorkersModule.kt

@@ -3,28 +3,10 @@ package info.nightscout.androidaps.di
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefsImpl
-import info.nightscout.androidaps.plugins.source.AidexPlugin
-import info.nightscout.androidaps.plugins.source.DexcomPlugin
-import info.nightscout.androidaps.plugins.source.EversensePlugin
-import info.nightscout.androidaps.plugins.source.GlimpPlugin
-import info.nightscout.androidaps.plugins.source.MM640gPlugin
-import info.nightscout.androidaps.plugins.source.PoctechPlugin
-import info.nightscout.androidaps.plugins.source.TomatoPlugin
-import info.nightscout.androidaps.plugins.source.XdripPlugin
-import info.nightscout.plugins.profile.ProfilePlugin
 
 @Module
 @Suppress("unused")
 abstract class WorkersModule {
 
-    @ContributesAndroidInjector abstract fun contributesXdripWorker(): XdripPlugin.XdripWorker
-    @ContributesAndroidInjector abstract fun contributesDexcomWorker(): DexcomPlugin.DexcomWorker
-    @ContributesAndroidInjector abstract fun contributesMM640gWorker(): MM640gPlugin.MM640gWorker
-    @ContributesAndroidInjector abstract fun contributesGlimpWorker(): GlimpPlugin.GlimpWorker
-    @ContributesAndroidInjector abstract fun contributesPoctechWorker(): PoctechPlugin.PoctechWorker
-    @ContributesAndroidInjector abstract fun contributesTomatoWorker(): TomatoPlugin.TomatoWorker
-    @ContributesAndroidInjector abstract fun contributesEversenseWorker(): EversensePlugin.EversenseWorker
-    @ContributesAndroidInjector abstract fun contributesNSProfileWorker(): ProfilePlugin.NSProfileWorker
     @ContributesAndroidInjector abstract fun contributesCsvExportWorker(): ImportExportPrefsImpl.CsvExportWorker
-    @ContributesAndroidInjector abstract fun contributesAidexWorker(): AidexPlugin.AidexWorker
 }

app/src/main/java/info/nightscout/androidaps/implementations/ActivityNamesImpl.kt

@@ -50,14 +50,14 @@ class ActivityNamesImpl @Inject constructor() : ActivityNames {
             .show(fragmentManager, "ProfileSwitchDialog")
     }
 
-    override fun runProfileViewerDialog(fragmentManager: FragmentManager, time: Long, mode: ActivityNames.Mode, customProfile: String?, customProfilename: String?, customProfile2: String?) {
+    override fun runProfileViewerDialog(fragmentManager: FragmentManager, time: Long, mode: ActivityNames.Mode, customProfile: String?, customProfileName: String?, customProfile2: String?) {
         ProfileViewerDialog()
             .also {
                 it.arguments = Bundle().also { bundle ->
                     bundle.putLong("time", time)
                     bundle.putInt("mode", mode.ordinal)
                     bundle.putString("customProfile", customProfile)
-                    bundle.putString("customProfileName", customProfilename)
+                    bundle.putString("customProfileName", customProfileName)
                     bundle.putString("customProfile2", customProfile2)
                 }
             }

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

@@ -60,8 +60,8 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOve
 import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin
-import info.nightscout.androidaps.plugins.source.DexcomPlugin
+import info.nightscout.plugins.source.DexcomPlugin
-import info.nightscout.androidaps.plugins.source.XdripPlugin
+import info.nightscout.plugins.source.XdripPlugin
 import info.nightscout.androidaps.skins.SkinProvider
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.ToastUtils

app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt

@@ -6,14 +6,14 @@ import android.provider.Telephony
 import androidx.work.Data
 import androidx.work.OneTimeWorkRequest
 import dagger.android.DaggerBroadcastReceiver
-import info.nightscout.androidaps.plugins.source.AidexPlugin
+import info.nightscout.plugins.source.AidexPlugin
-import info.nightscout.androidaps.plugins.source.DexcomPlugin
+import info.nightscout.plugins.source.DexcomPlugin
-import info.nightscout.androidaps.plugins.source.EversensePlugin
+import info.nightscout.plugins.source.EversensePlugin
-import info.nightscout.androidaps.plugins.source.GlimpPlugin
+import info.nightscout.plugins.source.GlimpPlugin
-import info.nightscout.androidaps.plugins.source.MM640gPlugin
+import info.nightscout.plugins.source.MM640gPlugin
-import info.nightscout.androidaps.plugins.source.PoctechPlugin
+import info.nightscout.plugins.source.PoctechPlugin
-import info.nightscout.androidaps.plugins.source.TomatoPlugin
+import info.nightscout.plugins.source.TomatoPlugin
-import info.nightscout.androidaps.plugins.source.XdripPlugin
+import info.nightscout.plugins.source.XdripPlugin
 import info.nightscout.androidaps.utils.extensions.copyDouble
 import info.nightscout.androidaps.utils.extensions.copyLong
 import info.nightscout.androidaps.utils.extensions.copyString

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

@@ -235,13 +235,13 @@
     <string name="urgent_alarm">Dringende Alarm</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense App (bygewerk)</string>
-    <string name="dexcomg5_nsupload_title">BG data oplaai na NS</string>
+    <string name="do_ns_upload_title">BG data oplaai na NS</string>
     <string name="bgsource_upload">BG oplaai instellings</string>
     <string name="wear_detailed_delta_title">Wys gedetailleerde delta</string>
     <string name="wear_detailed_delta_summary">Wys delta met een meer desimale plek</string>
     <string name="smbmaxminutes_summary">Maks minute van basale beperk SMB tot</string>
-    <string name="dexcomg5_xdripupload_title">Stuur BG data na xDrip+</string>
+    <string name="do_xdrip_upload_title">Stuur BG data na xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">Xdrip+ kies 640g/Eversense data bron</string>
+    <string name="do_xdrip_upload_summary">Xdrip+ kies 640g/Eversense data bron</string>
     <string name="nsclientbg">NSClient BG</string>
     <string name="overview_editquickwizard_usebg">BG berekening</string>
     <string name="overview_editquickwizard_usebolusiob">Bolus IAB berekening</string>
@@ -385,7 +385,7 @@
     <string name="loop_openmode_min_change">Minimale versoek verandering [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Oop lus sal nuwe verandering versoek as die %. Verstek waarde is 20%</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="dexcom_lognssensorchange_title">Log sensor verander na NS</string>
+    <string name="dexcom_log_ns_sensor_change_title">Log sensor verander na NS</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">JouTidepool login gebruiker, normaallweg \'n email adres</string>

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

@@ -315,7 +315,7 @@
     <string name="urgent_alarm">Спешна аларма</string>
     <string name="info">ИНФО</string>
     <string name="eversense">Eversense приложение(модифицирано)</string>
-    <string name="dexcomg5_nsupload_title">Качвай данните за КЗ в NS</string>
+    <string name="do_ns_upload_title">Качвай данните за КЗ в NS</string>
     <string name="bgsource_upload">Настройки при качване на КЗ към Nightscout</string>
     <string name="wear_detailed_delta_title">Показвай подробна делта</string>
     <string name="wear_detailed_delta_summary">Показвай делта с още един десетичен знак</string>
@@ -325,8 +325,8 @@
     <string name="uamsmbmaxminutes_summary">Максимални минути за ограничаване на базала при SMB за UAM</string>
     <string name="carbsReqThreshold">Минимум въглехидрати, необходими за аларма</string>
     <string name="carbsReqThreshold_summary">Грама въглехидрати минимум, за да се покаже аларма. Нужни въглехидрати под това число няма да доведат до уведомяване.</string>
-    <string name="dexcomg5_xdripupload_title">Изпращай данни за КЗ към xDrip+</string>
+    <string name="do_xdrip_upload_title">Изпращай данни за КЗ към xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">В xDrip+ изберете 640g/Eversense за източник на данни</string>
+    <string name="do_xdrip_upload_summary">В xDrip+ изберете 640g/Eversense за източник на данни</string>
     <string name="nsclientbg">КЗ от NS</string>
     <string name="nsclientbgshort">NS КЗ</string>
     <string name="overview_editquickwizard_usebg">Калкулиране на КЗ</string>
@@ -495,7 +495,7 @@
     <string name="loop_openmode_min_change">Минимална стойност за промяна [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">AndroidAPS ще покаже запитването за промяна на базала само ако е по-голямо от тази стойност.(Стандартно 20%)</string>
     <string name="profile_total">Общо  %1$s Е</string>
-    <string name="dexcom_lognssensorchange_title">Записвай смяната на сензор в NS</string>
+    <string name="dexcom_log_ns_sensor_change_title">Записвай смяната на сензор в NS</string>
     <string name="tomato">Tomato(MяоМяо)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Потребителското Ви име за Tidepool, обикновено е Вашия имейл</string>

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

@@ -324,7 +324,7 @@
     <string name="urgent_alarm">Urgentní alarm</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense aplikace (upravená)</string>
-    <string name="dexcomg5_nsupload_title">Nahrávat data do NS</string>
+    <string name="do_ns_upload_title">Nahrávat data do NS</string>
     <string name="bgsource_upload">Nastavení nahrávání glykémií</string>
     <string name="wear_detailed_delta_title">Zobrazovat detailní změny</string>
     <string name="wear_detailed_delta_summary">Zobrazovat rozdíl s jedním desetinným místem navíc</string>
@@ -334,8 +334,8 @@
     <string name="uamsmbmaxminutes_summary">Maximální počet minut bazálu, ke kterým se limituje SMB pro UAM</string>
     <string name="carbsReqThreshold">Minimální množství sacharidů potřebných pro návrh</string>
     <string name="carbsReqThreshold_summary">Minimální množství sacharidů v gramech, které spustí upozornění návrhu sacharidů. Množství sacharidů pod touto hodnotou nespustí oznámení.</string>
-    <string name="dexcomg5_xdripupload_title">Odesílat data do xDrip+</string>
+    <string name="do_xdrip_upload_title">Odesílat data do xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">V xDrip+ vyberte zdroj dat 640g/Eversense</string>
+    <string name="do_xdrip_upload_summary">V xDrip+ vyberte zdroj dat 640g/Eversense</string>
     <string name="nsclientbg">Glykémie z NS</string>
     <string name="nsclientbgshort">NSGL</string>
     <string name="overview_editquickwizard_usebg">Kalkulace glykémie</string>
@@ -515,8 +515,8 @@
     <string name="loop_openmode_min_change">Minimální změna pro výzvu [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Otevřená smyčka vytvoří novou žádost o změnu pouze v případě, že změna je větší než tato hodnota. Výchozí hodnota je 20 %</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="dexcom_lognssensorchange_title">Zaznamenávat výměnu senzoru do NS</string>
+    <string name="dexcom_log_ns_sensor_change_title">Zaznamenávat výměnu senzoru do NS</string>
-    <string name="dexcom_lognssensorchange_summary">Vytvořit událost \"Výměna senzoru\" v NS automaticky po spuštění senzoru</string>
+    <string name="dexcom_log_ns_sensor_change_summary">Vytvořit událost \"Výměna senzoru\" v NS automaticky po spuštění senzoru</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Vaše uživatelské jméno na Tidepoolu, obvykle vaše e-mailová adresa</string>

app/src/main/res/values-da-rDK/strings.xml

@@ -318,7 +318,7 @@
     <string name="urgent_alarm">Akut alarm</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense App (patched)</string>
-    <string name="dexcomg5_nsupload_title">Upload BG data til NS</string>
+    <string name="do_ns_upload_title">Upload BG data til NS</string>
     <string name="bgsource_upload">BS upload indstillinger</string>
     <string name="wear_detailed_delta_title">Vis detaljeret data</string>
     <string name="wear_detailed_delta_summary">Vis delta med en decimal plads mere</string>
@@ -328,8 +328,8 @@
     <string name="uamsmbmaxminutes_summary">Maks antal minutter af basal at begrænse SMB til UAM</string>
     <string name="carbsReqThreshold">Minimum kulhydrater påkrævet for forslag</string>
     <string name="carbsReqThreshold_summary">Minimum gram kulhydrater til at vise kulhydrat forslags advarsel. Kulhydrat forslag under dette tal vil ikke udløse en notifikaton.</string>
-    <string name="dexcomg5_xdripupload_title">Seng BS data til xDrip+</string>
+    <string name="do_xdrip_upload_title">Seng BS data til xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">I xDrip+ vælg 640g/Eversense datakilde</string>
+    <string name="do_xdrip_upload_summary">I xDrip+ vælg 640g/Eversense datakilde</string>
     <string name="nsclientbg">NSClient BS</string>
     <string name="nsclientbgshort">NS BS</string>
     <string name="overview_editquickwizard_usebg">BS beregning</string>
@@ -505,7 +505,7 @@
     <string name="loop_openmode_min_change">Minimal anmodningsændring [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Åben Loop vil kun foreslå ny ændringsanmodning, hvis ændringen er større end denne værdi i %. Standardværdien er 20%</string>
     <string name="profile_total">== ∑  %1$s IE</string>
-    <string name="dexcom_lognssensorchange_title">Log sensor ændring til NS</string>
+    <string name="dexcom_log_ns_sensor_change_title">Log sensor ændring til NS</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Dit brugernavn til Tidepool, normalt din e-mailadresse</string>

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

@@ -318,7 +318,7 @@
     <string name="urgent_alarm">Wichtiger Alarm</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense App (gepatcht)</string>
-    <string name="dexcomg5_nsupload_title">Speichere BZ-Werte in Nightscout</string>
+    <string name="do_ns_upload_title">Speichere BZ-Werte in Nightscout</string>
     <string name="bgsource_upload">BZ Upload Einstellungen</string>
     <string name="wear_detailed_delta_title">Zeige detailliertes Delta</string>
     <string name="wear_detailed_delta_summary">Delta wird mit Dezimalstelle angezeigt.</string>
@@ -328,8 +328,8 @@
     <string name="uamsmbmaxminutes_summary">SMB Basal-Limit in Minuten für UAM</string>
     <string name="carbsReqThreshold">Minimale KH-Menge, die für einen Vorschlag erforderlich ist</string>
     <string name="carbsReqThreshold_summary">Minimale KH-Menge in Gramm, die Vorschlags-Alarm erforderlich ist. Vorschläge unterhalb dieser Menge, lösen keine Benachrichtigung aus.</string>
-    <string name="dexcomg5_xdripupload_title">Sende BZ-Werte zu xDrip+</string>
+    <string name="do_xdrip_upload_title">Sende BZ-Werte zu xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">Wähle in xDrip+ 640g/Eversense als Daten-Quelle.</string>
+    <string name="do_xdrip_upload_summary">Wähle in xDrip+ 640g/Eversense als Daten-Quelle.</string>
     <string name="nsclientbg">Nightscout-Client BZ</string>
     <string name="nsclientbgshort">NS BZ</string>
     <string name="overview_editquickwizard_usebg">BZ Berechnung</string>
@@ -506,7 +506,7 @@ Unerwartetes Verhalten.</string>
     <string name="loop_openmode_min_change">Minimaler Wert zur Anfrage einer Änderung [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Open Loop schlägt neue Änderungen nur dann vor, wenn die Änderung größer als dieser Wert ist. Der Standard-Wert ist 20%.</string>
     <string name="profile_total">== ∑  %1$s IE</string>
-    <string name="dexcom_lognssensorchange_title">Speichere Sensor Wechsel in Nightscout</string>
+    <string name="dexcom_log_ns_sensor_change_title">Speichere Sensor Wechsel in Nightscout</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Dein Tidepool-Login-Benutzername, normalerweise deine E-Mail-Adresse</string>

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

@@ -235,13 +235,13 @@
     <string name="urgent_alarm">Συναγερμός έκτακτης ανάγκης</string>
     <string name="info">Πληροφορίες</string>
     <string name="eversense">Eversense App (τροποποιημένη)</string>
-    <string name="dexcomg5_nsupload_title">Ανέβασμα δεδομένων BG στο NS</string>
+    <string name="do_ns_upload_title">Ανέβασμα δεδομένων BG στο NS</string>
     <string name="bgsource_upload">Ανέβασμα ρυθμίσεων BG</string>
     <string name="wear_detailed_delta_title">Εμφάνιση λεπτομερών στατιστικών</string>
     <string name="wear_detailed_delta_summary">Δείξτε τη διαφορά με ένα επιπλέον δεκαδικό ψηφίο</string>
     <string name="smbmaxminutes_summary">Τα μέγιστα λεπτά του βασικού ρυθμού που περιορίζουν το SMB να</string>
-    <string name="dexcomg5_xdripupload_title">Αποστολή δεδομένων BG στο xDrip+</string>
+    <string name="do_xdrip_upload_title">Αποστολή δεδομένων BG στο xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">Στο xDrip+, επιλέξτε την πηγή δεδομένων 640g / Eversense</string>
+    <string name="do_xdrip_upload_summary">Στο xDrip+, επιλέξτε την πηγή δεδομένων 640g / Eversense</string>
     <string name="nsclientbg">NSClient BG</string>
     <string name="overview_editquickwizard_usebg">Υπολογισμός BG</string>
     <string name="overview_editquickwizard_usebolusiob">Υπολογισμός του IOB bolus</string>
@@ -386,7 +386,7 @@
     <string name="loop_openmode_min_change">Ελάχιστο αίτημα για αλλαγή [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Το Ανοιχτό κύκλωμα θα εμφανίσει νέο μήνυμα αλλαγής μόνο αν η αλλαγή είναι μεγαλύτερη από αυτήν τη τιμή %. Προεπιλεγμένη τιμή 20%</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="dexcom_lognssensorchange_title">Αλλαγή αρχείου αισθητήρα σε NS</string>
+    <string name="dexcom_log_ns_sensor_change_title">Αλλαγή αρχείου αισθητήρα σε NS</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Το όνομα χρήστη του Tidepool, συνήθως το mail σας</string>

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

@@ -324,7 +324,7 @@
     <string name="urgent_alarm">Alarma urgente</string>
     <string name="info">INFORMACIÓN</string>
     <string name="eversense">Eversense App (parcheada)</string>
-    <string name="dexcomg5_nsupload_title">Subir datos de glucosa a Nightscout</string>
+    <string name="do_ns_upload_title">Subir datos de glucosa a Nightscout</string>
     <string name="bgsource_upload">Ajuste de subida de datos de glucosa</string>
     <string name="wear_detailed_delta_title">Mostrar detalles del delta</string>
     <string name="wear_detailed_delta_summary">Mostrar el delta con un decimal más</string>
@@ -334,8 +334,8 @@
     <string name="uamsmbmaxminutes_summary">Minutos máximos de basal para limitar SMB para UAM</string>
     <string name="carbsReqThreshold">Carbohidratos mínimos necesarios para la sugerencia</string>
     <string name="carbsReqThreshold_summary">Gramos mínimos de carbohidratos para mostrar una alerta de sugerencia de carbohitratos: las sugerencias de carbohidratos debajo de este número no iniciarán una notificación.</string>
-    <string name="dexcomg5_xdripupload_title">Enviar datos de glucosa a xDrip+</string>
+    <string name="do_xdrip_upload_title">Enviar datos de glucosa a xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">En xDrip+, selecciona 640G/Eversense como fuente de datos</string>
+    <string name="do_xdrip_upload_summary">En xDrip+, selecciona 640G/Eversense como fuente de datos</string>
     <string name="nsclientbg">NSClient BG</string>
     <string name="nsclientbgshort">NS BG</string>
     <string name="overview_editquickwizard_usebg">Cálculo de glucosa</string>
@@ -515,8 +515,8 @@
     <string name="loop_openmode_min_change">Valor mínimo de cambio [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Valor predeterminado 20%. El lazo abierto realizará una petición de cambio, sólo cuando se supere este valor</string>
     <string name="profile_total">== ∑%1$s U</string>
-    <string name="dexcom_lognssensorchange_title">Registro de cambio de sensor en Nightscout</string>
+    <string name="dexcom_log_ns_sensor_change_title">Registro de cambio de sensor en Nightscout</string>
-    <string name="dexcom_lognssensorchange_summary">Crear evento \"Cambio de sensor\" en Nightscout automáticamente al iniciar el sensor</string>
+    <string name="dexcom_log_ns_sensor_change_summary">Crear evento \"Cambio de sensor\" en Nightscout automáticamente al iniciar el sensor</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Tu nombre de usuario de Tidepool, normalmente tu dirección de correo electrónico</string>

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

@@ -325,7 +325,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="urgent_alarm">Alarme d\'urgence</string>
     <string name="info">INFO</string>
     <string name="eversense">App Eversense (patché)</string>
-    <string name="dexcomg5_nsupload_title">Remonter les Gly vers NS</string>
+    <string name="do_ns_upload_title">Remonter les Gly vers NS</string>
     <string name="bgsource_upload">Paramètres de téléchargement des glycémies</string>
     <string name="wear_detailed_delta_title">Afficher le delta détaillé</string>
     <string name="wear_detailed_delta_summary">Afficher delta avec une décimale supplémentaire</string>
@@ -335,8 +335,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="uamsmbmaxminutes_summary">Minutes de basal max pour limiter les SMB des RNS</string>
     <string name="carbsReqThreshold">Glucides minimum requis pour suggestion</string>
     <string name="carbsReqThreshold_summary">Quantité de glucides minimum en g pour afficher une alerte de suggestion de glucides. Les suggestions inférieures ne déclencheront pas de notification.</string>
-    <string name="dexcomg5_xdripupload_title">Transmettre les Gly vers xDrip+</string>
+    <string name="do_xdrip_upload_title">Transmettre les Gly vers xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">Dans xDrip+ veuillez séléctionner 640g/Eversense comme source de données</string>
+    <string name="do_xdrip_upload_summary">Dans xDrip+ veuillez séléctionner 640g/Eversense comme source de données</string>
     <string name="nsclientbg">Glycémie NSClient</string>
     <string name="nsclientbgshort">Gly NS</string>
     <string name="overview_editquickwizard_usebg">Calcul de Glycémie</string>
@@ -516,8 +516,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="loop_openmode_min_change">Changement minimum [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Le fonctionnement de la Boucle demandera une confirmation uniquement si le changement est supérieur à cette valeur en %. Par défaut, la valeur est 20%</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="dexcom_lognssensorchange_title">Enreg. du changement de capteur sur NS</string>
+    <string name="dexcom_log_ns_sensor_change_title">Enreg. du changement de capteur sur NS</string>
-    <string name="dexcom_lognssensorchange_summary">Créer automatiquement un événement \"Changement de capteur\" dans NS au démarrage du capteur</string>
+    <string name="dexcom_log_ns_sensor_change_summary">Créer automatiquement un événement \"Changement de capteur\" dans NS au démarrage du capteur</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Votre nom d\'utilisateur Tidepool, normalement votre adresse e-mail</string>

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

@@ -324,7 +324,7 @@
     <string name="urgent_alarm">Allarme urgente</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense app (modificata)</string>
-    <string name="dexcomg5_nsupload_title">Carica dati BG su NS</string>
+    <string name="do_ns_upload_title">Carica dati BG su NS</string>
     <string name="bgsource_upload">Impostazioni caricamento BG</string>
     <string name="wear_detailed_delta_title">Mostra delta dettagliato</string>
     <string name="wear_detailed_delta_summary">Mostra delta con una cifra decimale in più</string>
@@ -334,8 +334,8 @@
     <string name="uamsmbmaxminutes_summary">Max minuti di basale a cui limitare SMB per UAM</string>
     <string name="carbsReqThreshold">CHO minimi richiesti per il suggerimento</string>
     <string name="carbsReqThreshold_summary">Quantità minima di carboidrati (in grammi) necessaria per visualizzare un avviso di suggerimento CHO. Al di sotto di questo numero non verrà attivata alcuna notifica.</string>
-    <string name="dexcomg5_xdripupload_title">Invia dati BG a xDrip+</string>
+    <string name="do_xdrip_upload_title">Invia dati BG a xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">In xDrip+ seleziona origine dati 640g/Eversense</string>
+    <string name="do_xdrip_upload_summary">In xDrip+ seleziona origine dati 640g/Eversense</string>
     <string name="nsclientbg">BG NSClient</string>
     <string name="nsclientbgshort">BG NS</string>
     <string name="overview_editquickwizard_usebg">Calcolo BG</string>
@@ -515,8 +515,8 @@
     <string name="loop_openmode_min_change">Richiesta minima di modifica [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Il loop aperto mostrerà una nuova richiesta di modifica solo se la modifica è maggiore di questo valore in %. Il valore predefinito è 20%</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="dexcom_lognssensorchange_title">Registra cambio sensore in NS</string>
+    <string name="dexcom_log_ns_sensor_change_title">Registra cambio sensore in NS</string>
-    <string name="dexcom_lognssensorchange_summary">Crea evento \"Cambio Sensore\" in NS all\'avvio del sensore</string>
+    <string name="dexcom_log_ns_sensor_change_summary">Crea evento \"Cambio Sensore\" in NS all\'avvio del sensore</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Il tuo nome utente per l\'accesso a Tidepool, generalmente il tuo indirizzo email</string>

app/src/main/res/values-iw-rIL/strings.xml

@@ -318,7 +318,7 @@
     <string name="urgent_alarm">התראה דחופה</string>
     <string name="info">מידע</string>
     <string name="eversense">אפליקלציית Eversense (עם פאץ\')</string>
-    <string name="dexcomg5_nsupload_title">טוען נתוני סוכר ל-Nightscout</string>
+    <string name="do_ns_upload_title">טוען נתוני סוכר ל-Nightscout</string>
     <string name="bgsource_upload">הגדרות העלאת ערכי סוכר בדם</string>
     <string name="wear_detailed_delta_title">הצגת דלתא מפורטת</string>
     <string name="wear_detailed_delta_summary">הצגת דלתא עם עוד נק\' עשרונית אחת</string>
@@ -328,8 +328,8 @@
     <string name="uamsmbmaxminutes_summary">מקס\' דקות של בזאלי להגבלת SMB לארוחות לא מוכרזות</string>
     <string name="carbsReqThreshold">סף מינ\' הפחמימות הנדרשות להצעה</string>
     <string name="carbsReqThreshold_summary">כמות הפחמ\' המינימלית (גר\') הדרושה כדי שתוצג התראה על הצעת פחמימות. לא תוצגנה התראות על הצעות הנמוכות מכמות זו.</string>
-    <string name="dexcomg5_xdripupload_title">שליחת נתוני סוכר אל xDrip</string>
+    <string name="do_xdrip_upload_title">שליחת נתוני סוכר אל xDrip</string>
-    <string name="dexcomg5_xdripupload_summary">ב-xDrip בחרו 640g/Eversense כמקור נתונים</string>
+    <string name="do_xdrip_upload_summary">ב-xDrip בחרו 640g/Eversense כמקור נתונים</string>
     <string name="nsclientbg">נתוני סוכר מ-NSClient</string>
     <string name="nsclientbgshort">סוכר NS</string>
     <string name="overview_editquickwizard_usebg">חישוב רמת הסוכר</string>
@@ -507,7 +507,7 @@
     <string name="loop_openmode_min_change">מינימום לבקשה לשינוי [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">\'לולאה פתוחה\' תציג בקשת שינוי חדשה רק אם השינוי גדול מערך זה ב-%. ערך ברירת המחדל הוא 20%</string>
     <string name="profile_total">== ∑  %1$s יח\'</string>
-    <string name="dexcom_lognssensorchange_title">רישום החלפת סנסור ב-Nightscout</string>
+    <string name="dexcom_log_ns_sensor_change_title">רישום החלפת סנסור ב-Nightscout</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">שם המשתמש שלכם להתחברות ל-Tidepool, בדרך כלל כתובת הדוא\"ל שלכם</string>

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

@@ -309,7 +309,7 @@
     <string name="urgent_alarm">긴급 알람</string>
     <string name="info">정보</string>
     <string name="eversense">Eversense 앱(패치버전)</string>
-    <string name="dexcomg5_nsupload_title">NS에 혈당데이터 업로드하기</string>
+    <string name="do_ns_upload_title">NS에 혈당데이터 업로드하기</string>
     <string name="bgsource_upload">혈당 업로드 설정</string>
     <string name="wear_detailed_delta_title">델타(혈당증분값) 자세히 보여주기</string>
     <string name="wear_detailed_delta_summary">소수점 자리 추가된 증분값 보여주기</string>
@@ -319,8 +319,8 @@
     <string name="uamsmbmaxminutes_summary">SMB가 UAM에 대해 basal을 제한할 수 있는 최대 시간(분)</string>
     <string name="carbsReqThreshold">제안을 위한 최소 탄수화물 필요량</string>
     <string name="carbsReqThreshold_summary">탄수화물 제안 알림을 보여주는 최소 탄수화물 g수. 이 양보다 적은 경우 탄수화물 제안 알림이 작동하지 않습니다.</string>
-    <string name="dexcomg5_xdripupload_title">혈당 데이터를 xDrip+에 전송하기</string>
+    <string name="do_xdrip_upload_title">혈당 데이터를 xDrip+에 전송하기</string>
-    <string name="dexcomg5_xdripupload_summary">xDrip+ 데이터 소스에서 640g/Eversense을 선택하세요</string>
+    <string name="do_xdrip_upload_summary">xDrip+ 데이터 소스에서 640g/Eversense을 선택하세요</string>
     <string name="nsclientbg">NSClient 혈당</string>
     <string name="overview_editquickwizard_usebg">혈당 계산</string>
     <string name="overview_editquickwizard_usebolusiob">Bolus IOB 계산</string>
@@ -480,7 +480,7 @@
     <string name="loop_openmode_min_change">최소 요청 변화 [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Open Loop가 %단위로 이 값보다 변화가 더 클 경우에만 새 변경 요청을 팝업합니다. 기본값은 20 %입니다</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="dexcom_lognssensorchange_title">센서 교체 NS에 기록하기</string>
+    <string name="dexcom_log_ns_sensor_change_title">센서 교체 NS에 기록하기</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Tidepool 사용자명, 보통 이메일 주소입니다.</string>

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

@@ -311,7 +311,7 @@
     <string name="urgent_alarm">Kritiniai perspėjimai</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense programėlė (modifikuota)</string>
-    <string name="dexcomg5_nsupload_title">Perduoti KG duomenis į NS</string>
+    <string name="do_ns_upload_title">Perduoti KG duomenis į NS</string>
     <string name="bgsource_upload">KG duomenų perdavimo nustatymai</string>
     <string name="wear_detailed_delta_title">Rodyti gliukozės pokyčio detales</string>
     <string name="wear_detailed_delta_summary">Rodyti pokytį su reikšme po kablelio</string>
@@ -321,8 +321,8 @@
     <string name="uamsmbmaxminutes_summary">NDM SMB atitinka valandinės bazės insulino kiekį, kuris gaunamas ne daugiau, kaip per</string>
     <string name="carbsReqThreshold">Minimali būtinų angliavandenių priminimo riba</string>
     <string name="carbsReqThreshold_summary">Minimalus angliavandenių kiekis gramais, apie kurį reikia įspėti. Angliavandenių pasiūlymai, mažesni už šį kiekį, nėra pranešami.</string>
-    <string name="dexcomg5_xdripupload_title">Siųsti KG duomenis į xDrip+</string>
+    <string name="do_xdrip_upload_title">Siųsti KG duomenis į xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">Xdrip+ pasirinkite 640g/Eversense duomenų šaltinį</string>
+    <string name="do_xdrip_upload_summary">Xdrip+ pasirinkite 640g/Eversense duomenų šaltinį</string>
     <string name="nsclientbg">NSClient KG</string>
     <string name="nsclientbgshort">NS KG</string>
     <string name="overview_editquickwizard_usebg">KG apskaičiavimas</string>
@@ -488,7 +488,7 @@
     <string name="loop_openmode_min_change">Minimalaus pokyčio užklausa [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Atviras Ciklas parodys naujų pakeitimų užklausą tik tada, kai pokytis bus didesnis nei ši vertė %. Numatytoji vertė yra 20%</string>
     <string name="profile_total">== ∑  %1$s vv</string>
-    <string name="dexcom_lognssensorchange_title">Registruoti sensoriaus keitimą NS</string>
+    <string name="dexcom_log_ns_sensor_change_title">Registruoti sensoriaus keitimą NS</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Jūsų Tidepool vartotojo vardas, įprastai jūsų el. pašto adresas</string>

app/src/main/res/values-nl-rNL/strings.xml

@@ -324,7 +324,7 @@
     <string name="urgent_alarm">Dringend alarm</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense App (aangepast)</string>
-    <string name="dexcomg5_nsupload_title">Upload BG gegevens naar NS</string>
+    <string name="do_ns_upload_title">Upload BG gegevens naar NS</string>
     <string name="bgsource_upload">BG upload instellingen</string>
     <string name="wear_detailed_delta_title">Toon gedetailleerde delta</string>
     <string name="wear_detailed_delta_summary">Toon delta met een extra decimaal punt</string>
@@ -334,8 +334,8 @@
     <string name="uamsmbmaxminutes_summary">Max minuten basaal om SMB tot te limiteren voor UAM</string>
     <string name="carbsReqThreshold">Minimaal benodigde koolhydraten voor waarschuwing</string>
     <string name="carbsReqThreshold_summary">Minimum gram benodigde koolhydraten waarbij een waarschuwing wordt gegeven. Wanneer er minder koolhydraten nodig zijn dan dit getal, wordt er geen waarschuwing gegeven.</string>
-    <string name="dexcomg5_xdripupload_title">Stuur BG data naar xDrip+</string>
+    <string name="do_xdrip_upload_title">Stuur BG data naar xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">In xDrip+ kies 640g/Eversense data bron</string>
+    <string name="do_xdrip_upload_summary">In xDrip+ kies 640g/Eversense data bron</string>
     <string name="nsclientbg">NSClient BG</string>
     <string name="nsclientbgshort">NS BG</string>
     <string name="overview_editquickwizard_usebg">BG berekening</string>
@@ -515,8 +515,8 @@
     <string name="loop_openmode_min_change">Minimale verzoek voor aanpassing [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Open Loop zal alleen een wijzigingsverzoek tonen als de verandering groter is dan deze waarde in %. De standaard waarde is 20%</string>
     <string name="profile_total">== ∑  %1$s E</string>
-    <string name="dexcom_lognssensorchange_title">Noteer sensor wissel in NS</string>
+    <string name="dexcom_log_ns_sensor_change_title">Noteer sensor wissel in NS</string>
-    <string name="dexcom_lognssensorchange_summary">Noteer automatisch \"Sensor Wissel\" in NS bij starten van sensor</string>
+    <string name="dexcom_log_ns_sensor_change_summary">Noteer automatisch \"Sensor Wissel\" in NS bij starten van sensor</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Uw Tidepool login gebruikersnaam, normaliter uw e-mailadres</string>

app/src/main/res/values-no-rNO/strings.xml

@@ -324,7 +324,7 @@
     <string name="urgent_alarm">Kritisk alarm</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense App (patched)</string>
-    <string name="dexcomg5_nsupload_title">Last opp BS-data til NS</string>
+    <string name="do_ns_upload_title">Last opp BS-data til NS</string>
     <string name="bgsource_upload">Innstillinger for opplasting av BS</string>
     <string name="wear_detailed_delta_title">Vis detaljer om delta</string>
     <string name="wear_detailed_delta_summary">Vis delta med én ekstra desimal</string>
@@ -334,8 +334,8 @@
     <string name="uamsmbmaxminutes_summary">Maks antall minutter basal som kan bli SMB ved UAM</string>
     <string name="carbsReqThreshold">Minimumsgrense for KH-forslag</string>
     <string name="carbsReqThreshold_summary">Minimum mengde karbohydrater i gram for å vise advarsel. Behov under denne grenseverdien vil ikke vises som et varsel.</string>
-    <string name="dexcomg5_xdripupload_title">Send BS-data til xDrip+</string>
+    <string name="do_xdrip_upload_title">Send BS-data til xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">I xDrip+, velg 640G/Eversens som datakilde</string>
+    <string name="do_xdrip_upload_summary">I xDrip+, velg 640G/Eversens som datakilde</string>
     <string name="nsclientbg">NSClient BS</string>
     <string name="nsclientbgshort">NS BS</string>
     <string name="overview_editquickwizard_usebg">BS-beregning</string>
@@ -515,8 +515,8 @@
     <string name="loop_openmode_min_change">Minste endrings forespørsel [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">I åpen Loop modus vil AAPS be om en endring hvis forandringen er større enn denne verdien i %. Standard verdi er 20%</string>
     <string name="profile_total">== ∑  %1$s E</string>
-    <string name="dexcom_lognssensorchange_title">Logg sensor endring til NS</string>
+    <string name="dexcom_log_ns_sensor_change_title">Logg sensor endring til NS</string>
-    <string name="dexcom_lognssensorchange_summary">Opprett hendelse \"Sensor bytte\" i NS automatisk ved start av sensoren</string>
+    <string name="dexcom_log_ns_sensor_change_summary">Opprett hendelse \"Sensor bytte\" i NS automatisk ved start av sensoren</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Ditt Tidepool brukernavn, normalt din e-postadresse</string>

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

@@ -312,7 +312,7 @@
     <string name="urgent_alarm">Pilny alarm</string>
     <string name="info">INFO</string>
     <string name="eversense">Apka Eversense (spatchowana)</string>
-    <string name="dexcomg5_nsupload_title">Przekaż dane BG do NS</string>
+    <string name="do_ns_upload_title">Przekaż dane BG do NS</string>
     <string name="bgsource_upload">Ustawienia wysyłania wartości BG (poziomów cukru)</string>
     <string name="wear_detailed_delta_title">Pokaż szczegółowe delta</string>
     <string name="wear_detailed_delta_summary">Pokaż deltę z jednym więcej miejscem dziesiętnym</string>
@@ -322,8 +322,8 @@
     <string name="uamsmbmaxminutes_summary">Maks. ilość minut dawki bazowej do ograniczenia SMB dla UAM</string>
     <string name="carbsReqThreshold">Minimalna sugestia węglowodanów (dosłodzenia)</string>
     <string name="carbsReqThreshold_summary">Minimalna ilość węglowodanów, w gramach, niezbędna dla pokazania sugestii dosłodzenia. Sugestie dosłodzenia poniżej tej wartości będą ignorowane - powiadomienie nie będzie pokazywane.</string>
-    <string name="dexcomg5_xdripupload_title">Prześlij dane BG do xDrip+</string>
+    <string name="do_xdrip_upload_title">Prześlij dane BG do xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">W xDrip+ wybierz źródło danych 640g/Eversense</string>
+    <string name="do_xdrip_upload_summary">W xDrip+ wybierz źródło danych 640g/Eversense</string>
     <string name="nsclientbg">NSClient BG</string>
     <string name="nsclientbgshort">NS BG</string>
     <string name="overview_editquickwizard_usebg">Obliczenia BG</string>
@@ -490,7 +490,7 @@
     <string name="loop_openmode_min_change">Minimalna żądana zmiana [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Otwarta pętla wprowadzi żądanie zmiany tylko w przypadku, gdy będzie ona większa niż ta wartość w %. Wartość domyślna to 20%</string>
     <string name="profile_total">== ∑ %1$s U</string>
-    <string name="dexcom_lognssensorchange_title">Prześlij zmianę sensora do NS</string>
+    <string name="dexcom_log_ns_sensor_change_title">Prześlij zmianę sensora do NS</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Twoja nazwa użytkownika Tidepool, zwykle Twój adres e-mail</string>

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

@@ -296,7 +296,7 @@
     <string name="urgent_alarm">Alarme Urgente</string>
     <string name="info">INFO</string>
     <string name="eversense">Aplicação Eversense (com patch)</string>
-    <string name="dexcomg5_nsupload_title">Enviar dados Glic. para NS</string>
+    <string name="do_ns_upload_title">Enviar dados Glic. para NS</string>
     <string name="bgsource_upload">Configurações de upload de BG</string>
     <string name="wear_detailed_delta_title">Mostrar Delta detalho</string>
     <string name="wear_detailed_delta_summary">Mostrar delta com mais um ponto decimal</string>
@@ -305,8 +305,8 @@
     <string name="uamsmbmaxminutes">UAM SMB máx minutos</string>
     <string name="uamsmbmaxminutes_summary">Max minutos de basal para limitar SMB para UAM</string>
     <string name="carbsReqThreshold">Limite mínimo de carboidratos necessários para sugerir</string>
-    <string name="dexcomg5_xdripupload_title">Enviar dados Glic. para xDrip+</string>
+    <string name="do_xdrip_upload_title">Enviar dados Glic. para xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">Seleccionar 640g/Eversense como fonte no xDrip+</string>
+    <string name="do_xdrip_upload_summary">Seleccionar 640g/Eversense como fonte no xDrip+</string>
     <string name="nsclientbg">Glic NSCliente</string>
     <string name="overview_editquickwizard_usebg">Cálculos Glic</string>
     <string name="overview_editquickwizard_usebolusiob">Cálculo de Bólus IOB</string>
@@ -460,7 +460,7 @@
     <string name="loop_openmode_min_change">Pedido de mudança mínima [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">A app mostrará um pedido de alteração apenas se a mudança for superior a este valor em %. O valor padrão é 20%</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="dexcom_lognssensorchange_title">Registar mudança de sensor para NS</string>
+    <string name="dexcom_log_ns_sensor_change_title">Registar mudança de sensor para NS</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Nome de utilizador no Tidepool, normalmente seu endereço de e-mail</string>

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

@@ -311,7 +311,7 @@
     <string name="urgent_alarm">Alarme Urgente</string>
     <string name="info">INFO</string>
     <string name="eversense">Aplicação Eversense (com patch)</string>
-    <string name="dexcomg5_nsupload_title">Enviar dados Glicose para NS</string>
+    <string name="do_ns_upload_title">Enviar dados Glicose para NS</string>
     <string name="bgsource_upload">Definições de Envio da Glicose</string>
     <string name="wear_detailed_delta_title">Mostrar Delta detalho</string>
     <string name="wear_detailed_delta_summary">Mostrar delta com mais um ponto decimal</string>
@@ -321,8 +321,8 @@
     <string name="uamsmbmaxminutes_summary">Máx minutos de basal para limitar SMB para RNA</string>
     <string name="carbsReqThreshold">Mínimo De Hidratos Necessários Para Sugestão</string>
     <string name="carbsReqThreshold_summary">Mínimo de gramas de hidratos de carbono para exibir um alerta de sugestão de hidratos. As sugestões de hidratos abaixo deste número não ativarão uma notificação.</string>
-    <string name="dexcomg5_xdripupload_title">Enviar dados Glicose para xDrip+</string>
+    <string name="do_xdrip_upload_title">Enviar dados Glicose para xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">Seleccionar 640g/Eversense como fonte no xDrip+</string>
+    <string name="do_xdrip_upload_summary">Seleccionar 640g/Eversense como fonte no xDrip+</string>
     <string name="nsclientbg">Glicose ClienteNS</string>
     <string name="nsclientbgshort">Glicemia do NS</string>
     <string name="overview_editquickwizard_usebg">Cálculos Glicose</string>
@@ -488,7 +488,7 @@
     <string name="loop_openmode_min_change">Pedido de mudança mínima [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">A app mostrará um pedido de alteração apenas se a mudança para uma nova basal temporária for superior a este valor em %. O valor padrão é 20%</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="dexcom_lognssensorchange_title">Registar mudança de sensor para NS</string>
+    <string name="dexcom_log_ns_sensor_change_title">Registar mudança de sensor para NS</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Nome de utilizador no Tidepool, normalmente seu endereço de e-mail</string>

app/src/main/res/values-ro-rRO/strings.xml

@@ -311,7 +311,7 @@
     <string name="urgent_alarm">Alarmă urgentă</string>
     <string name="info">INFO</string>
     <string name="eversense">Aplicația Eversense (modificată)</string>
-    <string name="dexcomg5_nsupload_title">Încarcă date glicemie în NS</string>
+    <string name="do_ns_upload_title">Încarcă date glicemie în NS</string>
     <string name="bgsource_upload">Setări înregistrare glicemie</string>
     <string name="wear_detailed_delta_title">Arată variație detaliată</string>
     <string name="wear_detailed_delta_summary">Arată variație cu încă o zecimală</string>
@@ -321,8 +321,8 @@
     <string name="uamsmbmaxminutes_summary">Durata maxima (în minute) a bazalei pentru a limita SMB în cazul UAM</string>
     <string name="carbsReqThreshold">Numărul minim de carbohidrați solicitați în Sugestii</string>
     <string name="carbsReqThreshold_summary">Numărul minim de carbohidrați pentru a afișa o alertă-sugestie. Sugestiile de carbohidrați mai jos acest număr nu vor declanșa o notificare.</string>
-    <string name="dexcomg5_xdripupload_title">Trimite date glicemie la xDrip+</string>
+    <string name="do_xdrip_upload_title">Trimite date glicemie la xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">Selectați 640g/Eversense ca sursă de date în xDrip+</string>
+    <string name="do_xdrip_upload_summary">Selectați 640g/Eversense ca sursă de date în xDrip+</string>
     <string name="nsclientbg">Glicemie NSClient</string>
     <string name="nsclientbgshort">NS GL</string>
     <string name="overview_editquickwizard_usebg">Calcul glicemie</string>
@@ -488,7 +488,7 @@
     <string name="loop_openmode_min_change">Cerere de schimbare minimală [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Bucla deschisă va afișa o nouă cerere de schimbare doar dacă nou valoare este mai mare cu %. Valoarea implicită este 20%</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="dexcom_lognssensorchange_title">Înregistrează schimbarea senzorului în NS</string>
+    <string name="dexcom_log_ns_sensor_change_title">Înregistrează schimbarea senzorului în NS</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Utilizatorul Tidepool (de obicei adresa de email)</string>

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

@@ -324,7 +324,7 @@
     <string name="urgent_alarm">Сигнал тревоги</string>
     <string name="info">ИНФОРМАЦИЯ</string>
     <string name="eversense">Приложение Eversense (пропатченное)</string>
-    <string name="dexcomg5_nsupload_title">Загрузить данные СК в Nightscout</string>
+    <string name="do_ns_upload_title">Загрузить данные СК в Nightscout</string>
     <string name="bgsource_upload">Параметры загрузки СК</string>
     <string name="wear_detailed_delta_title">Показать подробно дельту</string>
     <string name="wear_detailed_delta_summary">Показать дельту еще с одним десятичным знаком</string>
@@ -334,8 +334,8 @@
     <string name="uamsmbmaxminutes_summary">Максимум минут базала ограничивающего микроболюсы SMB на непредвиденный прием пищи UAM</string>
     <string name="carbsReqThreshold">Минимальный порог для напоминания о необходимых углеводах</string>
     <string name="carbsReqThreshold_summary">Минимум граммов для активации предложения углеводов. Предложения ниже этой величины не будут инициировать уведомление.</string>
-    <string name="dexcomg5_xdripupload_title">Отправить данные СК на xDrip+</string>
+    <string name="do_xdrip_upload_title">Отправить данные СК на xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">В xDrip + выберите источник данных 640g/Eversense</string>
+    <string name="do_xdrip_upload_summary">В xDrip + выберите источник данных 640g/Eversense</string>
     <string name="nsclientbg">СК с клиента Nightscout</string>
     <string name="nsclientbgshort">ГК с NS </string>
     <string name="overview_editquickwizard_usebg">Вычисление СК</string>
@@ -515,8 +515,8 @@
     <string name="loop_openmode_min_change">Минимальный запрос на изменения [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Алгоритм ИПЖ выдаст всплывающее окно с запросом на новые изменения, только если изменение больше, чем это значение в %. Значение по умолчанию — 20%</string>
     <string name="profile_total">== ∑  %1$s ед</string>
-    <string name="dexcom_lognssensorchange_title">Внести замену сенсора в лог NS</string>
+    <string name="dexcom_log_ns_sensor_change_title">Внести замену сенсора в лог NS</string>
-    <string name="dexcom_lognssensorchange_summary">Автоматически создать событие \"Замена сенсора\" в NS при запуске сенсора</string>
+    <string name="dexcom_log_ns_sensor_change_summary">Автоматически создать событие \"Замена сенсора\" в NS при запуске сенсора</string>
     <string name="tomato">Томато (MiaoMiao)</string>
     <string name="tomato_short">Томато</string>
     <string name="summary_tidepool_username">Имя пользователя Tidepool, обычно ваш адрес электронной почты</string>

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

@@ -324,7 +324,7 @@
     <string name="urgent_alarm">Urgentný alarm</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense aplikácia (upravená)</string>
-    <string name="dexcomg5_nsupload_title">Nahrávať glykémie do NS</string>
+    <string name="do_ns_upload_title">Nahrávať glykémie do NS</string>
     <string name="bgsource_upload">Nastavenie nahrávania glykémie</string>
     <string name="wear_detailed_delta_title">Zobrazovať detailné zmeny</string>
     <string name="wear_detailed_delta_summary">Zobrazovať rozdiel s jedným desatinným miestom naviac</string>
@@ -334,8 +334,8 @@
     <string name="uamsmbmaxminutes_summary">Maximální počet minút bazálu, ku ktorým sa limituje SMB pre UAM</string>
     <string name="carbsReqThreshold">Minimálne množstvo sacharidov potrebných pre návrh</string>
     <string name="carbsReqThreshold_summary">Minimálne množstvo sacharidov v gramoch, ktoré spustí upozornenie návrhu sacharidov. Množstvo sacharidov pod touto hodnotou nespustí oznámenie.</string>
-    <string name="dexcomg5_xdripupload_title">Odosielať glykémie do xDrip+</string>
+    <string name="do_xdrip_upload_title">Odosielať glykémie do xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">V xDrip+ vyberte zdroj dát 640g/Eversense</string>
+    <string name="do_xdrip_upload_summary">V xDrip+ vyberte zdroj dát 640g/Eversense</string>
     <string name="nsclientbg">Glykémie z NS</string>
     <string name="nsclientbgshort">NS GL</string>
     <string name="overview_editquickwizard_usebg">Výpočet glykémie</string>
@@ -515,8 +515,8 @@
     <string name="loop_openmode_min_change">Minimálna požiadavka na zmenu [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Otvorený okruh vytvorí novú žiadosť o zmenu iba v prípade, že zmena je väčšia ako táto hodnota v %. Štandardná hodnota je 20%</string>
     <string name="profile_total">== ∑  %1$s JI</string>
-    <string name="dexcom_lognssensorchange_title">Ulož výmenu senzora do NS</string>
+    <string name="dexcom_log_ns_sensor_change_title">Ulož výmenu senzora do NS</string>
-    <string name="dexcom_lognssensorchange_summary">Vytvoriť udalosť \"Výmena senzora\" v NS automaticky pri spustení senzora</string>
+    <string name="dexcom_log_ns_sensor_change_summary">Vytvoriť udalosť \"Výmena senzora\" v NS automaticky pri spustení senzora</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Vaše meno používateľa na Tidepoole, obvykle Vaša E-mailová adresa</string>

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

@@ -315,7 +315,7 @@ Eversense-appen.</string>
     <string name="urgent_alarm">Akut larm</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense App (modifierad)</string>
-    <string name="dexcomg5_nsupload_title">Ladda upp BG-data till Nightscout</string>
+    <string name="do_ns_upload_title">Ladda upp BG-data till Nightscout</string>
     <string name="bgsource_upload">Uppladdningsinställningar för BG</string>
     <string name="wear_detailed_delta_title">Visa detaljerad delta</string>
     <string name="wear_detailed_delta_summary">Visa delta med en extra decimal</string>
@@ -325,8 +325,8 @@ Eversense-appen.</string>
     <string name="uamsmbmaxminutes_summary">Max antal minuter basal som kan bli SMB vid UAM</string>
     <string name="carbsReqThreshold">Minimigräns för KH-förslag</string>
     <string name="carbsReqThreshold_summary">Gränsvärde för om systemet ska föreslå en KH-korrektion. Förslag som är mindre än detta värde kommer inte att visas som notis.</string>
-    <string name="dexcomg5_xdripupload_title">Skicka BG-data till xDrip+</string>
+    <string name="do_xdrip_upload_title">Skicka BG-data till xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">Välj \"640G/Eversense\" som datakälla i xDrip+</string>
+    <string name="do_xdrip_upload_summary">Välj \"640G/Eversense\" som datakälla i xDrip+</string>
     <string name="nsclientbg">NSClient BG</string>
     <string name="nsclientbgshort">NS BG</string>
     <string name="overview_editquickwizard_usebg">Använd BG</string>
@@ -493,7 +493,7 @@ Eversense-appen.</string>
     <string name="loop_openmode_min_change">Minsta ändring som ger notifiering [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">I Open Loop-läge kommer AAPS bara att be om ändring ifall förändringen är större än detta värde. Standardvärdet är 20%</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="dexcom_lognssensorchange_title">Logga sensorbyte till Nightscout</string>
+    <string name="dexcom_log_ns_sensor_change_title">Logga sensorbyte till Nightscout</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Ditt användarnamn på Tidepool. Normalt din e-postadress</string>

app/src/main/res/values-tr-rTR/strings.xml

@@ -325,7 +325,7 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="urgent_alarm">Acil önemli Alarm</string>
     <string name="info">BİLGİ</string>
     <string name="eversense">Eversense App (yamalı)</string>
-    <string name="dexcomg5_nsupload_title">KŞ verilerini NighScout\'a yükle</string>
+    <string name="do_ns_upload_title">KŞ verilerini NighScout\'a yükle</string>
     <string name="bgsource_upload">KŞ yükleme ayarları</string>
     <string name="wear_detailed_delta_title">Ayrıntılı delta göster</string>
     <string name="wear_detailed_delta_summary">Deltayı bir ondalık basamakla daha göster</string>
@@ -335,8 +335,8 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="uamsmbmaxminutes_summary">UAM da SMB\'yi sınırlamak için maksimum bazal dakika</string>
     <string name="carbsReqThreshold">Gerekli Minimum Karbonhidrat Önerisi</string>
     <string name="carbsReqThreshold_summary">Bir karbonhidrat öneri uyarısı görüntülemek için minimum karbonhidrat gramı. Bu sayının altındaki karbonhidrat önerileri bildirilmeyecektir.</string>
-    <string name="dexcomg5_xdripupload_title">XDrip+\'a KŞ verilerini gönder</string>
+    <string name="do_xdrip_upload_title">XDrip+\'a KŞ verilerini gönder</string>
-    <string name="dexcomg5_xdripupload_summary">Xdrip+ içerisinde 640g/Eversense veri kaynağı seç</string>
+    <string name="do_xdrip_upload_summary">Xdrip+ içerisinde 640g/Eversense veri kaynağı seç</string>
     <string name="nsclientbg">Nightscout Client KŞ</string>
     <string name="nsclientbgshort">NS KŞ</string>
     <string name="overview_editquickwizard_usebg">KŞ Hesaplaması</string>
@@ -516,8 +516,8 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="loop_openmode_min_change">Minimum istek değişikliği [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Açık Döngü, yalnızca değişiklik % cinsinden bu değerden büyükse yeni değişiklik isteğini açar. Varsayılan değer %20\'dir</string>
     <string name="profile_total">== ∑  %1$s Ü</string>
-    <string name="dexcom_lognssensorchange_title">Sensör değişimlerini NS\'a kaydet</string>
+    <string name="dexcom_log_ns_sensor_change_title">Sensör değişimlerini NS\'a kaydet</string>
-    <string name="dexcom_lognssensorchange_summary">Sensör başlangıcında otomatik olarak NS\'de \"Sensör Değişimi\" olayı oluştur</string>
+    <string name="dexcom_log_ns_sensor_change_summary">Sensör başlangıcında otomatik olarak NS\'de \"Sensör Değişimi\" olayı oluştur</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Tidepool oturum açma kullanıcı adınız, normalde e-posta adresiniz</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -316,7 +316,7 @@
     <string name="urgent_alarm">紧急报警</string>
     <string name="info">信息</string>
     <string name="eversense">Everyang App (补丁)</string>
-    <string name="dexcomg5_nsupload_title">将 数据血糖数据上传到 NS服务器</string>
+    <string name="do_ns_upload_title">将 数据血糖数据上传到 NS服务器</string>
     <string name="bgsource_upload">血糖上传设置</string>
     <string name="wear_detailed_delta_title">显示详细的增量</string>
     <string name="wear_detailed_delta_summary">增量再多显示一个小数位</string>
@@ -326,8 +326,8 @@
     <string name="uamsmbmaxminutes_summary">监测到UAM(未通知膳食) 后启用SMB(微型大剂量) 替代基础率的最大分钟数</string>
     <string name="carbsReqThreshold">碳水化合物需求建议的最小值</string>
     <string name="carbsReqThreshold_summary">显示碳水化合物需求警告的最小克数。低于此数值的碳水化合物需求不会触发通知。</string>
-    <string name="dexcomg5_xdripupload_title">将血糖数据发送到 xDrip +</string>
+    <string name="do_xdrip_upload_title">将血糖数据发送到 xDrip +</string>
-    <string name="dexcomg5_xdripupload_summary">在 xDrip + 选择640ｇ/Eversense 数据源</string>
+    <string name="do_xdrip_upload_summary">在 xDrip + 选择640ｇ/Eversense 数据源</string>
     <string name="nsclientbg">NSClient 血糖</string>
     <string name="nsclientbgshort">NS血糖</string>
     <string name="overview_editquickwizard_usebg">血糖计算</string>
@@ -496,7 +496,7 @@
     <string name="loop_openmode_min_change">最小请求更改[%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">开环状态下，算法建议的基础率调整百分比大于此数值时，才会弹出更改建议。默认值为20%</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="dexcom_lognssensorchange_title">记录传感器更换至NS服务器</string>
+    <string name="dexcom_log_ns_sensor_change_title">记录传感器更换至NS服务器</string>
     <string name="tomato">番茄（喵喵）</string>
     <string name="tomato_short">番茄</string>
     <string name="summary_tidepool_username">你的Tidepool登录用户名，通常是你的邮件地址</string>

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

@@ -520,9 +520,6 @@
     <string name="loop_openmode_min_change_summary" formatted="false">Open Loop will popup new change request only if change is bigger than this value in %. Default value is 20%</string>
     <string name="key_short_tabtitles" translatable="false">short_tabtitles</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="key_dexcom_lognssensorchange" translatable="false">dexcom_lognssensorchange</string>
-    <string name="dexcom_lognssensorchange_title">Log sensor change to NS</string>
-    <string name="dexcom_lognssensorchange_summary">Create event \"Sensor Change\" in NS automatically on sensor start</string>
     <string name="key_smbmaxminutes" translatable="false">smbmaxminutes</string>
     <string name="key_uamsmbmaxminutes" translatable="false">uamsmbmaxminutes</string>
     <string name="twohours">2h</string>
@@ -544,9 +541,6 @@
     <string name="key_wear_showbgi" translatable="false">wear_showbgi</string>
     <string name="low_mark_comment">Lower value of in range area (display only)</string>
     <string name="high_mark_comment">Higher value of in range area (display only)</string>
-    <string name="randombg">Random BG</string>
-    <string name="description_source_randombg">Generate random BG data (Demo mode only)</string>
-    <string name="randombg_short">BG</string>
     <string name="tools">Tools</string>
     <string name="show_calculation">Show calcuation</string>
     <string name="show_removed">Show removed</string>
@@ -597,8 +591,6 @@
     <string name="statuslights_cannula_age">cannula age</string>
     <string name="statuslights_patch_pump_age">patch pump age</string>
     <string name="patch_pump">Patch pump</string>
-    <string name="key_last_processed_glunovo_timestamp" translatable="false">last_processed_glunovo_timestamp</string>
-    <string name="key_last_processed_intelligo_timestamp" translatable="false">last_processed_intelligo_timestamp</string>
     <string name="identification">Identification (email, FB or Discord nick etc)</string>
     <string name="identification_not_set">Identification not set in dev mode</string>
     <string name="a11y_dialog">dialog</string>

app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt

@@ -25,7 +25,7 @@ import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInf
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalStorage
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
-import info.nightscout.androidaps.plugins.source.GlimpPlugin
+import info.nightscout.plugins.source.GlimpPlugin
 import info.nightscout.androidaps.utils.Profiler
 import info.nightscout.androidaps.utils.buildHelper.BuildHelperImpl
 import info.nightscout.database.impl.AppRepository

app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt

@@ -11,7 +11,7 @@ import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
-import info.nightscout.androidaps.plugins.source.GlimpPlugin
+import info.nightscout.plugins.source.GlimpPlugin
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.Constants

app/src/test/java/info/nightscout/androidaps/plugins/source/GlimpPluginTest.kt

@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.source
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
+import info.nightscout.plugins.source.GlimpPlugin
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import org.junit.Assert

app/src/test/java/info/nightscout/androidaps/plugins/source/MM640GPluginTest.kt

@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.source
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
+import info.nightscout.plugins.source.MM640gPlugin
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import org.junit.Assert

app/src/test/java/info/nightscout/androidaps/plugins/source/XdripPluginTest.kt

@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.source
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
+import info.nightscout.plugins.source.XdripPlugin
 import info.nightscout.shared.interfaces.ResourceHelper
 import org.junit.Assert
 import org.junit.Before

plugins/src/main/java/info/nightscout/plugins/di/SourceModule.kt

@@ -2,8 +2,17 @@ package info.nightscout.plugins.di
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
+import info.nightscout.plugins.profile.ProfilePlugin
+import info.nightscout.plugins.source.AidexPlugin
 import info.nightscout.plugins.source.BGSourceFragment
+import info.nightscout.plugins.source.DexcomPlugin
+import info.nightscout.plugins.source.EversensePlugin
+import info.nightscout.plugins.source.GlimpPlugin
+import info.nightscout.plugins.source.MM640gPlugin
 import info.nightscout.plugins.source.NSClientSourcePlugin
+import info.nightscout.plugins.source.PoctechPlugin
+import info.nightscout.plugins.source.TomatoPlugin
+import info.nightscout.plugins.source.XdripPlugin
 
 @Module
 @Suppress("unused")
@@ -11,5 +20,14 @@ abstract class SourceModule {
 
     @ContributesAndroidInjector abstract fun contributesBGSourceFragment(): BGSourceFragment
 
+    @ContributesAndroidInjector abstract fun contributesNSProfileWorker(): ProfilePlugin.NSProfileWorker
     @ContributesAndroidInjector abstract fun contributesNSClientSourceWorker(): NSClientSourcePlugin.NSClientSourceWorker
+    @ContributesAndroidInjector abstract fun contributesXdripWorker(): XdripPlugin.XdripWorker
+    @ContributesAndroidInjector abstract fun contributesDexcomWorker(): DexcomPlugin.DexcomWorker
+    @ContributesAndroidInjector abstract fun contributesMM640gWorker(): MM640gPlugin.MM640gWorker
+    @ContributesAndroidInjector abstract fun contributesGlimpWorker(): GlimpPlugin.GlimpWorker
+    @ContributesAndroidInjector abstract fun contributesPoctechWorker(): PoctechPlugin.PoctechWorker
+    @ContributesAndroidInjector abstract fun contributesTomatoWorker(): TomatoPlugin.TomatoWorker
+    @ContributesAndroidInjector abstract fun contributesEversenseWorker(): EversensePlugin.EversenseWorker
+    @ContributesAndroidInjector abstract fun contributesAidexWorker(): AidexPlugin.AidexWorker
 }

plugins/src/main/java/info/nightscout/plugins/source/AidexPlugin.kt

@@ -1,11 +1,10 @@
-package info.nightscout.androidaps.plugins.source
+package info.nightscout.plugins.source
 
 import android.content.Context
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.receivers.DataWorkerStorage
 import info.nightscout.androidaps.receivers.Intents
@@ -18,7 +17,7 @@ import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
-import info.nightscout.plugins.source.BGSourceFragment
+import info.nightscout.plugins.R
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.interfaces.ResourceHelper

plugins/src/main/java/info/nightscout/plugins/source/DexcomPlugin.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.source
+package info.nightscout.plugins.source
 
 import android.content.Context
 import android.content.Intent
@@ -8,12 +8,10 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.extensions.fromConstant
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.plugins.source.activities.RequestDexcomPermissionActivity
 import info.nightscout.androidaps.receivers.DataWorkerStorage
 import info.nightscout.core.profile.unit
 import info.nightscout.database.entities.GlucoseValue
@@ -29,7 +27,8 @@ import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.profile.Profile
-import info.nightscout.plugins.source.BGSourceFragment
+import info.nightscout.plugins.R
+import info.nightscout.plugins.source.activities.RequestDexcomPermissionActivity
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.extensions.safeGetInstalledPackages
@@ -56,7 +55,7 @@ class DexcomPlugin @Inject constructor(
         .pluginIcon(R.drawable.ic_dexcom_g6)
         .pluginName(R.string.dexcom_app_patched)
         .shortName(R.string.dexcom_short)
-        .preferencesId(R.xml.pref_bgsourcedexcom)
+        .preferencesId(R.xml.pref_dexcom)
         .description(R.string.description_source_dexcom),
     aapsLogger, rh, injector
 ), BgSource {
@@ -75,7 +74,7 @@ class DexcomPlugin @Inject constructor(
         (glucoseValue.sourceSensor == GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE ||
             glucoseValue.sourceSensor == GlucoseValue.SourceSensor.DEXCOM_G5_NATIVE ||
             glucoseValue.sourceSensor == GlucoseValue.SourceSensor.DEXCOM_NATIVE_UNKNOWN)
-            && sp.getBoolean(R.string.key_dexcomg5_nsupload, false)
+            && sp.getBoolean(R.string.key_do_ns_upload, false)
 
     override fun onStart() {
         super.onStart()
@@ -157,7 +156,7 @@ class DexcomPlugin @Inject constructor(
                             sourceSensor = sourceSensor
                         )
                 }
-                var sensorStartTime = if (sp.getBoolean(R.string.key_dexcom_lognssensorchange, false) && bundle.containsKey("sensorInsertionTime")) {
+                var sensorStartTime = if (sp.getBoolean(R.string.key_dexcom_log_ns_sensor_change, false) && bundle.containsKey("sensorInsertionTime")) {
                     bundle.getLong("sensorInsertionTime", 0) * 1000
                 } else {
                     null

plugins/src/main/java/info/nightscout/plugins/source/EversensePlugin.kt

@@ -1,11 +1,10 @@
-package info.nightscout.androidaps.plugins.source
+package info.nightscout.plugins.source
 
 import android.content.Context
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.androidaps.receivers.DataWorkerStorage
@@ -17,7 +16,7 @@ import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyE
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
-import info.nightscout.plugins.source.BGSourceFragment
+import info.nightscout.plugins.R
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.interfaces.ResourceHelper
@@ -48,7 +47,7 @@ class EversensePlugin @Inject constructor(
     override var sensorBatteryLevel = -1
 
     override fun shouldUploadToNs(glucoseValue: GlucoseValue): Boolean =
-        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.EVERSENSE && sp.getBoolean(R.string.key_dexcomg5_nsupload, false)
+        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.EVERSENSE && sp.getBoolean(R.string.key_do_ns_upload, false)
 
     // cannot be inner class because of needed injection
     class EversenseWorker(

plugins/src/main/java/info/nightscout/plugins/source/GlimpPlugin.kt

@@ -1,11 +1,10 @@
-package info.nightscout.androidaps.plugins.source
+package info.nightscout.plugins.source
 
 import android.content.Context
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
@@ -15,7 +14,7 @@ import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
-import info.nightscout.plugins.source.BGSourceFragment
+import info.nightscout.plugins.R
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.interfaces.ResourceHelper
@@ -88,6 +87,6 @@ class GlimpPlugin @Inject constructor(
     }
 
     override fun shouldUploadToNs(glucoseValue: GlucoseValue): Boolean =
-        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.GLIMP && sp.getBoolean(R.string.key_dexcomg5_nsupload, false)
+        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.GLIMP && sp.getBoolean(R.string.key_do_ns_upload, false)
 
 }

plugins/src/main/java/info/nightscout/plugins/source/GlunovoPlugin.kt

@@ -1,11 +1,10 @@
-package info.nightscout.androidaps.plugins.source
+package info.nightscout.plugins.source
 
 import android.content.Context
 import android.net.Uri
 import android.os.Handler
 import android.os.HandlerThread
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -20,7 +19,7 @@ import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
-import info.nightscout.plugins.source.BGSourceFragment
+import info.nightscout.plugins.R
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.interfaces.ResourceHelper
@@ -153,13 +152,13 @@ class GlunovoPlugin @Inject constructor(
                                 aapsLogger.debug(LTag.DATABASE, "Inserted bg $it")
                             }
                             savedValues.calibrationsInserted.forEach { calibration ->
-                                calibration.glucose?.let { glucosevalue ->
+                                calibration.glucose?.let { glucoseValue ->
                                     uel.log(
                                         UserEntry.Action.CALIBRATION,
                                         UserEntry.Sources.Dexcom,
                                         ValueWithUnit.Timestamp(calibration.timestamp),
                                         ValueWithUnit.TherapyEventType(calibration.type),
-                                        ValueWithUnit.fromGlucoseUnit(glucosevalue, calibration.glucoseUnit.toString)
+                                        ValueWithUnit.fromGlucoseUnit(glucoseValue, calibration.glucoseUnit.toString)
                                     )
                                 }
                                 aapsLogger.debug(LTag.DATABASE, "Inserted calibration $calibration")
@@ -172,11 +171,10 @@ class GlunovoPlugin @Inject constructor(
     }
 
     override fun shouldUploadToNs(glucoseValue: GlucoseValue): Boolean =
-        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.GLUNOVO_NATIVE && sp.getBoolean(R.string.key_dexcomg5_nsupload, false)
+        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.GLUNOVO_NATIVE && sp.getBoolean(R.string.key_do_ns_upload, false)
 
     companion object {
 
-        @Suppress("SpellCheckingInspection")
         const val AUTHORITY = "alexpr.co.uk.infinivocgm.cgm_db.CgmExternalProvider/"
         const val TABLE_NAME = "CgmReading"
         const val INTERVAL = 180000L // 3 min

plugins/src/main/java/info/nightscout/plugins/source/IntelligoPlugin.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.source
+package info.nightscout.plugins.source
 
 import android.content.Context
 import android.content.pm.PackageManager
@@ -7,7 +7,6 @@ import android.os.Handler
 import android.os.HandlerThread
 import android.util.Log
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -22,7 +21,7 @@ import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
-import info.nightscout.plugins.source.BGSourceFragment
+import info.nightscout.plugins.R
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.extensions.safeGetInstalledPackages
@@ -180,11 +179,10 @@ class IntelligoPlugin @Inject constructor(
     }
 
     override fun shouldUploadToNs(glucoseValue: GlucoseValue): Boolean =
-        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.INTELLIGO_NATIVE && sp.getBoolean(R.string.key_dexcomg5_nsupload, false)
+        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.INTELLIGO_NATIVE && sp.getBoolean(R.string.key_do_ns_upload, false)
 
     companion object {
 
-        @Suppress("SpellCheckingInspection")
         const val AUTHORITY = "alexpr.co.uk.infinivocgm.intelligo.cgm_db.CgmExternalProvider"
 
         //const val AUTHORITY = "alexpr.co.uk.infinivocgm.cgm_db.CgmExternalProvider/"

plugins/src/main/java/info/nightscout/plugins/source/MM640gPlugin.kt

@@ -1,11 +1,10 @@
-package info.nightscout.androidaps.plugins.source
+package info.nightscout.plugins.source
 
 import android.content.Context
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.androidaps.receivers.DataWorkerStorage
@@ -15,7 +14,7 @@ import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
-import info.nightscout.plugins.source.BGSourceFragment
+import info.nightscout.plugins.R
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.interfaces.ResourceHelper
@@ -68,7 +67,7 @@ class MM640gPlugin @Inject constructor(
             if (collection == "entries") {
                 val data = inputData.getString("data")
                 aapsLogger.debug(LTag.BGSOURCE, "Received MM640g Data: $data")
-                if (data != null && data.isNotEmpty()) {
+                if (!data.isNullOrEmpty()) {
                     try {
                         val glucoseValues = mutableListOf<CgmSourceTransaction.TransactionGlucoseValue>()
                         val jsonArray = JSONArray(data)
@@ -110,6 +109,6 @@ class MM640gPlugin @Inject constructor(
     }
 
     override fun shouldUploadToNs(glucoseValue: GlucoseValue): Boolean =
-        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.MM_600_SERIES && sp.getBoolean(R.string.key_dexcomg5_nsupload, false)
+        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.MM_600_SERIES && sp.getBoolean(R.string.key_do_ns_upload, false)
 
 }

plugins/src/main/java/info/nightscout/plugins/source/PoctechPlugin.kt

@@ -1,11 +1,10 @@
-package info.nightscout.androidaps.plugins.source
+package info.nightscout.plugins.source
 
 import android.content.Context
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.database.entities.GlucoseValue
@@ -16,7 +15,7 @@ import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.utils.JsonHelper.safeGetString
-import info.nightscout.plugins.source.BGSourceFragment
+import info.nightscout.plugins.R
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.interfaces.ResourceHelper
@@ -101,6 +100,6 @@ class PoctechPlugin @Inject constructor(
     }
 
     override fun shouldUploadToNs(glucoseValue: GlucoseValue): Boolean =
-        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.POCTECH_NATIVE && sp.getBoolean(R.string.key_dexcomg5_nsupload, false)
+        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.POCTECH_NATIVE && sp.getBoolean(R.string.key_do_ns_upload, false)
 
 }

plugins/src/main/java/info/nightscout/plugins/source/RandomBgPlugin.kt

@@ -1,10 +1,9 @@
-package info.nightscout.androidaps.plugins.source
+package info.nightscout.plugins.source
 
 import android.os.Handler
 import android.os.HandlerThread
 import android.os.SystemClock
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.androidaps.utils.extensions.isRunningTest
@@ -15,8 +14,8 @@ import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
+import info.nightscout.plugins.R
 import info.nightscout.plugins.pump.virtual.VirtualPumpPlugin
-import info.nightscout.plugins.source.BGSourceFragment
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.interfaces.ResourceHelper
@@ -46,10 +45,10 @@ class RandomBgPlugin @Inject constructor(
         .mainType(PluginType.BGSOURCE)
         .fragmentClass(BGSourceFragment::class.java.name)
         .pluginIcon(R.drawable.ic_dice)
-        .pluginName(R.string.randombg)
+        .pluginName(R.string.random_bg)
-        .shortName(R.string.randombg_short)
+        .shortName(R.string.random_bg_short)
         .preferencesId(R.xml.pref_bgsource)
-        .description(R.string.description_source_randombg),
+        .description(R.string.description_source_random_bg),
     aapsLogger, rh, injector
 ), BgSource {
 
@@ -78,7 +77,7 @@ class RandomBgPlugin @Inject constructor(
     }
 
     override fun shouldUploadToNs(glucoseValue: GlucoseValue): Boolean =
-        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.RANDOM && sp.getBoolean(R.string.key_dexcomg5_nsupload, false)
+        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.RANDOM && sp.getBoolean(R.string.key_do_ns_upload, false)
 
     override fun onStart() {
         super.onStart()

plugins/src/main/java/info/nightscout/plugins/source/TomatoPlugin.kt

@@ -1,11 +1,10 @@
-package info.nightscout.androidaps.plugins.source
+package info.nightscout.plugins.source
 
 import android.content.Context
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.interfaces.XDripBroadcast
 import info.nightscout.database.entities.GlucoseValue
@@ -14,7 +13,7 @@ import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
-import info.nightscout.plugins.source.BGSourceFragment
+import info.nightscout.plugins.R
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.interfaces.ResourceHelper
@@ -88,6 +87,6 @@ class TomatoPlugin @Inject constructor(
     }
 
     override fun shouldUploadToNs(glucoseValue: GlucoseValue): Boolean =
-        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.LIBRE_1_TOMATO && sp.getBoolean(R.string.key_dexcomg5_nsupload, false)
+        glucoseValue.sourceSensor == GlucoseValue.SourceSensor.LIBRE_1_TOMATO && sp.getBoolean(R.string.key_do_ns_upload, false)
 
 }

plugins/src/main/java/info/nightscout/plugins/source/XdripPlugin.kt

@@ -1,11 +1,10 @@
-package info.nightscout.androidaps.plugins.source
+package info.nightscout.plugins.source
 
 import android.content.Context
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.BgSource
 import info.nightscout.androidaps.receivers.DataWorkerStorage
 import info.nightscout.androidaps.receivers.Intents
@@ -15,7 +14,7 @@ import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
-import info.nightscout.plugins.source.BGSourceFragment
+import info.nightscout.plugins.R
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.shared.interfaces.ResourceHelper

plugins/src/main/java/info/nightscout/plugins/source/activities/RequestDexcomPermissionActivity.kt

@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.source.activities
+package info.nightscout.plugins.source.activities
 
 import android.os.Bundle
 import info.nightscout.androidaps.activities.DialogAppCompatActivity
-import info.nightscout.androidaps.plugins.source.DexcomPlugin
+import info.nightscout.plugins.source.DexcomPlugin
 
 class RequestDexcomPermissionActivity : DialogAppCompatActivity() {
 

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

@@ -392,7 +392,10 @@
     <string name="virtualpump_uploadstatus_title">Upload status to NS</string>
 
     <!-- Source -->
-    <string name="key_dexcomg5_nsupload" translatable="false">dexcomg5_nsupload</string>
+    <string name="key_do_ns_upload" translatable="false">dexcomg5_nsupload</string>
+    <string name="key_dexcom_log_ns_sensor_change" translatable="false">dexcom_lognssensorchange</string>
+    <string name="key_last_processed_glunovo_timestamp" translatable="false">last_processed_glunovo_timestamp</string>
+    <string name="key_last_processed_intelligo_timestamp" translatable="false">last_processed_intelligo_timestamp</string>
 
     <string name="ns_client_bg">NSClient BG</string>
     <string name="ns_client_bg_short">NS BG</string>
@@ -421,11 +424,16 @@
     <string name="aidex">GlucoRx Aidex</string>
     <string name="aidex_short">Aidex</string>
     <string name="description_source_aidex">Receive BG values from GlucoRx Aidex CGMS.</string>
+    <string name="random_bg">Random BG</string>
+    <string name="description_source_random_bg">Generate random BG data (Demo mode only)</string>
+    <string name="random_bg_short">BG</string>
 
-    <string name="dexcomg5_xdripupload_title">Send BG data to xDrip+</string>
+    <string name="do_xdrip_upload_title">Send BG data to xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">In xDrip+ select 640g/Eversense data source</string>
+    <string name="do_xdrip_upload_summary">In xDrip+ select 640g/Eversense data source</string>
-    <string name="dexcomg5_nsupload_title">Upload BG data to NS</string>
+    <string name="do_ns_upload_title">Upload BG data to NS</string>
     <string name="bgsource_upload">BG upload settings</string>
+    <string name="dexcom_log_ns_sensor_change_title">Log sensor change to NS</string>
+    <string name="dexcom_log_ns_sensor_change_summary">Create event \"Sensor Change\" in NS automatically on sensor start</string>
 
     <!-- NSClient -->
     <string name="key_ns_temporary_target_last_synced_id" translatable="false">ns_temporary_target_last_sync</string>

plugins/src/main/res/xml/pref_bgsource.xml

@@ -9,14 +9,14 @@
 
         <SwitchPreference
             android:defaultValue="false"
-            android:key="@string/key_dexcomg5_nsupload"
+            android:key="@string/key_do_ns_upload"
-            android:title="@string/dexcomg5_nsupload_title" />
+            android:title="@string/do_ns_upload_title" />
 
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_dexcomg5_xdripupload"
-            android:summary="@string/dexcomg5_xdripupload_summary"
+            android:summary="@string/do_xdrip_upload_summary"
-            android:title="@string/dexcomg5_xdripupload_title" />
+            android:title="@string/do_xdrip_upload_title" />
 
     </PreferenceCategory>
 

plugins/src/main/res/xml/pref_dexcom.xml

@@ -9,20 +9,20 @@
 
         <SwitchPreference
             android:defaultValue="false"
-            android:key="@string/key_dexcomg5_nsupload"
+            android:key="@string/key_do_ns_upload"
-            android:title="@string/dexcomg5_nsupload_title" />
+            android:title="@string/do_ns_upload_title" />
 
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_dexcomg5_xdripupload"
-            android:summary="@string/dexcomg5_xdripupload_summary"
+            android:summary="@string/do_xdrip_upload_summary"
-            android:title="@string/dexcomg5_xdripupload_title" />
+            android:title="@string/do_xdrip_upload_title" />
 
         <SwitchPreference
             android:defaultValue="false"
-            android:key="@string/key_dexcom_lognssensorchange"
+            android:key="@string/key_dexcom_log_ns_sensor_change"
-            android:summary="@string/dexcom_lognssensorchange_summary"
+            android:summary="@string/dexcom_log_ns_sensor_change_summary"
-            android:title="@string/dexcom_lognssensorchange_title" />
+            android:title="@string/dexcom_log_ns_sensor_change_title" />
 
     </PreferenceCategory>
 

plugins/src/main/res/xml/pref_ns_client.xml

@@ -47,8 +47,8 @@
 
             <SwitchPreference
                 android:defaultValue="false"
-                android:key="@string/key_dexcomg5_nsupload"
+                android:key="@string/key_do_ns_upload"
-                android:title="@string/dexcomg5_nsupload_title" />
+                android:title="@string/do_ns_upload_title" />
 
             <SwitchPreference
                 android:defaultValue="false"