Merge branch 'dev' into dev

app/build.gradle

@@ -125,6 +125,7 @@ android {
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
         buildConfigField "String", "HEAD", '"' + generateGitBuild() + '"'
+        buildConfigField "String", "COMMITED", '"' + allCommited() + '"'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         // if you change minSdkVersion to less than 11, you need to change executeTask for wear
 

app/src/main/java/info/nightscout/androidaps/MainActivity.kt

@@ -25,6 +25,7 @@ import androidx.appcompat.widget.Toolbar
 import androidx.core.app.ActivityCompat
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayoutMediator
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.joanzapata.iconify.Iconify
 import com.joanzapata.iconify.fonts.FontAwesomeModule
 import dev.doubledot.doki.ui.DokiActivity
@@ -318,6 +319,7 @@ class MainActivity : NoSplashAppCompatActivity() {
                 message += "Flavor: ${BuildConfig.FLAVOR}${BuildConfig.BUILD_TYPE}\n"
                 message += "${resourceHelper.gs(R.string.configbuilder_nightscoutversion_label)} ${nsSettingsStatus.nightscoutVersionName}"
                 if (buildHelper.isEngineeringMode()) message += "\n${resourceHelper.gs(R.string.engineering_mode_enabled)}"
+                if (!fabricPrivacy.fabricEnabled()) message += "\n${resourceHelper.gs(R.string.fabric_upload_disabled)}"
                 message += resourceHelper.gs(R.string.about_link_urls)
                 val messageSpanned = SpannableString(message)
                 Linkify.addLinks(messageSpanned, Linkify.WEB_URLS)
@@ -398,6 +400,12 @@ class MainActivity : NoSplashAppCompatActivity() {
         fabricPrivacy.firebaseAnalytics.setUserProperty("Profile", activePlugin.activeProfileInterface.javaClass.simpleName)
         activePlugin.activeSensitivity.let { fabricPrivacy.firebaseAnalytics.setUserProperty("Sensitivity", it::class.java.simpleName) }
         activePlugin.activeInsulin.let { fabricPrivacy.firebaseAnalytics.setUserProperty("Insulin", it::class.java.simpleName) }
+        // Add to crash log too
+        FirebaseCrashlytics.getInstance().setCustomKey("HEAD", BuildConfig.HEAD)
+        FirebaseCrashlytics.getInstance().setCustomKey("Version", BuildConfig.VERSION)
+        FirebaseCrashlytics.getInstance().setCustomKey("Remote", remote)
+        FirebaseCrashlytics.getInstance().setCustomKey("Commited", BuildConfig.COMMITED)
+        FirebaseCrashlytics.getInstance().setCustomKey("Hash", hashes[0])
     }
 
 }

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

@@ -281,12 +281,12 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         if (childFragmentManager.isStateSaved) return
         activity?.let { activity ->
             when (v.id) {
-                R.id.overview_treatmentbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { TreatmentDialog().show(childFragmentManager, "Overview") })
-                R.id.overview_wizardbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { WizardDialog().show(childFragmentManager, "Overview") })
-                R.id.overview_insulinbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { InsulinDialog().show(childFragmentManager, "Overview") })
-                R.id.overview_quickwizardbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { onClickQuickWizard() })
-                R.id.overview_carbsbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { CarbsDialog().show(childFragmentManager, "Overview") })
-                R.id.overview_temptarget -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { TempTargetDialog().show(childFragmentManager, "Overview") })
+                R.id.overview_treatmentbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { if(isAdded) TreatmentDialog().show(childFragmentManager, "Overview") })
+                R.id.overview_wizardbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { if(isAdded) WizardDialog().show(childFragmentManager, "Overview") })
+                R.id.overview_insulinbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { if(isAdded) InsulinDialog().show(childFragmentManager, "Overview") })
+                R.id.overview_quickwizardbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { if(isAdded) onClickQuickWizard() })
+                R.id.overview_carbsbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { if(isAdded) CarbsDialog().show(childFragmentManager, "Overview") })
+                R.id.overview_temptarget -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { if(isAdded) TempTargetDialog().show(childFragmentManager, "Overview") })
 
                 R.id.overview_activeprofile -> {
                     ProfileViewerDialog().also { pvd ->
@@ -345,7 +345,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
                 R.id.overview_apsmode -> {
                     protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable {
-                        LoopDialog().also { dialog ->
+                        if(isAdded)  LoopDialog().also { dialog ->
                             dialog.arguments = Bundle().also { it.putInt("showOkCancel", 1) }
                         }.show(childFragmentManager, "Overview")
                     })

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

@@ -88,7 +88,8 @@ class OverviewMenus @Inject constructor(
 
     fun setupChartMenu(chartButton: ImageButton) {
         loadGraphConfig()
-        val numOfGraphs = _setting.size // 1 main + x secondary
+        val settingsCopy = setting
+        val numOfGraphs = settingsCopy.size // 1 main + x secondary
 
         chartButton.setOnClickListener { v: View ->
             val predictionsAvailable: Boolean = when {
@@ -100,7 +101,7 @@ class OverviewMenus @Inject constructor(
 
             for (g in 0 until numOfGraphs) {
                 if (g != 0 && g < numOfGraphs) {
-                    val dividerItem = popup.menu.add(Menu.NONE, g, Menu.NONE, "------- " + "Graph" + " " + g + " -------")
+                    val dividerItem = popup.menu.add(Menu.NONE, g, Menu.NONE, "------- ${resourceHelper.gs(R.string.graph_menu_divider_header)} $g -------")
                     dividerItem.isCheckable = true
                     dividerItem.isChecked = true
                 }
@@ -117,12 +118,12 @@ class OverviewMenus @Inject constructor(
                         s.setSpan(ForegroundColorSpan(resourceHelper.gc(m.colorId)), 0, s.length, 0)
                         item.title = s
                         item.isCheckable = true
-                        item.isChecked = _setting[g][m.ordinal]
+                        item.isChecked = settingsCopy[g][m.ordinal]
                     }
                 }
             }
             if (numOfGraphs < MAX_GRAPHS) {
-                val dividerItem = popup.menu.add(Menu.NONE, numOfGraphs, Menu.NONE, "------- " + "Graph" + " " + numOfGraphs + " -------")
+                val dividerItem = popup.menu.add(Menu.NONE, numOfGraphs, Menu.NONE, "------- ${resourceHelper.gs(R.string.graph_menu_divider_header)} $numOfGraphs -------")
                 dividerItem.isCheckable = true
                 dividerItem.isChecked = false
             }

app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java

@@ -192,7 +192,7 @@ public class TimeListEdit {
                                       int before, int count) {
             }
         });
-        numberPickers1[position].setTag(tagPrefix +"-1-" + position);
+        numberPickers1[position].setTag(tagPrefix + "-1-" + position);
 
         numberPickers2[position].setTextWatcher(new TextWatcher() {
             @Override
@@ -212,7 +212,7 @@ public class TimeListEdit {
                                       int before, int count) {
             }
         });
-        numberPickers2[position].setTag(tagPrefix +"-2-" + position);
+        numberPickers2[position].setTag(tagPrefix + "-2-" + position);
 
         layout.addView(childView);
     }
@@ -245,7 +245,7 @@ public class TimeListEdit {
         if (i == 0) next = ONEHOURINSECONDS;
         fillSpinner(timeSpinner, secondFromMidnight(i), previous, next);
 
-        editText1.setParams(value1(i), min, max, step, formatter, false,null);
+        editText1.setParams(value1(i), min, max, step, formatter, false, null);
         editText2.setParams(value2(i), min, max, step, formatter, false, null);
 
         if (data2 == null) {
@@ -372,6 +372,7 @@ public class TimeListEdit {
     }
 
     private void addItem(int index, int timeAsSeconds, double value1, double value2) {
+        if (itemsCount() >= 24) return;
         if (itemsCount() > inflatedUntil) {
             layout.removeView(finalAdd);
             inflateRow(++inflatedUntil);

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

@@ -198,7 +198,6 @@
     <string name="correctionbous">Corr</string>
     <string name="actions">Aksies</string>
     <string name="ns_upload_only">NS laai net op (opgeskorte sinkro)</string>
-    <string name="ns_upload_only_summary">NS oplaai net. Nie effektief op SGV tensy \'n plaaslike bron soos xDrip gekies is. Nie effektief op profiele terwyl NS-profiele gebruik word.</string>
     <string name="pumpNotInitialized">Pomp nie geïnisialiseer nie!</string>
     <string name="primefill">Prima/vul</string>
     <string name="fillwarning">Maak asseblief seker dat die hoeveelheid ooreenstem met die spesifikasies van jou infusie stel!</string>

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

@@ -286,7 +286,6 @@
     <string name="correctionbous">Корекция</string>
     <string name="actions">Действия</string>
     <string name="ns_upload_only">Само качва данни в NS (изключва синхронизацията)</string>
-    <string name="ns_upload_only_summary">Само качване на данните в NS. Няма ефект върху данните за КЗ ако локален източник като xDrip е избран. Няма ефект върху профила освен ако не е избран  NS-профил.</string>
     <string name="pumpNotInitialized">Помпата не е инициализирана!</string>
     <string name="primefill">Пълнене на сет</string>
     <string name="fillwarning">Моля, уверете се, че стойността съответсва на вашият сет! Този инсулин не се включва в IOB!</string>
@@ -443,11 +442,11 @@
     <string name="statuslights_sage_critical">Праг за критична възраст на сензор [часа]</string>
     <string name="statuslights_sbat_warning">Аларма при заряд на батерия под [%]</string>
     <string name="statuslights_sbat_critical">Критично ниво на сензорната батерия под [%]</string>
-    <string name="statuslights_bage_warning">Аларма при възраст на батерия над [часа]</string>
-    <string name="statuslights_bage_critical">Праг за критична възраст на батерията над [часа]</string>
+    <string name="statuslights_bage_warning">Висока възраст на батерия над [часа]</string>
+    <string name="statuslights_bage_critical">Критична възраст на батерията над [часа]</string>
     <string name="statuslights_res_warning">Ниво за аларма за останал инсулин в резервоара [Е]</string>
     <string name="statuslights_res_critical">Предупреждение за критично ниво на останал инсулин в резервоар [Е]</string>
-    <string name="statuslights_bat_warning">Аларма при заряд на батерия под [%]</string>
+    <string name="statuslights_bat_warning">Нисък заряд на батерия под [%]</string>
     <string name="statuslights_bat_critical">Критично ниво на батерията под [%]</string>
     <string name="prediction_shortname">Предв</string>
     <string name="iob">IOB</string>
@@ -1193,7 +1192,7 @@
     <string name="bolusadvisor">Съветник на болус</string>
     <string name="bolusadvisormessage">Имаш висока захар. Вместо да се яде сега, се препоръчва да се изчака за по-добра захар. Искате ли да направите корекция сега и да ви напомня кога е време за ядене? В този случай няма да бъдат записвани въглехидрати и трябва да използвате съветника отново, когато ви напомня.</string>
     <string name="enablebolusadvisor">Активиране на болус съветник</string>
-    <string name="enablebolusadvisor_summary">Използвайте напомняне за да начало на хранене вместо съветника по време на висока гликемия</string>
+    <string name="enablebolusadvisor_summary">Използвай напомняне за старт на хранене вместо съветника по време на висока гликемия (\"пре-болус\")</string>
     <string name="time_to_eat">Време за ядене!\nИзпълнете болус съветника и направете изчисления отново.</string>
     <string name="timetoeat">Време е за ядене</string>
 </resources>

app/src/main/res/values-ca-rES/exam.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/main/res/values-ca-rES/insight_alert_codes.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/main/res/values-ca-rES/insight_alert_descriptions.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/main/res/values-ca-rES/insight_alert_titles.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/main/res/values-ca-rES/insight_exceptions.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/main/res/values-ca-rES/objectives.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
+    <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
+    <!--    <string name="ga_lang" translatable="false">Irish</string> -->
+    <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
+    <!-- SMS Communicator & OTP Authenticator -->
+</resources>

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

@@ -286,7 +286,7 @@
     <string name="correctionbous">Korekce</string>
     <string name="actions">Akce</string>
     <string name="ns_upload_only">Pouze nahrávání do NS (zakázaná synchronizace)</string>
-    <string name="ns_upload_only_summary">Pouze nahrávání dat do NS. Neplatí pro glykémie, dokud není vybraný místní zdroj dat jako xDrip. Neplatí pro profily, pokud se používá NS profil.</string>
+    <string name="ns_upload_only_summary">Pouze nahrávání do NS. Neplatí pro glykémie, pokud je NS vybrán jako zdroj glykémií. Neplatí pro profily, pokud je vybraný NS Profil.\n!!! VAROVÁNÍ!!! Vypnutí této možnosti může způsobit chybné chování a předávkování inzulínem, pokud je některá z vašich komponent (AAPS, NS, xDrip) špatně nastavena. Pečlivě sledujte, jestli data zobrazená AAPS odpovídají stavu pumpy!</string>
     <string name="pumpNotInitialized">Pumpa není inicializována!</string>
     <string name="primefill">Plnění/doplňování</string>
     <string name="fillwarning">Prosím ujistěte se, že hodnota odpovídá specifikaci Vašeho setu!</string>
@@ -443,12 +443,12 @@
     <string name="statuslights_sage_critical">Úroveň kritického stáří senzoru [h]</string>
     <string name="statuslights_sbat_warning">Úroveň varování stavu baterie senzoru [%]</string>
     <string name="statuslights_sbat_critical">Úroveň kritického varování stavu baterie senzoru [%]</string>
-    <string name="statuslights_bage_warning">Úroveň varování stáří baterie [h]</string>
-    <string name="statuslights_bage_critical">Úroveň kritického varování stáří baterie [h]</string>
+    <string name="statuslights_bage_warning">Úroveň varování stáří baterie pumpy [h]</string>
+    <string name="statuslights_bage_critical">Úroveň kritického varování stáří baterie pumpy [h]</string>
     <string name="statuslights_res_warning">Úroveň varování stavu zásobníku [U]</string>
     <string name="statuslights_res_critical">Úroveň kritického varování stavu zásobníku [U]</string>
-    <string name="statuslights_bat_warning">Úroveň varování stavu baterie [%]</string>
-    <string name="statuslights_bat_critical">Úroveň kritického varování stavu baterie [%]</string>
+    <string name="statuslights_bat_warning">Úroveň varování stavu baterie pumpy [%]</string>
+    <string name="statuslights_bat_critical">Úroveň kritického varování stavu baterie pumpy [%]</string>
     <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
@@ -1193,7 +1193,8 @@
     <string name="bolusadvisor">Poradce pro bolus</string>
     <string name="bolusadvisormessage">Máte vysokou glykémii. Namísto jídla doporučujeme vyčkat na lepší glykémii a připomenout, až bude čas na jídlo. Přejete si poslat korekční bolus a připomenout, až bude čas k jídlu? V tomto případě nebudou zapsané žádné sacharidy, a později opět musíte spustit kalkulátor, jakmile vám to připomeneme.</string>
     <string name="enablebolusadvisor">Povolit poradce s bolusem</string>
-    <string name="enablebolusadvisor_summary">Během vysoké glykémie spusťte připomenutí namísto průvodce</string>
+    <string name="enablebolusadvisor_summary">Použij připomenutí, abys začal jíst později, namísto výsledku z kalkulátoru během vysoké glykémie (\"pre-bolus\")</string>
     <string name="time_to_eat">Čas k jídlu!\nSpusťte Bolusovou kalkulačku a proveďte výpočet znovu.</string>
     <string name="timetoeat">Čas k jídlu</string>
+    <string name="fabric_upload_disabled">Nahrávání protokolů o pádech zakázáno!</string>
 </resources>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
+    <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
+    <!--    <string name="ga_lang" translatable="false">Irish</string> -->
+    <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
+    <!-- SMS Communicator & OTP Authenticator -->
+</resources>

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

@@ -286,7 +286,7 @@
     <string name="correctionbous">Korr</string>
     <string name="actions">Aktionen</string>
     <string name="ns_upload_only">Zu Nightscout nur hochladen (keine Synchronisation)</string>
-    <string name="ns_upload_only_summary">Zu Nightscout nur hochladen. Nicht wirksam bei BZ-Werten, wenn nicht eine lokale Quelle wie z. B. xDrip gewählt wird; nicht wirksam bei Profilen, wenn Nightscout-Profile verwendet werden.</string>
+    <string name="ns_upload_only_summary">Zu Nightscout nur hochladen (keine Synchronisation). Gilt nicht für CGM-Werte falls nicht eine lokale Quelle wie xDrip+ ausgewählt wurde. Gilt ebenfalls nicht für Profildaten, wenn ein NS-Profil genutzt wird. \n!!! WARNUNG !!! Deaktivieren dieser Option kann zu Fehlfunktionen und Insulin-Überdosierung führen, wenn eine der Komponenten (AAPS, NS, xDrip+) falsch konfiguriert ist. Achte sorgfältig darauf, ob die in AAPS angezeigten Daten mit denen der Pumpe übereinstimmen!</string>
     <string name="pumpNotInitialized">Pumpe nicht initialisiert!</string>
     <string name="primefill">Katheterwechsel</string>
     <string name="fillwarning">Bitte vergewissere Dich, dass die Füllmenge den Eigenschaften des Katheters entspricht!</string>
@@ -432,8 +432,8 @@
     <string name="fastactinginsulincomment">NovoRapid, NovoLog, Humalog</string>
     <string name="ultrafastactinginsulincomment">Fiasp</string>
     <string name="insulin_shortname">INS</string>
-    <string name="enablesuperbolus">Aktiviere Superbolus im Wizard</string>
-    <string name="enablesuperbolus_summary">Aktiviere die SuperBolus-Funktion im Wizard. Nicht aktivieren, wenn Du nicht weißt, welche Auswirkungen dieser Bolus hat! ES KANN ZU EINER ÜBERDOSIERUNG AN INSULIN KOMMEN!</string>
+    <string name="enablesuperbolus">Aktiviere Superbolus im Bolus-Rechner</string>
+    <string name="enablesuperbolus_summary">Aktiviere die SuperBolus-Funktion im Bolus-Rechner. Nicht aktivieren, wenn Du nicht weißt, welche Auswirkungen dieser Bolus hat! ES KANN ZU EINER ÜBERDOSIERUNG AN INSULIN KOMMEN!</string>
     <string name="show_statuslights">Statusanzeige auf Homescreen</string>
     <string name="statuslights_cage_warning">Warnschwelle Kanülenalter [h]</string>
     <string name="statuslights_cage_critical">Warnschwelle kritisches Kanülenalter [h]</string>
@@ -441,14 +441,14 @@
     <string name="statuslights_iage_critical">Warnschwelle kritisches Insulinalter [h]</string>
     <string name="statuslights_sage_warning">Warnschwelle Sensoralter [h]</string>
     <string name="statuslights_sage_critical">Warnschwelle kritisches Sensoralter [h]</string>
-    <string name="statuslights_sbat_warning">Warnschwelle Sensor-Batteriestand [%]</string>
-    <string name="statuslights_sbat_critical">Warnschwelle kritischer Sensor-Batteriestand [%]</string>
-    <string name="statuslights_bage_warning">Warnschwelle Batteriealter [h]</string>
-    <string name="statuslights_bage_critical">Warnschwelle kritisches Batteriealter [h]</string>
+    <string name="statuslights_sbat_warning">Warnschwelle Sensor-Akkustand [%]</string>
+    <string name="statuslights_sbat_critical">Warnschwelle kritischer Sensor-Akkustand [%]</string>
+    <string name="statuslights_bage_warning">Warnschwelle Pumpenbatterie-Alter [h]</string>
+    <string name="statuslights_bage_critical">Warnschwelle kritisches Pumpenbatterie-Alter [h]</string>
     <string name="statuslights_res_warning">Warnschwelle Reservoirstand [IE]</string>
     <string name="statuslights_res_critical">Warnschwelle kritischer Reservoirstand [IE]</string>
-    <string name="statuslights_bat_warning">Warnschwelle Batteriestand [%]</string>
-    <string name="statuslights_bat_critical">Warnschwelle kritischer Batteriestand [%]</string>
+    <string name="statuslights_bat_warning">Warnschwelle Pumpenbatterie-Stand [%]</string>
+    <string name="statuslights_bat_critical">Warnschwelle kritischer Pumpenbatterie-Stand [%]</string>
     <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
@@ -1034,8 +1034,8 @@ Unerwartetes Verhalten.</string>
     <string name="cobvsiob">COB vs IOB</string>
     <string name="bolusconstraintappliedwarn">Bolus Einschränkung angewandt: %2$.2f U statt %1$.2f U</string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Langsamer Kohlenhydrat-Abbau erkannt: %2$d%% der Zeit. Überprüfe Deine Berechnung. COB könnte zu hoch sein und deswegen zu viel Insulin abgegeben werden!!!!!</font>]]></string>
-    <string name="partialboluswizard">Abgabe von [%] des Ergebnisses des Bolusrechners</string>
-    <string name="deliverpartofboluswizard">Der Bolus-Assistent führt Berechnungen durch, aber nur dieser Teil der berechneten Insulin wird abgegeben. Nützlich mit SMB-Algorithmus.</string>
+    <string name="partialboluswizard">Abgabe von [%] des Ergebnisses des Bolus-Rechners</string>
+    <string name="deliverpartofboluswizard">Der Bolus-Rechner führt Berechnungen durch, aber nur dieser Teil der berechneten Insulin wird abgegeben. Nützlich mit SMB-Algorithmus.</string>
     <string name="loading">Lädt ...</string>
     <string name="snooze">Schlummern</string>
     <string name="time_range">Zeitraum</string>
@@ -1194,7 +1194,8 @@ Unerwartetes Verhalten.</string>
     <string name="bolusadvisor">Bolus-Berater</string>
     <string name="bolusadvisormessage">Deine BZ-Werte sind hoch. Statt jetzt zu essen solltest Du abwarten, bis die Werte gesunken sind. Willst du jetzt einen Korrekturbolus abgeben und erinnert werden, wenn es Zeit zum Essen ist? In diesem Fall werden die Kohlenhydrate nicht übernommen und Du musst nach der Erinnerung den Bolus-Rechner erneut verwenden.</string>
     <string name="enablebolusadvisor">Bolus-Berater aktivieren</string>
-    <string name="enablebolusadvisor_summary">Bei hohen BZ-Werten Essenserinnerung statt Bolus-Wizard verwenden</string>
+    <string name="enablebolusadvisor_summary">Option zur Erinnerung an späteres Essen (z.B. bei hohen BZ-Werten) im Bolus-Rechner (\"Spritz-Ess-Abstand\")</string>
     <string name="time_to_eat">Zeit zum Essen!\nStarte den Bolus-Rechner und gib die KH ein. </string>
     <string name="timetoeat">Zeit zum Essen</string>
+    <string name="fabric_upload_disabled">Hochladen von Crash-Protokollen deaktiviert!</string>
 </resources>

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

@@ -200,7 +200,6 @@
     <string name="correctionbous">Διορθ</string>
     <string name="actions">Ενέργειες</string>
     <string name="ns_upload_only">NS φορτώνεται μόνο (απενεργοποίηση συγχρ)</string>
-    <string name="ns_upload_only_summary">NS φορτώνεται μόνο. Δεν είναι αποτελεσματικό στο SGV εκτός εάν έχει επιλεγεί μία τοπική πηγή όπως το xDrip. Δεν είναι αποτελεσματικό στα Προφίλ ενώ χρησιμοποιείται το NS-Profiles.</string>
     <string name="pumpNotInitialized">Η αντλία δεν έχει ρυθμιστεί!</string>
     <string name="primefill">Πλήρωση/Γέμισμα</string>
     <string name="fillwarning">Παρακαλώ ελέγξτε ότι η ποσότητα ταιριάζει με τις προδιαγραφές του σετ έγχυσης!</string>
@@ -331,8 +330,6 @@
     <string name="show_statuslights">Εμφάνιση του φωτισμού κατάστασης στην αρχική οθόνη</string>
     <string name="statuslights_res_warning">Όριο προειδοποίησης χαμηλής αμπούλας [U]</string>
     <string name="statuslights_res_critical">Όριο προειδοποίησης πολύ χαμηλής αμπούλας [U]</string>
-    <string name="statuslights_bat_warning">Όριο προειδοποίησης χαμηλής μπαταρίας [%]</string>
-    <string name="statuslights_bat_critical">Όριο προειδοποίησης πολύ χαμηλής μπαταρίας [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="nav_about">Σχετικά με</string>

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

@@ -286,7 +286,6 @@
     <string name="correctionbous">Corrección</string>
     <string name="actions">Acciones</string>
     <string name="ns_upload_only">NS solo subida (sinc. inactiva)</string>
-    <string name="ns_upload_only_summary">NS solo subida. No efectivo con SGV salvo que este seleccionada una fuente local como xDrip. No efectivo en perfiles usando perfiles NS.</string>
     <string name="pumpNotInitialized">¡Bomba no iniciada!</string>
     <string name="primefill">Rellenar/Llenar</string>
     <string name="fillwarning">¡Por favor asegurar que la cantidad coincide con la especificación del set de infusión!</string>
@@ -443,12 +442,8 @@
     <string name="statuslights_sage_critical">Umbral crítico de la edad del sensor [h]</string>
     <string name="statuslights_sbat_warning">Umbral de advertencia de nivel de batería del sensor [%]</string>
     <string name="statuslights_sbat_critical">Umbral crítico de nivel de batería del sensor [%]</string>
-    <string name="statuslights_bage_warning">Umbral de advertencia de nivel de pila [h]</string>
-    <string name="statuslights_bage_critical">Umbral crítico de nivel de batería [h]</string>
     <string name="statuslights_res_warning">Umbral de advertencia de nivel de reservorio [U]</string>
     <string name="statuslights_res_critical">Umbral crítico de nivel de reservorio [U]</string>
-    <string name="statuslights_bat_warning">Umbral de advertencia de nivel de pila [%]</string>
-    <string name="statuslights_bat_critical">Umbral crítico de nivel de batería [%]</string>
     <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
@@ -1193,7 +1188,6 @@
     <string name="bolusadvisor">Asistente de bolo</string>
     <string name="bolusadvisormessage">Usted tiene alta glicemia. En lugar de comer ahora se recomienda esperar a una mejor glicemia. ¿Quieres hacer un bolo de corrección ahora y recibir una nota cuándo es el momento de comer? En este caso no se grabarán carbohidratos y se debe volver a utilizar el asistente cuando lo recordamos.</string>
     <string name="enablebolusadvisor">Habilitar asistente de bolo</string>
-    <string name="enablebolusadvisor_summary">Usar un recordatorio para empezar a comer en lugar del asistente durante la glucemia alta</string>
     <string name="time_to_eat">¡Hora de comer!\nEjecutar el asistente de bolo y cálcular de nuevo.</string>
     <string name="timetoeat">Hora de comer</string>
 </resources>

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

@@ -287,7 +287,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="correctionbous">Corr</string>
     <string name="actions">Actions</string>
     <string name="ns_upload_only">Remonter uniquement vers NS (sync désactivée)</string>
-    <string name="ns_upload_only_summary">Uniquement téléchargement NS. Ceci n’est pas opérationnel pour les SGV à moins qu’une source locale comme xDrip ne soit sélectionnée. Ceci n’est pas opérationnel sur les profils lorsque les profils NS sont utilisés.</string>
+    <string name="ns_upload_only_summary">Envoi NS uniquement. Inactif sur les Gly capteurs sauf si une source locale comme xDrip est sélectionnée. Inactif sur les profils si Profil NS est sélectionné.\n!!! ATTENTION !!! La désactivation de cette option peut causer des dysfonctionnements et une surdose d\'insuline si l\'un de vos composants (AAPS, NS, xDrip) est mal configuré. Vérifiez bien si les données affichées par AAPS correspondent à l’état de la pompe !</string>
     <string name="pumpNotInitialized">Pompe non initialisée !</string>
     <string name="primefill">Amorcer/Remplir</string>
     <string name="fillwarning">Veuillez à ce que la quantité corresponde aux caractéristiques de votre cathéter !</string>
@@ -380,7 +380,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="queue">File d\'attente :</string>
     <string name="status">État :</string>
     <string name="paused">En pause</string>
-    <string name="clearlog">Effacer l\'histo</string>
+    <string name="clearlog">Effacer logs</string>
     <string name="nowritepermission">NSCLIENT ne possède pas la permission d\'écriture. Mauvais API secret?</string>
     <string name="wear_settings">Paramètres Wear</string>
     <string name="wear_detailedIOB_title">Afficher l\'IA détaillée</string>
@@ -444,12 +444,12 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="statuslights_sage_critical">Seuil critique âge capteur [h]</string>
     <string name="statuslights_sbat_warning">Seuil d’alerte niveau pile capteur [%]</string>
     <string name="statuslights_sbat_critical">Seuil critique niveau pile capteur [%]</string>
-    <string name="statuslights_bage_warning">Seuil d\'alerte âge pile [h]</string>
-    <string name="statuslights_bage_critical">Seuil critique âge pile [h]</string>
+    <string name="statuslights_bage_warning">Seuil d\'alerte âge pile pompe [h]</string>
+    <string name="statuslights_bage_critical">Seuil critique âge pile pompe [h]</string>
     <string name="statuslights_res_warning">Seuil d\'alerte niveau réservoir [U]</string>
     <string name="statuslights_res_critical">Seuil critique de niveau réservoir [U]</string>
-    <string name="statuslights_bat_warning">Seuil d’alerte niveau pile [%]</string>
-    <string name="statuslights_bat_critical">Seuil critique niveau pile [%]</string>
+    <string name="statuslights_bat_warning">Seuil d’alerte niveau pile pompe [%]</string>
+    <string name="statuslights_bat_critical">Seuil critique niveau pile pompe [%]</string>
     <string name="prediction_shortname">PRED</string>
     <string name="iob">IA</string>
     <string name="cob">GA</string>
@@ -806,8 +806,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="maintenance">Maintenance</string>
     <string name="maintenance_shortname">MAINT</string>
     <string name="description_maintenance">Fournir différentes fonctions de maintenance (ex : envoyer, supprimer le journal).</string>
-    <string name="send_all_logs">Envoyer le journal par e-mail</string>
-    <string name="delete_logs">Supprimer le journal</string>
+    <string name="send_all_logs">Envoyer les logs par mail</string>
+    <string name="delete_logs">Supprimer les logs</string>
     <string name="error_adding_treatment_message">Le traitement (insuline : %1$.2f, glucides : %2$d, à : %3$s) n\'a pas pu être ajouté aux traitements. Vérifiez et ajoutez SVP manuellement ce traitement.</string>
     <string name="generated_ecarbs_note">eCarbs : %1$d g (%2$d h), retard : %3$d m</string>
     <string name="openaps_noasdata">Pas de données d\'Autosens disponibles</string>
@@ -819,7 +819,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="setupwizard_preferred_aps_mode">Mode APS préféré</string>
     <string name="treatments_wizard_total_label">Total</string>
     <string name="calculation_short">Calc</string>
-    <string name="sendlogfiles">Envoi des fichiers des journaux aux développeurs. Cas imprévu.</string>
+    <string name="sendlogfiles">Envoi des fichiers logs d\'aujourd\'hui aux développeurs avec l\'heure. Cas imprévu.</string>
     <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="searching_for_devices">Recherche d\'appareils en cours…</string>
@@ -1194,7 +1194,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="bolusadvisor">Assistant bolus</string>
     <string name="bolusadvisormessage">Vous avez une glycémie élevée. Au lieu de manger maintenant, il est recommandé d\'attendre une meilleure glycémie. Voulez-vous faire un bolus de correction maintenant et avoir une alerte quand il sera temps de manger ? Dans ce cas, aucun glucide ne sera enregistré et vous devrez utiliser l\'assistant à nouveau lorsque nous vous le rappelons.</string>
     <string name="enablebolusadvisor">Activer l\'assistant bolus</string>
-    <string name="enablebolusadvisor_summary">Utiliser le rappel pour commencer à manger au lieu de l\'assistant quand la glycémie est élevée</string>
+    <string name="enablebolusadvisor_summary">Utiliser un rappel pour commencer le repas à la place du résultat de l\'assistant quand la glycémie est élevée (\"pré-bolus\")</string>
     <string name="time_to_eat">Il est temps de manger !\nExécutez l\'assistant Bolus et refaites le calcul.</string>
     <string name="timetoeat">Il est temps de manger</string>
+    <string name="fabric_upload_disabled">Téléchargement logs crashs désactivé!</string>
 </resources>

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

@@ -286,7 +286,7 @@
     <string name="correctionbous">Corr</string>
     <string name="actions">Azioni</string>
     <string name="ns_upload_only">NS: solo upload (sincron. disabilitata)</string>
-    <string name="ns_upload_only_summary">NS: solo upload. Non ha effetto su SGV a meno che non sia selezionata una fonte locale come xDrip. Non ha effetto sui profili durante l\'uso dei profili NS.</string>
+    <string name="ns_upload_only_summary">Solo upload su NS. Non ha effetto su SGV a meno che non sia selezionata una fonte locale come xDrip. Non ha effetto sui profili mentre vengono usati i profili NS.\n!!! ATTENZIONE !!! Disabilitare questa opzione potrebbe causare malfunzionamenti e sovra-dosaggio di insulina se uno dei tuoi strumenti (AAPS, NS, xDrip) è configurato in modo errato. Guarda attentamente se i dati visualizzati da AAPS corrispondono allo stato del micro!</string>
     <string name="pumpNotInitialized">Micro non inizializzato!</string>
     <string name="primefill">Carica/Riempi</string>
     <string name="fillwarning">Assicurati che la quantità corrisponda alla specifica del tuo set di infusione!</string>
@@ -443,12 +443,12 @@
     <string name="statuslights_sage_critical">Soglia età sensore critica [h]</string>
     <string name="statuslights_sbat_warning">Soglia di avviso livello batteria sensore [%]</string>
     <string name="statuslights_sbat_critical">Soglia livello batteria sensore critico [%]</string>
-    <string name="statuslights_bage_warning">Soglia di avviso età batteria [h]</string>
-    <string name="statuslights_bage_critical">Soglia età batteria critica [h]</string>
+    <string name="statuslights_bage_warning">Età batteria micro: soglia di avviso [h]</string>
+    <string name="statuslights_bage_critical">Età batteria micro: soglia critica [h]</string>
     <string name="statuslights_res_warning">Soglia di avviso livello serbatoio [U]</string>
     <string name="statuslights_res_critical">Soglia livello serbatoio critico [U]</string>
-    <string name="statuslights_bat_warning">Soglia di avviso livello batteria [%]</string>
-    <string name="statuslights_bat_critical">Soglia livello batteria critico [%]</string>
+    <string name="statuslights_bat_warning">Livello batteria micro: soglia di avviso [%]</string>
+    <string name="statuslights_bat_critical">Livello batteria micro: soglia critica [%]</string>
     <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
@@ -1193,7 +1193,7 @@
     <string name="bolusadvisor">Consiglio bolo</string>
     <string name="bolusadvisormessage">Hai una glicemia alta. Invece di mangiare ora, si consiglia di attendere una glicemia migliore. Vuoi fare adesso un bolo di correzione ed essere ricordato quando è il momento di mangiare? In questo caso non verranno registrati carboidrati e dovrai usare di nuovo il calcolatore quando ti verrà mostrato il promemoria.</string>
     <string name="enablebolusadvisor">Abilita consiglio bolo</string>
-    <string name="enablebolusadvisor_summary">Usa un promemoria per iniziare a mangiare invece del calcolatore durante la glicemia alta</string>
+    <string name="enablebolusadvisor_summary">Usa un promemoria per iniziare a mangiare invece del risultato del calcolatore durante la glicemia alta (\"pre-bolo\")</string>
     <string name="time_to_eat">Tempo di mangiare!\nEsegui il calcolatore e fai di nuovi i calcoli.</string>
     <string name="timetoeat">Tempo di mangiare</string>
 </resources>

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

@@ -155,7 +155,7 @@
     <string name="filenotfound">הקובץ לא נמצא</string>
     <string name="nav_export">ייצא הגדרות</string>
     <string name="nav_import">יבא הגדרות</string>
-    <string name="openapsma_maxbasal_title">מינון בזאלי זמני מקסימלי (יח\'\שעה)</string>
+    <string name="openapsma_maxbasal_title">מינון בזאלי זמני מקסימלי (יח\'\\שעה)</string>
     <string name="openapsma_maxbasal_summary">ערך זה נקרא בזאלי מרבי ב-OpenAPS</string>
     <string name="openapsma_maxiob_title">בזאלי פעיל מרבי ש-OpenAPS יכול לספק [U]</string>
     <string name="openapsma_maxiob_summary">ערך זה נקרא אינסולין פעיל מקסימלי (Max IOB) ב-OpenAPS. זהו מקסימום האינסולין הפעיל ב-[U] ש-APS מאפשר.</string>
@@ -225,7 +225,7 @@
     <string name="smscommunicator_stoppedsms">שירות השליטה מרחוק באמצעות SMS מופסק. על מנת להפעילו, השתמשו בAAPS במכשיר הראשי.</string>
     <string name="smscommunicator_calibrationreplywithcode">כדי לשלוח ערך כיול %1$.2f יש להשיב עם הקוד %2$s</string>
     <string name="smscommunicator_bolusfailed">הבולוס נכשל</string>
-    <string name="smscommunicator_remotebolusmindistance_summary">מספר הדקות המזערי שחייב לחלוף בין בולוס מרוחק אחד למשנהו</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">מספר המינימלי (בדקות) שחייב לחלוף בין בולוס מרוחק אחד למשנהו</string>
     <string name="smscommunicator_remotebolusmindistance">מספר הדקות המינימלי שצריכות לחלוף, בין בולוס אחד למשנהו</string>
     <string name="smscommunicator_remotebolusmindistance_caveat">למען בטחונכם, על מנת לערוך את העדפה זו, עליכם להוסיף לפחות שני מספרי טלפון.</string>
     <string name="bolusdelivered">בולוס %1$.2fU ניתן בהצלחה</string>
@@ -285,12 +285,11 @@
     <string name="mealbolus">ארוחה</string>
     <string name="correctionbous">תיקון</string>
     <string name="actions">פעולות</string>
-    <string name="ns_upload_only">העלאה ל-nightscout בלבד (סנכרון מבוטל)</string>
-    <string name="ns_upload_only_summary">העלאה ל- NS בלבד. ללא השפעה על SGV אלא אם נבחר מקור מקומי כגון Xdrip. ללא השפעה על הפרופילים כל עוד פרופיל NS בשימוש.</string>
+    <string name="ns_upload_only">העלאה בלבד לנייטסקאוט (סנכרון מבוטל)</string>
     <string name="pumpNotInitialized">משאבה לא הופעלה!</string>
-    <string name="primefill">תיחול\מילוי</string>
+    <string name="primefill">תיחול\\מילוי</string>
     <string name="fillwarning">נא ודאו שהכמות מתאימה למפרט ערכת העירוי שלכם!</string>
-    <string name="fillbolus_title">מילוי\תיחול כמויות סטנדרטיות של אינסולין</string>
+    <string name="fillbolus_title">מילוי\\תיחול כמויות סטנדרטיות של אינסולין</string>
     <string name="button1">כפתור 1</string>
     <string name="button2">כפתור 2</string>
     <string name="button3">כפתור 3</string>
@@ -340,7 +339,7 @@
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">קצר את כותרות הלשוניות</string>
-    <string name="always_use_shortavg">התבסס על הפרש ממוצע קצר במקום הפרש פשוט\רגיל</string>
+    <string name="always_use_shortavg">התבסס על הפרש ממוצע קצר במקום הפרש פשוט\\רגיל</string>
     <string name="always_use_shortavg_summary">לשימוש כאשר נתונים ממקור לא מפוקח כמו Xdrip אינם יציבים.</string>
     <string name="profile">פרופיל</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">ערך ברירת מחדל: 3 מנגנון הגנה עיקרי של OpenAPS. מגביל את המינון הבזאלי לעד פי 3 מהמינון הבזאלי הגבוה ביותר שהוגדר. ברוב המקרים אין צורך לשנות ערך זה, אך יש לזכור שזו המשמעות של “3x max daily; 4x current” בדיון על מנגנוני הגנה.</string>
@@ -386,13 +385,13 @@
     <string name="wear_detailedIOB_summary">לחלק את ה IOB לבולוס ובזאלי במסך השעון</string>
     <string name="nosuccess">נכשל - נא לבדוק את הטלפון</string>
     <string name="notavailable">לא זמין</string>
-    <string name="patientage">סוג המטופל\ת</string>
+    <string name="patientage">סוג המטופל\\ת</string>
     <string name="child">ילד/ה</string>
-    <string name="teenage">מתבגר\ת</string>
-    <string name="adult">מבוגר\ת</string>
-    <string name="resistantadult">מבוגר\ת עם תנגודת אינסולין גבוהה</string>
+    <string name="teenage">מתבגר\\ת</string>
+    <string name="adult">מבוגר\\ת</string>
+    <string name="resistantadult">מבוגר\\ת עם תנגודת אינסולין גבוהה</string>
     <string name="pregnant">הריון</string>
-    <string name="patientage_summary">נא לבחור את גיל המטופל\ת להתאמת מגבלות בטיחות</string>
+    <string name="patientage_summary">נא לבחור את גיל המטופל\\ת להתאמת מגבלות בטיחות</string>
     <string name="patient_name">שם מטופל</string>
     <string name="patient_name_summary">נא לציין שם המטופל או כינוי, להבחנה בין מספר הגדרות</string>
     <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">משתמש</string>
@@ -402,9 +401,9 @@
     <string name="loopsuspendedfor">מושהה (%1$d דק\')</string>
     <string name="suspendloop">השהה לולאה</string>
     <string name="suspendloopfor1h">השהה לולאה לשעה אחת</string>
-    <string name="suspendloopfor2h">השהה לולאה ל-2 שע\'</string>
-    <string name="suspendloopfor3h">השהה לולאה ל-3 שע\'</string>
-    <string name="suspendloopfor10h">השהה לולאה ל-10 שע\'</string>
+    <string name="suspendloopfor2h">השהה לולאה ל-2 ש\'</string>
+    <string name="suspendloopfor3h">השהה לולאה ל-3 ש\'</string>
+    <string name="suspendloopfor10h">השהה לולאה ל-10 ש\'</string>
     <string name="suspendloopforXmin">השהה לולאה ל-%1$d דקות</string>
     <string name="disconnectpump">ניתוק משאבה</string>
     <string name="disconnectpumpfor15m">נתק את המשאבה למשך 15 דקות</string>
@@ -443,12 +442,12 @@
     <string name="statuslights_sage_critical">סף התראה קריטית של תוקף החיישן [h]</string>
     <string name="statuslights_sbat_warning">סף התראה של רמת סוללת החיישן [%]</string>
     <string name="statuslights_sbat_critical">סף התראה קריטית של רמת סוללת החיישן [%]</string>
-    <string name="statuslights_bage_warning">סף התראה של תוקף הסוללה [h]</string>
-    <string name="statuslights_bage_critical">סף התראה קריטית של תוקף הסוללה [h]</string>
+    <string name="statuslights_bage_warning">סף התראה של גיל הסוללה [h]</string>
+    <string name="statuslights_bage_critical">סף התראה קריטית של גיל הסוללה [h]</string>
     <string name="statuslights_res_warning">אזהרת סף של מיכל ריק [U]</string>
     <string name="statuslights_res_critical">אזהרת סף קריטית של מיכל ריק [U]</string>
-    <string name="statuslights_bat_warning">אזהרת סף של רמת הסוללה [%]</string>
-    <string name="statuslights_bat_critical">אזהרת סף קריטית של רמת הסוללה [%]</string>
+    <string name="statuslights_bat_warning">סף התראה של רמת הסוללה [%]</string>
+    <string name="statuslights_bat_critical">סף התראה קריטית של רמת הסוללה [%]</string>
     <string name="prediction_shortname">חיזוי</string>
     <string name="iob">אינ\' פעיל</string>
     <string name="cob">פחמ\' פעילות</string>
@@ -621,7 +620,7 @@
     <string name="enablesmbalways">הפעלת SMB תמיד</string>
     <string name="enablesmbalways_summary">אפשר SMB תמיד באופן עצמאי מבולוסים. אפשרי רק עם מקור ערכי סוכר עם דיוק של נתונים כמו G5</string>
     <string name="enablesmbaftercarbs">הפעלת SMB אחרי פחמימות</string>
-    <string name="enablesmbaftercarbs_summary">הפעלת SMB במשך 6 שע\' אחרי פחמימות, גם אם אין פחמ\' פעילות. אפשרי רק עם מקור ערכי סוכר עם דיוק נתונים כמו G5</string>
+    <string name="enablesmbaftercarbs_summary">הפעלת SMB במשך 6 ש\' אחרי פחמימות, גם אם אין פחמ\' פעילות. אפשרי רק עם מקור ערכי סוכר עם דיוק נתונים כמו G5</string>
     <string name="enablesmbwithcob">הפעלת SMB עם פחמ\' פעילות</string>
     <string name="enablesmbwithcob_summary">הפעלת SMB כשיש פחמ\' פעילות.</string>
     <string name="enablesmbwithtemptarget">הפעלת SMB עם ערכי מטרה זמניים</string>
@@ -685,7 +684,7 @@
     <string name="combo_error_multiple_boluses_with_identical_timestamp">בולוסים מרובים באותו הגודל בתוך הובאו באותה דקה. ניתן להוסיף רק רשומה אחת לטיפולים. בדקו את המשאבה והוסיפו באופן ידני רשומת בולוס בלשונית פורטל הטיפולים. יש ליצור רשומות בולוס עם זמנים שונים מבולוסים אחרים.</string>
     <string name="about_link_urls">\n\nתיעוד:\nhttps://androidaps.readthedocs.io\n\nפייסבוק:\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
     <string name="combo_check_date">הבולוס האחרון נרשם לפני 24 שעות או בשעה עתידית, נא לבדוק את כיוון השעון ותאריך במשאבה.</string>
-    <string name="combo_suspious_bolus_time">זמן\תאריך הבולוס שהוזרק מהמשאבה נראה לא נכון, IOB כנראה שגוי, בדקו את השעון ואת התאריך במשאבה.</string>
+    <string name="combo_suspious_bolus_time">זמן\\תאריך הבולוס שהוזרק מהמשאבה נראה לא נכון, IOB כנראה שגוי, בדקו את השעון ואת התאריך במשאבה.</string>
     <string name="profileswitch_ismissing">שינוי פרופיל חסר. אנא החליפו פרופיל או לחצו על \"הפעל פרופיל\" בפרופיל המקומי.</string>
     <string name="combo_bolus_count">ספירת בולוסים</string>
     <string name="combo_tbr_count">ספירת TBR</string>
@@ -759,7 +758,7 @@
     <string name="readstatus">קרא סטטוס</string>
     <string name="adjustprofileinns">יש לבצע שינויים ב-Nightscout</string>
     <string name="exitwizard">דלג על אשף ההתקנה</string>
-    <string name="setupwizard_loop_description">לחצו על הלחצן למטה כדי לאפשר ל-AndroidAPS להציע\לבצע שינויים במינון הבזאלי</string>
+    <string name="setupwizard_loop_description">לחצו על הלחצן למטה כדי לאפשר ל-AndroidAPS להציע\\לבצע שינויים במינון הבזאלי</string>
     <string name="setupwizard_sensitivity_description">תוסף רגישות משמש לזיהוי רגישות וחישוב הפחמ\' הפעילות. לקבלת מידע נוסף, בקרו בכתובת:</string>
     <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
     <string name="nsclientinfotext">NSClient מטפל בחיבור ל-Nightscout. אפשר לדלג על החלק הזה עכשיו, אך לא תוכלו לעבור את המשימות מבלי להגדיר אותו.</string>
@@ -1065,7 +1064,7 @@
     <string name="saveorresetchangesfirst">יש לשמור או לאפס תחילה את השינויים הנוכחיים</string>
     <string name="deletecurrentprofile">למחוק את הפרופיל הנוכחי?</string>
     <string name="copytolocalprofile">ליצור פרופיל מקומי חדש מפרופיל זה?</string>
-    <string name="profilenamecontainsdot">שם הפרפיל מכיל נקודות.\nשם כזה אינו נתמך ע\"י Nightscout \nהפרופיל לא הועלה ל-Nightscout.</string>
+    <string name="profilenamecontainsdot">שם הפרפיל מכיל נקודות.\nשם כזה אינו נתמך ע\"י Nightscout \n הפרופיל לא הועלה ל-Nightscout.</string>
     <string name="low_mark_comment">ערך נמוך יותר באזור הטווח (הצגה בלבד)</string>
     <string name="high_mark_comment">ערך גבוה יותר באזור הטווח (הצגה בלבד)</string>
     <string name="reorder_label">סדר מחדש</string>
@@ -1193,7 +1192,8 @@
     <string name="bolusadvisor">יועץ הבולוסים</string>
     <string name="bolusadvisormessage">יש לכם היפרגליקמיה. במקום לאכול עכשיו מומלץ לחכות לרמת סוכר נמוכה יותר. האם תרצו לעשות בולוס תיקון עכשיו ולאחר מכן תופעל תזכורת לאכול? במקרה זה, לא יירשמו פחמימות ויהיה עליכם להשתמש באשף מחדש כאשר תגשו לאכול.</string>
     <string name="enablebolusadvisor">אפשר את יועץ הבולוסים</string>
-    <string name="enablebolusadvisor_summary">קובע תזכורת לאכול במקום להשתמש באשף במהלך היפרגליקמיה</string>
+    <string name="enablebolusadvisor_summary">מציג תזכורת לאכול אחר כך במקום להזריק את המינון שהומלץ ע\"י האשף בעת היפרגליקמיה (\"בולוס מקדים\")</string>
     <string name="time_to_eat">זמן לאכול!\nהפעילו את אשף הבולוסים וחשבו בולוס חדש.</string>
     <string name="timetoeat">זמן לאכול</string>
+    <string name="fabric_upload_disabled">העלאת רשומות קריסה מושבתת!</string>
 </resources>

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

@@ -214,7 +214,6 @@
     <string name="correctionbous">교정주입</string>
     <string name="actions">실행</string>
     <string name="ns_upload_only">NS에 업로드만 하기(동기화 안됨)</string>
-    <string name="ns_upload_only_summary">NS에 업로드만 하기. xDrip같은 로컬 혈당 출처가 선택되지 않다면 SGV에는 효력이 없습니다. NS프로파일이 사용중이라면 프로파일에는 효력이 없습니다.</string>
     <string name="pumpNotInitialized">펌프가 초기화 되지 않았습니다!</string>
     <string name="primefill">교체/채움</string>
     <string name="fillwarning">양이 인퓨전세트의 사양과 일치하는지 확인하세요!</string>
@@ -349,8 +348,6 @@
     <string name="show_statuslights">홈화면에 상태 표시등 보여주기</string>
     <string name="statuslights_res_warning">주사기량 경고 기준값[U]</string>
     <string name="statuslights_res_critical">주사기량 위험 기준값[U]</string>
-    <string name="statuslights_bat_warning">배터리 잔량 경고값 [%]</string>
-    <string name="statuslights_bat_critical">배터리 잔량 위험값 [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="nav_about">버전정보</string>

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

@@ -286,7 +286,6 @@
     <string name="correctionbous">Korekcija</string>
     <string name="actions">Veiksmai</string>
     <string name="ns_upload_only">Tik įkelti duomenis į NS (ne sinchronizuoti)</string>
-    <string name="ns_upload_only_summary">Duomenys tik perkeliami į Nightscout. Gliukozės duomenys perkeliami tik tada, kai naudojama lokali programa, pvz.: xDrip. Naudojant NS-profilį, kiti profiliai neaktyvūs.</string>
     <string name="pumpNotInitialized">Pompa neprijungta!</string>
     <string name="primefill">Užpildymas</string>
     <string name="fillwarning">Įsitikinkite, kad nurodytas kiekis atitinka Jūsų infuzijos rinkinio specifikaciją!</string>
@@ -443,12 +442,8 @@
     <string name="statuslights_sage_critical">Jutiklio kritinio laiko įspėjimas [h]</string>
     <string name="statuslights_sbat_warning">Įspėjimo apie žemą sensoriaus baterijos lygį riba [%]</string>
     <string name="statuslights_sbat_critical">Įspėjimo apie kritiškai žemą sensoriaus baterijos lygį riba [%]</string>
-    <string name="statuslights_bage_warning">Baterijos ribinio laiko įspėjimas [h]</string>
-    <string name="statuslights_bage_critical">Baterijos kritinio laiko įspėjimas [h]</string>
     <string name="statuslights_res_warning">Įspėjimo apie žemą rezervuaro lygį riba [U]</string>
     <string name="statuslights_res_critical">Įspėjimo apie kritiškai žemą rezervuaro lygį riba [U]</string>
-    <string name="statuslights_bat_warning">Įspėjimo apie žemą baterijos įkrovimo lygį riba [%]</string>
-    <string name="statuslights_bat_critical">Įspėjimo apie kritiškai žemą baterijos įkrovimo lygį riba [%]</string>
     <string name="prediction_shortname">PROGN</string>
     <string name="iob">AIO</string>
     <string name="cob">AAO</string>
@@ -1193,7 +1188,7 @@
     <string name="bolusadvisor">Boluso patarėjas</string>
     <string name="bolusadvisormessage">Jūsų glikemija yra aukšta. Užuot valgę dabar, turėtumėte palaukti, kol sumažės glikemija. Ar norite dabar susileisti korekcinį bolusą ir nustatyti priminimą, kada ateis laikas valgyti? Tokiu atveju angliavandeniai nebus įrašyti, o po priminimo turėsite vėl naudoti boluso skaičiuoklę.</string>
     <string name="enablebolusadvisor">Įgalinti boluso patarėją</string>
-    <string name="enablebolusadvisor_summary">Jei jūsų glikemija yra aukšta, naudokite priminimą apie laiką valgyti, o ne Boluso patarėją</string>
+    <string name="enablebolusadvisor_summary">Galimybė priminti jums valgyti vėliau (pvz., esant aukštai glikemijai) boliuso vedlyje („po susileidimo palaukti ir valgyti vėliau“)</string>
     <string name="time_to_eat">Laikas valgyti!\nĮjunkite Boluso patarėją ir atlikite skaičiavimą dar kartą.</string>
     <string name="timetoeat">Laikas valgyti</string>
 </resources>

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

@@ -286,7 +286,7 @@
     <string name="correctionbous">Correctie</string>
     <string name="actions">Acties</string>
     <string name="ns_upload_only">Alleen NS upload (sync. gedeactiveerd)</string>
-    <string name="ns_upload_only_summary">Alleen NS upload. Heeft geen effect op de SGV behalve als een lokale bron zoals xDipp geselecteerd is. Heeft geen effect op de profielen wanneer het NS profiel is gekozen.</string>
+    <string name="ns_upload_only_summary">Alleen NS-upload. Heeft geen effect op de SGV, behalve als een lokale bron als xDrip geselecteerd is. Heeft geen effect op profielen wanneer NS-Profielen gebruikt worden.\n!!! WAARSCHUWING !!! Het uitschakelen van deze optie kan fouten veroorzaken en mogelijk resulteren in een overdosis insuline als een van de onderdelen (AAPS, NS, xDrip) onjuist is geconfigureerd. Let goed op of de gegevens van AAPS overeenkomen met de pompstatus!</string>
     <string name="pumpNotInitialized">Pomp niet geïnitialiseerd!</string>
     <string name="primefill">Ontlucht/vul</string>
     <string name="fillwarning">Verzeker u dat de vulhoeveelheid overeenkomt met de infusieset!</string>
@@ -443,12 +443,12 @@
     <string name="statuslights_sage_critical">Drempel alarm sensor leeftijd [h]</string>
     <string name="statuslights_sbat_warning">Drempel waarschuwing batterij niveau [%]</string>
     <string name="statuslights_sbat_critical">Drempel alarm batterij niveau [%]</string>
-    <string name="statuslights_bage_warning">Drempel waarschuwing batterij leeftijd [h]</string>
-    <string name="statuslights_bage_critical">Drempel alarm batterij niveau [h]</string>
+    <string name="statuslights_bage_warning">Drempelwaarde waarschuwing pompbatterijleeftijd [h]</string>
+    <string name="statuslights_bage_critical">Drempelwaarde kritieke pompbatterijleeftijd [h]</string>
     <string name="statuslights_res_warning">Drempel waarschuwing reservoir niveau [E]</string>
     <string name="statuslights_res_critical">Drempel alarm reservoir niveau [E]</string>
-    <string name="statuslights_bat_warning">Drempel waarschuwing batterij niveau [%]</string>
-    <string name="statuslights_bat_critical">Drempel alarm batterij niveau [%]</string>
+    <string name="statuslights_bat_warning">Drempelwaarde waarschuwing pompbatterijniveau [%]</string>
+    <string name="statuslights_bat_critical">Drempelwaarde kritiek pompbatterijniveau [%]</string>
     <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
@@ -1193,7 +1193,8 @@
     <string name="bolusadvisor">Bolusadviseur</string>
     <string name="bolusadvisormessage">Je hebt een hoge bloedglucose. In plaats van te eten, is het nu aan te raden om te wachten op een betere bloedglucose. Wil je nu een correctiebolus uitvoeren en je herinneren wanneer het tijd is om te eten? In dit geval worden er geen koolhydraten opgenomen en moet je de wizard opnieuw gebruiken wanneer we je eraan herinneren.</string>
     <string name="enablebolusadvisor">Bolusadviseur inschakelen</string>
-    <string name="enablebolusadvisor_summary">Gebruik bij een hoge bloedglucose niet de wizard maar een herinnering om met eten te beginnen</string>
+    <string name="enablebolusadvisor_summary">Gebruik bij een hoge bloedglucose niet het resultaat van de wizard, maar een herinnering om later met eten te beginnen (\"pre-bolus\")</string>
     <string name="time_to_eat">Tijd om te eten!\nVoer de boluswizard opnieuw uit.</string>
     <string name="timetoeat">Tijd om te eten</string>
+    <string name="fabric_upload_disabled">Upload van crashrapporten is uitgeschakeld!</string>
 </resources>

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

@@ -286,7 +286,7 @@
     <string name="correctionbous">Korreksjon</string>
     <string name="actions">Handlinger</string>
     <string name="ns_upload_only">Kun NS opplasting (deaktivert sync)</string>
-    <string name="ns_upload_only_summary">Kun opplast til NS. Påvirker ikke SGV (BS) med mindre en lokal kilde som xDrip er valgt. Påvirker ikke profiler hvis NS profiler benyttes.</string>
+    <string name="ns_upload_only_summary">Kun NS opplasting. Ikke effektiv på SGV med mindre en lokal kilde som xDrip er valgt. Ikke effektiv på Profiler mens NS-Profiler brukes.\n!!! ADVARSEL !!! Deaktivering av dette alternativet kan føre til funksjonsfeil og overdosering av insulin hvis noen av dine komponenter (AAPS, NS, xDrip) er feil konfigurert. Observer at data som vises i AAPS samsvarer med pumpestatus!</string>
     <string name="pumpNotInitialized">Pumpen ikke initialisert!</string>
     <string name="primefill">Prime/fylling</string>
     <string name="fillwarning">Kontroller at mengden samsvarer med spesifikasjonen for slangesettet ditt!</string>
@@ -443,12 +443,12 @@
     <string name="statuslights_sage_critical">Advarsel: alder CGM [h]</string>
     <string name="statuslights_sbat_warning">Nivå for når batterivarsel skal gis [%]</string>
     <string name="statuslights_sbat_critical">Nivå for når kritisk batteriadvarsel skal gis [%]</string>
-    <string name="statuslights_bage_warning">OBS: alder batteri [h]</string>
-    <string name="statuslights_bage_critical">Advarsel: alder batteri [h]</string>
+    <string name="statuslights_bage_warning">Nivå for når batterivarsel for pumpe skal gis [h]</string>
+    <string name="statuslights_bage_critical">Nivå for når kritisk batteriadvarsel for pumpe skal gis [h]</string>
     <string name="statuslights_res_warning">OBS: nivå insulinreservoar [U]</string>
     <string name="statuslights_res_critical">Advarsel: nivå insulinreservoar [U]</string>
-    <string name="statuslights_bat_warning">OBS: batterivarsel [%]</string>
-    <string name="statuslights_bat_critical">Advarsel: lavt batterinivå [%]</string>
+    <string name="statuslights_bat_warning">Nivå for når batterivarsel for pumpe skal gis [%]</string>
+    <string name="statuslights_bat_critical">Nivå for når kritisk batteriadvarsel for pumpe skal gis [%]</string>
     <string name="prediction_shortname">PROGN</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
@@ -1193,7 +1193,7 @@
     <string name="bolusadvisor">Bolusguide</string>
     <string name="bolusadvisormessage">Du har høyt blodsukker. I stedet for å spise nå er det bedre å utsette det til du har et lavere blodsukker. Ønsker du å sette en korrigerings bolus nå og få en påminnelse om når den er på tide å spise? I dette tilfellet vil ingen karbohydrater registreres nå, og du må bruke måltids veiviseren igjen når vi gir deg en påminnelse.</string>
     <string name="enablebolusadvisor">Aktiver boluskalkulator</string>
-    <string name="enablebolusadvisor_summary">Få påminnelse om å spise i stedet for å bruke wizard når du har høyt blodsukker</string>
+    <string name="enablebolusadvisor_summary">Bruk en påminnelse om å spise senere enn kalkulator resultatet fra wizard ved høyt blodsukker (\"pre-bolus\")</string>
     <string name="time_to_eat">Nå må du spise!\Bruk bolus veiviseren og beregn på nytt.</string>
     <string name="timetoeat">Nå må du spise</string>
 </resources>

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

@@ -286,7 +286,6 @@
     <string name="correctionbous">Korekta</string>
     <string name="actions">Akcje</string>
     <string name="ns_upload_only">NS tylko przesył. (wyłączona synch.)</string>
-    <string name="ns_upload_only_summary">NS tylko przesył. Nie skuteczne na SGV o ile ni jest wykorzystywane lokalne źródło danych jak xDrip. Nie skuteczne na Profilach gdy profil z NS jest wykorzystywany.</string>
     <string name="pumpNotInitialized">Pompa nie zainicjowana!</string>
     <string name="primefill">Rozpocznij/Wypełnij</string>
     <string name="fillwarning">Proszę upewnij się, że ilość wypełnienia odpowiada ilości właściwej dla twojego wkłucia!</string>
@@ -443,12 +442,8 @@
     <string name="statuslights_sage_critical">Krytyczny czas sensora CGM [h]</string>
     <string name="statuslights_sbat_warning">Próg ostrzeżenia o poziomie baterii sensora [%]</string>
     <string name="statuslights_sbat_critical">Próg ostrzeżenia o krytycznym poziomie baterii sensora [%]</string>
-    <string name="statuslights_bage_warning">Ostrzeżenie o czasie baterii [h]</string>
-    <string name="statuslights_bage_critical">Krytyczny czas baterii [h]</string>
     <string name="statuslights_res_warning">Próg ostrzeżenia o poziomie zbiornika [U]</string>
     <string name="statuslights_res_critical">Próg ostrzeżenia o krytycznym poziomie zbiornika [U]</string>
-    <string name="statuslights_bat_warning">Próg ostrzeżenia o poziomie baterii [%]</string>
-    <string name="statuslights_bat_critical">Próg ostrzeżenia o krytycznym poziomie baterii [%]</string>
     <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
@@ -474,7 +469,7 @@
     <string name="careportal_canula_label">Kaniula</string>
     <string name="careportal_insulin_label">Insulina</string>
     <string name="careportal_pb_label">Bateria pompy</string>
-    <string name="careportal_age_label">wiek:</string>
+    <string name="careportal_age_label">czas:</string>
     <string name="careportal_level_label">poziom:</string>
     <string name="ns_alarmoptions">Opcje alarmu</string>
     <string name="ns_alarms">Utwórz powiadomienia z alarmów NS</string>
@@ -1070,7 +1065,7 @@
     <string name="low_mark_comment">Dolna wartość zakresu docelowego (tylko do wyświetlania)</string>
     <string name="high_mark_comment">Górna wartość zakresu docelowego (tylko do wyświetlania)</string>
     <string name="reorder_label">Zmień kolejność</string>
-    <string name="age">Wiek:</string>
+    <string name="age">Czas:</string>
     <string name="weight_label">Waga:</string>
     <string name="id">ID:</string>
     <string name="submit">Wyślij</string>
@@ -1147,7 +1142,7 @@
     <string name="currentprofile">Bieżący profil</string>
     <string name="availableprofile">Dostępny profil</string>
     <string name="profiletype">Typ profilu</string>
-    <string name="formatwithtdd">Wiek: %1$.0f TDD: %2$.0f U</string>
+    <string name="formatwithtdd">Czas: %1$.0f TDD: %2$.0f U</string>
     <string name="formatwittddandpct">Wiek: %1$.0f TDD: %2$.0f U %3$d%%</string>
     <string name="formatwithweight">Wiek: %1$.0f Waga: %2$.0f kg</string>
     <string name="basalpctfromtdd_label">% bazy</string>
@@ -1194,7 +1189,7 @@
     <string name="bolusadvisor">Doradca bolusa</string>
     <string name="bolusadvisormessage">Masz wysoki poziom. Zamiast jeść teraz, zaleca się poczekać na wyrównanie poziomu cukru. Czy chcesz teraz wykonać korekcyjny bolus i otrzymać przypomnienie, kiedy nadejdzie czas na posiłek? W tym przypadku żadne węglowodany nie zostaną zarejestrowane i należy ponownie użyć kreatora, gdy zostanie otrzymane przypomnienie.</string>
     <string name="enablebolusadvisor">Włącz doradcę bolusa</string>
-    <string name="enablebolusadvisor_summary">Użyj przypomnienia, aby rozpocząć jedzenie zamiast kreatora podczas wysokiej glikemii</string>
+    <string name="enablebolusadvisor_summary">Użyj przypomnienia, aby rozpocząć jedzenie później podczas wysokiej glikemii (\"pre-bolus\")</string>
     <string name="time_to_eat">Czas jeść!\nUruchom kreatora bolusa i zrób obliczenia ponownie.</string>
     <string name="timetoeat">Czas na jedzenie</string>
 </resources>

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

@@ -261,7 +261,6 @@
     <string name="correctionbous">Correção</string>
     <string name="actions">Ações</string>
     <string name="ns_upload_only">Envio do NS apenas (sincronização desativada)</string>
-    <string name="ns_upload_only_summary">Apenas upload para NS. Não é eficaz em SGV a menos que uma fonte local como xDrip esteja selecionada. Não é eficaz em perfis enquanto NS-Profiles é usado.</string>
     <string name="pumpNotInitialized">Bomba não inicializada!</string>
     <string name="primefill">Purgar/Preencher</string>
     <string name="fillwarning">Por favor certifique-se que o valor corresponde ao especificado para o seu conjunto de infusão!</string>
@@ -402,8 +401,6 @@
     <string name="show_statuslights">Mostrar luzes de estado no ecrã principal</string>
     <string name="statuslights_res_warning">Limite de aviso de nível de reservatório [U]</string>
     <string name="statuslights_res_critical">Limite crítico de nível de reservatório [U]</string>
-    <string name="statuslights_bat_warning">Limite de aviso de nível de bateria [%]</string>
-    <string name="statuslights_bat_critical">Limite de crítico de nível de bateria [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="activity_shortname">ACT</string>

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

@@ -284,7 +284,6 @@
     <string name="correctionbous">Corr</string>
     <string name="actions">Acções</string>
     <string name="ns_upload_only">Envio NS apenas (sincronização desactivada)</string>
-    <string name="ns_upload_only_summary">Apenas upload para NS. Não é eficaz em SGV a menos que uma fonte local como xDrip esteja selecionada. Não é eficaz em perfis enquanto NS-Profiles é usado.</string>
     <string name="pumpNotInitialized">Bomba não inicializada!</string>
     <string name="primefill">Purgar/Preencher</string>
     <string name="fillwarning">Por favor certifique-se que o valor corresponde ao especificado para o seu conjunto de infusão!</string>
@@ -431,12 +430,8 @@
     <string name="statuslights_iage_critical">Limite crítico idade insulina [h]</string>
     <string name="statuslights_sage_warning">Limite aviso idade sensor [h]</string>
     <string name="statuslights_sage_critical">Limite crítico idade sensor [h]</string>
-    <string name="statuslights_bage_warning">Limite de aviso de nível de bateria [h]</string>
-    <string name="statuslights_bage_critical">Limite crítico de nível de bateria [h]</string>
     <string name="statuslights_res_warning">Limite de aviso de nível de reservatório [U]</string>
     <string name="statuslights_res_critical">Limite crítico de nível de reservatório [U]</string>
-    <string name="statuslights_bat_warning">Limite de aviso de nível de bateria [%]</string>
-    <string name="statuslights_bat_critical">Limite de crítico de nível de bateria [%]</string>
     <string name="prediction_shortname">PREV</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>

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

@@ -76,7 +76,7 @@
     <string name="result">Rezultat</string>
     <string name="result_insulin_carbs">Rezultat: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">Nu există date despre glicemie</string>
-    <string name="openapsma_request_label">Solicită</string>
+    <string name="openapsma_request_label">Solicitare</string>
     <string name="glucose">Glicemie</string>
     <string name="delta">Diferență</string>
     <string name="sms_delta">Diferență:</string>
@@ -114,7 +114,7 @@
     <string name="overview_calculator_label">Calculator</string>
     <string name="constraintapllied">Limitare aplicată!</string>
     <string name="sms_bolus">Bolus:</string>
-    <string name="basal">Bazală</string>
+    <string name="basal">Rate bazale</string>
     <string name="sms_basal">Bazală:</string>
     <string name="changeyourinput">Schimbați ceea ce ați introdus!</string>
     <string name="configbuilder_bgsource">Sursă glicemie</string>
@@ -286,7 +286,6 @@
     <string name="correctionbous">Corecție</string>
     <string name="actions">Acțiuni</string>
     <string name="ns_upload_only">Doar încărcare în NS (sincronizare dezactivată)</string>
-    <string name="ns_upload_only_summary">Doar încărcare în NS. Nu are efect asupra SGV decât în cazul selectării unei surse locale, precum xDrip. Nu acționează asupra Profilurilor cât timp se folosesc profilurile din Nightscout.</string>
     <string name="pumpNotInitialized">Pompa nu este inițializată!</string>
     <string name="primefill">Pregătire/umplere</string>
     <string name="fillwarning">Asigurați-vă că aveți cantitatea specificată de instrucțiunile setului de infuzie!</string>
@@ -443,12 +442,8 @@
     <string name="statuslights_sage_critical">Prag critic vechime senzor [h]</string>
     <string name="statuslights_sbat_warning">Prag de avertizare nivel baterie senzor [%]</string>
     <string name="statuslights_sbat_critical">Prag nivel critic baterie senzor [%]</string>
-    <string name="statuslights_bage_warning">Prag de avertizare nivel baterie [h]</string>
-    <string name="statuslights_bage_critical">Prag critic nivel baterie [h]</string>
     <string name="statuslights_res_warning">Pragul de avertisment pentru insulina din rezervor [U]</string>
     <string name="statuslights_res_critical">Pragul critic al nivelului insulinei în rezervor [U]</string>
-    <string name="statuslights_bat_warning">Pragul de avertizare nivel baterie [%]</string>
-    <string name="statuslights_bat_critical">Pragul critic al nivelului baterie [%]</string>
     <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
@@ -1193,7 +1188,6 @@
     <string name="bolusadvisor">Consilier bolus</string>
     <string name="bolusadvisormessage">Glicemia ta e mare. In loc sa mănânci acum, este recomandat sa mai aștepți un pic. Vrei sa faci un bolus de corecție acum si sa setezi o alarma pentru a manca mai târziu? In acest caz, nu vor fi înregistrați carbohidrați si va trebui sa folosești calculatorul de bolus din nou când îți vom reaminti.</string>
     <string name="enablebolusadvisor">Activare consilier bolus</string>
-    <string name="enablebolusadvisor_summary">Folosește o alarma de reamintire pentru a începe sa mănânci în loc de calculatorul de bolus în timpul hiperglicemiei</string>
     <string name="time_to_eat">Timpul sa mănânci!\nRuleaza Calculatorul de Bolus pentru a face calculele din nou.</string>
     <string name="timetoeat">Timpul sa mănânci</string>
 </resources>

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

@@ -286,7 +286,6 @@
     <string name="correctionbous">коррекция</string>
     <string name="actions">действия</string>
     <string name="ns_upload_only">только передача в NS (синхронизация отсутствует)</string>
-    <string name="ns_upload_only_summary">только передача в NS. Не работает в SGV пока не выбран местный источник вроде xdrip. Не работает в Профилях при действующем профиле NS.</string>
     <string name="pumpNotInitialized">помпа не инициализирована</string>
     <string name="primefill">прайм/заполнение</string>
     <string name="fillwarning">убедитесь что количество соответствует характеристикам вашей инфузионной системы</string>
@@ -436,12 +435,8 @@
     <string name="statuslights_sage_critical">Критический порог предупреждения о времени, отработанном сенсором [h]</string>
     <string name="statuslights_sbat_warning">Порог предупреждения о разрядке батареи [%]</string>
     <string name="statuslights_sbat_critical">Порог предупреждения о критическом уровне разрядки батареи [%]</string>
-    <string name="statuslights_bage_warning">Порог предупреждения о разрядке батареи [h]</string>
-    <string name="statuslights_bage_critical">Порог предупреждения о критическом уровне разрядки батареи [h]</string>
     <string name="statuslights_res_warning">Порог уровня наполненности резервуара для оповещения [ед.]</string>
     <string name="statuslights_res_critical">Порог критического уровня наполненности резервуара [U]</string>
-    <string name="statuslights_bat_warning">Порог предупреждения о разрядке батареи [%]</string>
-    <string name="statuslights_bat_critical">Порог предупреждения о критическом уровне разрядки батареи [%]</string>
     <string name="prediction_shortname">ОЖИД</string>
     <string name="iob">IOB акт инс</string>
     <string name="cob">акт углев</string>

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

@@ -286,7 +286,6 @@
     <string name="correctionbous">Korekcia</string>
     <string name="actions">Akcie</string>
     <string name="ns_upload_only">Iba nahrávanie do NS (synchronizácia deaktivovaná)</string>
-    <string name="ns_upload_only_summary">Iba nahrávanie dát do NS. Neúčinné pri hodnotách glykémie, pokiaľ nieje vybraný lokálny zdroj dát ako xDrip. Neúčinné pri profiloch, pokiaľ sa používajú NS profily.</string>
     <string name="pumpNotInitialized">Pumpa nie je inicializovaná!</string>
     <string name="primefill">Plnenie/doplňovanie</string>
     <string name="fillwarning">Prosím uistite sa, že hodnota zodpovedá špecifikácií Vášho setu!</string>
@@ -443,12 +442,8 @@
     <string name="statuslights_sage_critical">Prah kritického veku senzora [h]</string>
     <string name="statuslights_sbat_warning">Prah upozornenia na úroveň batérie senzora [%]</string>
     <string name="statuslights_sbat_critical">Prah kritickej úrovne batérie senzora [%]</string>
-    <string name="statuslights_bage_warning">Prah upozornenia na úroveň batérie [h]</string>
-    <string name="statuslights_bage_critical">Prah kritickej úrovne batérie [h]</string>
     <string name="statuslights_res_warning">Prah upozornenia na úroveň hladiny zásobníka [JI]</string>
     <string name="statuslights_res_critical">Prah kritickej úrovne hladiny zásobníka [JI]</string>
-    <string name="statuslights_bat_warning">Prah upozornenia na úroveň batérie [%]</string>
-    <string name="statuslights_bat_critical">Prah kritickej úrovne batérie [%]</string>
     <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
@@ -1193,7 +1188,6 @@
     <string name="bolusadvisor">Bolusový poradca</string>
     <string name="bolusadvisormessage">Máte vysokú glykémiu. Namiesto jedla doporučujeme počkať na lepšiu glykémiu a pripomenúť, keď bude čas na jedlo. Prajete si poslať korekčný bolus a pripomenúť, keď bude čas na jedlo? V tomto prípade nebudú zapísané žiadne sacharidy, a neskôr musíte opäť spustiť kalkulačku, akonáhle vám to pripomenieme.</string>
     <string name="enablebolusadvisor">Povoliť bolusového poradcu</string>
-    <string name="enablebolusadvisor_summary">Pri vysokej glykémii spustiť pripomienku na jedlo namiesto kalkulačky</string>
     <string name="time_to_eat">Čas na jedlo!\nSpustite Bolusovú kalkulačku a urobte výpočet znova.</string>
     <string name="timetoeat">Čas na jedlo</string>
 </resources>

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

@@ -287,7 +287,6 @@ Eversense-appen.</string>
     <string name="correctionbous">Korrektion</string>
     <string name="actions">Åtgärder</string>
     <string name="ns_upload_only">Endast uppladdning till Nightscout</string>
-    <string name="ns_upload_only_summary">Endast uppladdning till Nightscout. Kommer inte få BG-data om inte lokal källa som xDrip används. Kommer heller inte att kunna hämta basalprofiler från Nightscout.</string>
     <string name="pumpNotInitialized">Pump inte initierad</string>
     <string name="primefill">Förfyllning</string>
     <string name="fillwarning">Försäkra dig om att mängden motsvarar det som är specificerat för just ditt infusionsset.</string>
@@ -444,8 +443,8 @@ Eversense-appen.</string>
     <string name="statuslights_sage_critical">Sensorålder - akut varning: [h]</string>
     <string name="statuslights_sbat_warning">Varningsnivå sensorbatteri [%]</string>
     <string name="statuslights_sbat_critical">Kritisk nivå sensorbatteri [%]</string>
-    <string name="statuslights_bage_warning">Batteriålder - varning: [h]</string>
-    <string name="statuslights_bage_critical">Batteriålder - akut varning: [h]</string>
+    <string name="statuslights_bage_warning">Batteriålder - varning: [tim]</string>
+    <string name="statuslights_bage_critical">Batteriålder - akut varning: [tim]</string>
     <string name="statuslights_res_warning">Varningsnivå för reservoar [U]</string>
     <string name="statuslights_res_critical">Akut varningsnivå för reservoar [U]</string>
     <string name="statuslights_bat_warning">Varningsnivå för batteri [%]</string>
@@ -1194,7 +1193,7 @@ Eversense-appen.</string>
     <string name="bolusadvisor">Bolusguide</string>
     <string name="bolusadvisormessage">Ditt blodsocker är högt. Istället för att äta är det rekommenderat att vänta tills det sjunker. Vill du göra en korrektionsbolus nu och påminna dig när det är dags att äta? I det här fallet kommer inga kolhydrater att registreras nu, utan du måste ange måltiden på nytt i kalkylatorn.</string>
     <string name="enablebolusadvisor">Aktivera bolusguiden</string>
-    <string name="enablebolusadvisor_summary">Använd påminnelse om att börja äta istället för kalkylatorn under hög glykemi</string>
+    <string name="enablebolusadvisor_summary">Få en påminnelse om att börja äta senare (istället för kalkylatorns resultat) om du ligger högt i BG</string>
     <string name="time_to_eat">Dags att äta!\nKör bolusguiden igen för ny beräkning.</string>
     <string name="timetoeat">Dags att äta</string>
 </resources>

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

@@ -184,7 +184,6 @@
     <string name="correctionbous">Düzeltme</string>
     <string name="actions">Eylemler</string>
     <string name="ns_upload_only">Sadece Nightscout\'a yükle (devre dışı senkronizasyon)</string>
-    <string name="ns_upload_only_summary">Sadece NS yükle. Etkili değil SGV üzerinde xDrip gibi bir yerel kaynağı seçili olmadıkça. NS-profilleri kullanılır iken profilleri üzerinde etkili değil.</string>
     <string name="pumpNotInitialized">Pompa başlatılmamış!</string>
     <string name="primefill">Hazırla/doldur</string>
     <string name="fillwarning">Lütfen miktarın infüzyon setinizin özelliklerine uygun olduğundan emin olun!</string>

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

@@ -197,7 +197,6 @@
     <string name="correctionbous">矫正</string>
     <string name="actions">手动操作</string>
     <string name="ns_upload_only">只上传到NS服务器 (禁用同步)</string>
-    <string name="ns_upload_only_summary">只上传给NS服务器，对SGV没有影响除非选择了本地血糖来源，例如 xDrip. 对配置文件没有影响当选择NS-配置文件时.</string>
     <string name="pumpNotInitialized">泵未初始化!</string>
     <string name="primefill">充盈</string>
     <string name="fillwarning">请确保数量和输液器里的药量匹配</string>

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

@@ -331,8 +331,8 @@
     <string name="mealbolus">Meal</string>
     <string name="correctionbous">Corr</string>
     <string name="actions">Actions</string>
-    <string name="ns_upload_only">NS upload only (disabled sync)</string>
-    <string name="ns_upload_only_summary">NS upload only. Not effective on SGV unless a local source like xDrip+ is selected. Not effective on Profiles while NS-Profiles is used.\n!!! WARNING !!! Disabling this option may cause malfunctions and insulin overdose if any of your component (AAPS, NS, xDrip+) is wrong configured. Carefully watch if data displayed by AAPS match the pump state!</string>
+    <string name="ns_upload_only">(DANGEROUS TO DISABLE) NS upload only</string>
+    <string name="ns_upload_only_summary">NS upload only (disabled sync). Not effective on SGV unless a local source like xDrip+ is selected. Not effective on Profiles while NS-Profiles is used.\n!!! WARNING !!! Disabling this option may cause malfunctions and insulin overdose if any of your component (AAPS, NS, xDrip+) is wrong configured. Carefully watch if data displayed by AAPS match the pump state!</string>
     <string name="pumpNotInitialized">Pump not initialized!</string>
     <string name="primefill">Prime/Fill</string>
     <string name="fillwarning">Please make sure the amount matches the specification of your infusion set!</string>
@@ -549,7 +549,7 @@
     <string name="wear_showbgi_summary">Add BGI to status line</string>
     <string name="ns_noupload">No upload to NS</string>
     <string name="ns_noupload_summary">All data sent to NS are dropped. AAPS is connected to NS but no change in NS is done</string>
-    <string name="key_ns_upload_only" translatable="false">ns_upload_only</string>
+    <string name="key_ns_upload_only" translatable="false">ns_upload_only2</string>
     <string name="key_ns_noupload" translatable="false">ns_noupload</string>
     <string name="overview_extendedbolus_cancel_button">Cancel Extended Bolus</string>
     <string name="doprofileswitch">Do Profile Switch</string>
@@ -1405,7 +1405,7 @@
     <string name="donate_your_data_to_science">Donate your data to science</string>
     <string name="open_humans_short">OH</string>
     <string name="you_have_been_signed_out_of_open_humans">You have been signed out of Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Click here to sign in a again if this wasn\'t on purpose.</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Click here to sign in again if this wasn\'t on purpose.</string>
     <string name="only_upload_if_connected_to_wifi">Only upload if connected to WiFi</string>
     <string name="only_upload_if_charging">Only upload if charging</string>
     <string name="worker_state">Worker State: %s</string>
@@ -1418,7 +1418,7 @@
     <string name="alarm">Alarm</string>
     <string name="key_smscommunicator_report_pump_ureachable" translatable="false">smscommunicator_report_pump_ureachable</string>
     <string name="smscommunicator_report_pump_ureachable_summary">Send SMS if unreachable pump event is triggered</string>
-    <string name="smscommunicator_pump_ureachable">Report  pump ureachable</string>
+    <string name="smscommunicator_pump_ureachable">Report pump unreachable</string>
     <string name="advisoralarm">Run alarm when is time to eat</string>
     <string name="alarminxmin">Run alarm in %1$d min</string>
     <string name="bolusadvisor">Bolus advisor</string>
@@ -1428,5 +1428,7 @@
     <string name="enablebolusadvisor_summary">Use reminder to start eating later instead of wizard result during high glycemia ("pre-bolus")</string>
     <string name="time_to_eat">Time to eat!\nRun Bolus wizard and do calculation again.</string>
     <string name="timetoeat">Time to eat</string>
+    <string name="fabric_upload_disabled">Crash logs upload disabled!</string>
+    <string name="graph_menu_divider_header">Graph</string>
 
 </resources>

core/src/main/res/values-ca-rES/strings.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    Keys-->
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Protection-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+    <!-- PumoCommon - Pump Abstract -->
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
+</resources>

dana/src/main/res/values-ca-rES/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

medtronic/src/main/res/values-ca-rES/strings.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <!-- MDT Configuration -->
+    <!-- MDT Errors -->
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+</resources>

omnipod/src/main/res/values-ca-rES/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <!-- Omnipod - Pod Status -->
+    <!-- Omnipod - Alerts -->
+    <!-- Omnipod - History -->
+    <!-- Omnipod - Short status -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Confirmation -->
+    <!-- Omnipod - Commands -->
+    <!-- Omnipod - Pod Management -->
+    <!-- Omnipod - Wizard common -->
+    <!-- Omnipod - Pod activation Wizard -->
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <!-- Omnipod - Overview -->
+    <!-- Omnipod - Other -->
+    <!-- Omnipod - Times -->
+</resources>

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

@@ -11,8 +11,7 @@
     <string name="omnipod_config_suspend_delivery_button_enabled">Zobrazit tlačítko \"Pozastavit dodávku\" na záložce Omnipod</string>
     <string name="omnipod_config_pulse_log_button_enabled">Zobrazit tlačítko Pulzní Log v menu Správa Podu</string>
     <string name="omnipod_config_rileylink_stats_button_enabled">Zobrazit tlačítko Statistika RileyLink v nabídce Správa Podu</string>
-    <string name="omnipod_config_use_riley_link_battery_level">Použít úroveň baterie hlášenou OrangeLinkem/RileyLinkem</string>
-    <string name="omnipod_config_use_riley_link_battery_level_summary">NEPRACUJE s původním RileyLinkem. Nemusí pracovat s jinými alternativami RileyLinku.</string>
+    <string name="omnipod_config_battery_change_logging_enabled">V Akcích povolit zaznamenávání výměny baterie</string>
     <string name="omnipod_config_time_change_enabled">Letní čas / Detekce časového pásma povoleno</string>
     <string name="omnipod_config_expiration_reminder_enabled">Připomenutí vypršení platnosti povoleno</string>
     <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Hodiny před vypnutím</string>
@@ -67,6 +66,7 @@
     <string name="omnipod_error_rileylink_address_invalid">Chybná adresa RileyLinku.</string>
     <string name="omnipod_error_operation_not_possible_no_configuration">Operace není možná.\n\nNejdříve je nutné nakonfigurovat Omnipod, než bude možné tuto funkci použít.</string>
     <string name="omnipod_error_pod_not_attached">Žádný aktivní Pod</string>
+    <string name="omnipod_error_time_out_of_sync">Čas na Podu není synchronizován. Aktualizujte prosím čas na kartě Omnipod.</string>
     <string name="omnipod_error_unexpected_exception">Došlo k neočekávané chybě. Prosíme o její nahlášeníní! (%1$s: %2$s).</string>
     <string name="omnipod_error_crc_mismatch">Komunikace selhala: nezdařilo se ověření integrity zprávy</string>
     <string name="omnipod_error_invalid_packet_type">Komunikace selhala: z podu byly přijaty neplatné pakety</string>

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <!-- Omnipod - Pod Status -->
+    <!-- Omnipod - Alerts -->
+    <!-- Omnipod - History -->
+    <!-- Omnipod - Short status -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Confirmation -->
+    <!-- Omnipod - Commands -->
+    <!-- Omnipod - Pod Management -->
+    <!-- Omnipod - Wizard common -->
+    <!-- Omnipod - Pod activation Wizard -->
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <!-- Omnipod - Overview -->
+    <!-- Omnipod - Other -->
+    <!-- Omnipod - Times -->
+</resources>

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

@@ -11,8 +11,7 @@
     <string name="omnipod_config_suspend_delivery_button_enabled">Button \'Insulinabgabe unterbrechen\' im Omnipod Tab anzeigen</string>
     <string name="omnipod_config_pulse_log_button_enabled">Button \'Pulse Log\' im Menü Pod Mgmt. anzeigen</string>
     <string name="omnipod_config_rileylink_stats_button_enabled">Button \'RileyLink Status\' im Menü Pod Mgmt. anzeigen</string>
-    <string name="omnipod_config_use_riley_link_battery_level">Batteriestand von OrangeLink/EmaLink verwenden</string>
-    <string name="omnipod_config_use_riley_link_battery_level_summary">FUNKTIONIERT NICHT mit dem original RileyLink. Funktioniert vielleicht nicht mit anderen RileyLink Alternativen.</string>
+    <string name="omnipod_config_battery_change_logging_enabled">Aktiviere die Protokollierung des Akkuwechsels im Aktionen-Tab/Menü</string>
     <string name="omnipod_config_time_change_enabled">Sommerzeit/Zeitzonen-Erkennung aktiviert</string>
     <string name="omnipod_config_expiration_reminder_enabled">Ablauferinnerung aktiviert</string>
     <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Stunden bis zum Podende</string>
@@ -67,6 +66,7 @@
     <string name="omnipod_error_rileylink_address_invalid">RileyLink Adresse ungültig.</string>
     <string name="omnipod_error_operation_not_possible_no_configuration">Aktion ist nicht möglich.\n\n Du musst zuerst den Omnipod konfigurieren, bevor Du diese Operation verwenden kannst.</string>
     <string name="omnipod_error_pod_not_attached">Kein aktiver Pod</string>
+    <string name="omnipod_error_time_out_of_sync">Zeit auf dem Pod ist nicht synchron. Aktualisiere die Zeit auf der Registerkarte \"Omnipod\".</string>
     <string name="omnipod_error_unexpected_exception">Es ist ein unerwarteter Fehler aufgetreten. Bitte melden! (%1$s: %2$s)</string>
     <string name="omnipod_error_crc_mismatch">Kommunikation fehlgeschlagen: Die Überprüfung der Nachrichtenintegrität ist fehlgeschlagen</string>
     <string name="omnipod_error_invalid_packet_type">Kommunikation fehlgeschlagen: Es wurde ein ungültiges Paket vom Pod empfangen.</string>

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

@@ -11,8 +11,7 @@
     <string name="omnipod_config_suspend_delivery_button_enabled">Montrer le bouton Suspendre l\'injection dans l\'onglet Omnipod</string>
     <string name="omnipod_config_pulse_log_button_enabled">Afficher le bouton Journal d\'impulsions dans le menu de gestion des pods</string>
     <string name="omnipod_config_rileylink_stats_button_enabled">Afficher le bouton Stats RileyLink dans le menu de gestion des pods</string>
-    <string name="omnipod_config_use_riley_link_battery_level">Utiliser le niveau de batterie signalé par OrangeLink/EmaLink</string>
-    <string name="omnipod_config_use_riley_link_battery_level_summary">NE FONCTIONNE PAS avec le RileyLink original. Peut ne pas fonctionner avec d\'autres versions de RileyLink.</string>
+    <string name="omnipod_config_battery_change_logging_enabled">Activer l\'enregistrement des changements de pile dans Actions</string>
     <string name="omnipod_config_time_change_enabled">Changement de Zone/Heure Activé</string>
     <string name="omnipod_config_expiration_reminder_enabled">Rappel d\'expiration activé</string>
     <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Heures avant arrêt</string>
@@ -46,7 +45,7 @@
     <string name="omnipod_alert_low_reservoir">Réservoir bas</string>
     <string name="omnipod_alert_unknown_alert">Alerte inconnue</string>
     <!-- Omnipod - History -->
-    <string name="omnipod_history_title">Historique du Pod</string>
+    <string name="omnipod_history_title">Historique Pod</string>
     <string name="omnipod_history_item_description">Description</string>
     <string name="omnipod_history_item_source">Source</string>
     <string name="omnipod_history_item_date">Date</string>
@@ -67,6 +66,7 @@
     <string name="omnipod_error_rileylink_address_invalid">Adresse RileyLink invalide.</string>
     <string name="omnipod_error_operation_not_possible_no_configuration">Operation impossible.\n\nVous devez d\'abord configurer l\'Omnipod pour pouvoir faire cette operation.</string>
     <string name="omnipod_error_pod_not_attached">Pas de Pod actif</string>
+    <string name="omnipod_error_time_out_of_sync">L\'heure du Pod est désynchronisée. Veuillez la mettre à jour dans l\'onglet Omnipod.</string>
     <string name="omnipod_error_unexpected_exception">Erreur inconnue. Veuillez signaler ! (%1$s : %2$s).</string>
     <string name="omnipod_error_crc_mismatch">Échec de communication : vérification de l\'intégrité du message échouée</string>
     <string name="omnipod_error_invalid_packet_type">Échec de communication : paquet reçu du Pod invalide</string>
@@ -124,14 +124,14 @@
     <string name="omnipod_confirmation_delivery_resumed">L\'injection de l\'insuline a été reprise.</string>
     <!-- Omnipod - Commands -->
     <string name="omnipod_cmd_deactivate_pod">Désactiver Pod</string>
-    <string name="omnipod_cmd_discard_pod">Supprimer le Pod</string>
+    <string name="omnipod_cmd_discard_pod">Supprimer Pod</string>
     <string name="omnipod_cmd_set_bolus">Définir bolus</string>
     <string name="omnipod_cmd_cancel_bolus">Annuler bolus</string>
     <string name="omnipod_cmd_set_tbr">Définir le basal temp.</string>
     <string name="omnipod_cmd_cancel_tbr_by_driver">Annuler basal temp. (en interne par le pilote)</string>
     <string name="omnipod_cmd_cancel_tbr">Annuler basale temporaire</string>
     <string name="omnipod_cmd_set_basal_schedule">Définir le profil de basale</string>
-    <string name="omnipod_cmd_get_pod_status">Obtenir l\'état du Pod</string>
+    <string name="omnipod_cmd_get_pod_status">État du Pod</string>
     <string name="omnipod_cmd_get_pod_info">Obtenir infos Pod</string>
     <string name="omnipod_cmd_set_time">Définir l\'heure</string>
     <string name="omnipod_cmd_configure_alerts">Configurer les Alertes</string>
@@ -139,53 +139,53 @@
     <string name="omnipod_cmd_suspend_delivery">Suspendre l\'injection</string>
     <string name="omnipod_cmd_resume_delivery">Reprendre l\'injection</string>
     <string name="omnipod_cmd_unknown_entry">Entrée inconnue</string>
-    <string name="omnipod_cmd_initialize_pod">Initialiser le Pod</string>
-    <string name="omnipod_cmd_insert_cannula">Insérer la canule</string>
-    <string name="omnipod_cmd_read_pulse_log">Lecture journal d\'impulsion</string>
+    <string name="omnipod_cmd_initialize_pod">Initialiser Pod</string>
+    <string name="omnipod_cmd_insert_cannula">Insérer canule</string>
+    <string name="omnipod_cmd_read_pulse_log">Lire journal d\'impulsion</string>
     <string name="omnipod_cmd_set_fake_suspended_tbr">Définir un faux débit de basal temporaire car le Pod est suspendu</string>
     <string name="omnipod_cmd_cancel_fake_suspended_tbr">Annuler le faux débit de basal temporaire créé à cause du Pod suspendu</string>
     <string name="omnipod_cmd_split_tbr">Fractionner la Basale temporaire en raison d\'un échec incertain dans l\'annulation</string>
-    <string name="omnipod_cmd_beep_config">Configuration des bips</string>
-    <string name="omnipod_cmd_play_test_beep">Tester les bips</string>
+    <string name="omnipod_cmd_beep_config">Configuration bips</string>
+    <string name="omnipod_cmd_play_test_beep">Tester bips</string>
     <!-- Omnipod - Pod Management -->
     <string name="omnipod_pod_management_title">Gestion du Pod</string>
     <string name="omnipod_pod_management_heading_actions">Actions</string>
     <string name="omnipod_pod_management_heading_tools">Outils</string>
     <string name="omnipod_pod_management_waiting_for_rileylink_connection">En attente de connexion RileyLink...</string>
-    <string name="omnipod_pod_management_button_activate_pod">Activer le Pod</string>
-    <string name="omnipod_pod_management_button_deactivate_pod">Désactiver le Pod</string>
-    <string name="omnipod_pod_management_button_discard_pod">Supprimer le Pod</string>
+    <string name="omnipod_pod_management_button_activate_pod">Activer Pod</string>
+    <string name="omnipod_pod_management_button_deactivate_pod">Désactiver Pod</string>
+    <string name="omnipod_pod_management_button_discard_pod">Supprimer Pod</string>
     <string name="omnipod_pod_management_button_pod_history">Historique du Pod</string>
     <string name="omnipod_pod_management_button_riley_link_stats">Stats RileyLink</string>
-    <string name="omnipod_pod_management_button_reset_riley_link_config">Réinitialiser la config. RileyLink</string>
-    <string name="omnipod_pod_management_button_read_pulse_log">Lecture journal d\'impulsion</string>
+    <string name="omnipod_pod_management_button_reset_riley_link_config">Réinit config. RileyLink</string>
+    <string name="omnipod_pod_management_button_read_pulse_log">Lire journal d\'impulsion</string>
     <string name="omnipod_pod_management_button_reading_pulse_log">Lecture journal d\'impulsion…</string>
     <string name="omnipod_pod_management_discard_pod_confirmation">Si vous supprimez le Pod, vous ne pourrez plus communiquer avec lui. Vous ne devez le faire que lorsque toutes les communications avec le Pod échouent de manière permanente. Si vous pouvez toujours communiquer avec le Pod, veuillez utiliser l\'option <b>Désactiver le Pod</b> .\n\nSi vous souhaitez continuer, assurez-vous de retirer la Pod de votre corps !</string>
-    <string name="omnipod_pod_management_button_play_test_beep">Tester les bips</string>
+    <string name="omnipod_pod_management_button_play_test_beep">Tester bips</string>
     <string name="omnipod_pod_management_button_playing_test_beep">Test des bips…</string>
     <!-- Omnipod - Wizard common -->
     <string name="omnipod_wizard_button_cancel">Annuler</string>
     <string name="omnipod_wizard_button_finish">Terminer</string>
     <string name="omnipod_wizard_button_next">Suivant</string>
     <string name="omnipod_wizard_button_retry">Réessayer</string>
-    <string name="omnipod_wizard_button_deactivate_pod">Désactiver le Pod</string>
-    <string name="omnipod_wizard_button_discard_pod">Supprimer le Pod</string>
+    <string name="omnipod_wizard_button_deactivate_pod">Désactiver Pod</string>
+    <string name="omnipod_wizard_button_discard_pod">Supprimer Pod</string>
     <string name="omnipod_wizard_exit_confirmation_text">Vous n\'avez pas encore terminé toutes les étapes. Êtes-vous sûr de vouloir quitter ?</string>
     <string name="omnipod_wizard_exit_confirmation_title">Quitter</string>
     <!-- Omnipod - Pod activation Wizard -->
-    <string name="omnipod_pod_activation_wizard_fill_pod_title">Remplir le Pod</string>
+    <string name="omnipod_pod_activation_wizard_fill_pod_title">Remplir Pod</string>
     <string name="omnipod_pod_activation_wizard_fill_pod_text">Remplir le nouveau Pod avec suffisamment d\'insuline pendant 3 jours.\n\nÉcoutez les deux bips du Pod pendant le processus de remplissage. Ils indiquent que la quantité minimale de 85U a été ajouté. Assurez-vous de vider complètement la seringue de remplissage, même après avoir entendu les deux bips.\n\nAprès avoir rempli le Pod, veuillez appuyer sur <b>Suivant</b>.\n\n<b>Remarque :</b> Ne retirez pas la protection de l\'aiguille du Pod pour le moment.\n<b>Remarque :</b>Veuillez placer le RileyLink en position verticale et placez le Pod quelques centimètres à côté.</string>
-    <string name="omnipod_pod_activation_wizard_initialize_pod_title">Initialiser le Pod</string>
+    <string name="omnipod_pod_activation_wizard_initialize_pod_title">Initialiser Pod</string>
     <string name="omnipod_pod_activation_wizard_initialize_pod_text">Tentative d\'appairage et d\'amorçage du nouveau Pod.\n\nUne fois le processus d\'initialisation terminé, appuyez sur <b>Suivant</b>.\n\n<b>Remarque :</b> Veuillez placer le RileyLink en position verticale et placez le Pod à quelques centimètres de lui.</string>
-    <string name="omnipod_pod_activation_wizard_attach_pod_title">Collez le Pod</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_title">Collez Pod</string>
     <string name="omnipod_pod_activation_wizard_attach_pod_text">Préparez le site d\'injection. Enlevez la protection de l\'aiguille et le support adhésif et collez le Pod sur le site d\'injection.\n\nSi la canule se colle, appuyez sur <b>Annuler</b> et jetez votre Pod.\n\nAppuyez sur <b>Suivant</b> pour insérer la canule et démarrer l\'injection de la basal.</string>
     <string name="omnipod_pod_activation_wizard_attach_pod_confirm_insert_cannula_text">Lorsque vous appuyez sur <b>OK</b>, la canule sera insérée. Assurez-vous d\'avoir collé le Pod sur le site de perfusion.</string>
-    <string name="omnipod_pod_activation_wizard_insert_cannula_title">Insérer la canule</string>
+    <string name="omnipod_pod_activation_wizard_insert_cannula_title">Insérer canule</string>
     <string name="omnipod_pod_activation_wizard_insert_cannula_text">Tentative de définir le schéma de basal et d\'insertion de la canule.\n\nUne fois la canule correctement insérée, appuyez sur <b>Suivant</b>.</string>
     <string name="omnipod_pod_activation_wizard_pod_activated_title">Pod activé</string>
     <string name="omnipod_pod_activation_wizard_pod_activated_text">Le Pod est maintenant actif.\n\nVos débits de basal ont été programmés et la canule a été insérée.\n\nVeuillez verifier que la canule a été insérée correctement et remplacez le Pod si vous pensez que ce n\'est pas le cas.</string>
     <!-- Omnipod - Pod deactivation Wizard -->
-    <string name="omnipod_pod_deactivation_wizard_deactivate_pod_title">Désactiver le Pod</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivate_pod_title">Désactiver Pod</string>
     <string name="omnipod_pod_deactivation_wizard_deactivate_pod_text">Appuyez sur <b>Suivant</b> pour désactiver le Pod.\n\n<b>Remarque :</b> Cela suspendra l\'injection de l\'insuline et désactivera le Pod.</string>
     <string name="omnipod_pod_deactivation_wizard_deactivating_pod_title">Désactivation du Pod</string>
     <string name="omnipod_pod_deactivation_wizard_deactivating_pod_text">Désactivation du Pod.\n\nUne fois la désactivation terminée, vous pouvez appuyer sur <b>Suivant</b>.</string>
@@ -194,7 +194,7 @@
     <string name="omnipod_pod_deactivation_wizard_pod_discarded_title">Pod supprimé</string>
     <string name="omnipod_pod_deactivation_wizard_pod_discarded_text">L\'état du Pod a été supprimé. L\'injection d\'insuline n\'a pas été suspendue car le Pod n\'a pas été correctement désactivé !\n\nVeuillez retirer le Pod de votre corps et le jeter dans le recyclage.</string>
     <string name="omnipod_pod_deactivation_wizard_discard_pod_confirmation">Si vous supprimez le Pod, vous ne pourrez plus communiquer avec lui. Vous ne devez le faire que lorsque toutes les communications avec le Pod échouent de manière permanente. Êtes-vous sûr de vouloir supprimer le Pod ?</string>
-    <string name="omnipod_pod_deactivation_wizard_discard_pod">Supprimer le Pod</string>
+    <string name="omnipod_pod_deactivation_wizard_discard_pod">Supprimer Pod</string>
     <!-- Omnipod - Overview -->
     <string name="omnipod_overview_button_set_time">Définir l\'heure</string>
     <string name="omnipod_overview_button_suspend_delivery">Arrêter</string>
@@ -205,7 +205,7 @@
     <string name="omnipod_overview_pod_status">État du Pod</string>
     <string name="omnipod_overview_total_delivered">Total injecté</string>
     <string name="omnipod_overview_total_delivered_value">%1$.2f U</string>
-    <string name="omnipod_overview_pod_address">Adresse du Pod</string>
+    <string name="omnipod_overview_pod_address">Adresse Pod</string>
     <string name="omnipod_overview_pod_expiry_date">Pod expiré</string>
     <string name="omnipod_overview_last_connection">Dernière connexion</string>
     <string name="omnipod_overview_last_bolus">Dernier bolus</string>

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

@@ -11,8 +11,7 @@
     <string name="omnipod_config_suspend_delivery_button_enabled">Mostra tasto \"sospendi erogazione\" nella scheda Omnipod</string>
     <string name="omnipod_config_pulse_log_button_enabled">Mostra tasto \"log impulsi\" nel menu gestione pod</string>
     <string name="omnipod_config_rileylink_stats_button_enabled">Mostra tasto \"statistiche RileyLink\" nel menu gestione pod</string>
-    <string name="omnipod_config_use_riley_link_battery_level">Usa livello batteria riportato da OrangeLink/EmaLink</string>
-    <string name="omnipod_config_use_riley_link_battery_level_summary">NON funziona con il RileyLink originale. Potrebbe non funzionare con altre alternative al RileyLink.</string>
+    <string name="omnipod_config_battery_change_logging_enabled">Abilita log cambio batteria in \"Azioni\"</string>
     <string name="omnipod_config_time_change_enabled">Rilevamento ora legale/fuso orario abilitato</string>
     <string name="omnipod_config_expiration_reminder_enabled">Promemoria scadenza abilitato</string>
     <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Ore prima dell\'arresto</string>
@@ -67,6 +66,7 @@
     <string name="omnipod_error_rileylink_address_invalid">Indirizzo RileyLink non valido.</string>
     <string name="omnipod_error_operation_not_possible_no_configuration">Operazione non possibile.\n\nDevi prima configurare Omnipod.</string>
     <string name="omnipod_error_pod_not_attached">Nessun pod attivo</string>
+    <string name="omnipod_error_time_out_of_sync">L\'ora sul pod non è sincronizzata. Aggiorna l\'ora nella scheda Omnipod.</string>
     <string name="omnipod_error_unexpected_exception">Si è verificato un errore imprevisto. Segnalalo! (%1$s: %2$s).</string>
     <string name="omnipod_error_crc_mismatch">Comunicazione fallita: verifica dell\'integrità del messaggio fallita</string>
     <string name="omnipod_error_invalid_packet_type">Comunicazione fallita: ricevuto un pacchetto non valido dal pod</string>

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

@@ -11,8 +11,7 @@
     <string name="omnipod_config_suspend_delivery_button_enabled">הצג לחצן \"השהיית מתן אינסולין\" בלשונית אומניפוד</string>
     <string name="omnipod_config_pulse_log_button_enabled">הצג לחצן \"יומן פעימות\" בתפריט ניהול פוד</string>
     <string name="omnipod_config_rileylink_stats_button_enabled">הצג לחצן \"סטטיסטיקת ריילילינק\" בתפריט ניהול פוד</string>
-    <string name="omnipod_config_use_riley_link_battery_level">השתמש ברמת סוללה המדווחת מ-EmaLink/OrangeLink</string>
-    <string name="omnipod_config_use_riley_link_battery_level_summary">לא עובד עם ריילילינק המקורי. עלול שלא לעבוד עם חלופות ריילילינק אחרות.</string>
+    <string name="omnipod_config_battery_change_logging_enabled">אפשר רישום החלפת סוללה בפעולות</string>
     <string name="omnipod_config_time_change_enabled">זיהוי אזור זמן ושעון קיץ מופעל</string>
     <string name="omnipod_config_expiration_reminder_enabled">תזכורת לתפוגה מופעלת</string>
     <string name="omnipod_config_expiration_reminder_hours_before_shutdown">שעות לפני כיבוי</string>
@@ -67,6 +66,7 @@
     <string name="omnipod_error_rileylink_address_invalid">כתובת ריילילינק לא חוקית.</string>
     <string name="omnipod_error_operation_not_possible_no_configuration">הפעולה אינה אפשרית.\n\nיש להגדיר קודם את אומניפוד על מנת לבצע פעולה זו.</string>
     <string name="omnipod_error_pod_not_attached">אין פוד פעיל</string>
+    <string name="omnipod_error_time_out_of_sync">הזמן בפוד אינו מסונכרן. בבקשה עדכנו את השעה בלשונית Omnipod.</string>
     <string name="omnipod_error_unexpected_exception">אירעה שגיאה לא צפויה. נא לדווח! (%1$s: %2$s).</string>
     <string name="omnipod_error_crc_mismatch">התקשורת נכשלה: אימות תקינות ההודעה נכשל</string>
     <string name="omnipod_error_invalid_packet_type">התקשורת נכשלה: התקבלה חבילת נתונים לא חוקית מהפוד</string>
@@ -135,7 +135,7 @@
     <string name="omnipod_cmd_get_pod_info">קבל מידע על הפוד</string>
     <string name="omnipod_cmd_set_time">הגדרת שעה</string>
     <string name="omnipod_cmd_configure_alerts">הגדרת התראות</string>
-    <string name="omnipod_cmd_acknowledge_alerts">קבלת ההתראות</string>
+    <string name="omnipod_cmd_acknowledge_alerts">אשר התראות</string>
     <string name="omnipod_cmd_suspend_delivery">השהה הזרקה</string>
     <string name="omnipod_cmd_resume_delivery">חידוש הזרקה</string>
     <string name="omnipod_cmd_unknown_entry">רשומה לא ידועה</string>
@@ -202,7 +202,7 @@
     <string name="omnipod_overview_button_refresh">רענן</string>
     <string name="omnipod_overview_button_resume_delivery">חידוש הזרקה</string>
     <string name="omnipod_overview_button_pod_management">ניהול הפוד</string>
-    <string name="omnipod_overview_button_acknowledge_active_alerts">קבל התראות</string>
+    <string name="omnipod_overview_button_acknowledge_active_alerts">אשר התראות</string>
     <string name="omnipod_overview_pod_status">סטטוס הפוד</string>
     <string name="omnipod_overview_total_delivered">סה\"כ שהוזרק</string>
     <string name="omnipod_overview_total_delivered_value">%1$.2f יח\'</string>
@@ -216,7 +216,7 @@
     <string name="omnipod_overview_pod_active_alerts">התראות פוד פעילות</string>
     <string name="omnipod_overview_firmware_version">גרסת קושחה</string>
     <string name="omnipod_overview_time_on_pod">זמן פעילות הפוד</string>
-    <string name="omnipod_overview_temp_basal_value">%1$.2f יח\'\ש\' @ %2$s (%3$d\%4$d דק\')</string>
+    <string name="omnipod_overview_temp_basal_value">%1$.2f יח\'\\ש\' @ %2$s (%3$d\%4$d דק\')</string>
     <string name="omnipod_overview_reservoir_value">%1$.2f יח\' נותרו</string>
     <string name="omnipod_overview_reservoir_value_over50">נותרו יותר מ-50 יח\'</string>
     <string name="omnipod_overview_errors">שגיאות</string>

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

@@ -11,8 +11,7 @@
     <string name="omnipod_config_suspend_delivery_button_enabled">Knop voor het onderbreken van insulinetoediening weergeven in het Omnipod-tabblad</string>
     <string name="omnipod_config_pulse_log_button_enabled">Knop voor het uitlezen van het Pulslog weergeven in het Podbeheer menu</string>
     <string name="omnipod_config_rileylink_stats_button_enabled">Knop voor RileyLink statistieken weergeven in het Omnipod-tabblad</string>
-    <string name="omnipod_config_use_riley_link_battery_level">Gebruik batterijniveau van OrangeLink/EmaLink</string>
-    <string name="omnipod_config_use_riley_link_battery_level_summary">Werkt NIET met de originele RileyLink. Werkt mogelijk niet met andere RileyLink alternatieven.</string>
+    <string name="omnipod_config_battery_change_logging_enabled">Loggen van batterijwissel in Acties inschakelen</string>
     <string name="omnipod_config_time_change_enabled">Zomertijd-/tijdzonedetectie ingeschakeld</string>
     <string name="omnipod_config_expiration_reminder_enabled">Pieptonen voor uiterste gebruiksdatum ingeschakeld</string>
     <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Aantal uur voordat de Pod stopt</string>
@@ -67,6 +66,7 @@
     <string name="omnipod_error_rileylink_address_invalid">RileyLink adres ongeldig.</string>
     <string name="omnipod_error_operation_not_possible_no_configuration">Bewerking is niet mogelijk.\n\nJe moet eerst Omnipod ingesteld hebben, voordat je deze bewerking kunt gebruiken.</string>
     <string name="omnipod_error_pod_not_attached">Geen actieve Pod</string>
+    <string name="omnipod_error_time_out_of_sync">De tijd op de Pod wijkt af. Werk de tijd bij op het Omnipod-tabblad.</string>
     <string name="omnipod_error_unexpected_exception">Er is een onverwachte fout opgetreden. A.u.b rapporteren! (%1$s: %2$s).</string>
     <string name="omnipod_error_crc_mismatch">Communicatie mislukt: berichtintegriteit kon niet worden geverifieerd</string>
     <string name="omnipod_error_invalid_packet_type">Communicatie mislukt: ongeldige gegevens ontvangen van de Pod</string>
@@ -143,7 +143,7 @@
     <string name="omnipod_cmd_insert_cannula">Canule inbrengen</string>
     <string name="omnipod_cmd_read_pulse_log">Pulslog uitlezen</string>
     <string name="omnipod_cmd_set_fake_suspended_tbr">Neppe tijdelijk basaal omdat insulinetoediening onderbroken is</string>
-    <string name="omnipod_cmd_cancel_fake_suspended_tbr">Annuleren van vals tijdelijk basaal wat ontstaan is omdat de insulinetoediening onderbroken was</string>
+    <string name="omnipod_cmd_cancel_fake_suspended_tbr">Annuleren van neppe tijdelijk basaal die is aangemaakt omdat de insulinetoediening onderbroken was</string>
     <string name="omnipod_cmd_split_tbr">Tijdelijke basaal gesplitst als gevolg van een onzekere fout bij annulering</string>
     <string name="omnipod_cmd_beep_config">Pieptoonconfiguratie</string>
     <string name="omnipod_cmd_play_test_beep">Testpieptoon afspelen</string>

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

@@ -11,8 +11,7 @@
     <string name="omnipod_config_suspend_delivery_button_enabled">Vis Pause insulintilførsel knapp i Omnipod meny</string>
     <string name="omnipod_config_pulse_log_button_enabled">Vis Puls logg knappen i Pod menyen</string>
     <string name="omnipod_config_rileylink_stats_button_enabled">Vis RileyLink status knapp i Pod menyen</string>
-    <string name="omnipod_config_use_riley_link_battery_level">Bruk batterinivå rapportert av EmaLink/OrangeLink</string>
-    <string name="omnipod_config_use_riley_link_battery_level_summary">Virker IKKE med RileyLink. Kan hende den ikke fungerer med andre RileyLink-alternativer.</string>
+    <string name="omnipod_config_battery_change_logging_enabled">Aktiver logging av batteribytte i Aksjoner</string>
     <string name="omnipod_config_time_change_enabled">DST/Tidssone deteksjon aktivert</string>
     <string name="omnipod_config_expiration_reminder_enabled">Utløpspåminnelse aktivert</string>
     <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Timer før nedstenging</string>
@@ -67,6 +66,7 @@
     <string name="omnipod_error_rileylink_address_invalid">RileyLink adressen er ugyldig.</string>
     <string name="omnipod_error_operation_not_possible_no_configuration">Operasjon ikke mulig.\n\n Du må konfigurere Medtronic pumpen før du kan bruke denne funksjonen.</string>
     <string name="omnipod_error_pod_not_attached">Ingen aktiv Pod</string>
+    <string name="omnipod_error_time_out_of_sync">Tid på Pod er ikke synkronisert. Vennligst oppdater tiden i Omnipod fanen.</string>
     <string name="omnipod_error_unexpected_exception">En uventet feil oppstod. Vennligst rapporter (%1$s: %2$s).</string>
     <string name="omnipod_error_crc_mismatch">Kommunikasjonsfeil: klarte ikke å verifisere meldingen</string>
     <string name="omnipod_error_invalid_packet_type">Kommunikasjonsfeil: mottok en ugyldig datapakke fra Pod</string>

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

@@ -11,8 +11,6 @@
     <string name="omnipod_config_suspend_delivery_button_enabled">Pokaż przycisk wstrzymania podawania w zakładce Omnipod</string>
     <string name="omnipod_config_pulse_log_button_enabled">Pokaż przycisk Puls Log w menu zarządzania Podem</string>
     <string name="omnipod_config_rileylink_stats_button_enabled">Pokaż przycisk Statystyki RileyLink w menu zarządzania Podem</string>
-    <string name="omnipod_config_use_riley_link_battery_level">Użyj poziomu baterii zgłoszonego przez OrangeLink/EmaLink</string>
-    <string name="omnipod_config_use_riley_link_battery_level_summary">NIE działa z oryginalnym RileyLinkiem. Może nie działać z innymi alternatywami RileyLink.</string>
     <string name="omnipod_config_time_change_enabled">Włączone wykrywanie strefy czasowej DST</string>
     <string name="omnipod_config_expiration_reminder_enabled">Przypomnienie o utracie ważności włączone</string>
     <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Godziny przed wyłączeniem</string>

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

@@ -11,8 +11,6 @@
     <string name="omnipod_config_suspend_delivery_button_enabled">Afișare buton de Suspendare Livrare în secțiunea Omnipod</string>
     <string name="omnipod_config_pulse_log_button_enabled">Afişare buton Jurnal Puls în meniul Gestionare Pod-uri</string>
     <string name="omnipod_config_rileylink_stats_button_enabled">Afişare buton Status RileyLink în meniul Gestionare Pod-uri</string>
-    <string name="omnipod_config_use_riley_link_battery_level">Utilizare nivel baterie raportat de OrangeLink/EmaLink</string>
-    <string name="omnipod_config_use_riley_link_battery_level_summary">NU funcționează cu RileyLink original. Este posibil sa nu funcționeze nici cu versiuni alternative de RileyLink.</string>
     <string name="omnipod_config_time_change_enabled">Detectare fusului orar activată</string>
     <string name="omnipod_config_expiration_reminder_enabled">Notificare expirare activat</string>
     <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Numar de ore înainte de oprire</string>

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

@@ -11,8 +11,7 @@
     <string name="omnipod_config_suspend_delivery_button_enabled">Visa knapp för Pausa Leverans i Omnipod-fliken</string>
     <string name="omnipod_config_pulse_log_button_enabled">Visa Pulse Log-knapp i menyn Podhantering</string>
     <string name="omnipod_config_rileylink_stats_button_enabled">Visa knappen Riley Link-statistik i menyn Pod-hantering</string>
-    <string name="omnipod_config_use_riley_link_battery_level">Använd batterinivå som rapporterats av OrangeLink/EmaLink</string>
-    <string name="omnipod_config_use_riley_link_battery_level_summary">Fungerar inte med original Riley Link. Fungerar eventuellt inte med alla motsvarigheter heller.</string>
+    <string name="omnipod_config_battery_change_logging_enabled">Aktivera inloggning av batteribyte i Åtgärder</string>
     <string name="omnipod_config_time_change_enabled">Automatisk avkänning av tidszon aktiverad</string>
     <string name="omnipod_config_expiration_reminder_enabled">Påminnelse för utgångstid aktiverad</string>
     <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Timmar före avstängning</string>
@@ -67,6 +66,7 @@
     <string name="omnipod_error_rileylink_address_invalid">Riley Link adress felaktig.</string>
     <string name="omnipod_error_operation_not_possible_no_configuration">Operationen inte möjlig.\n\n Du måste konfigurera Omnipod innan du kan använda denna funktion.</string>
     <string name="omnipod_error_pod_not_attached">Ingen aktiv pod</string>
+    <string name="omnipod_error_time_out_of_sync">Tiden på Podden är ur synk. Vänligen uppdatera tiden i Omnipod fliken.</string>
     <string name="omnipod_error_unexpected_exception">Ett oväntat fel uppstod. Vänligen rapportera! (%1$s: %2$s).</string>
     <string name="omnipod_error_crc_mismatch">Kommunikationsfel: Lyckades inte verifiera meddelandet</string>
     <string name="omnipod_error_invalid_packet_type">Kommunikationsfel: Mottog ett ogiltigt datapaket från pod</string>

rileylink/src/main/res/values-ca-rES/strings.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL keys -->
+    <!-- RL BLE Config -->
+    <!-- RL Status Page -->
+    <!-- RL State -->
+    <!-- RL Errors -->
+    <!-- RileyLink - Common -->
+    <!-- RileyLink - Preferences -->
+</resources>

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

@@ -22,19 +22,23 @@
     <string name="medtronic_pump_status">Stav pumpy</string>
     <string name="title_activity_rileylink_settings">Nastavení RileyLink</string>
     <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_riley_link_address">Adresa nakonfigurovaného RileyLinku:</string>
-    <string name="rileylink_configured_riley_link_name">Název nakonfigurovaného RileyLinku:</string>
-    <string name="rileylink_connected_device">Připojené zařízení:</string>
+    <string name="rileylink_address">Adresa:</string>
+    <string name="rileylink_name">Jméno:</string>
+    <string name="rileylink_battery_level">Stav nabití baterie:</string>
+    <string name="rileylink_battery_level_value">%1$d%%</string>
     <string name="rileylink_connection_status">Stav připojení:</string>
     <string name="rileylink_connection_error">Chyba spojení:</string>
     <string name="rileylink_device">Zařízení</string>
     <string name="rileylink_device_type">Typ zařízení:</string>
-    <string name="rileylink_device_model">Model zařízení:</string>
+    <string name="rileylink_configured_device_model">Model nastaveného zařízení:</string>
+    <string name="rileylink_connected_device_model">Model připojeného zařízení:</string>
     <string name="rileylink_last_used_frequency">Poslední použitá frekvence:</string>
     <string name="rileylink_last_device_contact">Poslední spojení se zařízením:</string>
     <string name="rileylink_firmware_version">Verze firmwaru:</string>
+    <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
     <string name="rileylink_pump_serial_number">Sériové číslo pumpy:</string>
     <string name="rileylink_pump_frequency">Frekvence pumpy:</string>
+    <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
     <!-- RL State -->
     <string name="rileylink_state_bt_init">Bluetooth se incializuje…</string>
     <string name="rileylink_state_bt_error">Chyba Bluetooth</string>
@@ -56,9 +60,12 @@
     <string name="rileylink_error_pod_unreachable">Pod nedostupný</string>
     <!-- RileyLink - Common -->
     <string name="rileylink_target_device_medtronic">Pumpa Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omipod</string>
+    <string name="rileylink_target_device_omnipod">Omnipod (Eros)</string>
     <string name="riley_link_common_yes">Ano</string>
     <string name="riley_link_common_no">Ne</string>
+    <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Ukázat úroveň baterie hlášenou OrangeLinkem/RileyLinkem</string>
+    <string name="riley_link_show_battery_level_summary">NEPRACUJE s původním RileyLinkem. Nemusí pracovat s jinými alternativami RileyLinky.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d den</item>
         <item quantity="few">%1$d dnů</item>

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

@@ -22,19 +22,23 @@
     <string name="medtronic_pump_status">Pumpen-Status</string>
     <string name="title_activity_rileylink_settings">RileyLink Einstellungen</string>
     <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_riley_link_address">Adresse des verbundenen RileyLink:</string>
-    <string name="rileylink_configured_riley_link_name">Name des verbundenen RileyLinks:</string>
-    <string name="rileylink_connected_device">Verbundenes Gerät:</string>
+    <string name="rileylink_address">Adresse:</string>
+    <string name="rileylink_name">Name:</string>
+    <string name="rileylink_battery_level">Akkustand:</string>
+    <string name="rileylink_battery_level_value">%1$d%%</string>
     <string name="rileylink_connection_status">Verbindungsstatus:</string>
     <string name="rileylink_connection_error">Verbindungsfehler:</string>
     <string name="rileylink_device">Gerät</string>
     <string name="rileylink_device_type">Geräte-Typ:</string>
-    <string name="rileylink_device_model">Gerätemodell:</string>
+    <string name="rileylink_configured_device_model">Eingerichtetes Gerätemodell:</string>
+    <string name="rileylink_connected_device_model">Verbundenes Gerätemodell:</string>
     <string name="rileylink_last_used_frequency">Zuletzt verwendete Frequenz:</string>
     <string name="rileylink_last_device_contact">Letzter Gerätekontakt:</string>
     <string name="rileylink_firmware_version">Firmware-Version:</string>
+    <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
     <string name="rileylink_pump_serial_number">Seriennummer der Pumpe:</string>
     <string name="rileylink_pump_frequency">Pumpenfrequenz:</string>
+    <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
     <!-- RL State -->
     <string name="rileylink_state_bt_init">Initialisiere Bluetooth…</string>
     <string name="rileylink_state_bt_error">Bluetooth-Fehler</string>
@@ -56,9 +60,12 @@
     <string name="rileylink_error_pod_unreachable">Pod nicht erreichbar</string>
     <!-- RileyLink - Common -->
     <string name="rileylink_target_device_medtronic">Medtronic Pumpe</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="rileylink_target_device_omnipod">Omnipod (Eros)</string>
     <string name="riley_link_common_yes">Ja</string>
     <string name="riley_link_common_no">Nein</string>
+    <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Akkustand von OrangeLink/EmaLink anzeigen</string>
+    <string name="riley_link_show_battery_level_summary">FUNKTIONIERT NICHT mit dem original RileyLink. Funktioniert vielleicht nicht mit anderen RileyLink Alternativen.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d Tag</item>
         <item quantity="other">%1$d Tage</item>

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

@@ -28,5 +28,5 @@
     <string name="rileylink_error_pod_unreachable">Το Pod δεν είναι διαθέσιμο</string>
     <!-- RileyLink - Common -->
     <string name="rileylink_target_device_medtronic">Αντλία Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <!-- RileyLink - Preferences -->
 </resources>

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

@@ -22,19 +22,23 @@
     <string name="medtronic_pump_status">État de la pompe</string>
     <string name="title_activity_rileylink_settings">Paramètres RileyLink</string>
     <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_riley_link_address">Adresse du RileyLink :</string>
-    <string name="rileylink_configured_riley_link_name">Nom du RileyLink :</string>
-    <string name="rileylink_connected_device">Appareil connecté :</string>
+    <string name="rileylink_address">Adresse :</string>
+    <string name="rileylink_name">Nom :</string>
+    <string name="rileylink_battery_level">Niveau pile :</string>
+    <string name="rileylink_battery_level_value">%1$d%%</string>
     <string name="rileylink_connection_status">État de la connexion :</string>
     <string name="rileylink_connection_error">Erreur de Connexion :</string>
     <string name="rileylink_device">Appareil</string>
     <string name="rileylink_device_type">Type d\'appareil :</string>
-    <string name="rileylink_device_model">Modèle d’appareil :</string>
+    <string name="rileylink_configured_device_model">Rileylink configuré :</string>
+    <string name="rileylink_connected_device_model">Rileylink connecté :</string>
     <string name="rileylink_last_used_frequency">Dernière fréquence utilisée :</string>
     <string name="rileylink_last_device_contact">Dernier contact appareil :</string>
     <string name="rileylink_firmware_version">Version du firmware :</string>
+    <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
     <string name="rileylink_pump_serial_number">Numéro de série de pompe :</string>
     <string name="rileylink_pump_frequency">Fréquence de pompe :</string>
+    <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
     <!-- RL State -->
     <string name="rileylink_state_bt_init">Initialisation Bluetooth…</string>
     <string name="rileylink_state_bt_error">Erreur Bluetooth</string>
@@ -56,9 +60,12 @@
     <string name="rileylink_error_pod_unreachable">Pod inaccessible</string>
     <!-- RileyLink - Common -->
     <string name="rileylink_target_device_medtronic">Pompe Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="rileylink_target_device_omnipod">Omnipod (Eros)</string>
     <string name="riley_link_common_yes">Oui</string>
     <string name="riley_link_common_no">Non</string>
+    <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Afficher le niveau de pile transmis par OrangeLink/EmaLink</string>
+    <string name="riley_link_show_battery_level_summary">NE FONCTIONNE PAS avec le RileyLink original. Peut ne pas fonctionner avec d\'autres versions de RileyLink.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d jour</item>
         <item quantity="other">%1$d jours</item>

rileylink/src/main/res/values-ga-rIE/strings.xml

@@ -6,4 +6,5 @@
     <!-- RL State -->
     <!-- RL Errors -->
     <!-- RileyLink - Common -->
+    <!-- RileyLink - Preferences -->
 </resources>

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

@@ -22,19 +22,23 @@
     <string name="medtronic_pump_status">Stato micro</string>
     <string name="title_activity_rileylink_settings">Impostazioni RileyLink</string>
     <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_riley_link_address">Indirizzo RileyLink configurato:</string>
-    <string name="rileylink_configured_riley_link_name">Nome RileyLink configurato:</string>
-    <string name="rileylink_connected_device">Dispositivo connesso:</string>
+    <string name="rileylink_address">Indirizzo:</string>
+    <string name="rileylink_name">Nome:</string>
+    <string name="rileylink_battery_level">Livello batteria:</string>
+    <string name="rileylink_battery_level_value">%1$d%%</string>
     <string name="rileylink_connection_status">Stato connessione:</string>
     <string name="rileylink_connection_error">Errore connessione:</string>
     <string name="rileylink_device">Dispositivo</string>
     <string name="rileylink_device_type">Tipo dispositivo:</string>
-    <string name="rileylink_device_model">Modello dispositivo:</string>
+    <string name="rileylink_configured_device_model">Modello dispositivo configurato:</string>
+    <string name="rileylink_connected_device_model">Modello dispositivo connesso:</string>
     <string name="rileylink_last_used_frequency">Ultima frequenza usata:</string>
     <string name="rileylink_last_device_contact">Ultimo contatto dispositivo:</string>
     <string name="rileylink_firmware_version">Versione firmware:</string>
+    <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
     <string name="rileylink_pump_serial_number">Numero seriale micro:</string>
     <string name="rileylink_pump_frequency">Frequenza micro:</string>
+    <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
     <!-- RL State -->
     <string name="rileylink_state_bt_init">Inizializzazione bluetooth…</string>
     <string name="rileylink_state_bt_error">Errore bluetooth</string>
@@ -56,9 +60,12 @@
     <string name="rileylink_error_pod_unreachable">Pod irraggiungibile</string>
     <!-- RileyLink - Common -->
     <string name="rileylink_target_device_medtronic">Micro Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="rileylink_target_device_omnipod">Omnipod (Eros)</string>
     <string name="riley_link_common_yes">Sì</string>
     <string name="riley_link_common_no">No</string>
+    <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Mostra livello batteria riportato da OrangeLink/EmaLink</string>
+    <string name="riley_link_show_battery_level_summary">NON funziona con il RileyLink originale. Potrebbe non funzionare con altre alternative al RileyLink.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d giorno</item>
         <item quantity="other">%1$d giorni</item>

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

@@ -22,19 +22,23 @@
     <string name="medtronic_pump_status">סטטוס המשאבה</string>
     <string name="title_activity_rileylink_settings">הגדרות ריילילינק</string>
     <string name="rileylink_title">ריילילינק</string>
-    <string name="rileylink_configured_riley_link_address">כתובת הריילילינק המוגדרת:</string>
-    <string name="rileylink_configured_riley_link_name">שם הריילילינק המחובר:</string>
-    <string name="rileylink_connected_device">המכשיר המחובר:</string>
+    <string name="rileylink_address">כתובת:</string>
+    <string name="rileylink_name">שם:</string>
+    <string name="rileylink_battery_level">רמת הסוללה:</string>
+    <string name="rileylink_battery_level_value">%1$d%%</string>
     <string name="rileylink_connection_status">מצב החיבור:</string>
     <string name="rileylink_connection_error">שגיאת חיבור:</string>
     <string name="rileylink_device">מכשיר</string>
     <string name="rileylink_device_type">סוג מכשיר:</string>
-    <string name="rileylink_device_model">דגם המכשיר:</string>
+    <string name="rileylink_configured_device_model">דגם המכשיר המוגדר:</string>
+    <string name="rileylink_connected_device_model">דגם המכשיר המחובר:</string>
     <string name="rileylink_last_used_frequency">תדירות השימוש לאחרונה:</string>
     <string name="rileylink_last_device_contact">קשר אחרון עם המכשיר:</string>
     <string name="rileylink_firmware_version">גרסת קושחה:</string>
+    <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
     <string name="rileylink_pump_serial_number">מספר סידורי של המשאבה:</string>
     <string name="rileylink_pump_frequency">תדר המשאבה:</string>
+    <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
     <!-- RL State -->
     <string name="rileylink_state_bt_init">מאתחל בלוטות\'…</string>
     <string name="rileylink_state_bt_error">שגיאת בלוטות\'</string>
@@ -56,9 +60,12 @@
     <string name="rileylink_error_pod_unreachable">הפוד לא זמין</string>
     <!-- RileyLink - Common -->
     <string name="rileylink_target_device_medtronic">משאבת Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="rileylink_target_device_omnipod">אומניפוד (Eros)</string>
     <string name="riley_link_common_yes">כן</string>
     <string name="riley_link_common_no">לא</string>
+    <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">הצג את רמת הסוללה המדווחת על-ידי OrangeLink/EmaLink</string>
+    <string name="riley_link_show_battery_level_summary">לא עובד עם ריילילינק המקורי. עלול שלא לעבוד עם חלופות ריילילינק אחרות.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d יום</item>
         <item quantity="two">%1$d ימים</item>

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

@@ -28,5 +28,5 @@
     <string name="rileylink_error_pod_unreachable">포드에 연결할 수 없습니다.</string>
     <!-- RileyLink - Common -->
     <string name="rileylink_target_device_medtronic">메드트로닉 펌프</string>
-    <string name="rileylink_target_device_omnipod">옴니포드</string>
+    <!-- RileyLink - Preferences -->
 </resources>

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

@@ -22,14 +22,10 @@
     <string name="medtronic_pump_status">Pompos statusas</string>
     <string name="title_activity_rileylink_settings">RileyLink parametrai</string>
     <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_riley_link_address">Konfigūruoti RileyLink adresą:</string>
-    <string name="rileylink_configured_riley_link_name">Konfigūruoti RileyLink vardą:</string>
-    <string name="rileylink_connected_device">Prijungtas įrenginys:</string>
     <string name="rileylink_connection_status">Ryšio būsena:</string>
     <string name="rileylink_connection_error">Prisijungimo klaida:</string>
     <string name="rileylink_device">Įrenginys</string>
     <string name="rileylink_device_type">Įrenginio tipas:</string>
-    <string name="rileylink_device_model">Įrenginio modelis:</string>
     <string name="rileylink_last_used_frequency">Paskutinis naudotas dažnis:</string>
     <string name="rileylink_last_device_contact">Paskutinis įrenginio kontaktas:</string>
     <string name="rileylink_firmware_version">Programinės įrangos versija:</string>
@@ -56,9 +52,9 @@
     <string name="rileylink_error_pod_unreachable">Pod nepasiekiamas</string>
     <!-- RileyLink - Common -->
     <string name="rileylink_target_device_medtronic">Pompa Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
     <string name="riley_link_common_yes">Taip</string>
     <string name="riley_link_common_no">Ne</string>
+    <!-- RileyLink - Preferences -->
     <plurals name="duration_days">
         <item quantity="one">%1$d d.</item>
         <item quantity="few">%1$d d.</item>

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

@@ -22,19 +22,23 @@
     <string name="medtronic_pump_status">Pompstatus</string>
     <string name="title_activity_rileylink_settings">RileyLink Instellingen</string>
     <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_riley_link_address">Geconfigureerd RileyLink-adres:</string>
-    <string name="rileylink_configured_riley_link_name">Geconfigureerde RileyLink-naam:</string>
-    <string name="rileylink_connected_device">Aangesloten apparaat:</string>
+    <string name="rileylink_address">Adres:</string>
+    <string name="rileylink_name">Naam:</string>
+    <string name="rileylink_battery_level">Batterijniveau:</string>
+    <string name="rileylink_battery_level_value">%1$d%%</string>
     <string name="rileylink_connection_status">Verbindingsstatus:</string>
     <string name="rileylink_connection_error">Verbindingsfout:</string>
     <string name="rileylink_device">Apparaat</string>
     <string name="rileylink_device_type">Apparaattype:</string>
-    <string name="rileylink_device_model">Model apparaat:</string>
+    <string name="rileylink_configured_device_model">Geconfigureerd apparaatmodel:</string>
+    <string name="rileylink_connected_device_model">Verbonden apparaatmodel:</string>
     <string name="rileylink_last_used_frequency">Laatst gebruikte frequentie:</string>
     <string name="rileylink_last_device_contact">Laatste contact met apparaat:</string>
     <string name="rileylink_firmware_version">Firmwareversie:</string>
+    <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
     <string name="rileylink_pump_serial_number">Serienummer van de pomp:</string>
     <string name="rileylink_pump_frequency">Pompfrequentie:</string>
+    <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
     <!-- RL State -->
     <string name="rileylink_state_bt_init">Bluetooth initialiseren…</string>
     <string name="rileylink_state_bt_error">Bluetooth fout</string>
@@ -56,9 +60,12 @@
     <string name="rileylink_error_pod_unreachable">Pod niet bereikbaar</string>
     <!-- RileyLink - Common -->
     <string name="rileylink_target_device_medtronic">Medtronic Pomp</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="rileylink_target_device_omnipod">Omnipod (Eros)</string>
     <string name="riley_link_common_yes">Ja</string>
     <string name="riley_link_common_no">Nee</string>
+    <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Toon batterijniveau van OrangeLink/EmaLink</string>
+    <string name="riley_link_show_battery_level_summary">Werkt NIET met de originele RileyLink. Werkt mogelijk niet met andere RileyLink-alternatieven.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dagen</item>

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

@@ -22,19 +22,23 @@
     <string name="medtronic_pump_status">Pumpe Status</string>
     <string name="title_activity_rileylink_settings">RileyLink Innstillinger</string>
     <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_riley_link_address">Konfigurert RileyLink adresse:</string>
-    <string name="rileylink_configured_riley_link_name">Konfigurert RileyLink navn:</string>
-    <string name="rileylink_connected_device">Tilkoblet enhet:</string>
+    <string name="rileylink_address">Adresse:</string>
+    <string name="rileylink_name">Navn:</string>
+    <string name="rileylink_battery_level">Batterinivå:</string>
+    <string name="rileylink_battery_level_value">%1$d%%</string>
     <string name="rileylink_connection_status">Tilkoblingsstatus:</string>
     <string name="rileylink_connection_error">Tilkoblings feil:</string>
     <string name="rileylink_device">Enhet</string>
     <string name="rileylink_device_type">Enhets type:</string>
-    <string name="rileylink_device_model">Enhets modell:</string>
+    <string name="rileylink_configured_device_model">Konfigurert enhetsmodell:</string>
+    <string name="rileylink_connected_device_model">Tilkoblet enhetsmodell:</string>
     <string name="rileylink_last_used_frequency">Sist brukte frekvens:</string>
     <string name="rileylink_last_device_contact">Siste tilkobling:</string>
     <string name="rileylink_firmware_version">Firmware versjon:</string>
+    <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
     <string name="rileylink_pump_serial_number">Pumpens serienummer:</string>
     <string name="rileylink_pump_frequency">Pumpens frekvens:</string>
+    <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
     <!-- RL State -->
     <string name="rileylink_state_bt_init">Bluetooth initialiserer…</string>
     <string name="rileylink_state_bt_error">Bluetooth feil</string>
@@ -56,9 +60,12 @@
     <string name="rileylink_error_pod_unreachable">Pod utilgjengelig</string>
     <!-- RileyLink - Common -->
     <string name="rileylink_target_device_medtronic">Medtronic pumpe</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="rileylink_target_device_omnipod">Omnipod (Eros)</string>
     <string name="riley_link_common_yes">Ja</string>
     <string name="riley_link_common_no">Nei</string>
+    <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Vis batterinivå rapportert av OrangeLink/EmaLink</string>
+    <string name="riley_link_show_battery_level_summary">Virker IKKE med RileyLink. Kan hende den ikke fungerer med andre RileyLink alternativer.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dager</item>

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

@@ -22,14 +22,10 @@
     <string name="medtronic_pump_status">Stan pompy</string>
     <string name="title_activity_rileylink_settings">Ustawienia RileyLink</string>
     <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_riley_link_address">Skonfigurowany adres RileyLink:</string>
-    <string name="rileylink_configured_riley_link_name">Skonfigurowana nazwa RileyLink:</string>
-    <string name="rileylink_connected_device">Połączone urządzenie:</string>
     <string name="rileylink_connection_status">Status połączenia:</string>
     <string name="rileylink_connection_error">Błąd połączenia:</string>
     <string name="rileylink_device">Urządzenie</string>
     <string name="rileylink_device_type">Typ urządzenia:</string>
-    <string name="rileylink_device_model">Model urządzenia:</string>
     <string name="rileylink_last_used_frequency">Ostatnio używana częstotliwość:</string>
     <string name="rileylink_last_device_contact">Ostatnie połączenie z urządzeniem:</string>
     <string name="rileylink_firmware_version">Wersja oprogramowania:</string>
@@ -56,9 +52,9 @@
     <string name="rileylink_error_pod_unreachable">Pod nieosiągalny</string>
     <!-- RileyLink - Common -->
     <string name="rileylink_target_device_medtronic">Pompa Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
     <string name="riley_link_common_yes">Tak</string>
     <string name="riley_link_common_no">Nie</string>
+    <!-- RileyLink - Preferences -->
     <plurals name="duration_days">
         <item quantity="one">%1$d dzień</item>
         <item quantity="few">%1$d dni</item>

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

@@ -22,14 +22,10 @@
     <string name="medtronic_pump_status">Stare pompă</string>
     <string name="title_activity_rileylink_settings">Setări RileyLink</string>
     <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_riley_link_address">Adresă RileyLink configurată:</string>
-    <string name="rileylink_configured_riley_link_name">Nume RileyLink configurat:</string>
-    <string name="rileylink_connected_device">Dispozitiv conectat:</string>
     <string name="rileylink_connection_status">Stare conexiune:</string>
     <string name="rileylink_connection_error">Eroare conexiune:</string>
     <string name="rileylink_device">Dispozitiv</string>
     <string name="rileylink_device_type">Tip dispozitiv:</string>
-    <string name="rileylink_device_model">Model dispozitiv:</string>
     <string name="rileylink_last_used_frequency">Ultima frecvență utilizată:</string>
     <string name="rileylink_last_device_contact">Ultima conexiune cu dispozitivul:</string>
     <string name="rileylink_firmware_version">Versiune Firmware:</string>
@@ -56,9 +52,9 @@
     <string name="rileylink_error_pod_unreachable">Nu se poate comunica cu pod-ul</string>
     <!-- RileyLink - Common -->
     <string name="rileylink_target_device_medtronic">Pompă Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
     <string name="riley_link_common_yes">Da</string>
     <string name="riley_link_common_no">Nu</string>
+    <!-- RileyLink - Preferences -->
     <plurals name="duration_days">
         <item quantity="one">%1$d zi</item>
         <item quantity="few">%1$d zile</item>

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

@@ -22,19 +22,23 @@
     <string name="medtronic_pump_status">Pumpstatus</string>
     <string name="title_activity_rileylink_settings">Inställningar för Riley Link</string>
     <string name="rileylink_title">Riley Link</string>
-    <string name="rileylink_configured_riley_link_address">Riley Link-adress:</string>
-    <string name="rileylink_configured_riley_link_name">Riley Link-namn:</string>
-    <string name="rileylink_connected_device">Ansluten enhet:</string>
+    <string name="rileylink_address">Adress:</string>
+    <string name="rileylink_name">Namn:</string>
+    <string name="rileylink_battery_level">Batterinivå:</string>
+    <string name="rileylink_battery_level_value">%1$d%%</string>
     <string name="rileylink_connection_status">Anslutningsstatus:</string>
     <string name="rileylink_connection_error">Anslutningsproblem:</string>
     <string name="rileylink_device">Enhet</string>
     <string name="rileylink_device_type">Enhetstyp:</string>
-    <string name="rileylink_device_model">Modell:</string>
+    <string name="rileylink_configured_device_model">Konfigurerad modell:</string>
+    <string name="rileylink_connected_device_model">Ansluten modell:</string>
     <string name="rileylink_last_used_frequency">Senast använda frekvens:</string>
     <string name="rileylink_last_device_contact">Senaste anslutning:</string>
     <string name="rileylink_firmware_version">Firmwareversion:</string>
+    <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
     <string name="rileylink_pump_serial_number">Serienummer på pumpen:</string>
     <string name="rileylink_pump_frequency">Pumpfrekvens:</string>
+    <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
     <!-- RL State -->
     <string name="rileylink_state_bt_init">Bluetooth initieras…</string>
     <string name="rileylink_state_bt_error">Bluetoothfel</string>
@@ -56,9 +60,12 @@
     <string name="rileylink_error_pod_unreachable">Podden kan inte nås</string>
     <!-- RileyLink - Common -->
     <string name="rileylink_target_device_medtronic">Medtronicpump</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="rileylink_target_device_omnipod">Omnipod (Eros)</string>
     <string name="riley_link_common_yes">Ja</string>
     <string name="riley_link_common_no">Nej</string>
+    <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Visa batterinivå som rapporterats av OrangeLink/EmaLink</string>
+    <string name="riley_link_show_battery_level_summary">Fungerar inte med original Riley Link. Fungerar eventuellt inte med alla motsvarigheter heller.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dagar</item>

wear/build.gradle

@@ -50,8 +50,8 @@ android {
         applicationId "info.nightscout.androidaps"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 1
-        versionName "1.0.2"
+        versionCode 2
+        versionName "1.0.3"
         buildConfigField "String", "BUILDVERSION", generateGitBuild()
     }
     buildTypes {

wear/src/main/java/info/nightscout/androidaps/data/ListenerService.java

@@ -80,11 +80,12 @@ public class ListenerService extends WearableListenerService implements GoogleAp
 
 
     private static final String ACTION_RESEND_BULK = "com.dexdrip.stephenblack.nightwatch.RESEND_BULK_DATA";
-    private static final String AAPS_NOTIFY_CHANNEL_ID = "AndroidAPS-Openloop";
+    private static final String AAPS_NOTIFY_CHANNEL_ID_OPENLOOP = "AndroidAPS-Openloop";
+    private static final String AAPS_NOTIFY_CHANNEL_ID_BOLUSPROGRESS = "AndroidAPS-bolus-progress";
+
 
     GoogleApiClient googleApiClient;
     private long lastRequest = 0;
-    private DismissThread confirmThread;
     private DismissThread bolusprogressThread;
     private static final String TAG = "ListenerService";
 
@@ -559,7 +560,7 @@ public class ListenerService extends WearableListenerService implements GoogleAp
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 CharSequence name = "AAPS Open Loop";
                 String description = "Open Loop request notiffication";//getString(R.string.channel_description);
-                NotificationChannel channel = new NotificationChannel(AAPS_NOTIFY_CHANNEL_ID, name, NotificationManager.IMPORTANCE_HIGH);
+                NotificationChannel channel = new NotificationChannel(AAPS_NOTIFY_CHANNEL_ID_OPENLOOP, name, NotificationManager.IMPORTANCE_HIGH);
                 channel.setDescription(description);
                 channel.enableVibration(true);
 
@@ -570,7 +571,7 @@ public class ListenerService extends WearableListenerService implements GoogleAp
             }
 
         NotificationCompat.Builder builder =
-                new NotificationCompat.Builder(this, AAPS_NOTIFY_CHANNEL_ID);
+                new NotificationCompat.Builder(this, AAPS_NOTIFY_CHANNEL_ID_OPENLOOP);
 
         builder = builder.setSmallIcon(R.drawable.notif_icon)
                 .setContentTitle(title)
@@ -605,6 +606,20 @@ public class ListenerService extends WearableListenerService implements GoogleAp
     }
 
     private void showBolusProgress(int progresspercent, String progresstatus) {
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            CharSequence name = "AAPS Bolus Progress";
+            String description = "Bolus progress and cancel";
+            NotificationChannel channel = new NotificationChannel(AAPS_NOTIFY_CHANNEL_ID_BOLUSPROGRESS, name, NotificationManager.IMPORTANCE_HIGH);
+            channel.setDescription(description);
+            channel.enableVibration(true);
+
+            // Register the channel with the system; you can't change the importance
+            // or other notification behaviors after this
+            NotificationManager notificationManager = getSystemService(NotificationManager.class);
+            notificationManager.createNotificationChannel(channel);
+        }
+
         Intent cancelIntent = new Intent(this, ListenerService.class);
         cancelIntent.setAction(ACTION_CANCELBOLUS);
         PendingIntent cancelPendingIntent = PendingIntent.getService(this, 0, cancelIntent, 0);
@@ -618,11 +633,13 @@ public class ListenerService extends WearableListenerService implements GoogleAp
             vibratePattern = new long[]{0, 1, 1000};
         }
 
+        // TODO: proper channel. Does cancel work?
         NotificationCompat.Builder notificationBuilder =
-                new NotificationCompat.Builder(this)
+                new NotificationCompat.Builder(this, AAPS_NOTIFY_CHANNEL_ID_BOLUSPROGRESS)
                         .setSmallIcon(R.drawable.ic_icon)
                         .setContentTitle("Bolus Progress")
                         .setContentText(progresspercent + "% - " + progresstatus)
+                        .setSubText("press to cancel")
                         .setContentIntent(cancelPendingIntent)
                         .setPriority(NotificationCompat.PRIORITY_MAX)
                         .setVibrate(vibratePattern)
@@ -631,9 +648,6 @@ public class ListenerService extends WearableListenerService implements GoogleAp
         NotificationManagerCompat notificationManager =
                 NotificationManagerCompat.from(this);
 
-        if(confirmThread != null){
-            confirmThread.invalidate();
-        }
         notificationManager.notify(BOLUS_PROGRESS_NOTIF_ID, notificationBuilder.build());
         notificationManager.cancel(CONFIRM_NOTIF_ID); // multiple watch setup
 
@@ -656,9 +670,6 @@ public class ListenerService extends WearableListenerService implements GoogleAp
     }
 
     private void scheduleDismissBolusprogress(final int seconds) {
-        if(confirmThread != null){
-            confirmThread.invalidate();
-        }
         bolusprogressThread = new DismissThread(BOLUS_PROGRESS_NOTIF_ID, seconds);
         bolusprogressThread.start();
     }

wear/src/main/java/info/nightscout/androidaps/interaction/actions/CPPActivity.java

@@ -93,7 +93,7 @@ public class CPPActivity extends ViewSelectorActivity {
                 if (editPercentage != null){
                     def = SafeParse.stringToDouble(editPercentage.editText.getText().toString());
                 }
-                editPercentage = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 50d, 150d, 1d, new DecimalFormat("0"), false);
+                editPercentage = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 30d, 250d, 1d, new DecimalFormat("0"), false);
                 setLabelToPlusMinusView(view, aaps.gs(R.string.action_percentage));
                 container.addView(view);
                 return view;

wear/src/main/java/info/nightscout/androidaps/watchfaces/BgGraphBuilder.java

@@ -31,6 +31,7 @@ import lecho.lib.hellocharts.model.Viewport;
  */
 public class BgGraphBuilder {
     public static final double MAX_PREDICTION__TIME_RATIO = (3d / 5);
+    public static final double UPPER_CUTOFF_SGV = 400;
     private final long predictionEndTime;
     private final List<BgWatchData> predictionsList;
     private final ArrayList<BolusWatchData> bolusWatchDataList;
@@ -317,7 +318,7 @@ public class BgGraphBuilder {
         long endTime = getPredictionEndTime();
         for (BgWatchData bwd : predictionsList) {
             if (bwd.timestamp <= endTime) {
-                double value = bwd.sgv < 300 ? bwd.sgv : 300;
+                double value = Math.min(bwd.sgv, UPPER_CUTOFF_SGV);
                 if (!values.containsKey(bwd.color)) {
                     values.put(bwd.color, new ArrayList<>());
                 }

wear/src/main/res/values-ca-rES/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

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

@@ -69,6 +69,7 @@
     <string name="menu_ecarb">eGlucides</string>
     <string name="menu_settings">Paramètres</string>
     <string name="menu_status">États</string>
+    <string name="menu_resync">Re-sync</string>
     <string name="menu_prime_fill">Amorcer/Remplir</string>
     <string name="menu_none">Aucun</string>
     <string name="menu_default">Défaut</string>

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

@@ -69,6 +69,7 @@
     <string name="menu_ecarb">eCarb</string>
     <string name="menu_settings">Impostazioni</string>
     <string name="menu_status">Stato</string>
+    <string name="menu_resync">Re-Sincronizza</string>
     <string name="menu_prime_fill">Carica/Riempi</string>
     <string name="menu_none">Nessuno</string>
     <string name="menu_default">Default</string>

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

@@ -69,6 +69,7 @@
     <string name="menu_ecarb">eCarb</string>
     <string name="menu_settings">Inställningar</string>
     <string name="menu_status">Status</string>
+    <string name="menu_resync">Synkronisera om</string>
     <string name="menu_prime_fill">Förfyllning</string>
     <string name="menu_none">Ingen</string>
     <string name="menu_default">Standardinställning</string>