Merge branch 'omnipod_eros_dev_upstream_merge' into omnipod_eros_dev

2020-10-26 20:37:10 +01:00 · 2020-10-26 20:37:10 +01:00 · 37d269d9b9
parent aa8e71e0f8 78ad381684
commit 37d269d9b9
37 changed files with 1641 additions and 1475 deletions
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@ -990,6 +990,7 @@
    <string name="storage">omezení vnitřního úložiště</string>
    <string name="diskfull">Uvolněte alespoň %1$d MB z vnitřního úložiště! Smyčka zakázána!</string>
    <string name="wrongformat">Chybný formát</string>
+    <string name="wrongTbrDuration">Trvání dočasného bazálu musí být násobkem %1$d minut a musí být větší než 0.</string>
    <string name="sms_wrongcode">Nesprávný kód. Příkaz zrušen.</string>
    <string name="notconfigured">Není nakonfigurováno</string>
    <string name="profileswitchcreated">Přepnutí profilu vytvořeno</string>
@ -1218,4 +1219,5 @@
    <string name="worker_state">Stav procesu: %s</string>
    <string name="uploaded_data">Odeslaná data</string>
    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Následující data budou nahrána do vašeho účtu Open Humans: hodnoty glykémie, bolusy, sacharidy, události péče (kromě poznámek), rozložené bolusy, přepnutí profilu, celkové denní dávky, dočasné bazály, nastavení, verze aplikace, model zařízení a rozměry obrazovky. Tajné nebo soukromé informace, jako je URL nebo API heslo vašeho Nightscoutu, nahrány nebudou.</string>
+    <string name="setupwizard_pump_riley_link_status">Status RileyLink:</string>
 </resources>
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@ -991,6 +991,7 @@ Unerwartetes Verhalten.</string>
    <string name="storage">interne Speicherbegrenzung</string>
    <string name="diskfull">Mindestens %1$d MB freier interer Speicher benötigt! Loop abgeschaltet!</string>
    <string name="wrongformat">Falsches Format</string>
+    <string name="wrongTbrDuration">Die TBR-Dauer muss ein Vielfaches von %1$d Minuten und größer als 0 sein.</string>
    <string name="sms_wrongcode">Falscher Code. Befehl wurde abgebrochen.</string>
    <string name="notconfigured">Nicht konfiguriert</string>
    <string name="profileswitchcreated">Profilwechsel wurde erstellt</string>
@ -1156,6 +1157,9 @@ Unerwartetes Verhalten.</string>
    <string name="smscommunicator_otp_reset_title">Authentifikatorschlüssel zurücksetzen</string>
    <string name="smscommunicator_otp_reset_prompt">Willst Du wirklich den Authentifikatorschlüssel zurücksetzen? Dies wird alle momentan genutzten Authentifikatoren ungültig machen und Du musst sie neu einrichten.</string>
    <string name="smscommunicator_otp_reset_successful">Neuer Authentifizierungsschlüssel generiert! Bitte verwende den aktualisierten QR-Code für die Bereitstellung von Authentifikatoren.</string>
+    <string name="smscommunicator_otp_export_title">OTP-Secret exportieren</string>
+    <string name="smscommunicator_otp_export_prompt">Willst Du wirklich das OTP Secret in die Zwischenablage kopieren?\n\nDas ist nur erforderlich, wenn Deine Authentifizierungs-App Probleme mit dem Scannen des QR-Codes hat. Du kannst es auch manuell eingeben oder einen Hardware-OTP-Token mit einer bestimmten App verwenden.</string>
+    <string name="smscommunicator_otp_export_successful">OTP Secret (im Base32 Format) exportiert und in die Zwischenablage kopiert. Setze es von dort in Deine Authentifizierungs-App ein.</string>
    <string name="smscommunicator_otp_step1_install_header">1. Authentifikator installieren</string>
    <string name="smscommunicator_otp_step2_provisioning_header">2. Scanne den Code zum Einrichten von AndroidAPS OTP-Codes</string>
    <string name="smscommunicator_otp_step3_test_header">3. Teste das Einmal-Passwort</string>
@ -1219,4 +1223,5 @@ Unerwartetes Verhalten.</string>
    <string name="worker_state">Worker State: %s</string>
    <string name="uploaded_data">Daten hochgeladen</string>
    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Die folgenden Daten werden auf Dein Open Humans-Konto hochgeladen: Glukosewerte, Boli, Kohlenhydrate, Careportal-Ereignisse (außer Notizen), erweiterte Boli, Profilwechsel, Gesamttagesdosen, temporäre Basalwerte, Temporäre Ziele, Einstellungen, Anwendungsversion, Gerätemodell und Bildschirmabmessungen. Vertrauliche oder private Informationen wie z.B. Deine Nightscout-URL oder Dein API-Secret werden nicht hochgeladen.</string>
+    <string name="setupwizard_pump_riley_link_status">RileyLink Status:</string>
 </resources>
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@ -991,6 +991,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="storage">stockage interne limité</string>
    <string name="diskfull">Boucle désactivée ! Libérez au moins %1$d Mo du stockage interne !</string>
    <string name="wrongformat">Format incorrect</string>
+    <string name="wrongTbrDuration">La durée du DBT doit être un multiple de %1$d minutes et supérieure à 0.</string>
    <string name="sms_wrongcode">Code incorrect. Commande annulée.</string>
    <string name="notconfigured">Non configuré</string>
    <string name="profileswitchcreated">Changement de profil effectué</string>
@ -1175,7 +1176,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="statuslights_copy_ns">Copier les paramètres depuis NS</string>
    <string name="copyexistingvalues">Copier les paramètres NS (s\'ils existent)?</string>
    <string name="classic_description">Thème d\'origine</string>
-    <string name="buttonson_description">Les boutons sont toujours affichés en bas de l\'écran</string>
+    <string name="buttonson_description">Boutons toujours en bas</string>
    <string name="largedisplay_description">Grand écran</string>
    <string name="skin">Thème</string>
    <string name="comapareprofile">Comparer les profils</string>
@ -1219,4 +1220,5 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="worker_state">État du travail : %s</string>
    <string name="uploaded_data">Données transférées</string>
    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Les données suivantes seront téléchargées sur votre compte Open Humans : glycémie, bolus, glucides, événements Careportal (sauf les notes), bolus étendus, changements de profil, doses quotidiennes totales, basales temporaires, cibles temporaires, préférences, version de l\'application, modèle de l\'appareil et dimensions de l\'écran. Les informations secrètes ou privées telles que votre URL Nightscout ou votre API secret ne seront pas téléchargés.</string>
+    <string name="setupwizard_pump_riley_link_status">État du RileyLink :</string>
 </resources>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@ -990,6 +990,7 @@
    <string name="storage">vincolo di archiviazione interna</string>
    <string name="diskfull">Libera almeno %1$d MB dalla memoria interna! Loop disabilitato!</string>
    <string name="wrongformat">Formato errato</string>
+    <string name="wrongTbrDuration">La durata del TBR deve essere un multiplo di %1$d minuti e maggiore di 0.</string>
    <string name="sms_wrongcode">Codice errato. Comando cancellato.</string>
    <string name="notconfigured">Non configurato</string>
    <string name="profileswitchcreated">Cambio profilo creato</string>
@ -1218,4 +1219,5 @@
    <string name="worker_state">Worker State: %s</string>
    <string name="uploaded_data">Dati caricati</string>
    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">I seguenti dati verranno caricati sul tuo account Open Humans: valori glicemia, boli, carboidrati, eventi portale (eccetto note), boli estesi, cambi profilo, dosi giornaliere totali (TDD), basali temporanee, target temporanei, preferenze, versione dell\'applicazione, modello del dispositivo e dimensioni dello schermo. Informazioni segrete o private come l\'URL di Nightscout o l\'API secret non verranno caricate.</string>
+    <string name="setupwizard_pump_riley_link_status">Stato RileyLink:</string>
 </resources>
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@ -21,6 +21,7 @@
    <string name="description_food">Toon de instellingen voor Voeding in Nightscout</string>
    <string name="description_insulin_rapid">Insuline instelling voor Humalog en NovoRapid / NovoLog</string>
    <string name="description_insulin_ultra_rapid">Insuline instelling voor Fiasp</string>
+    <string name="description_insulin_lyumjev">Insuline instelling voor Lyumjev</string>
    <string name="description_insulin_free_peak">Hiermee kan je de piek van de insulineactiviteit definiëren en deze mag alleen worden gebruikt door gevorderde gebruikers</string>
    <string name="description_loop">Activeer of deactiveer de implementatie die de Loop triggert.</string>
    <string name="description_ns_client">Synchroniseert je data met Nightscout</string>
@ -156,6 +157,7 @@
    <string name="overview_tempbasal_button">Tijdelijk basaal</string>
    <string name="overview_extendedbolus_button">Vertraagde bolus</string>
    <string name="configbuilder_nightscoutversion_label">Nightscout versie:</string>
+    <string name="missing_carbs">Er ontbreekt %1$d g</string>
    <string name="exported">Instellingen geëxporteerd</string>
    <string name="export_to">Exporteer instellingen naar</string>
    <string name="import_from">Importeer instellingen van</string>
@ -171,6 +173,11 @@
    <string name="password_preferences_decrypt_prompt">Je wordt gevraagd om een masterwachtwoord. Daarmee worden geïmporteerde instellingen ontsleuteld.</string>
    <string name="preferences_export_canceled">Exporteren geannuleerd! Instellingen zijn NIET geëxporteerd!</string>
    <string name="preferences_import_canceled">Importeren geannuleerd! Instellingen zijn NIET geïmporteerd!</string>
+    <string name="preferences_import_impossible">Kan voorkeuren niet importeren!</string>
+    <string name="goto_main_try_again">Ga terug naar het hoofdscherm en probeer opnieuw.</string>
+    <string name="old_master_password">Oud hoofdwachtwoord</string>
+    <string name="different_password_used">Dit bestand is geëxporteerd en gecodeerd met een ander hoofdwachtwoord. Geef het oude hoofdwachtwoord op om het bestand te kunnen decoderen.</string>
+    <string name="master_password_will_be_replaced">Als gevolg van het importeren, zal het huidige hoofdwachtwoord worden vervangen door het oude hoofdwachtwoord!</string>
    <string name="preferences_import_list_title">Kies bestand om te importeren</string>
    <string name="check_preferences_before_import">Controleer instellingen voor het importeren:</string>
    <string name="check_preferences_cannot_import">Instellingen kunnen niet worden geïmporteerd!</string>
@ -232,6 +239,10 @@
    <string name="smscommunicator_remotebolusmindistance_summary">Minimum aantal minuten dat moet verstrijken tussen de ene bolus op afstand en de volgende</string>
    <string name="smscommunicator_remotebolusmindistance">Hoeveel minuten er ten minste moeten verstrijken tussen de ene bolus en de volgende</string>
    <string name="smscommunicator_remotebolusmindistance_caveat">Voor de veiligheid moet je ten minste 2 telefoonnummers toevoegen om deze instelling te kunnen bijwerken.</string>
+    <string name="bolusdelivered">Bolus van %1$.2f E succesvol toegediend</string>
+    <string name="bolusrequested">%1$.2f E toedienen</string>
+    <string name="smscommunicator_bolusdelivered">Bolus van %1$.2f E succesvol toegediend</string>
+    <string name="smscommunicator_mealbolusdelivered">Maaltijdbolus van %1$.2f E succesvol toegediend</string>
    <string name="smscommunicator_mealbolusdelivered_tt">Streefdoel %1$s gedurende %2$d minuten</string>
    <string name="smscommunicator_tt_set">Streefdoel %1$s gedurende %2$d minuten succesvol ingesteld</string>
    <string name="smscommunicator_tt_canceled">Tijdelijk streefdoel is geannuleerd</string>
@ -255,7 +266,9 @@
    <string name="smscommunicator_reconnect">Pomp opnieuw verbonden</string>
    <string name="smscommunicator_remotecommandnotallowed">Commando\'s op afstand zijn niet toegestaan</string>
    <string name="smscommunicator_remotebolusnotallowed">Bolus op afstand niet beschikbaar. Probeer het later opnieuw.</string>
+    <string name="smscommunicator_basalreplywithcode">Om een basaal van %1$.2f E/uur voor %2$d min te starten, antwoord met code %3$s</string>
    <string name="smscommunicator_profilereplywithcode">Om naar profiel %1$s %2$d%% te wisselen antwoord met code %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Om een vertraagde bolus van %1$.2f E voor %2$d min te starten, antwoord met code %3$s</string>
    <string name="smscommunicator_carbsreplywithcode">Antwoord met code %3$s om %1$dg in te voeren op %2$s</string>
    <string name="smscommunicator_basalpctreplywithcode">Om een basaal van %1$d%% voor %2$d min te starten antwoord met code %3$s</string>
    <string name="smscommunicator_suspendreplywithcode">Om de loop te onderbreken voor %1$d minuten antwoord met de code %2$s</string>
@ -264,6 +277,7 @@
    <string name="smscommunicator_loopdisablereplywithcode">Om loop uit te schakelen antwoord met code %1$s</string>
    <string name="smscommunicator_tempbasalset">Tijdelijk basaal %1$.2fE/u voor %2$d minuten succesvol gestart</string>
    <string name="smscommunicator_extendedset">Vertraagde bolus %1$.2fE voor %2$d minuten succesvol gestart</string>
+    <string name="smscommunicator_carbsset">Koolhydraten %1$d g succesvol ingevoerd</string>
    <string name="smscommunicator_carbsfailed">Invoeren van %1$dg koolhydraten is mislukt</string>
    <string name="smscommunicator_tempbasalset_percent">Tijdelijk basaal van %1$d%% voor %2$d minuten succesvol gestart</string>
    <string name="smscommunicator_tempbasalfailed">Start tijdelijk basaal mislukt</string>
@ -522,6 +536,7 @@
    <string name="free_peak_oref">Free-Peak Oref</string>
    <string name="rapid_acting_oref">Snel-werkende Oref</string>
    <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
+    <string name="lyumjev">Lyumjev</string>
    <string name="dia_too_short">DIA van %1$f te kort - %2$f wordt inplaats gebruikt!</string>
    <string name="activate_profile">Activeer profiel</string>
    <string name="invalid">Ongeldig</string>
@ -549,6 +564,7 @@
    <string name="pump_unreachable">Pomp niet beschikbaar</string>
    <string name="missed_bg_readings">Geen BG metingen</string>
    <string name="raise_notifications_as_android_notifications">Gebruik systeem notificaties voor waarschuwingen en notificaties</string>
+    <string name="gradually_increase_notification_volume">Volume van notificaties en meldingen geleidelijk verhogen</string>
    <string name="localalertsettings_title">Lokaal gegenereerde waarschuwingen</string>
    <string name="enable_missed_bg_readings_alert">Alarm als er geen BG gegevens ontvangen zijn</string>
    <string name="enable_pump_unreachable_alert">Waarschuwing bij niet bereikbare pomp</string>
@ -637,6 +653,7 @@
    <string name="enablesmbwithtemptarget">Gebruik SMB met tijdelijke streefdoelen</string>
    <string name="enablesmbwithtemptarget_summary">Gebruik SMB bij een actief tijdelijk streefdoel (eet binnenkort, activiteit)</string>
    <string name="enablesmbwithhightemptarget">Gebruik SMB met een hoog tijdelijk streefdoel</string>
+    <string name="enablesmbwithhightemptarget_summary">Schakel SMB in wanneer er een hoog tijdelijk doel actief is (uitvoeren boven 100 mg/dl of 5,5 mmol/l)</string>
    <string name="overview_insulin_label">Insuline</string>
    <string name="overview_carbs_label">Koolhydraten</string>
    <string name="overview_buttons_selection">Knoppen</string>
@ -670,6 +687,7 @@
    <string name="do_not_bolus_record_only">Geen bolus toedienen enkel in behandelingen zetten</string>
    <string name="category">Categorie</string>
    <string name="subcategory">Subcategorie</string>
+    <string name="bolusrecordedonly">Bolus wordt alleen geregistreerd (niet toegediend door pomp)</string>
    <string name="ns_autobackfill_summary">Automatische onbekende BGs aanvullen van NS</string>
    <string name="loop_smbsetbypump_label">SMB op de pomp ingesteld</string>
    <string name="overview_show_activity">Activiteit</string>
@ -781,11 +799,14 @@
    <string name="bgsourcesetup">BG bron configureren</string>
    <string name="setupwizard_profile_description">Kies een bron van het profiel. Als de patiënt een kind is, moet u het NS-profiel gebruiken. Als er niemand is die je volgt op Nightscout, zul je waarschijnlijk een lokaal profiel prefereren. Onthoud dat u alleen de profielbron selecteert. Om het te gebruiken, moet u het activeren door \"Profiel wisselen\" uit te voeren</string>
    <string name="setupwizard_aps_description">Selecteer een van beschikbare algoritmen. Ze zijn gesorteerd van oudste naar nieuwste. Nieuwer algoritme is meestal krachtiger en agressiever. Dus als je een nieuwe looper bent, kun je waarschijnlijk beginnen met AMA en niet met de nieuwste. Vergeet niet de OpenAPS-documentatie te lezen en deze vóór gebruik te configureren.</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Wachten op verbinding met RileyLink…\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>Opmerking:</b> je kunt de setup voortzetten zodra de pomp geïnitialiseerd is.\n</string>
    <string name="startobjective">Start je eerste Doel</string>
    <string name="permission">Toestemming</string>
    <string name="askforpermission">Vragen om toestemming</string>
    <string name="needsystemwindowpermission">Toepassing vereist systeemvenstermachtiging voor meldingen</string>
    <string name="needlocationpermission">App heeft locatie toestemming nodig voor Bluetooth scan en WiFi identificatie</string>
+    <string name="needstoragepermission">Applicatie heeft toestemming nodig om log bestanden op te slaan en instellingen te exporteren</string>
    <string name="request">Verzoek</string>
    <string name="insulinsourcesetup">Gevoeligheid plugin configureren</string>
    <string name="exit">Afsluiten</string>
@ -841,6 +862,7 @@
    <string name="code_compare">Worden dezelfde codes weergegeven op dit apparaat als op je pomp?</string>
    <string name="insight_pairing">Insight koppelen</string>
    <string name="insight_local">Accu-Chek Insight</string>
+    <string name="insight_delivered">%1$.2f E / %2$.2f E toegediend</string>
    <string name="insight_alert_formatter">%1$s: %2$s</string>
    <string name="tube_changed">Slang vervangen</string>
    <string name="pump_time_updated">Pomp tijd bijgewerkt</string>
@ -898,6 +920,7 @@
    <string name="short_status_extended">Vertraagd: %1$.2f / %2$.2f U gedurende %3$d min</string>
    <string name="short_status_multiwave">Multiwave: %1$.2f / %2$.2f E gedurende %3$d min</string>
    <string name="short_status_tdd">TDD: %1$.2f</string>
+    <string name="short_status_reservoir">Reservoir: %1$.2f E</string>
    <string name="short_status_battery">Batt.: %1$d%%</string>
    <string name="max_recovery_duration">Max. herstel duur [s]</string>
    <string name="min_recovery_duration">Min. herstel duur [s]</string>
@ -967,6 +990,7 @@
    <string name="storage">interne opslag bijna vol</string>
    <string name="diskfull">Maak minstens %1$d MB vrij in interne opslag! Loop is uitgeschakeld!</string>
    <string name="wrongformat">Verkeerde invoer</string>
+    <string name="wrongTbrDuration">Tijdelijk basaal duur moet een veelvoud van %1$d minuten en groter dan 0 zijn.</string>
    <string name="sms_wrongcode">Verkeerde code. Opdracht geannuleerd.</string>
    <string name="notconfigured">Niet ingesteld</string>
    <string name="profileswitchcreated">Profiel wissel aangemaakt</string>
@ -1040,6 +1064,8 @@
    <string name="sendsmsactionlabel">Stuur SMS: %1$s</string>
    <string name="sendsmsactiondescription">SMS verzenden naar alle nummers</string>
    <string name="sendsmsactiontext">Stuur SMS met tekst</string>
+    <string name="cobvsiob">COB vs IOB</string>
+    <string name="bolusconstraintappliedwarn">Bolusbeperking toegepast: %1$.2f E naar %2$.2f E</string>
    <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!! Trage koolhydraat absorptie gedetecteerd: %2$d%% van de tijd. Controleer je berekening nogmaals. COB kan zijn overschat waardoor er misschien meer insuline wordt afgegeven!!!</font> zijn]]></string>
    <string name="partialboluswizard">Voer dit deel van het bolus wizard resultaat uit [%]</string>
    <string name="deliverpartofboluswizard">Bolus wizard voert de berekening uit maar alleen dit deel van berekende insuline wordt geleverd. Handig in combinatie met het SMB algoritme.</string>
@ -1075,6 +1101,7 @@
    <string name="clone_label">Dupliceren</string>
    <string name="saveorresetchangesfirst">Huidige wijzigingen eerst opslaan of ongedaan maken</string>
    <string name="deletecurrentprofile">Huidige profiel verwijderen?</string>
+    <string name="copytolocalprofile">Nieuw lokaal profiel aanmaken van dit profiel?</string>
    <string name="profilenamecontainsdot">Profielnaam bevat punten.\nDit wordt niet ondersteund door NS.\nProfiel is niet geüpload naar NS.</string>
    <string name="low_mark_comment">Laagste waarde in bereik (alleen weergave)</string>
    <string name="high_mark_comment">Hoogste waarde in bereik (alleen weergave)</string>
@ -1088,6 +1115,7 @@
    <string name="nav_survey">Enquête</string>
    <string name="invalidage">Ongeldige leeftijd invoer</string>
    <string name="invalidweight">Ongeldige gewicht invoer</string>
+    <string name="invalidpct">Ongeldig % invoer</string>
    <string name="tirformat"><![CDATA[<b>%1$s:</b> Laag: <b>%2$02d%%</b> In: <b>%3$02d%%</b> Hoog: <b>%4$02d%%</b>]]></string>
    <string name="average">Gemiddelde</string>
    <string name="tir">TIR</string>
@ -1114,15 +1142,23 @@
    <string name="loop_tbrexecution_time_label">Tijdelijke basaal uitvoering tijd</string>
    <string name="insight_alert_notification_channel">Insight pomp waarschuwingen</string>
    <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">van de Authenticator-app voor: %1$s gevolgd door PIN</string>
    <string name="smscommunicator_otp_enabled">Authentificatie inschakelen</string>
    <string name="smscommunicator_otp_enabled_summary">Authentificeer SMS commando\'s met behulp van One Time Passwords (OTPs, eenmalige wachtwoorden) gegenereerd door Google Authenticator of soortgelijke 2FA apps.</string>
+    <string name="smscommunicator_otp_pin">Extra verplichte PIN aan einde van token</string>
    <string name="smscommunicator_otp_pin_summary">Extra cijfers die je moet onthouden, en aan het eind van elk gegenereerd eenmalig wachtwoord moet toevoegen.</string>
    <string name="smscomunicator_tab_otp_label">Authentificatie instellingen</string>
+    <string name="smscommunicator_code_verify_label">Te controleren code:</string>
+    <string name="smscommunicator_code_verify_hint">OTP + PIN</string>
+    <string name="smscommunicator_code_verify_info">De verificatiecode bestaat uit 6 cijfers die worden afgebeeld door de Authenticator-app (bekend als OTP), gevolgd door 3 of meer cijfers van de verplichte PIN-code.</string>
    <string name="smscommunicator_otp_verify_label">Te controleren OTP:</string>
    <string name="smscommunicator_otp_reset_btn">Reset Authentificatie</string>
    <string name="smscommunicator_otp_reset_title">Reset Authentificatie-sleutel</string>
    <string name="smscommunicator_otp_reset_prompt">Weet je zeker dat je de Autentificatie-sleutel wilt resetten? Met deze actie maak je alle Authentificatie instellingen van verbonden telefoons ongeldig, en je zult ze opnieuw moeten instellen.</string>
    <string name="smscommunicator_otp_reset_successful">Er is een nieuwe Authentificatie-sleutel gegenereerd! Gebruik de nieuwe QR-Code voor het instellen van geautoriseerde telefoons.</string>
+    <string name="smscommunicator_otp_export_title">OTP-secret wordt geëxporteerd</string>
+    <string name="smscommunicator_otp_export_prompt">Weet je zeker dat je het OTP-secret naar het klembord wilt kopiëren?\n\nJe hebt dit alleen nodig als je Authenticator-app problemen heeft met het scannen van QR-codes, als je het handmatig wilt invullen of als je een hardware OTP-token met een speciale app wilt configureren.</string>
+    <string name="smscommunicator_otp_export_successful">OTP-secret (in Base32-formaat) is geëxporteerd en gekopieerd naar het klembord. Plak het in de Authenticator-app of de app van de hardware OTP-token!</string>
    <string name="smscommunicator_otp_step1_install_header">1. Installeer Authenticator app</string>
    <string name="smscommunicator_otp_step2_provisioning_header">2. Scan code om AndroidAPS OTP codes in te stellen</string>
    <string name="smscommunicator_otp_step3_test_header">3. Test eenmalig wachtwoord (One Time Password)</string>
@ -1145,5 +1181,46 @@
    <string name="buttonson_description">Knoppen worden altijd weergegeven aan de onderkant van het scherm</string>
    <string name="largedisplay_description">Groot scherm</string>
    <string name="skin">Skin</string>
+    <string name="comapareprofile">Vergelijk profielen</string>
    <string name="nav_profilehelper">Profiel hulp</string>
+    <string name="motoldefaultprofile">Basis profiel</string>
+    <string name="currentprofile">Huidig profiel</string>
+    <string name="availableprofile">Beschikbaar profiel</string>
+    <string name="profiletype">Profieltype</string>
+    <string name="formatwithtdd">Duur: %1$.0f TDD: %2$.0f E</string>
+    <string name="formatwittddandpct">Leeftijd: %1$.0f TDD: %2$.0f E %3$d%%</string>
+    <string name="formatwithweight">Leeftijd: %1$.0f gewicht: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% van basaal</string>
+    <string name="dpvdefaultprofile">DPV Basis profiel</string>
+    <string name="open_humans">Open Humans</string>
+    <string name="finishing_open_humans_setup">Setup van Open Humans voltooien…</string>
+    <string name="this_may_take_a_while">Dit kan even duren. Zet de telefoon of plugin niet uit.</string>
+    <string name="setup_finished">Setup voltooid</string>
+    <string name="your_phone_will_upload_data">Je telefoon zal binnenkort data gaan uploaden naar Open Humans.</string>
+    <string name="your_phone_is_upload_data">Je telefoon is data aan het uploaden naar Open Humans.</string>
+    <string name="setup_failed">Setup mislukt</string>
+    <string name="there_was_an_error">Er is een fout opgetreden. Probeer opnieuw in te loggen. Sorry &amp; bedankt!</string>
+    <string name="open_humans_terms">Dit is een open source tool die je data uploadt naar Open Humans. Wij behouden geen rechten om je gegevens te delen met derden zonder jouw uitdrukkelijke toestemming. De gegevens die het project en de app ontvangen, worden geïdentificeerd aan de hand van een willekeurig gebruikers-ID en worden uitsluitend veilig verzonden naar een Open Humans account met jouw toestemming voor dat proces. Je kunt op elk gewenst moment stoppen met uploaden en je data verwijderen via www.openhumans.org.</string>
+    <string name="i_understand_and_agree">Ik begrijp het en ga akkoord.</string>
+    <string name="login">Inloggen</string>
+    <string name="logout">Uitloggen</string>
+    <string name="oh_logout_confirmation">Weet je zeker dat je uit wilt loggen en wilt stoppen met het doneren van gegevens aan de wetenschap?</string>
+    <string name="project_member_id">Projectlid-ID: %s</string>
+    <string name="queue_size">Grootte wachtrij: %d</string>
+    <string name="terms_of_use">Gebruiksvoorwaarden</string>
+    <string name="not_logged_in">Niet ingelogd</string>
+    <string name="you_need_to_accept_the_of_use_first">Je moet eerst instemmen met de voorwaarden.</string>
+    <string name="successfully_logged_in">Succesvol ingelogd</string>
+    <string name="setup_will_continue_in_background">De setup wordt nu op de achtergrond voltooid. Bedankt voor het uploaden van je gegevens.\n\nHoud deze plugin en je telefoon even ingeschakeld om de setup te voltooien.</string>
+    <string name="completing_login">Login voltooien…</string>
+    <string name="donate_your_data_to_science">Doneer je gegevens aan de wetenschap</string>
+    <string name="open_humans_short">OH</string>
+    <string name="you_have_been_signed_out_of_open_humans">Je bent uitgelogd van Open Humans</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Klik hier om opnieuw in te loggen als dit niet opzettelijk was.</string>
+    <string name="only_upload_if_connected_to_wifi">Alleen uploaden indien verbonden met WiFi</string>
+    <string name="only_upload_if_charging">Alleen uploaden tijdens opladen</string>
+    <string name="worker_state">Werkstatus: %s</string>
+    <string name="uploaded_data">Geüploade gegevens</string>
+    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">De volgende gegevens worden geüpload naar je Open Humans account: glucosewaarden, bolussen, koolhydraten, careportal-events (met uitzondering van notities), verlengde bolussen, profielwissels, totale dagelijkse doses, tijdelijke basaalstanden, tijdelijke doelen, voorkeuren, app-versie, apparaatmodel en schermafmetingen. Geheime of persoonlijke gegevens zoals je Nightscout-URL of API-secret worden niet geüpload.</string>
+    <string name="setupwizard_pump_riley_link_status">RileyLink Status:</string>
 </resources>
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@ -990,6 +990,7 @@
    <string name="storage">intern lagringsbegrensning</string>
    <string name="diskfull">Frigjør minst %1$d MB fra internminnet! Loop deaktivert!</string>
    <string name="wrongformat">Feil format</string>
+    <string name="wrongTbrDuration">Temp basal varighet må oppgis i antall %1$d minutter og større enn 0.</string>
    <string name="sms_wrongcode">Feil kode. Kommandoen avbrutt.</string>
    <string name="notconfigured">Ikke konfigurert</string>
    <string name="profileswitchcreated">Profilbytte opprettet</string>
@ -1218,4 +1219,5 @@
    <string name="worker_state">Fremdrift: %s</string>
    <string name="uploaded_data">Opplastede data</string>
    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Følgende data vil bli lastet opp til din Open Humans konto: glukoseverdier, boluser, karbohydrater, careportalhendelser (bortsett fra merknader), forlengede boluser, profilbytter, totale daglige doser, temp basaler, endringer i BS mål, innstillinger, app versjon, mobilmerke og skjermstørrelser. Hemmelig eller privat informasjon som din Nightscout URL eller API secret vil ikke bli lastet opp.</string>
+    <string name="setupwizard_pump_riley_link_status">RileyLink status:</string>
 </resources>
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@ -991,6 +991,7 @@
    <string name="storage">limit wielkości pamięci wewnętrznej</string>
    <string name="diskfull">Zwolnij co najmniej %1$d MB z pamięci wewnętrznej! Pętla zatrzymana!</string>
    <string name="wrongformat">Błędny format</string>
+    <string name="wrongTbrDuration">Czas trwania TBR musi być wielokrotnością %1$d minut i większy niż 0.</string>
    <string name="sms_wrongcode">Zły kod. Polecenie anulowano.</string>
    <string name="notconfigured">Nie skonfigurowano</string>
    <string name="profileswitchcreated">Zmiana profilu wykonana</string>
@ -1156,6 +1157,9 @@
    <string name="smscommunicator_otp_reset_title">Resetuj klucz uwierzytelniania</string>
    <string name="smscommunicator_otp_reset_prompt">Czy na pewno zresetować klucz uwierzytelniający? Spowoduje to, że wszystkie aktualnie skonfigurowane uwierzytelniania będą niepoprawne i konieczne będzie ponowne ich skonfigurowanie.</string>
    <string name="smscommunicator_otp_reset_successful">Nowy klucz uwierzytelniający został wygenerowany! Proszę użyć zaktualizowanego kodu QRCode do potwierdzenia uwierzytelniania.</string>
+    <string name="smscommunicator_otp_export_title">Eksportowanie sekretu OTP</string>
+    <string name="smscommunicator_otp_export_prompt">Czy na pewno chcesz skopiować klucz tajny OTP do schowka?\n\nMożesz tego potrzebować jeśli Twoja aplikacja uwierzytelniająca (authenticator) ma problemy ze skanowaniem kodu QR, chcesz wprowadzić klucz ręcznie lub chcesz skonfigurować sprzętowy token OTP za pomocą dedykowanej aplikacji.</string>
+    <string name="smscommunicator_otp_export_successful">Klucz tajny OTP (w formacie Base32) został wyeksportowany i skopiowany do schowka. Wklej go przy ręcznym dodawaniu konta w aplikacji authenticator lub użyj w aplikacji konfigurującej tokeny sprzętowe!</string>
    <string name="smscommunicator_otp_step1_install_header">1. Zainstaluj uwierzytelnianie</string>
    <string name="smscommunicator_otp_step2_provisioning_header">2. Zeskanuj kod, aby skonfigurować kody OTP AndroidAPS</string>
    <string name="smscommunicator_otp_step3_test_header">3. Sprawdź hasło jednorazowe</string>
@ -1219,4 +1223,5 @@
    <string name="worker_state">Stan procesu: %s</string>
    <string name="uploaded_data">Przesłane dane</string>
    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Następujące dane zostaną przesłane na konto Open Humans: wartości Glikemii, bolusy, węglowodany, zdarzenia z portalu opieki (z wyjątkiem notatek), rozszerzone bolusy, przełączenia profilu, całkowite dawki dobowe, bazy tymczasowe, cele tymczasowe, preferencje, wersja aplikacji, model urządzenia i wymiary ekranu. Dane niejawne lub prywatne, takie jak adres URL strony Nightscout lub klucz autoryzacji API, nie zostaną przesłane.</string>
+    <string name="setupwizard_pump_riley_link_status">Stan RileyLink:</string>
 </resources>
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@ -21,6 +21,7 @@
    <string name="description_food">Afişează mâncărurile predefinite în Nightscout</string>
    <string name="description_insulin_rapid">Setări prestabilite pentru insulinele Humalog sau NovoRapid / NovoLog</string>
    <string name="description_insulin_ultra_rapid">Setări prestabilite pentru Fiasp</string>
+    <string name="description_insulin_lyumjev">Setări prestabilite pentru Lyumjev</string>
    <string name="description_insulin_free_peak">Vă permite definirea vârfului activităţii insulinei şi ar trebui folosit doar de către utilizatorii avansaţi</string>
    <string name="description_loop">Activare sau dezactivare a implementării declanşatoare pentru buclă.</string>
    <string name="description_ns_client">Sincronizare a datelor cu Nightscout</string>
@ -798,6 +799,8 @@
    <string name="bgsourcesetup">Configurați sursa glicemiilor</string>
    <string name="setupwizard_profile_description">Selectați sursa sau profilul. Dacă pacientul este copil, ar fi bine să alegeți un profil NS. Dacă nu aveți profil NS, puteți alege profil local. De aici alegeți doar sursa profilului; pentru a utiliza acest profil, trebuie să îl activați prin executarea unei \"Schimbări de profil\"</string>
    <string name="setupwizard_aps_description">Alegeți unul dintre algoritmii disponibili. Algoritmii sunt aranjați de la cel mai vechi spre cel mai nou. Algoritmii mai noi sunt, de obicei, mai puternici și mai agresivi. De aceeea, dacă sunteți la început, ar fi indicat să porniți cu AMA și nu cu cel mai nou. Este important să parcurgeți documentația OpenAPS și să îl configurați corect înainte de a folosi aplicația.</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Se așteaptă conexiunea la RileyLink…\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>Notă:</b> Puteți continua configurarea imediat ce pompa a fost inițializată.\n</string>
    <string name="startobjective">Începeți primul obiectiv</string>
    <string name="permission">Permisiune</string>
    <string name="askforpermission">Solicitați permisiunea</string>
@ -987,6 +990,7 @@
    <string name="storage">restricție de stocare internă</string>
    <string name="diskfull">Eliberați cel puțin %1$d MB din spațiunl de stocare al telefonlui! Buclă dezactivată!</string>
    <string name="wrongformat">Format greșit</string>
+    <string name="wrongTbrDuration">Durata RBT trebuie să fie un multiplu de %1$d minute și mai mare de 0.</string>
    <string name="sms_wrongcode">Cod greșit. Comandă anulată.</string>
    <string name="notconfigured">Nu este configurat</string>
    <string name="profileswitchcreated">Schimbare de profil creată</string>
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@ -992,6 +992,7 @@ Context | Edit Context</string>
    <string name="storage">ограничение по объему карты памяти</string>
    <string name="diskfull">Освободите по крайней мере %1$d MB из внутренней памяти! Цикл остановлен!</string>
    <string name="wrongformat">Неверный формат</string>
+    <string name="wrongTbrDuration">Длительность временного базала TBR должна быть кратной %1$d минутам и больше 0.</string>
    <string name="sms_wrongcode">Неверный код. Команда отменена.</string>
    <string name="notconfigured">Не сконфигурировано</string>
    <string name="profileswitchcreated">Переключатель профиля создан</string>
@ -1220,4 +1221,5 @@ Context | Edit Context</string>
    <string name="worker_state">Рабочее состояние: %s</string>
    <string name="uploaded_data">Загруженные данные</string>
    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">На ваш аккаунт Open Humans будут загружены следующие данные: значения ГК, события careportal (за исключением примечаний), пролонгированные болюсы, переключения профиля, суммарные суточные дозы, временные базалы, временные цели, настройки, версии приложения, модель устройства и размеры экрана. Секретная или конфиденциальная информация, такая как адрес вашего сайта Nightscout или API secret, не будет загружена.</string>
+    <string name="setupwizard_pump_riley_link_status">Статус RileyLink:</string>
 </resources>
--- a/core/src/main/res/values-nl-rNL/strings.xml
+++ b/core/src/main/res/values-nl-rNL/strings.xml
@ -8,15 +8,22 @@
    <string name="profile_set_ok">Basaal profiel in pomp bijgewerkt</string>
    <string name="invalidinput">Ongeldige invoer</string>
    <string name="tempbasaldeliveryerror">Storing toedienen tijdelijk basaal</string>
+    <string name="goingtodeliver">%1$.2f E toedienen</string>
    <string name="waitingforpump">Wacht op pomp</string>
    <string name="connectingfor">Verbinding maken gedurende %1$d s</string>
+    <string name="bolusdelivering">%1$.2f E worden toegediend</string>
    <string name="handshaking">Handshaking</string>
    <string name="connecting">Verbining maken</string>
    <string name="connected">Verbonden</string>
    <string name="disconnected">Verbinding verbroken</string>
    <string name="disconnecting">Verbinding aan het verbreken</string>
    <string name="androidaps_start">AndroidAPS gestart</string>
+    <string name="formatinsulinunits1">%1$.1f E</string>
+    <string name="formatinsulinunits">%1$.2f E</string>
+    <string name="formatsignedinsulinunits">%1$+.2f E</string>
+    <string name="format_carbs">%1$d g</string>
    <string name="reservoirvalue">%1$.0f / %2$d E</string>
+    <string name="pump_basebasalrate">%1$.2f E/uur</string>
    <string name="format_hours">%1$.2f u</string>
    <string name="format_mins">%1$d minuten</string>
    <string name="pumpbusy">Pomp is bezig</string>
@ -78,6 +85,8 @@
    <string name="location_not_found_title">Locatie is niet ingeschakeld</string>
    <string name="location_not_found_message">Om Bluetooth discovery met nieuwere apparaten te laten werken moet locatie worden ingeschakeld. AAPS volgt je locatie niet en locatie kan ook weer worden uitgeschakeld nadat het koppelen is gelukt.</string>
    <!--    DateUtil-->
+    <string name="minago">%1$d m geleden</string>
+    <string name="hoursago">%1$.1f u geleden</string>
    <string name="shorthour">u</string>
    <string name="days">dagen</string>
    <string name="hours">uren</string>
@ -94,6 +103,8 @@
    <string name="shortminute">m</string>
    <string name="shortday">d</string>
    <!--    Protection-->
+    <string name="wrongpassword">Verkeerd wachtwoord</string>
+    <string name="passwords_dont_match">Wachtwoorden komen niet overeen</string>
    <!--    Profile-->
    <string name="basalprofilenotaligned">Basaalstanden niet ingesteld in hele uren: %1$s</string>
    <string name="minimalbasalvaluereplaced">Basale waarde vervangen door minimaal ondersteunde waarde; %1$s</string>
@ -115,9 +126,13 @@
    <!--    ProfileSwitch-->
    <string name="zerovalueinprofile">Ongeldig profiel: %1$s</string>
    <!--    Temptarget-->
+    <string name="mins">%1$d min</string>
    <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f E</b> Bol: <b>%3$.2f E</b> Bas: <b>%4$.2f E(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f E</b> Bol: <b>%3$.2f E</b> Bas: <b>%4$.2f E(%5$.0f%%)</b> Koolh. <b>%6$.0f g</b>]]></string>
    <!--    Translator-->
    <string name="careportal_bgcheck">BG Controle</string>
+    <string name="careportal_mbg">Handmatige BG of calibratie</string>
    <string name="careportal_announcement">Mededeling</string>
    <string name="careportal_note">Notitie</string>
    <string name="careportal_question">Vraag</string>
@ -155,6 +170,7 @@
    <string name="waitingforpumpresult">Wachtend op resultaat</string>
    <string name="smb_shortname">SMB</string>
    <!--    CarbsReq-->
+    <string name="carbsreq">%d g extra koolhydraten nodig binnen %d minuten</string>
    <!--    TDDStatsActivity-->
    <string name="stats">Statistieken</string>
    <string name="cumulative_tdd">Cumulatieve TDD</string>
@ -171,10 +187,31 @@
    <string name="tbb2">TBB * 2</string>
    <!--    Ntp-->
    <string name="timedetection">Tijd detectie</string>
+    <string name="format_hour_minute">%1$du %2$dm</string>
    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Bewerking niet ondersteund door pomp en/of driver.</string>
    <string name="pump_operation_not_yet_supported_by_pump">Operatie NU nog niet ondersteund door pomp.</string>
+    <string name="common_resultok">OK</string>
    <!-- PumoCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Nooit verbonden</string>
+    <string name="pump_status_waking_up">Ontwaken</string>
+    <string name="pump_status_error_comm">Communicatiefout</string>
+    <string name="pump_status_timeout_comm">Time-out op de communicatie</string>
+    <string name="pump_status_pump_unreachable">Pomp niet beschikbaar</string>
+    <string name="pump_status_invalid_config">Ongeldige configuratie</string>
+    <string name="pump_status_active">Actief</string>
+    <string name="pump_status_sleeping">Slapen</string>
    <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basalen</string>
+    <string name="history_group_configuration">Instellingen</string>
+    <string name="history_group_notification">Meldingen</string>
+    <string name="history_group_statistic">Statistieken</string>
+    <string name="history_group_unknown">Onbekend</string>
+    <string name="history_group_all">Alle</string>
+    <string name="history_group_bolus">Bolussen</string>
+    <string name="history_group_prime">Vullen</string>
+    <string name="history_group_alarm">Alarmen</string>
+    <string name="history_group_glucose">Glucose</string>
    <!--    <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>-->
--- a/medtronic/src/main/res/values-nl-rNL/strings.xml
+++ b/medtronic/src/main/res/values-nl-rNL/strings.xml
@ -48,6 +48,7 @@
    <!--    <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_pump_history">Medtronic Pomp Geschiedenis</string>
    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
    <string name="medtronic_cmd_cancel_bolus_not_supported">U heeft de Bolus geannuleerd nadat deze werd ingesteld op de Pomp. Aangezien de Medtronic Pump geen ondersteuning biedt voor automatische annulering moet u dit handmatig doen. Zet de Pump daartoe in de Suspend modus en kies vervolgens voor Hervatten (als u nog wilt annuleren). De applicatie zal de wijzigingen oppakken bij de volgende update (in minder dan 5 minuten).</string>
    <string name="medtronic_cmd_cant_read_tbr">Kan huidige TBR niet lezen.</string>
@ -70,8 +71,14 @@
    <string name="medtronic_cmd_desc_set_tbr">Instellen Tijdelijke Basaal</string>
    <string name="medtronic_cmd_desc_set_bolus">Instellen Bolus</string>
    <string name="medtronic_pump_status_pump_unreachable">Pomp niet bereikbaar</string>
+    <string name="medtronic_warning">Waarschuwing</string>
    <!-- medtronic_warning -->
+    <string name="medtronic_pump_connected_now">Zojuist</string>
    <!-- combo_pump_connected_now -->
+    <string name="ago">voorbij</string>
+    <string name="medtronic_notification_check_time_date">Pomp klok moet bijgesteld worden</string>
    <!-- combo_notification_check_time_date -->
+    <string name="common_on">Aan</string>
+    <string name="common_off">Uit</string>
    <string name="pump_time_updated">Pomp tijd bijgewerkt</string>
 </resources>
--- a/omnipod/src/main/res/values-af-rZA/strings.xml
+++ b/omnipod/src/main/res/values-af-rZA/strings.xml
@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <!-- Omnipod - Pod Status -->
+    <!-- Omnipod - Alerts -->
+    <!-- Omnipod - History -->
    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod - Base -->
+    <!-- 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>
--- a/omnipod/src/main/res/values-bg-rBG/strings.xml
+++ b/omnipod/src/main/res/values-bg-rBG/strings.xml
@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Интеграция на помпата Omnipod, изисква RileyLink устройство (с фърмуер минимум 2.0 ) .</string>
-    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
    <string name="omnipod_config_bolus_beeps_enabled">Звук при болус активен</string>
    <string name="omnipod_config_basal_beeps_enabled">Звук при базал активен</string>
    <string name="omnipod_config_smb_beeps_enabled">Звук при SMB активен</string>
@ -15,19 +14,12 @@
    <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Часове преди изключване</string>
    <string name="omnipod_config_low_reservoir_alert_enabled">Малко инсулин в резервоар</string>
    <string name="omnipod_config_low_reservoir_alert_units">Брой единици</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_moments_ago">Преди малко</string>
-    <string name="omnipod_pod_mgmt">Настройки на под</string>
-    <string name="omnipod_pod_status">Статус на под</string>
-    <string name="omnipod_total_delivered_label">Общо доставени</string>
-    <string name="omnipod_total_delivered">%1$.2fЕ</string>
-    <string name="omnipod_reservoir_left">%1$.2f Е остават</string>
-    <string name="omnipod_reservoir_over50">Над 50 Е</string>
-    <string name="omnipod_pod_address">Адрес на под</string>
-    <string name="omnipod_pod_expiry">Капсулата изтича</string>
-    <string name="omnipod_warning">Внимание</string>
+    <string name="omnipod_preference_category_rileylink">RileyLink</string>
+    <string name="omnipod_preference_category_other">Друго</string>
+    <string name="omnipod_preference_category_alerts">Известия</string>
+    <string name="omnipod_preference_category_confirmation_beeps">Звук за потвърждение</string>
+    <!-- Omnipod - Pod Status -->
    <string name="omnipod_pod_status_no_active_pod">Няма активен под</string>
-    <string name="omnipod_pod_status_waiting_for_pair_and_prime">Настройка в прогрес (изчакване на сдвояване и пълнене)</string>
    <string name="omnipod_pod_status_waiting_for_cannula_insertion">Настройка в прогрес (въвеждане на канюла)</string>
    <string name="omnipod_pod_status_running">Изпълнява</string>
    <string name="omnipod_pod_status_suspended">Прекратено</string>
@ -35,39 +27,35 @@
    <string name="omnipod_pod_status_activation_time_exceeded">Времето за активация изтече</string>
    <string name="omnipod_pod_status_inactive">Неактивен</string>
    <string name="omnipod_pod_status_pod_fault_description">Грешка на под: %1$s %2$s</string>
-    <string name="omnipod_pod_active_alerts">Сигнали за активен под</string>
-    <string name="omnipod_acknowledge_active_alerts_short">Потвърди аларми</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
+    <!-- Omnipod - Alerts -->
+    <string name="omnipod_alert_finish_pairing_reminder">Край на напомняне за сдвояване</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Край на напомнянето за настройка</string>
+    <string name="omnipod_alert_expiration">Подът скоро ще изтече</string>
+    <string name="omnipod_alert_expiration_advisory">Подът скоро ще изтече</string>
+    <string name="omnipod_alert_shutdown_imminent">Спирането е неизбежно</string>
+    <string name="omnipod_alert_low_reservoir">Минимален инсулин в резервоара</string>
+    <string name="omnipod_alert_unknown_alert">Непозната аларма</string>
+    <!-- Omnipod - History -->
+    <string name="omnipod_history_item_description">Описание</string>
+    <string name="omnipod_history_item_source">Източник</string>
+    <string name="omnipod_history_item_date">Дата</string>
+    <string name="omnipod_history_type">Тип:</string>
    <!-- Omnipod - Error -->
+    <string name="omnipod_warning">Внимание</string>
    <string name="omnipod_error_rileylink_address_invalid">Грешен RileyLink адрес.</string>
    <string name="omnipod_error_operation_not_possible_no_configuration">Забранено действие.\n\n Първо трябва да конфигурурате Omnipod , преди да използвате тази операция,.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Операцията не е възможна.\n\n Трябва да изчакате няколко минути, докато AAPS се опита да зададе профил за първи път.</string>
-    <string name="omnipod_error_illegal_init_action_type">Неправилен PodInitActionType: %1$s</string>
    <string name="omnipod_error_pod_not_attached">Няма активен под</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Грешка при проверка на командата</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Непредвидена грешка. Моля, докладвайте! (тип: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Неуспешна комуникация: получени грешни входни параметри</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Връзката е неуспешна: таймаут</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Комуникацията е неуспешна: възникнала е неочаквана грешка. Моля, докладвайте!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Неуспешна комуникация: проверката на целостта на съобщението е неуспешна</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Неуспешна комуникация: получени грешни входни параметри</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Съобщението е неуспешно: Pod е в лошо състояние</string>
-    <string name="omnipod_driver_error_invalid_response">Неуспешна комуникация: получени грешни входни параметри</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Неуспешна комуникация: получи съобщение с невалиден номер на последователност от Pod</string>
-    <string name="omnipod_driver_error_invalid_message_address">Неуспешна комуникация: получи съобщение с невалиден номер на последователност от Pod</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Неуспешна комуникация: получени грешни входни параметри</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Комуникацията е неуспешна: nonce ресинхронизирането е неуспешно</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Комуникацията е неуспешна: nonce ресинхронизирането е неуспешно</string>
-    <string name="omnipod_driver_error_not_enough_data">Комуникацията е неуспешна: няма достатъчно данни, получени от Pod</string>
-    <string name="omnipod_driver_error_pod_fault">Грешка на Pod (%1$03d %2$s). Моля, деактивирайте вашия Pod и стартирайте нов</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Комуникацията е неуспешна: Pod върна отговор с грешка</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Управление на Pod</string>
-    <string name="omnipod_cmd_init_pod">Инициализация на Pod</string>
+    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Неуспешно задаване на базален профил. Доставката може да бъде спряна! Моля, ръчно опреснете състоянието на Pod от раздел Omnipod и възобновете доставката, ако е необходимо.</string>
+    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Неуспешно задаване на базален профил. Доставката може да бъде спряна! Моля, ръчно опреснете състоянието на Pod от раздел Omnipod и възобновете доставката, ако е необходимо.</string>
+    <string name="omnipod_error_set_basal_failed_delivery_suspended">Неуспешно задаване на базален профил. Доставката е спряна! Моля, ръчно подновяване на доставката от раздела Omnipod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Задаването на временен базал е неуспешно. Ако преди това е изпълнявал временен базал, може да е бил отменен. Моля, ръчно опреснете статуса на Pod от раздела Omnipod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Задаването на временен базал е неуспешно. Ако преди това е изпълнявал временен базал, може да е бил отменен. Моля, ръчно опреснете статуса на Pod от раздела Omnipod.</string>
+    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Неуспешно задаване на базален профил. Доставката може да бъде спряна! Моля, ръчно опреснете състоянието на Pod от раздел Omnipod и възобновете доставката, ако е необходимо.</string>
+    <string name="omnipod_error_set_time_failed_delivery_suspended">Неуспешно задаване на базален профил. Доставката е спряна! Моля, ръчно подновяване на доставката от раздела Omnipod.</string>
+    <!-- Omnipod - Confirmation -->
+    <!-- Omnipod - Commands -->
    <string name="omnipod_cmd_deactivate_pod">Деактивирай под</string>
    <string name="omnipod_cmd_discard_pod">Премахни под</string>
-    <string name="omnipod_cmd_pod_history">История на под</string>
    <string name="omnipod_cmd_set_bolus">Стартирай болус</string>
    <string name="omnipod_cmd_cancel_bolus">Отмяна на болус</string>
    <string name="omnipod_cmd_set_tbr">Приложи временен базал</string>
@ -82,88 +70,23 @@
    <string name="omnipod_cmd_suspend_delivery">Спиране на доставката на инсулин</string>
    <string name="omnipod_cmd_resume_delivery">Подновяване на доставката</string>
    <string name="omnipod_cmd_unknown_entry">Непознат запис</string>
-    <string name="omnipod_cmd_bolus_value">%1$.2fЕ</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f U, CH=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Скорост: %1$.2f U, Продължителност: %2$d мин</string>
-    <string name="omnipod_cmd_discard_pod_desc">Ако натиснете <b>OK</b>, състоянието на Pod ще бъде нулирано и няма да можете да общувате с него повече. Правете това, само ако вече не можете да се свързвате с него. Ако все още можете да общувате с Под, моля, използвайте опцията <b>Деактивирай Pod</b>.</string>
-    <string name="omnipod_cmd_pod_history_na">Историята на Pod не е достъпна в момента.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Напълни Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nНапълнете с достатъчно инсулин за 3 дни.\n\nИзчакайте два сигнала от Pod по време на процеса на зареждане. Те показват, че е вмъкнат минималният размер от 85U. Уверете се, че сте изпразнил напълно спринцовката, дори след като сте чули двата сигнала.\n\nСлед пълнене на Pod, моля натиснете <b>Следващ</b>.\n\n<b>Забележка:</b> не вадете капачката на капсулата на Podв този момент.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Пълнене</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Опитвам се да се сдвоя с Pod.\n\nКогато всички елементи са проверени, можете да натиснете <b>Следващ</b>.\n\n<b>Забележка:</b> задръжте Pod много близо до RileyLink в този момент.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Прикрепете Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nПодгответе мястото за инфузия. Отстранете капачката на Pod и лепенката и прикрепете капсулата към мястото за инфузия.\n\nАко канюла стърчи, моля натиснете <b>Отказ</b> и изхвърлете вашия Pod.\n\nПрес <b>Следваща</b> да се вмъкне канюлата и да започне базалната доставка.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Вмъкване на канюла</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Опитвам се да определя първоначалния базален график и да вмъкна канюлата.\n\nКогато всички елементи са проверени, можете да натиснете <b>Следващ</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Информация за Pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\Podе активна.\n\nВашият базален график е програмиран и канюлата вмъкната.\n\nМоля, проверете дали канюлата е поставена правилно или заменете Pod, ако чувствате, че не е.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Деактивирай Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nНатиснете <b>Следващ</b> , за да деактивирате Pod.\n\n<b>Забележка:</b> Това ще спре всички доставки на инсулин и деактивира Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Деактивиране на Pod</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Деактивиране на Pod.\n\nКогато всички елементи са проверени, можете да натиснете <b>Следващ</b>.\n\n<b>Забележка:</b> Ако деактивирането непрекъснато се проваля, моля натиснете <b>Отказ</b> и използвайте опция <b>Нулирай Pod</b> , за да възстановите състоянието на Pod.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod изключен.\n\nмоля, извадете Pod от тялото си и го хвърли.</string>
-    <string name="omnipod_init_pod_pair_pod">Сдвояване на под</string>
-    <string name="omnipod_init_pod_prime_pod">Пълнене на под</string>
-    <string name="omnipod_init_pod_fill_cannula">Напълни канула</string>
-    <string name="omnipod_init_pod_set_basal_profile">Приложи базалният профил</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Отмяна</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Деактивирай под</string>
-    <!-- Omnipod - Base -->
-    <string name="omnipod_alert_finish_pairing_reminder">Край на напомняне за сдвояване</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Край на напомнянето за настройка</string>
-    <string name="omnipod_alert_expiration">Подът скоро ще изтече</string>
-    <string name="omnipod_alert_expiration_advisory">Подът скоро ще изтече</string>
-    <string name="omnipod_alert_shutdown_imminent">Спирането е неизбежно</string>
-    <string name="omnipod_alert_low_reservoir">Минимален инсулин в резервоара</string>
-    <string name="omnipod_alert_unknown_alert">Непозната аларма</string>
-    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Неуспешно задаване на базален профил. Доставката може да бъде спряна! Моля, ръчно опреснете състоянието на Pod от раздел Omnipod и възобновете доставката, ако е необходимо.</string>
-    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Неуспешно задаване на базален профил. Доставката може да бъде спряна! Моля, ръчно опреснете състоянието на Pod от раздел Omnipod и възобновете доставката, ако е необходимо.</string>
-    <string name="omnipod_error_set_basal_failed_delivery_suspended">Неуспешно задаване на базален профил. Доставката е спряна! Моля, ръчно подновяване на доставката от раздела Omnipod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Задаването на временен базал е неуспешно. Ако преди това е изпълнявал временен базал, може да е бил отменен. Моля, ръчно опреснете статуса на Pod от раздела Omnipod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Задаването на временен базал е неуспешно. Ако преди това е изпълнявал временен базал, може да е бил отменен. Моля, ръчно опреснете статуса на Pod от раздела Omnipod.</string>
-    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Неуспешно задаване на базален профил. Доставката може да бъде спряна! Моля, ръчно опреснете състоянието на Pod от раздел Omnipod и възобновете доставката, ако е необходимо.</string>
-    <string name="omnipod_error_set_time_failed_delivery_suspended">Неуспешно задаване на базален профил. Доставката е спряна! Моля, ръчно подновяване на доставката от раздела Omnipod.</string>
-    <string name="omnipod_bolus_failed_uncertain">Не може да се провери дали болус е успял. Моля, уверете се ръчно, че Вашата Pod се активира чрез слушане на кликвания. <b>Ако сте сигурни, че болус не е успял, вие трябва ръчно да изтриете болния запис от лечение, дори ако щракнете върху \'Отказ от болус\' сега!</b></string>
-    <string name="omnipod_bolus_failed_uncertain_smb">Не може да се провери дали SMB bolus (%1$.2f U) е успял. <b>Ако сте сигурни, че на Bolus не е успял, трябва ръчно да изтриете запис SMB от лечение.</b></string>
-    <string name="omnipod_rl_stats">Статистика на RL</string>
-    <string name="omnipod_read_pulse_log_short">Pulse лог</string>
-    <string name="omnipod_pod_lot">LOT</string>
-    <string name="omnipod_pod_tid">TID</string>
-    <string name="omnipod_pod_firmware_version">Firmware версия</string>
-    <string name="omnipod_errors">Грешки</string>
-    <string name="omnipod_cmd_basal_profile_not_set_is_same">Профилът е идентичен.</string>
-    <string name="omnipod_custom_action_reset_rileylink">Нулирай RileyLink конфигурацията</string>
-    <string name="omnipod_time_or_timezone_change">Време и/или промяна на часовата зона на помпата</string>
-    <string name="omnipod_composite_time">%1$s и %2$s</string>
-    <string name="omnipod_time_ago">преди %s</string>
-    <string name="omnipod_waiting_for_rileylink_connection">Изчакване за връзка...</string>
-    <string name="omnipod_bolus_did_not_succeed">Болус неуспешен</string>
-    <string name="omnipod_refresh">Обнови</string>
-    <string name="omnipod_resume_delivery">Подновяване на доставката</string>
-    <string name="omnipod_error_pod_suspended">Pod изключен</string>
-    <string name="omnipod_less_than_a_minute_ago">преди по-малко от минута</string>
-    <string name="omnipod_suspend_delivery_short">Спиране</string>
-    <string name="omnipod_cmd_pair_and_prime">Сдвояване и пълнене</string>
-    <string name="omnipod_cmd_fill_cannula_set_basal_profile">Запълнете канюлата и настройте базалния профил</string>
-    <string name="omnipod_cmd_get_pulse_log">Вземи лога</string>
-    <string name="omnipod_uncertain_failure">Неизвестна грешка</string>
-    <string name="omnipod_cancelled_old_tbr_failed_to_set_new">Спрян стар базал, но неуспешно задаване на нов</string>
    <string name="omnipod_cmd_set_fake_suspended_tbr">Поставете фалшив временен базал, защото Pod е спряно</string>
    <string name="omnipod_cmd_cancel_fake_suspended_tbr">Анулират фалшив временен базал, който е създаден, защото Pod е спряно</string>
-    <string name="omnipod_uncertain">неизвестно</string>
-    <string name="omnipod_expiration_alerts_updated">Конфигурация на тревога актуализирана в Pod</string>
-    <string name="omnipod_preference_category_rileylink">RileyLink</string>
-    <string name="omnipod_preference_category_other">Друго</string>
-    <string name="omnipod_preference_category_alerts">Известия</string>
-    <string name="omnipod_preference_category_confirmation_beeps">Звук за потвърждение</string>
-    <string name="omnipod_wizard_button_exit">Изход</string>
-    <string name="omnipod_wizard_button_previous">Предишен</string>
-    <string name="omnipod_wizard_button_next">Следващ</string>
+    <!-- Omnipod - Pod Management -->
+    <!-- Omnipod - Wizard common -->
    <string name="omnipod_wizard_button_finish">Край</string>
-    <string name="omnipod_history_item_description">Описание</string>
-    <string name="omnipod_history_item_source">Източник</string>
-    <string name="omnipod_history_item_date">Дата</string>
-    <string name="omnipod_history_type">Тип:</string>
+    <string name="omnipod_wizard_button_next">Следващ</string>
+    <!-- Omnipod - Pod activation Wizard -->
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <!-- Omnipod - Overview -->
+    <!-- Omnipod - Other -->
+    <string name="omnipod_custom_action_reset_rileylink">Нулирай RileyLink конфигурацията</string>
+    <string name="omnipod_uncertain">неизвестно</string>
+    <!-- Omnipod - Times -->
+    <string name="omnipod_moments_ago">Преди малко</string>
+    <string name="omnipod_less_than_a_minute_ago">преди по-малко от минута</string>
+    <string name="omnipod_composite_time">%1$s и %2$s</string>
+    <string name="omnipod_time_ago">преди %s</string>
    <plurals name="omnipod_minutes">
        <item quantity="one">%1$d минути</item>
        <item quantity="other">%1$d минути</item>
--- a/omnipod/src/main/res/values-cs-rCZ/strings.xml
+++ b/omnipod/src/main/res/values-cs-rCZ/strings.xml
@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Integrace pumpy pro Omnipod, vyžaduje zařízení RileyLink (s firmwarem alespoň 2.0).</string>
-    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
    <string name="omnipod_config_bolus_beeps_enabled">Pípnutí při bolusu povoleno</string>
    <string name="omnipod_config_basal_beeps_enabled">Pípnutí při bazálu povoleno</string>
    <string name="omnipod_config_smb_beeps_enabled">Pípnutí při SMB povoleno</string>
@ -15,19 +14,12 @@
    <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Hodiny před vypnutím</string>
    <string name="omnipod_config_low_reservoir_alert_enabled">Upozornění na nízký stav zásobníku povoleno</string>
    <string name="omnipod_config_low_reservoir_alert_units">Počet jednotek</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_moments_ago">před chvílí</string>
-    <string name="omnipod_pod_mgmt">Správa Podu</string>
-    <string name="omnipod_pod_status">Stav Podu</string>
-    <string name="omnipod_total_delivered_label">Celkem dodáno</string>
-    <string name="omnipod_total_delivered">%1$.2f U</string>
-    <string name="omnipod_reservoir_left">Zbývá %1$.2f U</string>
-    <string name="omnipod_reservoir_over50">Více než 50 U</string>
-    <string name="omnipod_pod_address">Adresa Podu</string>
-    <string name="omnipod_pod_expiry">Expirace Podu</string>
-    <string name="omnipod_warning">Varování</string>
+    <string name="omnipod_preference_category_rileylink">RileyLink</string>
+    <string name="omnipod_preference_category_other">Jiné</string>
+    <string name="omnipod_preference_category_alerts">Varování</string>
+    <string name="omnipod_preference_category_confirmation_beeps">Potvrzovací pípnutí</string>
+    <!-- Omnipod - Pod Status -->
    <string name="omnipod_pod_status_no_active_pod">Žádný aktivní Pod</string>
-    <string name="omnipod_pod_status_waiting_for_pair_and_prime">Instalace probíhá (čekání na párování a plnění)</string>
    <string name="omnipod_pod_status_waiting_for_cannula_insertion">Instalace probíhá (čeká se na vložení kanyly)</string>
    <string name="omnipod_pod_status_running">Běží</string>
    <string name="omnipod_pod_status_suspended">Pozastaveno</string>
@ -35,39 +27,28 @@
    <string name="omnipod_pod_status_activation_time_exceeded">Byl překročen čas aktivace</string>
    <string name="omnipod_pod_status_inactive">Neaktivní</string>
    <string name="omnipod_pod_status_pod_fault_description">Chyba Podu: %1$s %2$s</string>
-    <string name="omnipod_pod_active_alerts">Výstrahy aktivního Podu</string>
-    <string name="omnipod_acknowledge_active_alerts_short">Potrvdit upozornění</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
+    <!-- Omnipod - Alerts -->
+    <string name="omnipod_alert_finish_pairing_reminder">Upomínka dokončení párování</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Upomínka dokončení nastavení</string>
+    <string name="omnipod_alert_expiration">Životnost Podu brzy skončí</string>
+    <string name="omnipod_alert_expiration_advisory">Pod brzy vyprší</string>
+    <string name="omnipod_alert_shutdown_imminent">Blíží se vypnutí</string>
+    <string name="omnipod_alert_low_reservoir">Nízký stav zásobníku</string>
+    <string name="omnipod_alert_unknown_alert">Neznámá výstraha</string>
+    <!-- Omnipod - History -->
+    <string name="omnipod_history_item_description">Popis</string>
+    <string name="omnipod_history_item_source">Zdroj</string>
+    <string name="omnipod_history_item_date">Datum</string>
+    <string name="omnipod_history_type">Typ:</string>
    <!-- Omnipod - Error -->
+    <string name="omnipod_warning">Varování</string>
    <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_operation_not_possible_no_profile">Operace není možná.\n\n Je třeba několik minut počkat, dokud se AAPS nepokusí poprvé nastavit profil.</string>
-    <string name="omnipod_error_illegal_init_action_type">Neplatný atribut PodInitActionType: %1$s</string>
    <string name="omnipod_error_pod_not_attached">Žádný aktivní Pod</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Ověření příkazu se nezdařilo</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Došlo k neočekávané chybě. Nahlaste ji! (typ: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Komunikace selhala: byly přijaty neplatné vstupní parametry</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Komunikace selhala: časový limit vypršel</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Komunikace se nezdařila: došlo k neočekávané chybě. Prosím nahlašte!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Komunikace selhala: ověření integrity zprávy se nezdařilo</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Komunikace selhala: byly přijaty neplatné pakety z podu</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Komunikace selhala: Pod je v chybném stavu</string>
-    <string name="omnipod_driver_error_invalid_response">Komunikace selhala: byla přijata neplatná odezva z Podu</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Komunikace selhala: od Podu byla přijata zpráva s neplatným pořadovým číslem</string>
-    <string name="omnipod_driver_error_invalid_message_address">Komunikace selhala: od Podu byla přijata zpráva s neplatnou adresou</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Komunikace selhala: nepodařilo se dekódovat zprávu z Podu</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Komunikace selhala: synchronizace hodnoty Nonce se nezdařila</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Komunikace selhala: hodnota Nonce nebyla synchronizována</string>
-    <string name="omnipod_driver_error_not_enough_data">Komunikace selhala: nedostatek dat přijatých z Podu</string>
-    <string name="omnipod_driver_error_pod_fault">Byla zjištěna chyba Podu (%1$03d %2$s). Deaktivujte Pod a spusťte nový</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Komunikace selhala: Pod vrátil chybovou odezvu</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Správa Podu</string>
-    <string name="omnipod_cmd_init_pod">Inicializovat Pod</string>
+    <!-- Omnipod - Confirmation -->
+    <!-- Omnipod - Commands -->
    <string name="omnipod_cmd_deactivate_pod">Deaktivovat Pod</string>
    <string name="omnipod_cmd_discard_pod">Vyřadit Pod</string>
-    <string name="omnipod_cmd_pod_history">Historie Podu</string>
    <string name="omnipod_cmd_set_bolus">Nastavit bolus</string>
    <string name="omnipod_cmd_cancel_bolus">Zrušit bolus</string>
    <string name="omnipod_cmd_set_tbr">Nastavit dočasný bazál</string>
@ -82,73 +63,23 @@
    <string name="omnipod_cmd_suspend_delivery">Pozastavit dodávání inzulínu</string>
    <string name="omnipod_cmd_resume_delivery">Obnovit dodávání inzulínu</string>
    <string name="omnipod_cmd_unknown_entry">Neznámá položka</string>
-    <string name="omnipod_cmd_bolus_value">%1$.2f U</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f U, Sach=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Rychlost: %1$.2f U, doba trvání: %2$d min</string>
-    <string name="omnipod_cmd_discard_pod_desc">Pokud stisknete <b>OK</b>, stav Podu bude vynuceně resetován a již nebudete moci komunikovat s Podem. Udělejte to pouze v případě, že s Podem již nelze komunikovat. Pokud stále můžete komunikovat s Podem, použijte volbu <b>Deaktivovat Pod</b>.\n\nPokud chcete pokračovat, ujistěte se, že Pod je sundaný z těla.</string>
-    <string name="omnipod_cmd_pod_history_na">Historie Podu není v daném okamžiku k dispozici.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Naplňte Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nNaplňte nový Pod dostatkem inzulínu na 3 dny.\n\nSledujte dvě pípnutí z Podu během procesu plnění. Tyto ukazují, že minimální množství 85U bylo naplněno. Ujistěte se, že stříkačka je zcela vyprázdněná a to i po vyslechnutí dvou pípnutí.\n\nPo naplnění Podu, prosím, stiskněte <b>Další</b>.\n\n<b>Poznámka:</b> prozatím nesundavejte kryt jehly.\n<b>Poznámka:</b>prosím umístěte RileyLink ve svislé pozici blízko Podu.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Plnění</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Nasaďte Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPřipravte infuzní místo. Odstraňte krytku jehly a náplasti a nalepte Pod.\n\nPokud se kanyla odlepí, stiskněte <b>Zrušit</b> a zahoďte Pod.\n\nStiskněte <b>Další</b> pro vložení kanyly a spuštění bazálů.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Vkládání kanyly</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Snažím se nastavit počáteční základní bazální plán a vložit kanylu.\n\nPři zaškrtnutí všech položek můžete stisknout tlačítko <b>Další</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPod je nyní aktivní.\n\nVáš bazál byl naprogramován a kanyla byla vložena.\n\nOvěřte, prosím, že kanyla byla vložena správně a případně vyměňte Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Deaktivovat Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nStiskněte <b>Další</b> pro deaktivaci Podu.\n\n<b>Poznámka:</b> Zastavíte veškerý výdej inzulínu a deaktivujete Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Deaktivace Podu</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod deaktivován.\n\nOdstraňte Pod z těla a znehodnoťte jej.</string>
-    <string name="omnipod_init_pod_pair_pod">Párování Podu</string>
-    <string name="omnipod_init_pod_prime_pod">Plnění Podu</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Deaktivovat Pod</string>
-    <!-- Omnipod - Base -->
-    <string name="omnipod_alert_finish_pairing_reminder">Upomínka dokončení párování</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Upomínka dokončení nastavení</string>
-    <string name="omnipod_alert_expiration">Životnost Podu brzy skončí</string>
-    <string name="omnipod_alert_expiration_advisory">Pod brzy vyprší</string>
-    <string name="omnipod_alert_shutdown_imminent">Blíží se vypnutí</string>
-    <string name="omnipod_alert_low_reservoir">Nízký stav zásobníku</string>
-    <string name="omnipod_alert_unknown_alert">Neznámá výstraha</string>
-    <string name="omnipod_bolus_failed_uncertain_smb">Nelze ověřit, zda byl bolus SMB (%1$.2f U) úspěšně vydán. <b>Pokud jste si jisti, že bolus nebyl vydán, měli byste ručně odstranit položku SMB z Ošetření.</b></string>
-    <string name="omnipod_rl_stats">Statistika RL</string>
-    <string name="omnipod_read_pulse_log_short">Pulse log</string>
-    <string name="omnipod_pod_lot">LOT</string>
-    <string name="omnipod_pod_tid">TID</string>
-    <string name="omnipod_pod_firmware_version">Verze firmwaru</string>
-    <string name="omnipod_errors">Chyby</string>
-    <string name="omnipod_cmd_basal_profile_not_set_is_same">Bazální profil je stejný, takže nebude znovu nastaven.</string>
-    <string name="omnipod_custom_action_reset_rileylink">Resetovat konfiguraci RileyLinku</string>
-    <string name="omnipod_time_or_timezone_change">Změna času nebo časového pásma Podu</string>
-    <string name="omnipod_composite_time">%1$s a %2$s</string>
-    <string name="omnipod_time_ago">před %1$s</string>
-    <string name="omnipod_waiting_for_rileylink_connection">Čekání na připojení RileyLink...</string>
-    <string name="omnipod_bolus_did_not_succeed">Podání bolusu bylo neúspěšné</string>
-    <string name="omnipod_refresh">Obnovit</string>
-    <string name="omnipod_resume_delivery">Obnovit dodávání inzulínu</string>
-    <string name="omnipod_error_pod_suspended">Pod pozastavený</string>
-    <string name="omnipod_less_than_a_minute_ago">Před méně než minutou</string>
-    <string name="omnipod_suspend_delivery_short">Vypnutí</string>
-    <string name="omnipod_cmd_pair_and_prime">Spárovat a naplnit</string>
-    <string name="omnipod_cmd_fill_cannula_set_basal_profile">Naplnit kanylu a nastavit bazální profil</string>
-    <string name="omnipod_uncertain_failure">Neznámá chyba</string>
-    <string name="omnipod_cancelled_old_tbr_failed_to_set_new">Byl zrušen starý dočasný bazál, ale nový dočasný bazál se nepodařilo nastavit</string>
    <string name="omnipod_cmd_set_fake_suspended_tbr">Nastavit falešný dočasný bazál, protože Pod je pozastaven</string>
    <string name="omnipod_cmd_cancel_fake_suspended_tbr">Zrušit falešný dočasný bazál který byl vytvořen, protože Pod byl pozastaven</string>
-    <string name="omnipod_uncertain">neznámé</string>
-    <string name="omnipod_expiration_alerts_updated">Nastavení výstrahy bylo v Podu aktualizováno</string>
-    <string name="omnipod_preference_category_rileylink">RileyLink</string>
-    <string name="omnipod_preference_category_other">Jiné</string>
-    <string name="omnipod_preference_category_alerts">Varování</string>
-    <string name="omnipod_preference_category_confirmation_beeps">Potvrzovací pípnutí</string>
-    <string name="omnipod_wizard_button_exit">Konec</string>
-    <string name="omnipod_wizard_button_previous">Předchozí</string>
-    <string name="omnipod_wizard_button_next">Další</string>
+    <!-- Omnipod - Pod Management -->
+    <!-- Omnipod - Wizard common -->
    <string name="omnipod_wizard_button_finish">Konec</string>
-    <string name="omnipod_history_item_description">Popis</string>
-    <string name="omnipod_history_item_source">Zdroj</string>
-    <string name="omnipod_history_item_date">Datum</string>
-    <string name="omnipod_history_type">Typ:</string>
+    <string name="omnipod_wizard_button_next">Další</string>
+    <!-- Omnipod - Pod activation Wizard -->
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <!-- Omnipod - Overview -->
+    <!-- Omnipod - Other -->
+    <string name="omnipod_custom_action_reset_rileylink">Resetovat konfiguraci RileyLinku</string>
+    <string name="omnipod_uncertain">neznámé</string>
+    <!-- Omnipod - Times -->
+    <string name="omnipod_moments_ago">před chvílí</string>
+    <string name="omnipod_less_than_a_minute_ago">Před méně než minutou</string>
+    <string name="omnipod_composite_time">%1$s a %2$s</string>
+    <string name="omnipod_time_ago">před %1$s</string>
    <plurals name="omnipod_minutes">
        <item quantity="one">%1$d minuta</item>
        <item quantity="few">%1$d minut</item>
--- a/omnipod/src/main/res/values-de-rDE/strings.xml
+++ b/omnipod/src/main/res/values-de-rDE/strings.xml
@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Um den Omnipod nutzen zu können, brauchst Du einen RileyLink (mind. Firmware 2.0).</string>
-    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
    <string name="omnipod_config_bolus_beeps_enabled">Bolus-Piep aktiviert</string>
    <string name="omnipod_config_basal_beeps_enabled">Basal-Piep aktiviert</string>
    <string name="omnipod_config_smb_beeps_enabled">SMB-Piep aktiviert</string>
    <string name="omnipod_config_tbr_beeps_enabled">TBR-Piep aktiviert</string>
    <string name="omnipod_config_suspend_delivery_button_enabled">Button Abgabe aussetzen aktiviert</string>
+    <string name="omnipod_config_pulse_log_button_enabled">Pulse Log Button aktiviert</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>
    <string name="omnipod_config_low_reservoir_alert_enabled">Warnung niedriger Reservoirstand aktiviert</string>
    <string name="omnipod_config_low_reservoir_alert_units">Anzahl der Einheiten</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_moments_ago">gerade eben</string>
-    <string name="omnipod_pod_mgmt">Pod mgmt</string>
-    <string name="omnipod_pod_status">Pod Status</string>
-    <string name="omnipod_total_delivered_label">Insgesamt abgegeben</string>
-    <string name="omnipod_total_delivered">%1$.2f IE</string>
-    <string name="omnipod_reservoir_left">%1$.2f IE übrig</string>
-    <string name="omnipod_reservoir_over50">über 50 IE</string>
-    <string name="omnipod_pod_address">Pod Adresse</string>
-    <string name="omnipod_pod_expiry">Pod läuft ab</string>
-    <string name="omnipod_warning">Warnung</string>
+    <string name="omnipod_config_notification_uncertain_tbr_sound_enabled">Ton für unsichere TBR-Benachrichtigungen aktiviert</string>
+    <string name="omnipod_config_notification_uncertain_smb_sound_enabled">Ton für unsichere SMB-Benachrichtigungen aktiviert</string>
+    <string name="omnipod_config_notification_uncertain_bolus_sound_enabled">Ton für unsichere Bolus-Benachrichtigungen aktiviert</string>
+    <string name="omnipod_preference_category_rileylink">RileyLink</string>
+    <string name="omnipod_preference_category_other">Andere</string>
+    <string name="omnipod_preference_category_alerts">Alarme</string>
+    <string name="omnipod_preference_category_confirmation_beeps">Bestätigungstöne</string>
+    <string name="omnipod_preference_category_notifications">Benachrichtigungen</string>
+    <!-- Omnipod - Pod Status -->
    <string name="omnipod_pod_status_no_active_pod">Kein aktiver Pod</string>
-    <string name="omnipod_pod_status_waiting_for_pair_and_prime">Einrichtung im Gang (Warten auf Verbindung und Füllen)</string>
+    <string name="omnipod_pod_status_waiting_for_activation">Einrichtung im Gange (Warten auf Pod-Aktivierung)</string>
    <string name="omnipod_pod_status_waiting_for_cannula_insertion">Einrichtung im Gang (Warten auf Setzen der Kanüle)</string>
    <string name="omnipod_pod_status_running">In Betrieb</string>
    <string name="omnipod_pod_status_suspended">Angehalten</string>
@ -33,39 +32,82 @@
    <string name="omnipod_pod_status_activation_time_exceeded">Aktivierungszeit überschritten</string>
    <string name="omnipod_pod_status_inactive">Inaktiv</string>
    <string name="omnipod_pod_status_pod_fault_description">Pod-Fehler: %1$s %2$s</string>
-    <string name="omnipod_pod_active_alerts">Aktive Pod-Warnungen</string>
-    <string name="omnipod_acknowledge_active_alerts_short">Alarm bestätigen</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
+    <!-- Omnipod - Alerts -->
+    <string name="omnipod_alert_finish_pairing_reminder">Erinnerung Kopplung beendet</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Erinnerung Setup beendet</string>
+    <string name="omnipod_alert_expiration">Pod läuft in Kürze ab</string>
+    <string name="omnipod_alert_expiration_advisory">Pod läuft in Kürze ab</string>
+    <string name="omnipod_alert_shutdown_imminent">Herunterfahren steht unmittelbar bevor</string>
+    <string name="omnipod_alert_low_reservoir">Niedriger Reservoirstand</string>
+    <string name="omnipod_alert_unknown_alert">Unbekannter Alarm</string>
+    <!-- Omnipod - History -->
+    <string name="omnipod_history_title">Pod Historie</string>
+    <string name="omnipod_history_item_description">Beschreibung</string>
+    <string name="omnipod_history_item_source">Quelle</string>
+    <string name="omnipod_history_item_date">Datum</string>
+    <string name="omnipod_history_type">Typ:</string>
+    <string name="omnipod_history_bolus_value">%1$.2f IE</string>
+    <string name="omnipod_history_bolus_value_with_carbs">%1$.2f IE, KH=%2$.1fg</string>
+    <string name="omnipod_history_tbr_value">Rate: %1$.2f IE, Dauer: %2$d min.</string>
    <!-- Omnipod - Error -->
+    <string name="omnipod_warning">Warnung</string>
    <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_operation_not_possible_no_profile">Aktion ist nicht möglich.\n\n Du musst ein paar Minuten warten bis AAPS versucht, das Basalprofil zum ersten Mal zu setzen.</string>
-    <string name="omnipod_error_illegal_init_action_type">Illegal PodInitActionType: %1$s</string>
    <string name="omnipod_error_pod_not_attached">Kein aktiver Pod</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Kommandoprüfung fehlgeschlagen</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Es ist ein unerwarteter Fehler aufgetreten. Bitte melden! (Typ: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Kommunikation fehlgeschlagen: Ungültige Eingabeparameter empfangen</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Keine Verbindung: Zeitüberschreitung</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Keine Verbindung: Es ist ein unerwarteter Fehler aufgetreten. Bitte melden!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Kommunikation fehlgeschlagen: Die Überprüfung der Nachrichtenintegrität ist fehlgeschlagen</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Kommunikation fehlgeschlagen: Es wurde ein ungültiges Paket vom Pod empfangen</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Kommunikation fehlgeschlagen: Der Pod befindet sich in einem falschen Status</string>
-    <string name="omnipod_driver_error_invalid_response">Kommunikation fehlgeschlagen: Es wurde eine ungültige Antwort vom Pod empfangen</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Kommunikation fehlgeschlagen: Ungültige Zeichenfolge vom Pod empfangen</string>
-    <string name="omnipod_driver_error_invalid_message_address">Kommunikation fehlgeschlagen: Ungültige Adresse vom Pod empfangen</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Kommunikation fehlgeschlagen: Nachricht vom Pod konnte nicht decodiert werden</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Kommunikation fehlgeschlagen: Nonce resync fehlgeschlagen</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Kommunikation fehlgeschlagen: Nonce nicht synchronisiert</string>
-    <string name="omnipod_driver_error_not_enough_data">Kommunikation fehlgeschlagen: Nicht genügend Daten vom Pod empfangen</string>
-    <string name="omnipod_driver_error_pod_fault">Ein Pod-Fehler (%1$03d %2$s) wurde festgestellt. Bitte deaktiviere den Pod und starte einen neuen</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Kommunikation fehlgeschlagen: Fehlerhafte Antwort vom Pod</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Pod Management</string>
-    <string name="omnipod_cmd_init_pod">Init Pod</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>
+    <string name="omnipod_error_invalid_progress_state">Kommunikation fehlgeschlagen: Der Pod befindet sich in einem falschen Zustand.</string>
+    <string name="omnipod_error_invalid_response">Kommunikation fehlgeschlagen: Es wurde eine ungültige Antwort vom Pod empfangen.</string>
+    <string name="omnipod_error_invalid_message_sequence_number">Kommunikation fehlgeschlagen: Ungültige Zeichenfolge vom Pod empfangen.</string>
+    <string name="omnipod_error_invalid_message_address">Kommunikation fehlgeschlagen: Ungültige Adresse vom Pod empfangen.</string>
+    <string name="omnipod_error_message_decoding_failed">Kommunikation fehlgeschlagen: Nachricht vom Pod konnte nicht decodiert werden.</string>
+    <string name="omnipod_error_nonce_resync_failed">Kommunikation fehlgeschlagen: Nonce resync fehlgeschlagen.</string>
+    <string name="omnipod_error_nonce_out_of_sync">Kommunikation fehlgeschlagen: Nonce nicht synchronisiert.</string>
+    <string name="omnipod_error_not_enough_data">Kommunikation fehlgeschlagen: Nicht genügend Daten vom Pod empfangen.</string>
+    <string name="omnipod_error_pod_fault">Ein Pod-Fehler (%1$03d %2$s) wurde festgestellt. Bitte deaktiviere den Pod und aktiviere einen neuen.</string>
+    <string name="omnipod_error_pod_returned_error_response">Kommunikation fehlgeschlagen: Fehlerhafte Antwort vom Pod.</string>
+    <string name="omnipod_error_communication_failed_no_response_from_riley_link">Keine Antwort vom RileyLink</string>
+    <string name="omnipod_error_communication_failed_riley_link_interrupted">RileyLink unterbrochen</string>
+    <string name="omnipod_error_communication_failed_no_response_from_pod">Keine Rückmeldung vom Pod</string>
+    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Basalprofil konnte nicht eingestellt werden. Insulinabgabe wird evtl. unterbrochen. Aktualisiere den Pod Status bitte manuell im Omnipod Tab und starte die Abgabe falls notwendig neu. </string>
+    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Basalprofil konnte evtl. nicht eingestellt werden. Insulinabgabe wird evtl. unterbrochen. Aktualisiere den Pod Status bitte manuell im Omnipod Tab und starte die Abgabe falls notwendig neu. </string>
+    <string name="omnipod_error_set_basal_failed_delivery_suspended">Basalprofil konnte nicht eingestellt werden. Insulinabgabe wurde unterbrochen. Bitte starte die Abgabe manuell im Omnipod Tab neu. </string>
+    <string name="omnipod_error_set_basal_failed">Setzen des Basal-Profils fehlgeschlagen.</string>
+    <string name="omnipod_error_cancel_temp_basal_failed_uncertain">Abbruch der temporären Basalrate evtl. fehlgeschlagen. Aktualisiere den Pod Status manuell im Omnipod Tab.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">TBR konnte nicht gesetzt werden. Falls zuvor eine andere TBR aktiv war, wurde diese evtl. abgebrochen. Aktualisiere bitte manuell den Pod Status im Omnipod Tab.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">TBR konnte evtl. nicht gesetzt werden. Falls zuvor eine andere TBR aktiv war, wurde diese evtl. abgebrochen. Aktualisiere bitte manuell den Pod Status im Omnipod Tab.</string>
+    <string name="omnipod_error_set_temp_basal_failed_validation">TBR Dauer muss größer null und ein Vielfaches von %1$s Minuten sein.</string>
+    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Zeit konnte evtl. nicht eingestellt werden. Insulinabgabe wird evtl. unterbrochen. Aktualisiere den Pod Status bitte manuell im Omnipod Tab und starte die Abgabe falls notwendig neu. </string>
+    <string name="omnipod_error_set_time_failed_delivery_suspended">Zeit konnte nicht eingestellt werden. Insulinabgabe wurde unterbrochen. Bitte starte die Abgabe manuell im Omnipod Tab neu. </string>
+    <string name="omnipod_error_failed_to_set_profile_empty_profile">Fehler beim Festlegen des Basalprofils: Ein leeres Profil wurde empfangen. Akiviere Dein Basalprofil.</string>
+    <string name="omnipod_error_set_initial_basal_schedule_no_profile">Kein Basalprofil aktiv. Aktiviere Dein Profil.</string>
+    <string name="omnipod_error_unknown_custom_command">Unbekannter benutzerdefinierter Befehl: %1$s</string>
+    <string name="omnipod_error_failed_to_read_pulse_log">Fehler beim Lesen des Pulse-Log</string>
+    <string name="omnipod_error_failed_to_refresh_status">Status konnte nicht aktualisiert werden.</string>
+    <string name="omnipod_error_failed_to_acknowledge_alerts">Warnungen konnten nicht bestätigt werden.</string>
+    <string name="omnipod_error_failed_to_suspend_delivery">Insulinabgabe konnte nicht unterbrochen werden.</string>
+    <string name="omnipod_error_failed_to_set_time">Zeiteinstellung fehlgeschlagen</string>
+    <string name="omnipod_error_failed_to_resume_delivery">Insulinabgabe konnte nicht gestartet werden.</string>
+    <string name="omnipod_error_automatic_time_or_timezone_change_failed">Zeit auf den Pod konnte nicht geändert werden. Synchronisiere die Zeit manuell im Omnipod tab.</string>
+    <string name="omnipod_error_bolus_failed_uncertain">Bolusabgabe kann nicht verifiziert werden. Prüfe manuell, ob der Pod Insulin abgibt, indem Du auf Klickgeräusche achtest. <b>Wenn Du sicher bist, dass der Bolus nicht abgegeben wurde, musst Du ihn manuell aus den Behandlungen löschen. Dies gilt auch, wenn Du jetzt \'Bolus abbrechen\' klickst!</b></string>
+    <string name="omnipod_error_bolus_failed_uncertain_smb">SMB-Abgabe (%1$.2f IE) kann nicht verifiziert werden. <b>Wenn Du sicher bist, dass der SMB nicht abgegeben wurde, musst Du ihn manuell aus den Behandlungen löschen.</b></string>
+    <string name="omnipod_error_bolus_did_not_succeed">Bolus nicht abgegeben</string>
+    <string name="omnipod_error_failed_to_initialize_pod">Pod konnte nicht initalisiert werden.</string>
+    <string name="omnipod_error_failed_to_insert_cannula">Kanüle konnte nicht eingeführt werden.</string>
+    <string name="omnipod_error_pod_fault_activation_time_exceeded">Die Aktivierungszeit des Pods wurde überschritten. Dieser Pod kann nicht mehr aktiviert werden.</string>
+    <!-- Omnipod - Confirmation -->
+    <string name="omnipod_confirmation">Bestätigung</string>
+    <string name="omnipod_confirmation_time_or_timezone_change">Zeit und/oder Zeitzone auf dem Pod geändert.</string>
+    <string name="omnipod_confirmation_expiration_alerts_updated">Alarm-Einstellungen auf dem Pod geändert.</string>
+    <string name="omnipod_confirmation_time_on_pod_updated">Zeit auf dem Pod geändert.</string>
+    <string name="omnipod_confirmation_suspended_delivery">Insulinabgabe komplett ausgesetzt.</string>
+    <string name="omnipod_confirmation_acknowledged_alerts">Aktive Warnungen wurden bestätigt.</string>
+    <string name="omnipod_confirmation_delivery_resumed">Insulinabgabe wieder aufgenommen.</string>
+    <string name="omnipod_confirmation_pod_suspended">Pod unterbrochen</string>
+    <!-- Omnipod - Commands -->
    <string name="omnipod_cmd_deactivate_pod">Pod deaktivieren</string>
    <string name="omnipod_cmd_discard_pod">Pod ablegen</string>
-    <string name="omnipod_cmd_pod_history">Pod Historie</string>
    <string name="omnipod_cmd_set_bolus">Mahlzeiten Bolus abgeben</string>
    <string name="omnipod_cmd_cancel_bolus">Bolus abbrechen</string>
    <string name="omnipod_cmd_set_tbr">Temp. Basalrate setzen</string>
@ -80,41 +122,92 @@
    <string name="omnipod_cmd_suspend_delivery">Abgabe unterbrechen</string>
    <string name="omnipod_cmd_resume_delivery">Abgabe fortsetzen</string>
    <string name="omnipod_cmd_unknown_entry">Unbekannte Eingabe</string>
-    <string name="omnipod_cmd_bolus_value">%1$.2f IE</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f IE, CH=%2$.1f g</string>
-    <string name="omnipod_cmd_pod_history_na">Pod Historie derzeit nicht verfügbar.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Befülle den Pod</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Befüllen</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Befestige den Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nBereite die Infusionsstelle vor. Entferne den Nadelschutz des Pods und die Schutzfolie über dem Kleber. Klebe dann den Pod an die gewünschte Körperstelle.\n\nFalls die Kanüle herausragt, klicke <b>Abbrechen</b> und verwirf den Pod.\n\nKlicke <b>Weiter</b>; um die Kanüle zu setzen und die Insulinabgabe zu beginnen.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Kanüle setzen</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Erste Basalrate und Kanüle werden nun gesetzt.\n\nWenn alle Häkchen gesetzt sind, kannst Du <b>Weiter</b> klicken.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nDer Pod ist jetzt aktiv.\n\nDeine Basalrate ist programmiert und die Kanüle wurde gesetzt.\n\nBitte überprüfe, ob die Kanüle korrekt gesetzt wurde und ersetze den Pod, wenn Du das Gefühl hast, dass dies nicht erfolgreich war.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Pod deaktivieren</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nDrücke <b>Weiter</b> um den Pod zu deaktivieren.\n\n<b>Hinweis:</b> Dies unterbricht die gesamte Insulinabgabe und deaktiviert den Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Deaktiviere den Pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod deaktiviert.\n\nBitte entferne den Pod von Deinem Körper und entsorge ihn.</string>
-    <string name="omnipod_init_pod_pair_pod">Pod verbinden</string>
-    <string name="omnipod_init_pod_prime_pod">Pod befüllen</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Pod deaktivieren</string>
-    <!-- Omnipod - Base -->
-    <string name="omnipod_alert_finish_pairing_reminder">Erinnerung Kopplung beendet</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Erinnerung Setup beendet</string>
-    <string name="omnipod_alert_expiration">Pod läuft in Kürze ab</string>
-    <string name="omnipod_alert_expiration_advisory">Pod läuft in Kürze ab</string>
-    <string name="omnipod_alert_shutdown_imminent">Herunterfahren steht unmittelbar bevor</string>
-    <string name="omnipod_alert_low_reservoir">Niedriger Reservoirstand</string>
-    <string name="omnipod_alert_unknown_alert">Unbekannter Alarm</string>
-    <string name="omnipod_errors">Fehler</string>
-    <string name="omnipod_cmd_basal_profile_not_set_is_same">Basalprofil, unverändert wird nicht erneut eingestellt.</string>
-    <string name="omnipod_refresh">Aktualisieren</string>
-    <string name="omnipod_suspend_delivery_short">Unterbrechungen</string>
-    <string name="omnipod_preference_category_rileylink">RileyLink</string>
-    <string name="omnipod_preference_category_other">Andere</string>
-    <string name="omnipod_wizard_button_exit">Schließen</string>
+    <string name="omnipod_cmd_initialize_pod">Pod initialisieren</string>
+    <string name="omnipod_cmd_insert_cannula">Kanüle setzen</string>
+    <string name="omnipod_cmd_read_pulse_log">Pulse-Log lesen</string>
+    <string name="omnipod_cmd_set_fake_suspended_tbr">Fake TBR gesetzt, da der Pod pausiert ist.</string>
+    <string name="omnipod_cmd_cancel_fake_suspended_tbr">Abbruch der Fake TBR. Diese wurde eingestellt, da der Pod pausiert war.</string>
+    <!-- Omnipod - Pod Management -->
+    <string name="omnipod_pod_management_title">Pod Management</string>
+    <string name="omnipod_pod_management_waiting_for_rileylink_connection">Warte auf Verbindung mit RileyLink…</string>
+    <string name="omnipod_pod_management_button_activate_pod">Pod aktivieren</string>
+    <string name="omnipod_pod_management_button_deactivate_pod">Pod deaktivieren</string>
+    <string name="omnipod_pod_management_button_discard_pod">Pod verwerfen</string>
+    <string name="omnipod_pod_management_button_pod_history">Pod Historie</string>
+    <string name="omnipod_pod_management_discard_pod_state_confirmation">Wenn Du den Pod verwirfst, kannst Du nicht mehr mit ihm kommunizieren. Mache das nur, wenn jede Kommunikation mit dem Pod dauerhaft fehlschlägt. Falls Du noch mit dem Pod kommunizieren kannst, verwende bitte die Option <b>Pod deaktivieren</b>.\n\nWenn Du fortfahren willst, entferne jetzt den Pod von Deinem Körper!</string>
+    <!-- Omnipod - Wizard common -->
+    <string name="omnipod_wizard_button_cancel">Abbrechen</string>
+    <string name="omnipod_wizard_button_finish">Beenden</string>
    <string name="omnipod_wizard_button_next">Weiter</string>
-    <string name="omnipod_history_item_description">Beschreibung</string>
-    <string name="omnipod_history_item_date">Datum</string>
+    <string name="omnipod_wizard_button_retry">Erneut versuchen</string>
+    <string name="omnipod_wizard_button_deactivate_pod">Pod deaktivieren</string>
+    <string name="omnipod_wizard_button_discard_pod">Pod verwerfen</string>
+    <string name="omnipod_wizard_exit_confirmation_text">Du hast noch nicht alle Schritte abgeschlossen. Willst Du wirklich beenden?</string>
+    <string name="omnipod_wizard_exit_confirmation_title">Beenden</string>
+    <!-- Omnipod - Pod activation Wizard -->
+    <string name="omnipod_pod_activation_wizard_fill_pod_title">Pod füllen</string>
+    <string name="omnipod_pod_activation_wizard_fill_pod_text">Befülle den neuen Pod mit ausreichend Insulin für 3 Tage.\n\nAchte auch zwei Pieptöne vom Pod während des Füllens. Diese zeigen an, dass der Pod mit der Mindestmenge von 85 IE befüllt wurde. Leere die Spritze komplett, auch wenn Du die beiden Pieptöne gehört hast.\n\nKlicke <b>Weiter</b> nachdem Du den Pod befüllt hast.\n\n<b>Hinweis:</b> Entferne den Nadelschutz des Pods noch nicht.\n<b>Hinweis:</b> Bringe den RileyLink in eine aufrechte Position und platziere den Pod einige Zentimeter entfernt davon.</string>
+    <string name="omnipod_pod_activation_wizard_initialize_pod_title">Pod initialisieren</string>
+    <string name="omnipod_pod_activation_wizard_initialize_pod_text">Versuche, Dich mit dem neuen Pod zu verbinden und ihn zu befüllen.\n\nWenn der Initialisierungsprozess erfolgreich abgeschlossen ist, kannst Du <b>Weiter</b> drücken.\n\n<b>Hinweis:</b> Bringe den RileyLink bitte in eine aufrechte Position und platziere den Pod einige Zentimeter entfernt davon.</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_title">Pod anlegen</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_text">Bereite die Infusionsstelle vor. Entferne den Nadelschutz des Pods und die Schutzfolie über dem Kleber. Klebe dann den Pod an die gewünschte Körperstelle.\n\nFalls die Kanüle herausragt, klicke <b>Abbrechen</b> und verwirf den Pod.\n\nKlicke <b>Weiter</b>; um die Kanüle zu setzen und die Insulinabgabe zu beginnen.</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_confirm_insert_cannula_text">Nachdem Du <b>OK</b> gedrückt hast, wird die Kanüle eingeführt. Klebe den Pod vorher auf die gewünschte Infusionsstelle.</string>
+    <string name="omnipod_pod_activation_wizard_insert_cannula_title">Kanüle setzen</string>
+    <string name="omnipod_pod_activation_wizard_insert_cannula_text">Basalrate wird übertragen und Kanüle gesetzt.\n\nKlicke auf <b>Weiter</b> nachdem die Kanüle erfolgreich gesetzt wurde.</string>
+    <string name="omnipod_pod_activation_wizard_pod_activated_title">Pod aktiviert</string>
+    <string name="omnipod_pod_activation_wizard_pod_activated_text">\nDer neue Pod ist jetzt aktiv.\n\nDeine Basalrate ist programmiert und die Kanüle wurde gesetzt.\n\nBitte überprüfe, ob die Kanüle korrekt gesetzt wurde und ersetze den Pod, wenn Du das Gefühl hast, dass dies nicht erfolgreich war.</string>
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <string name="omnipod_pod_deactivation_wizard_deactivate_pod_title">Pod deaktivieren</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivate_pod_text">Drücke <b>Weiter</b> um den Pod zu deaktivieren.\n\n<b>Hinweis:</b> Dies unterbricht die gesamte Insulinabgabe und deaktiviert den Pod.</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivating_pod_title">Deaktiviere den Pod...</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivating_pod_text">Deaktiviere den Pod.\n\nNachdem die Deaktivierung komplett abgeschlossen wurde, kannst Du <b>Weiter</b> drücken.</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_deactivated_title">Pod deaktiviert</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_deactivated_text">Pod wurde deaktiviert.\n\nBitte entferne den Pod von Deinem Körper und recycle ihn.</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_discarded_title">Pod verworfen</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_discarded_text">Der Pod-Status wurde verworfen. Die Insulinabgabe wurde nicht unterbrochen, weil der Pod nicht korrekt deaktiviert wurde!\n\nBitte entferne den Pod von Deinem Körper und recycele ihn.</string>
+    <string name="omnipod_pod_deactivation_wizard_discard_pod_confirmation">Wenn Du den Pod verwirfst, kannst Du nicht mehr mit ihm kommunizieren. Mache das nur, wenn jede Kommunikation mit dem Pod dauerhaft fehlschlägt. Willst Du den Pod wirklich verwerfen?</string>
+    <string name="omnipod_pod_deactivation_wizard_discard_pod">Verwerfe Pod...</string>
+    <!-- Omnipod - Overview -->
+    <string name="omnipod_overview_button_set_time">Zeit einstellen</string>
+    <string name="omnipod_overview_button_suspend_delivery">Unterbrechen</string>
+    <string name="omnipod_overview_button_riley_link_stats">RL Stats</string>
+    <string name="omnipod_overview_button_read_pulse_log">Pulse Log</string>
+    <string name="omnipod_overview_button_refresh">Aktualisieren</string>
+    <string name="omnipod_overview_button_resume_delivery">Abgabe fortsetzen</string>
+    <string name="omnipod_overview_button_pod_management">Pod Mgmt.</string>
+    <string name="omnipod_overview_button_acknowledge_active_alerts">Alarm bestätigen</string>
+    <string name="omnipod_overview_pod_status">Pod Status</string>
+    <string name="omnipod_overview_total_delivered">Insgesamt abgegeben</string>
+    <string name="omnipod_overview_total_delivered_value">%1$.2f IE</string>
+    <string name="omnipod_overview_pod_address">Pod Adresse</string>
+    <string name="omnipod_overview_pod_expiry_date">Pod läuft ab</string>
+    <string name="omnipod_overview_last_connection">Letzte Verbindung</string>
+    <string name="omnipod_overview_last_bolus">Letzter Bolus:</string>
+    <string name="omnipod_overview_temp_basal_rate">Temporäre Basalrate</string>
+    <string name="omnipod_overview_base_basal_rate">Basis-Basalrate</string>
+    <string name="omnipod_overview_reservoir">Reservoir</string>
+    <string name="omnipod_overview_pod_active_alerts">Aktive Pod-Warnungen</string>
+    <string name="omnipod_overview_firmware_version">Firmware-Version</string>
+    <string name="omnipod_overview_time_on_pod">Zeit auf dem Pod</string>
+    <string name="omnipod_overview_temp_basal_value">%1$.2fIE/h @%2$s (%3$d/%4$d min.)</string>
+    <string name="omnipod_overview_reservoir_value">%1$.2f IE verbleiben</string>
+    <string name="omnipod_overview_reservoir_value_over50">Mehr als 50 IE verbleibend</string>
+    <string name="omnipod_overview_errors">Fehler</string>
+    <!-- Omnipod - Other -->
+    <string name="omnipod_pump_description">Um den Omnipod nutzen zu können, brauchst Du einen RileyLink (mind. Firmware 2.0).</string>
+    <string name="omnipod_custom_action_reset_rileylink">RileyLink-Konfiguration zurücksetzen</string>
+    <string name="omnipod_uncertain">unsicher</string>
+    <string name="omnipod_pulse_log">Pulse Log</string>
+    <string name="omnipod_pulse_log_value">Pulse Log (in Zwischenablage kopiert)</string>
+    <string name="omnipod_yes">Ja</string>
+    <string name="omnipod_no">Nein</string>
+    <string name="omnipod_ok">OK</string>
+    <string name="omnipod_cancel">Abbrechen</string>
+    <!-- Omnipod - Times -->
+    <string name="omnipod_moments_ago">gerade eben</string>
+    <string name="omnipod_less_than_a_minute_ago">vor weniger als einer Minute</string>
+    <string name="omnipod_composite_time">%1$s und %2$s</string>
+    <string name="omnipod_time_ago">vor %1$s</string>
    <plurals name="omnipod_minutes">
        <item quantity="one">%1$d Minute</item>
        <item quantity="other">%1$d Minuten</item>
--- a/omnipod/src/main/res/values-el-rGR/strings.xml
+++ b/omnipod/src/main/res/values-el-rGR/strings.xml
@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <!-- Omnipod - Pod Status -->
+    <!-- Omnipod - Alerts -->
+    <!-- Omnipod - History -->
    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod - Base -->
+    <!-- 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>
--- a/omnipod/src/main/res/values-es-rES/strings.xml
+++ b/omnipod/src/main/res/values-es-rES/strings.xml
@ -1,37 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">La integración de la bomba para Omnipod requiere el dispositivo RileyLink (con al menos 2,0 firmware).</string>
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_reservoir_left">%1$.2f U restantes</string>
-    <string name="omnipod_reservoir_over50">Más De 50 U</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_error_illegal_init_action_type">Ilegal PodInitActionType: %1$s</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Error inesperado. Por favor, informe! (tipo: %1$s).</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">La comunicación ha fallado: error inesperado. ¡Por favor, Informe!</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_cmd_init_pod">Iniciar Pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Desactivar Pod</string>
-    <string name="omnipod_cmd_pod_history_na">Historial del Pod no disponible en el momento.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Llenar el Pod</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Cebado</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Adherir el Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPreparar el sitio de infusión. Retire el capuchón de la aguja del Pod y el adhesivo y aplique el Pod al sitio de perfusión.\n\nSi la cánula se queda fuera, por favor presione <b>Cancel</b> y descarte su Pod.\n\nPress <b>Next</b> para insertar la cánula y comenzar la entrega basal.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Insertar cánula</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Intentando establecer la programación basal inicial e insertar la cánula.\n\nCuando todos los elementos están marcados, puede pulsar <b>Siguiente</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nEl Pod ahora está activo.\n\nSu horario basal ha sido programado y la cánula ha sido insertada.\n\nPor favor, verifique que la cánula ha sido insertada correctamente y reemplace su Pod si usted siente que no lo ha hecho.</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nPulsa <b>Siguiente</b> para desactivar el Pod.\n\n<b>Nota:</b> Esto suspenderá toda la entrega insulina y desactivará el Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Desactivando el Pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod desactivado.\n\nPor favor, retire el Pod de su cuerpo y desecharlo.</string>
-    <string name="omnipod_init_pod_pair_pod">Emparejar Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Llenado de cánula del Pod</string>
-    <!-- Omnipod - Base -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <!-- Omnipod - Pod Status -->
+    <!-- Omnipod - Alerts -->
    <string name="omnipod_alert_finish_setup_reminder_reminder">Recordatorio de configuración finalizado</string>
    <string name="omnipod_alert_shutdown_imminent">El apagado es inminente</string>
    <string name="omnipod_alert_low_reservoir">Reservorio bajo</string>
    <string name="omnipod_alert_unknown_alert">Alerta desconocida</string>
+    <!-- Omnipod - History -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Confirmation -->
+    <!-- Omnipod - Commands -->
+    <string name="omnipod_cmd_deactivate_pod">Desactivar Pod</string>
+    <!-- Omnipod - Pod Management -->
+    <!-- Omnipod - Wizard common -->
+    <!-- Omnipod - Pod activation Wizard -->
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <!-- Omnipod - Overview -->
+    <!-- Omnipod - Other -->
+    <!-- Omnipod - Times -->
 </resources>
--- a/omnipod/src/main/res/values-fr-rFR/strings.xml
+++ b/omnipod/src/main/res/values-fr-rFR/strings.xml
@ -1,33 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">L\'intégration de la pompe Omnipod nécessite un boitier RileyLink (avec au minimum un firmware 2.0).</string>
-    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
    <string name="omnipod_config_bolus_beeps_enabled">Bips bolus activés</string>
    <string name="omnipod_config_basal_beeps_enabled">Bips basal activés</string>
    <string name="omnipod_config_smb_beeps_enabled">Bips SMB activés</string>
    <string name="omnipod_config_tbr_beeps_enabled">Bips DBT activés</string>
    <string name="omnipod_config_suspend_delivery_button_enabled">Bouton Suspendre l\'injection activé</string>
-    <string name="omnipod_config_pulse_log_button_enabled">Bouton Enreg. Pulse activé</string>
+    <string name="omnipod_config_pulse_log_button_enabled">Bouton Journal d\'impulsions activé</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>
    <string name="omnipod_config_low_reservoir_alert_enabled">Alerte Réservoir bas activée</string>
    <string name="omnipod_config_low_reservoir_alert_units">Nombre d\'unités</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_moments_ago">Il y a un moment</string>
-    <string name="omnipod_pod_mgmt">Pod mngt</string>
-    <string name="omnipod_pod_status">État du Pod</string>
-    <string name="omnipod_total_delivered_label">Total délivré</string>
-    <string name="omnipod_total_delivered">%1$.2f U</string>
-    <string name="omnipod_reservoir_left">%1$.2f U restantes</string>
-    <string name="omnipod_reservoir_over50">Plus de 50 U</string>
-    <string name="omnipod_pod_address">Adresse du Pod</string>
-    <string name="omnipod_pod_expiry">Pod expiré</string>
-    <string name="omnipod_warning">Attention</string>
+    <string name="omnipod_preference_category_rileylink">RileyLink</string>
+    <string name="omnipod_preference_category_other">Autres</string>
+    <string name="omnipod_preference_category_alerts">Alertes</string>
+    <string name="omnipod_preference_category_confirmation_beeps">Bips de confirmation</string>
+    <!-- Omnipod - Pod Status -->
    <string name="omnipod_pod_status_no_active_pod">Pas de Pod actif</string>
-    <string name="omnipod_pod_status_waiting_for_pair_and_prime">Configuration en cours (en attente d\'appairage et d\'amorçage)</string>
+    <string name="omnipod_pod_status_waiting_for_activation">Configuration en cours (en attente d\'activation du Pod)</string>
    <string name="omnipod_pod_status_waiting_for_cannula_insertion">Configuration en cours (en attente d\'insertion de canule)</string>
    <string name="omnipod_pod_status_running">En cours d\'exécution</string>
    <string name="omnipod_pod_status_suspended">Suspendu</string>
@ -35,39 +28,81 @@
    <string name="omnipod_pod_status_activation_time_exceeded">Délai d\'activation dépassé</string>
    <string name="omnipod_pod_status_inactive">Inactif</string>
    <string name="omnipod_pod_status_pod_fault_description">Défaut du Pod : %1$s %2$s</string>
-    <string name="omnipod_pod_active_alerts">Activer alertes Pod</string>
-    <string name="omnipod_acknowledge_active_alerts_short">Valider Alertes</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
+    <!-- Omnipod - Alerts -->
+    <string name="omnipod_alert_finish_pairing_reminder">Rappel fin d\'appairage</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Rappel fin de configuration</string>
+    <string name="omnipod_alert_expiration">Le Pod expire bientôt</string>
+    <string name="omnipod_alert_expiration_advisory">Le Pod expire bientôt</string>
+    <string name="omnipod_alert_shutdown_imminent">Arrêt imminent</string>
+    <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_item_description">Description</string>
+    <string name="omnipod_history_item_source">Source</string>
+    <string name="omnipod_history_item_date">Date</string>
+    <string name="omnipod_history_type">Type :</string>
+    <string name="omnipod_history_bolus_value">%1$.2f U</string>
+    <string name="omnipod_history_bolus_value_with_carbs">%1$.2f U, Gluc=%2$.1f g</string>
+    <string name="omnipod_history_tbr_value">Débit : %1$.2f U, durée : %2$d minutes</string>
    <!-- Omnipod - Error -->
+    <string name="omnipod_warning">Attention</string>
    <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_operation_not_possible_no_profile">Operation impossible.\n\nVous devez attendre quelques minutes, jusqu\'à ce que AAPS tente de définir le profil de basale pour la première fois.</string>
-    <string name="omnipod_error_illegal_init_action_type">type d\'action d\'init Pod non autorisée : %1$s</string>
    <string name="omnipod_error_pod_not_attached">Pas de Pod actif</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Échec de vérification de la commande</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Erreur inconnue. Veuillez signaler ! (type : %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Échec de communication : paramètres d\'entrées reçus invalides</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Échec de communication : délai expiré</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Échec de communication : Erreur inconnue. Veuillez signaler !</string>
-    <string name="omnipod_driver_error_crc_mismatch">Échec de communication : vérification de l\'intégrité du message échouée</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Échec de communication : paquet reçu du Pod invalide</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Échec de communication : état du Pod incorrect</string>
-    <string name="omnipod_driver_error_invalid_response">Échec de communication : réponse invalide reçue du Pod</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Échec de communication : message reçu du Pod avec un numéro de séquence invalide</string>
-    <string name="omnipod_driver_error_invalid_message_address">Échec de communication : message reçu du Pod avec une adresse invalide</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Échec de communication : échec du décodage du message reçu du Pod</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Échec de communication : resynchro nonce échouée</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Échec de communication : nonce non synchro</string>
-    <string name="omnipod_driver_error_not_enough_data">Échec de communication : pas assez de données reçues du Pod</string>
-    <string name="omnipod_driver_error_pod_fault">Un défaut du Pod a été détecté (%1$03d %2$s). Veuillez désactiver votre Pod et en démarrer un nouveau</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Échec de communication : le Pod a renvoyé un message d\'erreur</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Gestion Pod</string>
-    <string name="omnipod_cmd_init_pod">Init Pod</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>
+    <string name="omnipod_error_invalid_progress_state">Échec de communication : état du Pod incorrect</string>
+    <string name="omnipod_error_invalid_response">Échec de communication : réponse invalide reçue du Pod</string>
+    <string name="omnipod_error_invalid_message_sequence_number">Échec de communication : message reçu du Pod avec un numéro de séquence invalide</string>
+    <string name="omnipod_error_invalid_message_address">Échec de communication : message reçu du Pod avec une adresse invalide</string>
+    <string name="omnipod_error_message_decoding_failed">Échec de communication : échec du décodage du message reçu du Pod</string>
+    <string name="omnipod_error_nonce_resync_failed">Échec de communication : resynchro numéro unique échouée</string>
+    <string name="omnipod_error_nonce_out_of_sync">Échec de communication : numéro unique non synchro</string>
+    <string name="omnipod_error_not_enough_data">Échec de communication : pas assez de données reçues du Pod</string>
+    <string name="omnipod_error_pod_fault">Un défaut du Pod a été détecté (%1$03d %2$s). Veuillez désactiver votre Pod et en acttiver un nouveau</string>
+    <string name="omnipod_error_pod_returned_error_response">Échec de communication : le Pod a renvoyé un message d\'erreur</string>
+    <string name="omnipod_error_communication_failed_no_response_from_riley_link">Aucune réponse du RileyLink</string>
+    <string name="omnipod_error_communication_failed_riley_link_interrupted">RileyLink interrompu</string>
+    <string name="omnipod_error_communication_failed_no_response_from_pod">Pas de réponse du Pod</string>
+    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Le paramétrage du profil basal a échoué. L\'injection peut être suspendue ! Actualisez manuellement l\'état du Pod à partir de l\'onglet Omnipod et reprenez l\'injection si nécessaire.</string>
+    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Le paramétrage du profil basal a peut-être échoué. L\'injection peut être suspendue ! Actualisez manuellement l\'état du Pod à partir de l\'onglet Omnipod et reprenez l\'injection si nécessaire.</string>
+    <string name="omnipod_error_set_basal_failed_delivery_suspended">Le paramétrage du profil basal a échoué. L\'injection est suspendue ! Veuillez poursuivre manuellement l\'injection à partir de l\'onglet Omnipod.</string>
+    <string name="omnipod_error_set_basal_failed">Echec Paramétrage Profil Basal.</string>
+    <string name="omnipod_error_cancel_temp_basal_failed_uncertain">L\'annulation de la basale temporaire peut avoir échouée. Veuillez actualiser manuellement l\'état du Pod depuis l\'onglet Omnipod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Le paramétrage de la basal temp a échoué. Si une basal temp était en cours d\'exécution, elle a peut-être été annulée. Veuillez actualiser manuellement l\'état du Pod à partir de l\'onglet Omnipod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Le paramétrage de la basal temp a peut-être échoué. Si une basal temp était en cours d\'exécution, elle a été annulée. Veuillez actualiser manuellement l\'état du Pod à partir de l\'onglet Omnipod.</string>
+    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Le paramétrage de l\'heure a peut-être échoué. L\'injection peut être suspendue ! Actualisez manuellement l\'état du Pod à partir de l\'onglet Omnipod et reprenez l\'injection si nécessaire.</string>
+    <string name="omnipod_error_set_time_failed_delivery_suspended">Le paramétrage de l\'heure a échoué. L\'injection est suspendue ! Veuillez poursuivre manuellement l\'injection à partir de l\'onglet Omnipod.</string>
+    <string name="omnipod_error_failed_to_set_profile_empty_profile">Impossible de définir le profil Basal : profil vide reçu. Vérifiez que votre profil de basal est activé.</string>
+    <string name="omnipod_error_set_initial_basal_schedule_no_profile">Aucun profil de basal n\'est actif. Assurez-vous d\'activer votre profil de basal.</string>
+    <string name="omnipod_error_unknown_custom_command">Commande personnalisée inconnue : %1$s</string>
+    <string name="omnipod_error_failed_to_read_pulse_log">Échec lecture Journal d\'impulsions</string>
+    <string name="omnipod_error_failed_to_refresh_status">Échec pour rafraichir l\'état</string>
+    <string name="omnipod_error_failed_to_acknowledge_alerts">Échec pour confirmer les alertes</string>
+    <string name="omnipod_error_failed_to_suspend_delivery">Échec pour suspendre l\'injection</string>
+    <string name="omnipod_error_failed_to_set_time">Échec pour définir l\'heure</string>
+    <string name="omnipod_error_failed_to_resume_delivery">Échec pour reprendre l\'injection</string>
+    <string name="omnipod_error_automatic_time_or_timezone_change_failed">Échec pour changer automatiquement l\'heure sur le Pod. Vous devez synchroniser manuellement l\'heure dans l\'onglet Omnipod.</string>
+    <string name="omnipod_error_bolus_failed_uncertain">Impossible de vérifier si le bolus a réussi. Veuillez vérifier manuellement que votre Pod est en train de délivrer un bolus en écoutant des clics. <b>Si vous êtes sûr que le bolus n\'a pas réussi, vous devez supprimer manuellement l\'entrée bolus des traitements, même si vous cliquez sur \'Annuler bolus\' maintenant !</b></string>
+    <string name="omnipod_error_bolus_failed_uncertain_smb">Impossible de vérifier si le bolus SMB (%1$.2f U) a réussi. <b>Si vous êtes certain que le bolus n\'a pas réussi, vous devez supprimer manuellement l\'entrée SMB des traitements.</b></string>
+    <string name="omnipod_error_bolus_did_not_succeed">Le bolus n\'a pas réussi.</string>
+    <string name="omnipod_error_failed_to_initialize_pod">Impossible d’initialiser le Pod</string>
+    <string name="omnipod_error_failed_to_insert_cannula">Impossible d\'insérer la canule</string>
+    <string name="omnipod_error_pod_fault_activation_time_exceeded">La durée d\'activation du Pod a été dépassée. Ce Pod ne peut plus être activé.</string>
+    <!-- Omnipod - Confirmation -->
+    <string name="omnipod_confirmation">Confirmation</string>
+    <string name="omnipod_confirmation_time_or_timezone_change">Heure et/ou fuseau horaire changé sur le Pod.</string>
+    <string name="omnipod_confirmation_expiration_alerts_updated">Configuration des alertes mise à jour dans le Pod.</string>
+    <string name="omnipod_confirmation_time_on_pod_updated">L\'heure du Pod a été mise à jour.</string>
+    <string name="omnipod_confirmation_suspended_delivery">Toutes les injections d\'insuline ont été suspendues.</string>
+    <string name="omnipod_confirmation_acknowledged_alerts">Les alertes actives ont été acceptées.</string>
+    <string name="omnipod_confirmation_delivery_resumed">L\'injection de l\'insuline a été reprise.</string>
+    <string name="omnipod_confirmation_pod_suspended">Pod suspendu</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_pod_history">Historique 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 basale temporaire</string>
@ -82,88 +117,92 @@
    <string name="omnipod_cmd_suspend_delivery">Suspendre l\'injection</string>
    <string name="omnipod_cmd_resume_delivery">Pousuivre l\'injection</string>
    <string name="omnipod_cmd_unknown_entry">Entrée inconnue</string>
-    <string name="omnipod_cmd_bolus_value">%1$.2f U</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f U, Gluc=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Débit : %1$.2f U, durée : %2$d min</string>
-    <string name="omnipod_cmd_discard_pod_desc">Si vous appuyez sur <b>OK</b>, le Pod sera réinitialisé et vous ne pourrez plus communiquer avec lui. Ne le faite que si vous ne pouvez plus communiquer avec le Pod. Si vous pouvez toujours communiquer avec lui, veuillez utiliser l\'option <b>Désactiver Pod</b>.\n\n Si vous souhaitez le faire, assurez-vous de retirer également le Pod de votre corps.</string>
-    <string name="omnipod_cmd_pod_history_na">Historique Pod non disponible pour le moment.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Remplir le Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nRemplir 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_init_pod_wizard_step2_title">Amorçage</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Tentative d\'appairage et d\'amorçage du nouveau Pod.\n\nQuand tous les items sont cochées, 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_init_pod_wizard_step3_title">Collez le Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPré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_init_pod_wizard_step4_title">Insertion canule</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Tentative de définir le schéma de basal et d\'insertion de la canule.\n\nQuand tous les items sont cochés, appuyez sur <b>Suivant</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Infos Pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nLe 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 votre Pod si vous pensez que ce n\'est pas le cas.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Désactiver Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nAppuyez 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_remove_pod_wizard_step2_title">Désactivation du Pod</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Désactivation du Pod.\n\nQuand tous les items sont cochés, appuyez sur <b>Suivant</b>.\n\n<b>Remarque :</b> Si la désactivation échoue en permanence, appuyez sur <b>Annuler</b> et utilisez l\'option <b>Réinit. Pod</b> pour réinitialiser l\'état du Pod.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod désactivé.\n\nVeuillez enlever le Pod de votre corps et le jeter.</string>
-    <string name="omnipod_init_pod_pair_pod">Appairer le Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Amorcer le Pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Remplir canule</string>
-    <string name="omnipod_init_pod_set_basal_profile">Définir profil de basale</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Annuler l\'injection</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Désactiver Pod</string>
-    <!-- Omnipod - Base -->
-    <string name="omnipod_alert_finish_pairing_reminder">Rappel fin d\'appairage</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Rappel fin de configuration</string>
-    <string name="omnipod_alert_expiration">Le Pod expire bientôt</string>
-    <string name="omnipod_alert_expiration_advisory">Le Pod expire bientôt</string>
-    <string name="omnipod_alert_shutdown_imminent">Arrêt imminent</string>
-    <string name="omnipod_alert_low_reservoir">Réservoir bas</string>
-    <string name="omnipod_alert_unknown_alert">Alerte inconnue</string>
-    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Le paramétrage du profil basal a échoué. L\'injection peut être suspendue ! Actualisez manuellement l\'état du Pod à partir de l\'onglet Omnipod et reprenez l\'injection si nécessaire.</string>
-    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Le paramétrage du profil basal a peut-être échoué. L\'injection peut être suspendue ! Actualisez manuellement l\'état du Pod à partir de l\'onglet Omnipod et reprenez l\'injection si nécessaire.</string>
-    <string name="omnipod_error_set_basal_failed_delivery_suspended">Le paramétrage du profil basal a échoué. L\'injection est suspendue ! Veuillez poursuivre manuellement l\'injection à partir de l\'onglet Omnipod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Le paramétrage de la basal temp a échoué. Si une basal temp était en cours d\'exécution, elle a peut-être été annulée. Veuillez actualiser manuellement l\'état du Pod à partir de l\'onglet Omnipod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Le paramétrage de la basal temp a peut-être échoué. Si une basal temp était en cours d\'exécution, elle a été annulée. Veuillez actualiser manuellement l\'état du Pod à partir de l\'onglet Omnipod.</string>
-    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Le paramétrage de l\'heure a peut-être échoué. L\'injection peut être suspendue ! Actualisez manuellement l\'état du Pod à partir de l\'onglet Omnipod et reprenez l\'injection si nécessaire.</string>
-    <string name="omnipod_error_set_time_failed_delivery_suspended">Le paramétrage de l\'heure a échoué. L\'injection est suspendue ! Veuillez poursuivre manuellement l\'injection à partir de l\'onglet Omnipod.</string>
-    <string name="omnipod_bolus_failed_uncertain">Impossible de vérifier si le bolus a réussi. Veuillez vérifier manuellement que votre Pod est en train de délivrer un bolus en écoutant des clics. <b>Si vous êtes sûr que le bolus n\'a pas réussi, vous devez supprimer manuellement l\'entrée bolus des traitements, même si vous cliquez sur \'Annuler bolus\' maintenant !</b></string>
-    <string name="omnipod_bolus_failed_uncertain_smb">Impossible de vérifier si le bolus SMB (%1$.2f U) a réussi. <b>Si vous êtes certain que le bolus n\'a pas réussi, vous devez supprimer manuellement l\'entrée SMB des traitements.</b></string>
-    <string name="omnipod_rl_stats">Stats RL</string>
-    <string name="omnipod_read_pulse_log_short">Enreg. Pulse</string>
-    <string name="omnipod_pod_lot">LOT</string>
-    <string name="omnipod_pod_tid">TID</string>
-    <string name="omnipod_pod_firmware_version">Version du firmware</string>
-    <string name="omnipod_errors">Erreurs</string>
-    <string name="omnipod_cmd_basal_profile_not_set_is_same">Le profil Basal est le même, donc il ne sera pas redéfini.</string>
-    <string name="omnipod_custom_action_reset_rileylink">Réinitialiser la config. RileyLink</string>
-    <string name="omnipod_time_or_timezone_change">Heure et/ou fuseau horaire changé sur le Pod</string>
-    <string name="omnipod_composite_time">%1$s et %2$s</string>
-    <string name="omnipod_time_ago">il y a %1$s</string>
-    <string name="omnipod_waiting_for_rileylink_connection">En attente de connexion RileyLink ...</string>
-    <string name="omnipod_bolus_did_not_succeed">Le bolus n\'a pas réussi</string>
-    <string name="omnipod_refresh">Actualiser</string>
-    <string name="omnipod_resume_delivery">Pousuivre l\'injection</string>
-    <string name="omnipod_error_pod_suspended">Pod suspendu</string>
-    <string name="omnipod_less_than_a_minute_ago">Il y a moins d\'une minute</string>
-    <string name="omnipod_suspend_delivery_short">Arrêter</string>
-    <string name="omnipod_cmd_pair_and_prime">Appairer et amorcer</string>
-    <string name="omnipod_cmd_fill_cannula_set_basal_profile">Remplir la canule et définir le profil de basal</string>
-    <string name="omnipod_cmd_get_pulse_log">Récupérer les journaux des pulses</string>
-    <string name="omnipod_uncertain_failure">Erreur inconnue</string>
-    <string name="omnipod_cancelled_old_tbr_failed_to_set_new">Ancien débit de basal temporaire annulé, mais impossible de définir le nouveau débits de basal temporaire</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">Lire Journal d\'impulsions</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_uncertain">incertain</string>
-    <string name="omnipod_expiration_alerts_updated">Configuration des alertes mise à jour dans le Pod</string>
-    <string name="omnipod_preference_category_rileylink">RileyLink</string>
-    <string name="omnipod_preference_category_other">Autres</string>
-    <string name="omnipod_preference_category_alerts">Alertes</string>
-    <string name="omnipod_preference_category_confirmation_beeps">Bips de confirmation</string>
-    <string name="omnipod_wizard_button_exit">Quitter</string>
-    <string name="omnipod_wizard_button_previous">Précédent</string>
-    <string name="omnipod_wizard_button_next">Suivant</string>
+    <!-- Omnipod - Pod Management -->
+    <string name="omnipod_pod_management_title">Gestion du Pod</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_pod_history">Historique du Pod</string>
+    <string name="omnipod_pod_management_discard_pod_state_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>
+    <!-- Omnipod - Wizard common -->
+    <string name="omnipod_wizard_button_cancel">Annuler</string>
    <string name="omnipod_wizard_button_finish">Terminer</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>
-    <string name="omnipod_history_type">Type :</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_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_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_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_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_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_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>
+    <string name="omnipod_pod_deactivation_wizard_pod_deactivated_title">Pod désactivé</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_deactivated_text">Votre Pod a été désactivé.\n\nVeuillez enlever le Pod de votre corps et le jeter dans le recyclage.</string>
+    <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>
+    <!-- Omnipod - Overview -->
+    <string name="omnipod_overview_button_set_time">Définir l\'heure</string>
+    <string name="omnipod_overview_button_suspend_delivery">Arrêter</string>
+    <string name="omnipod_overview_button_riley_link_stats">État RL</string>
+    <string name="omnipod_overview_button_read_pulse_log">Journal d\'impulsions</string>
+    <string name="omnipod_overview_button_refresh">Actualiser</string>
+    <string name="omnipod_overview_button_resume_delivery">Reprendre l\'injection</string>
+    <string name="omnipod_overview_button_pod_management">Pod mngt</string>
+    <string name="omnipod_overview_button_acknowledge_active_alerts">Accepter les alertes</string>
+    <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_expiry_date">Pod expiré</string>
+    <string name="omnipod_overview_last_connection">Dernière connexion</string>
+    <string name="omnipod_overview_last_bolus">Dernier bolus</string>
+    <string name="omnipod_overview_temp_basal_rate">Débit de Basal Temporaire</string>
+    <string name="omnipod_overview_base_basal_rate">Débit de Basal</string>
+    <string name="omnipod_overview_reservoir">Réservoir</string>
+    <string name="omnipod_overview_pod_active_alerts">Activer alertes Pod</string>
+    <string name="omnipod_overview_firmware_version">Version du firmware</string>
+    <string name="omnipod_overview_time_on_pod">Heure du Pod</string>
+    <string name="omnipod_overview_temp_basal_value">%1$.2fU/h @%2$s (%3$d/%4$d minutes)</string>
+    <string name="omnipod_overview_reservoir_value">%1$.2f U restantes</string>
+    <string name="omnipod_overview_reservoir_value_over50">Plus de 50 U restantes</string>
+    <string name="omnipod_overview_errors">Erreurs</string>
+    <!-- Omnipod - Other -->
+    <string name="omnipod_pump_description">L\'intégration de la pompe Omnipod nécessite un boitier RileyLink (avec au minimum un firmware 2.0).</string>
+    <string name="omnipod_custom_action_reset_rileylink">Réinitialiser la config. RileyLink</string>
+    <string name="omnipod_uncertain">incertain</string>
+    <string name="omnipod_pulse_log">Journal d\'impulsions</string>
+    <string name="omnipod_pulse_log_value">Journal d\'impulsions (copié dans presse-papiers)</string>
+    <string name="omnipod_yes">Oui</string>
+    <string name="omnipod_no">Non</string>
+    <string name="omnipod_ok">OK</string>
+    <string name="omnipod_cancel">Annuler</string>
+    <!-- Omnipod - Times -->
+    <string name="omnipod_moments_ago">Il y a un moment</string>
+    <string name="omnipod_less_than_a_minute_ago">Il y a moins d\'une minute</string>
+    <string name="omnipod_composite_time">%1$s et %2$s</string>
+    <string name="omnipod_time_ago">il y a %1$s</string>
    <plurals name="omnipod_minutes">
        <item quantity="one">%1$d minute</item>
        <item quantity="other">%1$d minutes</item>
--- a/omnipod/src/main/res/values-ga-rIE/strings.xml
+++ b/omnipod/src/main/res/values-ga-rIE/strings.xml
@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <!-- Omnipod - Pod Status -->
+    <!-- Omnipod - Alerts -->
+    <!-- Omnipod - History -->
    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod - Base -->
+    <!-- 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>
--- a/omnipod/src/main/res/values-hr-rHR/strings.xml
+++ b/omnipod/src/main/res/values-hr-rHR/strings.xml
@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <!-- Omnipod - Pod Status -->
+    <!-- Omnipod - Alerts -->
+    <!-- Omnipod - History -->
    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod - Base -->
+    <!-- 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>
--- a/omnipod/src/main/res/values-it-rIT/strings.xml
+++ b/omnipod/src/main/res/values-it-rIT/strings.xml
@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Integrazione del microinfusore Omnipod, richiede un dispositivo RileyLink (con almeno il firmware 2.0).</string>
-    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
    <string name="omnipod_config_bolus_beeps_enabled">BIP bolo abilitato</string>
    <string name="omnipod_config_basal_beeps_enabled">BIP basale abilitato</string>
    <string name="omnipod_config_smb_beeps_enabled">BIP SMB abilitato</string>
@ -15,19 +14,13 @@
    <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Ore prima dell\'arresto</string>
    <string name="omnipod_config_low_reservoir_alert_enabled">Avviso livello serbatoio basso abilitato</string>
    <string name="omnipod_config_low_reservoir_alert_units">Numero di unità</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_moments_ago">Momenti fa</string>
-    <string name="omnipod_pod_mgmt">GSTN pod</string>
-    <string name="omnipod_pod_status">Stato pod</string>
-    <string name="omnipod_total_delivered_label">Totale erogato</string>
-    <string name="omnipod_total_delivered">%1$.2f U</string>
-    <string name="omnipod_reservoir_left">%1$.2f U rimanenti</string>
-    <string name="omnipod_reservoir_over50">Oltre 50 U</string>
-    <string name="omnipod_pod_address">Indirizzo pod</string>
-    <string name="omnipod_pod_expiry">Scadenza pod</string>
-    <string name="omnipod_warning">Avviso</string>
+    <string name="omnipod_preference_category_rileylink">RileyLink</string>
+    <string name="omnipod_preference_category_other">Altro</string>
+    <string name="omnipod_preference_category_alerts">Avvisi</string>
+    <string name="omnipod_preference_category_confirmation_beeps">Beep di conferma</string>
+    <!-- Omnipod - Pod Status -->
    <string name="omnipod_pod_status_no_active_pod">Nessun pod attivo</string>
-    <string name="omnipod_pod_status_waiting_for_pair_and_prime">Configurazione in corso (attesa associazione e caricamento)</string>
+    <string name="omnipod_pod_status_waiting_for_activation">Configurazione in corso (attesa attivazione pod)</string>
    <string name="omnipod_pod_status_waiting_for_cannula_insertion">Configurazione in corso (attesa inserimento cannula)</string>
    <string name="omnipod_pod_status_running">In esecuzione</string>
    <string name="omnipod_pod_status_suspended">Sospeso</string>
@ -35,39 +28,78 @@
    <string name="omnipod_pod_status_activation_time_exceeded">Tempo di attivazione superato</string>
    <string name="omnipod_pod_status_inactive">Inattivo</string>
    <string name="omnipod_pod_status_pod_fault_description">Guasto pod: %1$s %2$s</string>
-    <string name="omnipod_pod_active_alerts">Attiva avvisi pod</string>
-    <string name="omnipod_acknowledge_active_alerts_short">Conferma avvisi</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
+    <!-- Omnipod - Alerts -->
+    <string name="omnipod_alert_finish_pairing_reminder">Fine promemoria associazione</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Fine promemoria configurazione</string>
+    <string name="omnipod_alert_expiration">Il pod scadrà presto</string>
+    <string name="omnipod_alert_expiration_advisory">Il pod scadrà presto</string>
+    <string name="omnipod_alert_shutdown_imminent">L\'arresto è imminente</string>
+    <string name="omnipod_alert_low_reservoir">Livello serbatoio basso</string>
+    <string name="omnipod_alert_unknown_alert">Avviso sconosciuto</string>
+    <!-- Omnipod - History -->
+    <string name="omnipod_history_title">Storico pod</string>
+    <string name="omnipod_history_item_description">Descrizione</string>
+    <string name="omnipod_history_item_source">Fonte</string>
+    <string name="omnipod_history_item_date">Data</string>
+    <string name="omnipod_history_type">Tipo:</string>
+    <string name="omnipod_history_bolus_value">%1$.2f U</string>
+    <string name="omnipod_history_bolus_value_with_carbs">%1$.2f U, CHO=%2$.1f g</string>
+    <string name="omnipod_history_tbr_value">Tasso: %1$.2f U, durata: %2$d minuti</string>
    <!-- Omnipod - Error -->
+    <string name="omnipod_warning">Avviso</string>
    <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_operation_not_possible_no_profile">Operazione non possibile.\n\n Devi attendere qualche minuto che AAPS imposti il profilo basale per la prima volta.</string>
-    <string name="omnipod_error_illegal_init_action_type">Illegal PodInitActionType: %1$s</string>
    <string name="omnipod_error_pod_not_attached">Nessun pod attivo</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Verifica comando fallita</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Si è verificato un errore imprevisto. Segnalalo! (%1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Comunicazione fallita: ricevuti parametri di input non validi</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Comunicazione fallita: timeout</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Comunicazione fallita: si è verificato un errore imprevisto. Segnalalo!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Comunicazione fallita: verifica dell\'integrità del messaggio fallita</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Comunicazione fallita: ricevuto un pacchetto non valido dal pod</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Comunicazione fallita: il pod è in uno stato non corretto</string>
-    <string name="omnipod_driver_error_invalid_response">Comunicazione fallita: ricevuta una risposta non valida dal pod</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Comunicazione fallita: ricevuto dal pod un messaggio con una sequenza numerica non valida</string>
-    <string name="omnipod_driver_error_invalid_message_address">Comunicazione fallita: ricevuto dal pod un messaggio con un indirizzo non valido</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Comunicazione fallita: non si è riuscito a decodificare il messaggio dal pod</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Comunicazione fallita: risincronizzazione \'nonce\' non riuscita</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Comunicazione fallita: \'nonce\' non sincronizzato</string>
-    <string name="omnipod_driver_error_not_enough_data">Comunicazione fallita: non abbastanza dati ricevuti dal pod</string>
-    <string name="omnipod_driver_error_pod_fault">È stato rilevato un guasto al pod (%1$03d %2$s). Disattiva il tuo pod e avviane uno nuovo</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Comunicazione fallita: il pod ha restituito una risposta di errore</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Gestione pod</string>
-    <string name="omnipod_cmd_init_pod">Inizializza pod</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>
+    <string name="omnipod_error_invalid_progress_state">Comunicazione fallita: il pod è in uno stato non corretto</string>
+    <string name="omnipod_error_invalid_response">Comunicazione fallita: ricevuta una risposta non valida dal pod</string>
+    <string name="omnipod_error_invalid_message_sequence_number">Comunicazione fallita: ricevuto dal pod un messaggio con una sequenza numerica non valida</string>
+    <string name="omnipod_error_invalid_message_address">Comunicazione fallita: ricevuto dal pod un messaggio con un indirizzo non valido</string>
+    <string name="omnipod_error_message_decoding_failed">Comunicazione fallita: non si è riuscito a decodificare il messaggio dal pod</string>
+    <string name="omnipod_error_nonce_resync_failed">Comunicazione fallita: risincronizzazione \'nonce\' non riuscita</string>
+    <string name="omnipod_error_nonce_out_of_sync">Comunicazione fallita: \'nonce\' non sincronizzato</string>
+    <string name="omnipod_error_not_enough_data">Comunicazione fallita: non abbastanza dati ricevuti dal pod</string>
+    <string name="omnipod_error_pod_fault">È stato rilevato un guasto al pod (%1$03d %2$s). Disattiva il tuo pod e avviane uno nuovo</string>
+    <string name="omnipod_error_pod_returned_error_response">Comunicazione fallita: il pod ha restituito una risposta di errore</string>
+    <string name="omnipod_error_communication_failed_no_response_from_riley_link">Nessuna risposta da RileyLink</string>
+    <string name="omnipod_error_communication_failed_riley_link_interrupted">RileyLink interrotto</string>
+    <string name="omnipod_error_communication_failed_no_response_from_pod">Nessuna risposta dal pod</string>
+    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Impostazione profilo basale fallita. L\'erogazione potrebbe essere sospesa! Aggiorna manualmente lo stato del pod dalla scheda Omnipod e riprendi l\'erogazione se necessario.</string>
+    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">L\'Impostazione del profilo basale potrebbe essere fallita. L\'erogazione potrebbe essere sospesa! Aggiorna manualmente lo stato del pod dalla scheda Omnipod e riprendi l\'erogazione se necessario.</string>
+    <string name="omnipod_error_set_basal_failed_delivery_suspended">Impostazione profilo basale fallita. L\'erogazione è sospesa! Riprendi manualmente l\'erogazione dalla scheda Omnipod.</string>
+    <string name="omnipod_error_set_basal_failed">Impostazione profilo basale fallita.</string>
+    <string name="omnipod_error_cancel_temp_basal_failed_uncertain">La cancellazione della basale temporanea potrebbe essere fallita. Aggiorna manualmente lo stato del pod dalla scheda Omnipod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Impostazione basale temporanea fallita. Se una basale temporanea era precedentemente in esecuzione, potrebbe essere stata cancellata. Aggiorna manualmente lo stato del pod dalla scheda Omnipod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Impostazione basale temporanea fallita. Se una basale temporanea era precedentemente in esecuzione, è stata cancellata. Aggiorna manualmente lo stato del pod dalla scheda Omnipod.</string>
+    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">L\'Impostazione dell\'ora potrebbe essere fallita. L\'erogazione potrebbe essere sospesa! Aggiorna manualmente lo stato del pod dalla scheda Omnipod e riprendi l\'erogazione se necessario.</string>
+    <string name="omnipod_error_set_time_failed_delivery_suspended">Impostazione ora fallita. L\'erogazione è sospesa! Riprendi manualmente l\'erogazione dalla scheda Omnipod.</string>
+    <string name="omnipod_error_failed_to_set_profile_empty_profile">Impossibile impostare il profilo basale: ricevuto un profilo vuoto. Assicurati di attivare il tuo profilo basale.</string>
+    <string name="omnipod_error_set_initial_basal_schedule_no_profile">Nessun profilo basale è attivo. Assicurati di attivare il tuo profilo basale.</string>
+    <string name="omnipod_error_unknown_custom_command">Comando personalizzato sconosciuto: %1$s</string>
+    <string name="omnipod_error_failed_to_read_pulse_log">Impossibile leggere il log impulsi</string>
+    <string name="omnipod_error_failed_to_refresh_status">Impossibile aggiornare lo stato</string>
+    <string name="omnipod_error_failed_to_suspend_delivery">Impossibile sospendere l\'erogazione</string>
+    <string name="omnipod_error_failed_to_set_time">Impossibile impostare l\'ora</string>
+    <string name="omnipod_error_failed_to_resume_delivery">Impossibile riprendere l\'erogazione</string>
+    <string name="omnipod_error_automatic_time_or_timezone_change_failed">Impossibile cambiare automaticamente l\'ora nel pod. Dovresti sincronizzare manualmente l\'ora nella scheda Omnipod.</string>
+    <string name="omnipod_error_bolus_failed_uncertain">Impossibile verificare che il bolo sia riuscito. Verifica manualmente che il tuo pod stia erogando insulina ascoltando i click. <b>Se sei sicuro che il bolo non sia riuscito, dovresti eliminare manualmente l\'inserimento del bolo dalla sezione Trattamenti, anche se fai click su \'Cancella bolo\' in questo momento!</b></string>
+    <string name="omnipod_error_bolus_failed_uncertain_smb">Impossibile verificare che il bolo SMB (%1$.2f U) sia riuscito. <b>Se sei sicuro che il bolo non sia riuscito, dovresti eliminare manualmente l\'inserimento dalla sezione Trattamenti.</b></string>
+    <string name="omnipod_error_bolus_did_not_succeed">Il bolo non è riuscito.</string>
+    <string name="omnipod_error_failed_to_initialize_pod">Inizializzazione pod fallita</string>
+    <string name="omnipod_error_failed_to_insert_cannula">Inserimento cannula fallito</string>
+    <string name="omnipod_error_pod_fault_activation_time_exceeded">Il tempo di attivazione del pod è stato superato. Questo pod non può più essere attivato.</string>
+    <!-- Omnipod - Confirmation -->
+    <string name="omnipod_confirmation">Conferma</string>
+    <string name="omnipod_confirmation_time_or_timezone_change">Ora e/o fuso orario cambiati nel pod.</string>
+    <string name="omnipod_confirmation_time_on_pod_updated">L\'ora nel pod è stata aggiornata.</string>
+    <string name="omnipod_confirmation_suspended_delivery">Tutta l\'erogazione di insulina è stata sospesa.</string>
+    <string name="omnipod_confirmation_delivery_resumed">L\'erogazione di insulina è ripresa.</string>
+    <string name="omnipod_confirmation_pod_suspended">Pod sospeso</string>
+    <!-- Omnipod - Commands -->
    <string name="omnipod_cmd_deactivate_pod">Disattiva pod</string>
    <string name="omnipod_cmd_discard_pod">Scarta pod</string>
-    <string name="omnipod_cmd_pod_history">Storico pod</string>
    <string name="omnipod_cmd_set_bolus">Imposta bolo</string>
    <string name="omnipod_cmd_cancel_bolus">Cancella bolo</string>
    <string name="omnipod_cmd_set_tbr">Imposta basale temporanea</string>
@ -82,88 +114,87 @@
    <string name="omnipod_cmd_suspend_delivery">Sospendi erogazione</string>
    <string name="omnipod_cmd_resume_delivery">Riprendi erogazione</string>
    <string name="omnipod_cmd_unknown_entry">Inserimento sconosciuto</string>
-    <string name="omnipod_cmd_bolus_value">%1$.2f U</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f U, CHO=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Tasso: %1$.2f U, durata: %2$d min</string>
-    <string name="omnipod_cmd_discard_pod_desc">Se premi <b>OK</b>, lo stato del pod verrà resettato forzatamente e non sarai più in grado di comunicare con il pod. Fallo solo se non riesci più a comunicare con il pod. Se puoi ancora comunicare con il pod, utilizza l\'opzione <b>Disattiva pod</b>.\n\nSe desideri procedere, assicurati anche di rimuovere il pod dal tuo corpo.</string>
-    <string name="omnipod_cmd_pod_history_na">Storico pod non disponibile al momento.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Riempi il pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nRiempi il nuovo pod con abbastanza insulina per 3 giorni.\n\nResta in ascolto di due bip dal pod durante il processo di riempimento. Questi indicano che è stata inserita la quantità minima di 85U. Assicurati di svuotare completamente la siringa di riempimento, anche dopo aver sentito i due segnali acustici.\n\nDopo il riempimento del pod, premi <b>Avanti</b>.\n\n<b>Nota:</b> non rimuovere la protezione dell\'ago del pod in questo momento.\n<b>Nota:</b> colloca il RileyLink in posizione verticale e il pod a pochi centimetri di distanza.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Caricamento</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Prova associazione nuovo pod e caricamento.\n\nQuando tutti gli elementi sono stati controllati, puoi premere <b>Avanti</b>.\n\n<b>Nota:</b> colloca il RileyLink in posizione verticale e il pod a pochi centimetri di distanza.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Attacca il pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPrepara il sito di infusione. Rimuovi la protezione dell\'ago del pod e il supporto adesivo e attacca il pod al sito di infusione.\n\nSe la cannula fuoriesce premi <b>Annulla</b> e cambia pod.\n\nPremi <b>Avanti</b> per inserire la cannula e iniziare l\'erogazione della basale.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Inserimento cannula</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Prova impostazione piano basale iniziale e inserimento cannula.\n\nQuando tutti gli elementi sono stati controllati, puoi premere <b>Avanti</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Info pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nIl pod è adesso attivo.\n\nIl tuo piano basale è stato programmato e la cannula è stata inserita.\n\nVerifica che la cannula sia stata inserita correttamente e sostituisci il tuo pod se avverti il contrario.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Disattiva pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nPremi <b>Avanti</b> per disattivare il pod.\n\n<b>Nota:</b> Questo sospenderà tutta l\'erogazione di insulina e disattiverà il pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Disattivazione del pod</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Disattivazione del pod.\n\nQuando tutti gli elementi sono stati controllati, puoi premere <b>Avanti</b>.\n\n<b>Nota:</b> se la disattivazione fallisce di continuo, premi <b>Annulla</b> e usa l\'opzione <b>Scarta pod</b> per resettare forzatamente lo stato del pod.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod disattivato.\n\nRimuovi il pod dal tuo corpo e gettalo.</string>
-    <string name="omnipod_init_pod_pair_pod">Associa pod</string>
-    <string name="omnipod_init_pod_prime_pod">Carica pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Riempi cannula</string>
-    <string name="omnipod_init_pod_set_basal_profile">Imposta profilo basale</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Cancella erogazione</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Disattiva pod</string>
-    <!-- Omnipod - Base -->
-    <string name="omnipod_alert_finish_pairing_reminder">Fine promemoria associazione</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Fine promemoria configurazione</string>
-    <string name="omnipod_alert_expiration">Il pod scadrà presto</string>
-    <string name="omnipod_alert_expiration_advisory">Il pod scadrà presto</string>
-    <string name="omnipod_alert_shutdown_imminent">L\'arresto è imminente</string>
-    <string name="omnipod_alert_low_reservoir">Livello serbatoio basso</string>
-    <string name="omnipod_alert_unknown_alert">Avviso sconosciuto</string>
-    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Impostazione profilo basale fallita. L\'erogazione potrebbe essere sospesa! Aggiorna manualmente lo stato del pod dalla scheda Omnipod e riprendi l\'erogazione se necessario.</string>
-    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">L\'Impostazione del profilo basale potrebbe essere fallita. L\'erogazione potrebbe essere sospesa! Aggiorna manualmente lo stato del pod dalla scheda Omnipod e riprendi l\'erogazione se necessario.</string>
-    <string name="omnipod_error_set_basal_failed_delivery_suspended">Impostazione profilo basale fallita. L\'erogazione è sospesa! Riprendi manualmente l\'erogazione dalla scheda Omnipod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Impostazione basale temporanea fallita. Se una basale temporanea era precedentemente in esecuzione, potrebbe essere stata cancellata. Aggiorna manualmente lo stato del pod dalla scheda Omnipod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Impostazione basale temporanea fallita. Se una basale temporanea era precedentemente in esecuzione, è stata cancellata. Aggiorna manualmente lo stato del pod dalla scheda Omnipod.</string>
-    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">L\'Impostazione dell\'ora potrebbe essere fallita. L\'erogazione potrebbe essere sospesa! Aggiorna manualmente lo stato del pod dalla scheda Omnipod e riprendi l\'erogazione se necessario.</string>
-    <string name="omnipod_error_set_time_failed_delivery_suspended">Impostazione ora fallita. L\'erogazione è sospesa! Riprendi manualmente l\'erogazione dalla scheda Omnipod.</string>
-    <string name="omnipod_bolus_failed_uncertain">Impossibile verificare se il bolo è riuscito. Verifica manualmente che il tuo pod stia erogando insulina ascoltando i click. <b>Se sei sicuro che il bolo non sia riuscito, dovresti eliminare manualmente l\'inserimento del bolo dalla sezione Trattamenti, anche se fai click su \'Cancella bolo\' in questo momento!</b></string>
-    <string name="omnipod_bolus_failed_uncertain_smb">Impossibile verificare se il bolo SMB (%1$.2f U) è riuscito. <b>Se sei sicuro che il bolo non sia riuscito, dovresti eliminare manualmente l\'inserimento dalla sezione Trattamenti.</b></string>
-    <string name="omnipod_rl_stats">Statistiche RL</string>
-    <string name="omnipod_read_pulse_log_short">Log impulsi</string>
-    <string name="omnipod_pod_lot">LOT</string>
-    <string name="omnipod_pod_tid">TID</string>
-    <string name="omnipod_pod_firmware_version">Versione firmware</string>
-    <string name="omnipod_errors">Errori</string>
-    <string name="omnipod_cmd_basal_profile_not_set_is_same">Il profilo basale è lo stesso, non sarà impostato di nuovo.</string>
-    <string name="omnipod_custom_action_reset_rileylink">Reset config.ne RileyLink</string>
-    <string name="omnipod_time_or_timezone_change">Ora e/o fuso orario cambiati nel pod</string>
-    <string name="omnipod_composite_time">%1$s e %2$s</string>
-    <string name="omnipod_time_ago">%1$s fa</string>
-    <string name="omnipod_waiting_for_rileylink_connection">Attesa connessione RileyLink...</string>
-    <string name="omnipod_bolus_did_not_succeed">Il bolo non è riuscito</string>
-    <string name="omnipod_refresh">Aggiorna</string>
-    <string name="omnipod_resume_delivery">Riprendi erogazione</string>
-    <string name="omnipod_error_pod_suspended">Pod sospeso</string>
-    <string name="omnipod_less_than_a_minute_ago">Meno di un minuto fa</string>
-    <string name="omnipod_suspend_delivery_short">Sospendi</string>
-    <string name="omnipod_cmd_pair_and_prime">Associa e carica</string>
-    <string name="omnipod_cmd_fill_cannula_set_basal_profile">Riempi cannula e imposta profilo basale</string>
-    <string name="omnipod_cmd_get_pulse_log">Ottieni log impulsi</string>
-    <string name="omnipod_uncertain_failure">Errore indeterminato</string>
-    <string name="omnipod_cancelled_old_tbr_failed_to_set_new">Cancellata la vecchia basale temporanea, ma fallita l\'impostazione della nuova basale temporanea</string>
+    <string name="omnipod_cmd_initialize_pod">Inizializza pod</string>
+    <string name="omnipod_cmd_insert_cannula">Inserisci cannula</string>
+    <string name="omnipod_cmd_read_pulse_log">Leggi log impulsi</string>
    <string name="omnipod_cmd_set_fake_suspended_tbr">Imposta basale temporanea fittizia perché il pod è sospeso</string>
    <string name="omnipod_cmd_cancel_fake_suspended_tbr">Cancella basale temporanea fittizia creata perché il pod era sospeso</string>
-    <string name="omnipod_uncertain">indeterminato</string>
-    <string name="omnipod_expiration_alerts_updated">Configurazione avviso aggiornata nel pod</string>
-    <string name="omnipod_preference_category_rileylink">RileyLink</string>
-    <string name="omnipod_preference_category_other">Altro</string>
-    <string name="omnipod_preference_category_alerts">Avvisi</string>
-    <string name="omnipod_preference_category_confirmation_beeps">Beep di conferma</string>
-    <string name="omnipod_wizard_button_exit">Esci</string>
-    <string name="omnipod_wizard_button_previous">Indietro</string>
-    <string name="omnipod_wizard_button_next">Avanti</string>
+    <!-- Omnipod - Pod Management -->
+    <string name="omnipod_pod_management_title">Gestione pod</string>
+    <string name="omnipod_pod_management_waiting_for_rileylink_connection">Attesa connessione RileyLink…</string>
+    <string name="omnipod_pod_management_button_activate_pod">Attiva pod</string>
+    <string name="omnipod_pod_management_button_deactivate_pod">Disattiva pod</string>
+    <string name="omnipod_pod_management_button_discard_pod">Scarta pod</string>
+    <string name="omnipod_pod_management_button_pod_history">Storico pod</string>
+    <!-- Omnipod - Wizard common -->
+    <string name="omnipod_wizard_button_cancel">Annulla</string>
    <string name="omnipod_wizard_button_finish">Fine</string>
-    <string name="omnipod_history_item_description">Descrizione</string>
-    <string name="omnipod_history_item_source">Fonte</string>
-    <string name="omnipod_history_item_date">Data</string>
-    <string name="omnipod_history_type">Tipo:</string>
+    <string name="omnipod_wizard_button_next">Avanti</string>
+    <string name="omnipod_wizard_button_retry">Riprova</string>
+    <string name="omnipod_wizard_button_deactivate_pod">Disattiva pod</string>
+    <string name="omnipod_wizard_button_discard_pod">Scarta pod</string>
+    <string name="omnipod_wizard_exit_confirmation_text">Non hai ancora completato tutti i passaggi. Sei sicuro di voler uscire?</string>
+    <string name="omnipod_wizard_exit_confirmation_title">Esci</string>
+    <!-- Omnipod - Pod activation Wizard -->
+    <string name="omnipod_pod_activation_wizard_fill_pod_title">Riempi pod</string>
+    <string name="omnipod_pod_activation_wizard_fill_pod_text">Riempi un nuovo pod con abbastanza insulina per 3 giorni.\n\nResta in ascolto di due bip dal pod durante il processo di riempimento. Questi indicano che è stata inserita la quantità minima di 85U. Assicurati di svuotare completamente la siringa di riempimento, anche dopo aver sentito i due segnali acustici.\n\nDopo il riempimento del pod, premi <b>Avanti</b>.\n\n<b>Nota:</b> non rimuovere la protezione dell\'ago del pod in questo momento.\n<b>Nota:</b> colloca il RileyLink in posizione verticale e il pod a pochi centimetri di distanza.</string>
+    <string name="omnipod_pod_activation_wizard_initialize_pod_title">Inizializza pod</string>
+    <string name="omnipod_pod_activation_wizard_initialize_pod_text">Tentativo di associazione nuovo pod e caricamento.\n\nQuando il processo di inizializzazione è stato completato con successo, puoi premere <b>Avanti</b>.\n\n<b>Nota:</b> colloca il RileyLink in posizione verticale e il pod a pochi centimetri di distanza.</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_title">Collega pod</string>
+    <string name="omnipod_pod_activation_wizard_insert_cannula_title">Inserisci cannula</string>
+    <string name="omnipod_pod_activation_wizard_insert_cannula_text">Tentativo di impostare il piano basale iniziale e inserire la cannula.\n\nQuando la cannula è stata inserita con successo, puoi premere <b>Avanti</b>.</string>
+    <string name="omnipod_pod_activation_wizard_pod_activated_title">Pod attivato</string>
+    <string name="omnipod_pod_activation_wizard_pod_activated_text">Il nuovo pod è ora attivo.\n\nIl tuo piano basale è stato programmato e la cannula è stata inserita.\n\nVerifica che la cannula sia stata inserita correttamente e sostituisci il tuo pod se avverti il contrario.</string>
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <string name="omnipod_pod_deactivation_wizard_deactivate_pod_title">Disattiva pod</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivate_pod_text">Premi <b>Avanti</b> per disattivare il pod.\n\n<b>Nota:</b> Questo sospenderà tutta l\'erogazione di insulina e disattiverà il pod.</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivating_pod_title">Disattivazione pod</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivating_pod_text">Disattivazione del pod.\n\nQuando la disattivazione è correttamente completata, puoi premere <b>Avanti</b>.</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_deactivated_title">Pod disattivato</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_deactivated_text">Il tuo pod è stato disattivato.\n\nRimuovi il pod dal tuo corpo e gettalo.</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_discarded_title">Pod scartato</string>
+    <string name="omnipod_pod_deactivation_wizard_discard_pod">Scarta pod</string>
+    <!-- Omnipod - Overview -->
+    <string name="omnipod_overview_button_set_time">Imposta ora</string>
+    <string name="omnipod_overview_button_suspend_delivery">Sospendi</string>
+    <string name="omnipod_overview_button_riley_link_stats">Statistiche RL</string>
+    <string name="omnipod_overview_button_read_pulse_log">Log impulsi</string>
+    <string name="omnipod_overview_button_refresh">Aggiorna</string>
+    <string name="omnipod_overview_button_resume_delivery">Riprendi erogazione</string>
+    <string name="omnipod_overview_button_pod_management">GSTN pod</string>
+    <string name="omnipod_overview_button_acknowledge_active_alerts">Conferma avvisi</string>
+    <string name="omnipod_overview_pod_status">Stato pod</string>
+    <string name="omnipod_overview_total_delivered">Totale erogato</string>
+    <string name="omnipod_overview_total_delivered_value">%1$.2f U</string>
+    <string name="omnipod_overview_pod_address">Indirizzo pod</string>
+    <string name="omnipod_overview_pod_expiry_date">Scadenza pod</string>
+    <string name="omnipod_overview_last_connection">Ultima connessione</string>
+    <string name="omnipod_overview_last_bolus">Ultimo bolo</string>
+    <string name="omnipod_overview_temp_basal_rate">Velocità basale temporanea</string>
+    <string name="omnipod_overview_base_basal_rate">Velocità basale originale</string>
+    <string name="omnipod_overview_reservoir">Serbatoio</string>
+    <string name="omnipod_overview_pod_active_alerts">Attiva avvisi pod</string>
+    <string name="omnipod_overview_firmware_version">Versione firmware</string>
+    <string name="omnipod_overview_time_on_pod">Ora nel pod</string>
+    <string name="omnipod_overview_temp_basal_value">%1$.2fU/h @%2$s (%3$d/%4$d minuti)</string>
+    <string name="omnipod_overview_reservoir_value">%1$.2f U rimanenti</string>
+    <string name="omnipod_overview_reservoir_value_over50">Oltre 50 U rimanenti</string>
+    <string name="omnipod_overview_errors">Errori</string>
+    <!-- Omnipod - Other -->
+    <string name="omnipod_pump_description">Integrazione del microinfusore Omnipod, richiede un dispositivo RileyLink (con almeno il firmware 2.0).</string>
+    <string name="omnipod_custom_action_reset_rileylink">Reset config.ne RileyLink</string>
+    <string name="omnipod_uncertain">indeterminato</string>
+    <string name="omnipod_pulse_log">Log impulsi</string>
+    <string name="omnipod_pulse_log_value">Log impulsi (copiato negli appunti)</string>
+    <string name="omnipod_yes">Sì</string>
+    <string name="omnipod_no">No</string>
+    <string name="omnipod_ok">OK</string>
+    <string name="omnipod_cancel">Annulla</string>
+    <!-- Omnipod - Times -->
+    <string name="omnipod_moments_ago">Momenti fa</string>
+    <string name="omnipod_less_than_a_minute_ago">Meno di un minuto fa</string>
+    <string name="omnipod_composite_time">%1$s e %2$s</string>
+    <string name="omnipod_time_ago">%1$s fa</string>
    <plurals name="omnipod_minutes">
        <item quantity="one">%1$d minuto</item>
        <item quantity="other">%1$d minuti</item>
--- a/omnipod/src/main/res/values-iw-rIL/strings.xml
+++ b/omnipod/src/main/res/values-iw-rIL/strings.xml
@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <!-- Omnipod - Pod Status -->
+    <!-- Omnipod - Alerts -->
+    <!-- Omnipod - History -->
    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod - Base -->
+    <!-- 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>
--- a/omnipod/src/main/res/values-ko-rKR/strings.xml
+++ b/omnipod/src/main/res/values-ko-rKR/strings.xml
@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <!-- Omnipod - Pod Status -->
+    <!-- Omnipod - Alerts -->
+    <!-- Omnipod - History -->
    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod - Base -->
+    <!-- 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>
--- a/omnipod/src/main/res/values-lt-rLT/strings.xml
+++ b/omnipod/src/main/res/values-lt-rLT/strings.xml
@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Omnipod pompos integracijai reikalingas RileyLink (programinės įrangos versija ne mažiau 2.0).</string>
-    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
    <string name="omnipod_config_bolus_beeps_enabled">Boluso signalai įjungti</string>
    <string name="omnipod_config_basal_beeps_enabled">Bazės signalai įjungti</string>
    <string name="omnipod_config_smb_beeps_enabled">SMB signalai įjungti</string>
@ -15,19 +14,12 @@
    <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Valandos prieš išsijungimą</string>
    <string name="omnipod_config_low_reservoir_alert_enabled">Įgalintas įspėjimas apie žemą rezervuaro lygį</string>
    <string name="omnipod_config_low_reservoir_alert_units">Vienetų skaičius</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_moments_ago">Neseniai</string>
-    <string name="omnipod_pod_mgmt">Pod valdymas</string>
-    <string name="omnipod_pod_status">Pod būklė</string>
-    <string name="omnipod_total_delivered_label">Iš viso suleista</string>
-    <string name="omnipod_total_delivered">%1$.2f vv</string>
-    <string name="omnipod_reservoir_left">liko %1$.2f U</string>
-    <string name="omnipod_reservoir_over50">Daugiau nei 50 U</string>
-    <string name="omnipod_pod_address">Pod adresas</string>
-    <string name="omnipod_pod_expiry">Pod laikas pasibaigs</string>
-    <string name="omnipod_warning">Perspėjimas</string>
+    <string name="omnipod_preference_category_rileylink">RileyLink</string>
+    <string name="omnipod_preference_category_other">Kiti</string>
+    <string name="omnipod_preference_category_alerts">Perspėjimai</string>
+    <string name="omnipod_preference_category_confirmation_beeps">Patvirtinimo signalai</string>
+    <!-- Omnipod - Pod Status -->
    <string name="omnipod_pod_status_no_active_pod">Nėra aktyvaus Pod</string>
-    <string name="omnipod_pod_status_waiting_for_pair_and_prime">Vykdomas nustatymas (laukiama suporavimo ir užpildymo)</string>
    <string name="omnipod_pod_status_waiting_for_cannula_insertion">Vykdomas nustatymas (laukiama kaniulės įvedimo)</string>
    <string name="omnipod_pod_status_running">Vykdoma</string>
    <string name="omnipod_pod_status_suspended">Sustabdyta</string>
@ -35,39 +27,35 @@
    <string name="omnipod_pod_status_activation_time_exceeded">Viršytas aktyvinimo laikas</string>
    <string name="omnipod_pod_status_inactive">Neaktyvus</string>
    <string name="omnipod_pod_status_pod_fault_description">Pod klaida: %1$s %2$s</string>
-    <string name="omnipod_pod_active_alerts">Aktyvūs Pod perspėjimai</string>
-    <string name="omnipod_acknowledge_active_alerts_short">Priimti pranešimus</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
+    <!-- Omnipod - Alerts -->
+    <string name="omnipod_alert_finish_pairing_reminder">Priminimas apie suporavimo pabaigą</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Priminimas apie sąrankos pabaigą</string>
+    <string name="omnipod_alert_expiration">Pod galiojimas greitai baigsis</string>
+    <string name="omnipod_alert_expiration_advisory">Pod galiojimas greitai baigsis</string>
+    <string name="omnipod_alert_shutdown_imminent">Išjungimas yra neišvengiamas</string>
+    <string name="omnipod_alert_low_reservoir">Žemas rezervuaro lygis</string>
+    <string name="omnipod_alert_unknown_alert">Nežinomas perspėjimas</string>
+    <!-- Omnipod - History -->
+    <string name="omnipod_history_item_description">Aprašymas</string>
+    <string name="omnipod_history_item_source">Šaltinis</string>
+    <string name="omnipod_history_item_date">Data</string>
+    <string name="omnipod_history_type">Tipas:</string>
    <!-- Omnipod - Error -->
+    <string name="omnipod_warning">Perspėjimas</string>
    <string name="omnipod_error_rileylink_address_invalid">RileyLink adresas neteisingas.</string>
    <string name="omnipod_error_operation_not_possible_no_configuration">Operacija negalima.\n\n Pirmiausia turite sukonfigūruoti Omnipod pompą prieš atliekant šią operaciją.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Operacija negalima.\n\n Jūs turite palaukti kelias minutes, kol AAPS bando nustatyti bazės profilį pirmą kartą.</string>
-    <string name="omnipod_error_illegal_init_action_type">Neteisingas inicijavimo tipas:%1$s</string>
    <string name="omnipod_error_pod_not_attached">Nėra aktyvaus Pod</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Komandos patikra nepavyko</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Įvyko netikėta klaida. Prašome pranešti! (tipas: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Ryšio klaida: gauti neteisingi įvesties parametrai</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Ryšio klaida: skirtas laikas baigėsi</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Ryšio klaida: įvyko netikėta klaida. Prašome pranešti!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Ryšio klaida: pranešimo vientisumo patikra nepavyko</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Ryšio klaida: netinkami įvesties iš Pod parametrai</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Ryšio klaida: Pod būklė yra netinkama</string>
-    <string name="omnipod_driver_error_invalid_response">Ryšio klaida: gautas netinkamas atsakymas iš Pod</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Ryšio klaida: iš Pod gautas pranešimas su negaliojančiu serijos numeriu</string>
-    <string name="omnipod_driver_error_invalid_message_address">Ryšio klaida: iš Pod gautas pranešimas su netinkamu adresu</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Ryšio klaida: nepavyko iššifruoti pranešimo iš Pod</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Ryšio klaida: nepavyko iš naujo sinchronizuoti Nonce</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Ryšio klaida: Nonce nebuvo sinchronizuota</string>
-    <string name="omnipod_driver_error_not_enough_data">Ryšio klaida: iš Pod gauta nepakankamai duomenų</string>
-    <string name="omnipod_driver_error_pod_fault">Aptikta Pod klaida (%1$03d %2$s). Išjunkite Pod ir startuokite naują</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Ryšio klaida: Pod pateikė klaidos atsakymą</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Pod valdymas</string>
-    <string name="omnipod_cmd_init_pod">Inicijuoti POD</string>
+    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Nepavyko nustatyti bazės profilio. Insulino leidimas gali būti nutrauktas! Rankiniu būdu atnaujinkite Pod būseną Omnipod skirtuke ir, jei reikia, atnaujinkite insulino leidimą.</string>
+    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Gali būti, kad bazės profilis nebuvo nustatytas. Insulino leidimas gali būti nutrauktas! Rankiniu būdu atnaujinkite Pod būseną Omnipod skirtuke ir, jei reikia, atnaujinkite insulino leidimą.</string>
+    <string name="omnipod_error_set_basal_failed_delivery_suspended">Nepavyko nustatyti bazės profilio. Insulino leidimas buvo sustabdytas! Rankiniu būdu iš Omnipod skirtuko atnaujinkite insulino leidimą.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Nepavyko nustatyti laikinos valandinės bazės. Jei laikina bazė buvo pradėta anksčiau, ji gali būti atšaukta. Rakiniu būdu atnaujinkite Pod būseną Omnipod skirtuke.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Gali būti, kad nepavyko nustatyti laikinos valandinės bazės. Jei laikina bazė buvo pradėta anksčiau, ji yra atšaukta. Rakiniu būdu atnaujinkite Pod būseną Omnipod skirtuke.</string>
+    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Gali būti, kad laikas nebuvo nustatytas. Insulino leidimas gali būti nutrauktas! Rankiniu būdu atnaujinkite Pod būseną Omnipod skirtuke ir, jei reikia, atnaujinkite insulino leidimą.</string>
+    <string name="omnipod_error_set_time_failed_delivery_suspended">Nepavyko nustatyti laiko. Insulino leidimas sustabdytas! Rankiniu būdu atnaujinkite insulino leidimą iš Omnipod skirtuko.</string>
+    <!-- Omnipod - Confirmation -->
+    <!-- Omnipod - Commands -->
    <string name="omnipod_cmd_deactivate_pod">Išjungti POD</string>
    <string name="omnipod_cmd_discard_pod">Išmesti Pod</string>
-    <string name="omnipod_cmd_pod_history">Pod istorija</string>
    <string name="omnipod_cmd_set_bolus">Nustatyti bolusą</string>
    <string name="omnipod_cmd_cancel_bolus">Atšaukti bolusą</string>
    <string name="omnipod_cmd_set_tbr">Nustatyti laikiną bazę</string>
@ -82,88 +70,23 @@
    <string name="omnipod_cmd_suspend_delivery">Sustabdyti suleidimą</string>
    <string name="omnipod_cmd_resume_delivery">Atnaujinti suleidimą</string>
    <string name="omnipod_cmd_unknown_entry">Nežinomas Įrašas</string>
-    <string name="omnipod_cmd_bolus_value">%1$.2f vv</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f vv, AV=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Kiekis: %1$.2f vv, trukmė: %2$d min</string>
-    <string name="omnipod_cmd_discard_pod_desc">Jei spustelėsite <b>OK</b>, ryšys su Pod bus priverstinai nutrauktas ir nebegalėsite prie jo prisijungti. Atlikite tai tik tada, kai AAPS nebegali bendrauti su Pod. Jei ryšys su Pod vis tiek veikia, naudokite parinktį <b>Išjungti Pod</b>. \n\nJei pageidaujate tęsti, įsitikinkite, kad pašalinote Pod nuo savo kūno.</string>
-    <string name="omnipod_cmd_pod_history_na">POD istorija šiuo metu nėra prieinama.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Užpildyti POD</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nUžpildykite naują Pod insulinu, kurio pakaktų 3 dienas.\n\nTaip pat atkreipkite dėmesį į du pyptelėjimus iš Pod, kai pildote. Tai rodo, kad rezervuaras buvo užpildytas mažiausiai 85vv. Visiškai ištuštinkite švirkštą, net jei girdėjote du pyptelėjimus.\n\nUžpildę Pod, spustelėkite <b>Kitas</b>.\n\n <b>Pastaba:</b> vykdant šiuos veiksmus, nenuimkite Pod adatos apsauginio dangtelio.\n<b>Pastaba:</b> padėkite RileyLink vertikalioje pozicijoje ir Pod kelių colių atstumu.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Užpildymas</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Pabandykite suporuoti naują Pod ir užpildykite jį.\n\nKai pažymėti visi elemetai, galite spustelėti <b>Kitas</b>.\n\n <b>Pastaba:</b> padėkite RileyLink vertikalioje pozicijoje ir Pod kelių colių atstumu.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Prijunkite POD</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nParuoškite infuzijos vietą. Nuimkite adatos apsauginį dangtelį, pleistro apsaugą ir užklijuokite POD ant infuzijos vietos.\n\nJei kaniulė atšoks, paspauskite <b>Atšaukti</b> ir pakeiskite POD.\n\nSpauskite <b>Kitas</b>, norėdami įvesti kaniulę ir pradėti leisti insuliną.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Įvedama kaniulė</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Mėginkite nustatyti pradinį bazės profilį ir įvesti kaniulę.\n\nKai visi elementai yra patikrinti, galite paspausti <b>Kitas</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Pod informacija</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPOD yra aktyvus.\n\nJūsų bazės profilis yra suprogramuotas ir kaniulė įvesta.\n\nPatikrinkite, ar kaniulė buvo tinkamai įvesta, ir, jei jaučiate, kad taip nėra, pakeiskite POD.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Išjungti Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nSpustelėkite<b>Kitas</b>, kad išjungtumėte POD.\n\n<b>Pastaba:</b> Tai sustabdys insulino leidimą ir išjungs POD.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">POD išjungimas</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Pod išjungimas.\n\nJei visi elementai pažymėti, galite paspausti <b>Kitas</b>.\n\n<b>Pastaba:</b> Jei išjungimas vis nepavyksta, paspauskite <b> Atšaukti</b> ir naudokite parinktį <b>Išmesti Pod </b>, kad priverstinai atkurtumėte Pod būklę.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">POD išjungtas.\n\nNuimkite POD nuo odos ir jį išmeskite.</string>
-    <string name="omnipod_init_pod_pair_pod">POD suporavimas</string>
-    <string name="omnipod_init_pod_prime_pod">POD užpildymas</string>
-    <string name="omnipod_init_pod_fill_cannula">Kaniulės užpildymas</string>
-    <string name="omnipod_init_pod_set_basal_profile">Nustatyti bazės profilį</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Atšauti insulino leidimą</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Išjungti Pod</string>
-    <!-- Omnipod - Base -->
-    <string name="omnipod_alert_finish_pairing_reminder">Priminimas apie suporavimo pabaigą</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Priminimas apie sąrankos pabaigą</string>
-    <string name="omnipod_alert_expiration">Pod galiojimas greitai baigsis</string>
-    <string name="omnipod_alert_expiration_advisory">Pod galiojimas greitai baigsis</string>
-    <string name="omnipod_alert_shutdown_imminent">Išjungimas yra neišvengiamas</string>
-    <string name="omnipod_alert_low_reservoir">Žemas rezervuaro lygis</string>
-    <string name="omnipod_alert_unknown_alert">Nežinomas perspėjimas</string>
-    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Nepavyko nustatyti bazės profilio. Insulino leidimas gali būti nutrauktas! Rankiniu būdu atnaujinkite Pod būseną Omnipod skirtuke ir, jei reikia, atnaujinkite insulino leidimą.</string>
-    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Gali būti, kad bazės profilis nebuvo nustatytas. Insulino leidimas gali būti nutrauktas! Rankiniu būdu atnaujinkite Pod būseną Omnipod skirtuke ir, jei reikia, atnaujinkite insulino leidimą.</string>
-    <string name="omnipod_error_set_basal_failed_delivery_suspended">Nepavyko nustatyti bazės profilio. Insulino leidimas buvo sustabdytas! Rankiniu būdu iš Omnipod skirtuko atnaujinkite insulino leidimą.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Nepavyko nustatyti laikinos valandinės bazės. Jei laikina bazė buvo pradėta anksčiau, ji gali būti atšaukta. Rakiniu būdu atnaujinkite Pod būseną Omnipod skirtuke.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Gali būti, kad nepavyko nustatyti laikinos valandinės bazės. Jei laikina bazė buvo pradėta anksčiau, ji yra atšaukta. Rakiniu būdu atnaujinkite Pod būseną Omnipod skirtuke.</string>
-    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Gali būti, kad laikas nebuvo nustatytas. Insulino leidimas gali būti nutrauktas! Rankiniu būdu atnaujinkite Pod būseną Omnipod skirtuke ir, jei reikia, atnaujinkite insulino leidimą.</string>
-    <string name="omnipod_error_set_time_failed_delivery_suspended">Nepavyko nustatyti laiko. Insulino leidimas sustabdytas! Rankiniu būdu atnaujinkite insulino leidimą iš Omnipod skirtuko.</string>
-    <string name="omnipod_bolus_failed_uncertain">Nepavyko patikrinti, ar buvo suleistas bolusas. Patikrinkite, ar Pod leidžia bolusą (klausantis boluso garsų). <b>Jei esate tikri, kad bolusas nebuvo suleistas, turite rankiniu būdu ištrinti boluso įrašą iš Terapijos, net jei dabar spustelėjote mygtuką „Atšaukti bolusą“!</b></string>
-    <string name="omnipod_bolus_failed_uncertain_smb">Nepavyko patikrinti, ar SMB (%1$.2fvv) suleistas. <b>Jei esate tikri, kad bolusas nebuvo suleistas, turite rankiniu būdu pašalinti SMB įrašą iš Terapijos.</b></string>
-    <string name="omnipod_rl_stats">RL statistika</string>
-    <string name="omnipod_read_pulse_log_short">Pulse žurnalas</string>
-    <string name="omnipod_pod_lot">LOT</string>
-    <string name="omnipod_pod_tid">TID</string>
-    <string name="omnipod_pod_firmware_version">Programinės įrangos versija</string>
-    <string name="omnipod_errors">Klaidos</string>
-    <string name="omnipod_cmd_basal_profile_not_set_is_same">Bazės profilis toks pat, todėl nenustatomas pakartotinai.</string>
-    <string name="omnipod_custom_action_reset_rileylink">Išvalyti RileyLink nustatymus</string>
-    <string name="omnipod_time_or_timezone_change">Laiko ir/ar laiko zonos pakeitimas Pod</string>
-    <string name="omnipod_composite_time">%1$s ir %2$s</string>
-    <string name="omnipod_time_ago">prieš %1$s</string>
-    <string name="omnipod_waiting_for_rileylink_connection">Laukiama RileyLink ryšio...</string>
-    <string name="omnipod_bolus_did_not_succeed">Bolusas nepavyko</string>
-    <string name="omnipod_refresh">Atnaujinti</string>
-    <string name="omnipod_resume_delivery">Atnaujinti suleidimą</string>
-    <string name="omnipod_error_pod_suspended">Pod sustabdyta</string>
-    <string name="omnipod_less_than_a_minute_ago">Mažiau nei prieš minutę</string>
-    <string name="omnipod_suspend_delivery_short">Sustabdyta</string>
-    <string name="omnipod_cmd_pair_and_prime">Suporuoti ir užpildyti</string>
-    <string name="omnipod_cmd_fill_cannula_set_basal_profile">Užpildyti kaniulę ir nustatyti bazės profilį</string>
-    <string name="omnipod_cmd_get_pulse_log">Gauti Pulse žurnalą</string>
-    <string name="omnipod_uncertain_failure">Neaiški klaida</string>
-    <string name="omnipod_cancelled_old_tbr_failed_to_set_new">Ankstesnė laikina bazė atšaukta, tačiau nepavyko nustatyti naujos laikinos bazės</string>
    <string name="omnipod_cmd_set_fake_suspended_tbr">Nustatykite netikrą laikiną bazę, nes Pod sustabdyta</string>
    <string name="omnipod_cmd_cancel_fake_suspended_tbr">Atšaukite netikrą laikiną bazę, kuri buvo nustatyta dėl to, kad Pod buvo sustabdyta</string>
-    <string name="omnipod_uncertain">neaiški</string>
-    <string name="omnipod_expiration_alerts_updated">Įspėjimo konfigūracija atnaujinta Pod</string>
-    <string name="omnipod_preference_category_rileylink">RileyLink</string>
-    <string name="omnipod_preference_category_other">Kiti</string>
-    <string name="omnipod_preference_category_alerts">Perspėjimai</string>
-    <string name="omnipod_preference_category_confirmation_beeps">Patvirtinimo signalai</string>
-    <string name="omnipod_wizard_button_exit">Išeiti</string>
-    <string name="omnipod_wizard_button_previous">Ankstesnis</string>
-    <string name="omnipod_wizard_button_next">Kitas</string>
+    <!-- Omnipod - Pod Management -->
+    <!-- Omnipod - Wizard common -->
    <string name="omnipod_wizard_button_finish">Užbaigti</string>
-    <string name="omnipod_history_item_description">Aprašymas</string>
-    <string name="omnipod_history_item_source">Šaltinis</string>
-    <string name="omnipod_history_item_date">Data</string>
-    <string name="omnipod_history_type">Tipas:</string>
+    <string name="omnipod_wizard_button_next">Kitas</string>
+    <!-- Omnipod - Pod activation Wizard -->
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <!-- Omnipod - Overview -->
+    <!-- Omnipod - Other -->
+    <string name="omnipod_custom_action_reset_rileylink">Išvalyti RileyLink nustatymus</string>
+    <string name="omnipod_uncertain">neaiški</string>
+    <!-- Omnipod - Times -->
+    <string name="omnipod_moments_ago">Neseniai</string>
+    <string name="omnipod_less_than_a_minute_ago">Mažiau nei prieš minutę</string>
+    <string name="omnipod_composite_time">%1$s ir %2$s</string>
+    <string name="omnipod_time_ago">prieš %1$s</string>
    <plurals name="omnipod_minutes">
        <item quantity="one">%1$d min.</item>
        <item quantity="few">%1$d min.</item>
--- a/omnipod/src/main/res/values-nl-rNL/strings.xml
+++ b/omnipod/src/main/res/values-nl-rNL/strings.xml
@ -1,37 +1,223 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Pomp integratie voor Omnipod, vereist RileyLink (met firmware 2.0 of hoger).</string>
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_reservoir_left">%1$.2f E over</string>
-    <string name="omnipod_reservoir_over50">Meer dan 50 E</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_error_illegal_init_action_type">Ongeldig PodInitActionType: %1$s</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Er is een onverwachte fout opgetreden. Rapporteer dit alsjeblieft! (type: %1$s).</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Communicatie mislukt: er is een onvoorziene fout opgetreden. Rapporteer dit alsjeblieft!</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_cmd_init_pod">Initialiseer Pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Deactiveer Pod</string>
-    <string name="omnipod_cmd_pod_history_na">Pod Historie momenteel niet beschikbaar.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Vul de Pod</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Uitvullen</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Plaats de Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nBereid het plaatsen voor. Verwijder de beschermdop van de naald en haal de papiertjes van de sticker.\n\n(Mocht je zien dat de canule uitsteekt, druk dan op <b>Annuleren</b> en begin overnieuw met een andere Pod.)\n\nBevestig de Pod op de huid. Druk op <b>Volgende</b> om de canule te gaan inschieten en de insulinetoediening te laten starten.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Canule inschieten</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">De basaalstand wordt ingesteld en de canule wordt ingeschoten.\n\nWanneer alle onderdelen zijn afgerond, druk je op <b>Volgende</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nDe Pod is nu actief.\n\nJouw basaalprofiel is ingeladen in de Pod en de canule is ingebracht.\n\nControleer of de canule correct is geplaatst en vervang de Pod als je denkt dat er iets is misgegaan.</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nDruk op <b>Volgende</b> om de Pod te deactiveren.\n\n<b>Opmerking:</b> Hiermee wordt de insuline toediening gestopt en wordt de Pod gedeactiveerd.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Deactiveren van de Pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod gedeactiveerd.\n\nVerwijder de Pod van je lichaam en gooi hem weg.</string>
-    <string name="omnipod_init_pod_pair_pod">Pod Koppelen</string>
-    <string name="omnipod_init_pod_prime_pod">Pod Uitvullen</string>
-    <!-- Omnipod - Base -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <string name="omnipod_config_bolus_beeps_enabled">Bolus pieptonen ingeschakeld</string>
+    <string name="omnipod_config_basal_beeps_enabled">Basaal pieptonen ingeschakeld</string>
+    <string name="omnipod_config_smb_beeps_enabled">SMB pieptonen ingeschakeld</string>
+    <string name="omnipod_config_tbr_beeps_enabled">Tijdelijk basaal pieptonen ingeschakeld</string>
+    <string name="omnipod_config_suspend_delivery_button_enabled">Knop om insuline toediening te onderbreken ingeschakeld</string>
+    <string name="omnipod_config_pulse_log_button_enabled">Pulslog knop ingeschakeld</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>
+    <string name="omnipod_config_low_reservoir_alert_enabled">Pieptonen voor \"Reservoir bijna leeg\" ingeschakeld</string>
+    <string name="omnipod_config_low_reservoir_alert_units">Aantal eenheden</string>
+    <string name="omnipod_config_notification_uncertain_tbr_sound_enabled">Geluid voor onzekere TBR notificaties ingeschakeld</string>
+    <string name="omnipod_config_notification_uncertain_smb_sound_enabled">Geluid voor onzekere SMB notificaties ingeschakeld</string>
+    <string name="omnipod_config_notification_uncertain_bolus_sound_enabled">Geluid voor onzekere bolus notificaties ingeschakeld</string>
+    <string name="omnipod_preference_category_rileylink">RileyLink</string>
+    <string name="omnipod_preference_category_other">Overige</string>
+    <string name="omnipod_preference_category_alerts">Waarschuwingen</string>
+    <string name="omnipod_preference_category_confirmation_beeps">Pieptonen</string>
+    <string name="omnipod_preference_category_notifications">Notificaties</string>
+    <!-- Omnipod - Pod Status -->
+    <string name="omnipod_pod_status_no_active_pod">Geen actieve Pod</string>
+    <string name="omnipod_pod_status_waiting_for_activation">Setup wordt uitgevoerd (in afwachting van Pod activering)</string>
+    <string name="omnipod_pod_status_waiting_for_cannula_insertion">Setup wordt uitgevoerd (in afwachting van het inbrengen van de canule)</string>
+    <string name="omnipod_pod_status_running">Actief</string>
+    <string name="omnipod_pod_status_suspended">Onderbroken</string>
+    <string name="omnipod_pod_status_pod_fault">Pod fout</string>
+    <string name="omnipod_pod_status_activation_time_exceeded">Activatietijd overschreden</string>
+    <string name="omnipod_pod_status_inactive">Inactief</string>
+    <string name="omnipod_pod_status_pod_fault_description">Pod fout: %1$s %2$s</string>
+    <!-- Omnipod - Alerts -->
+    <string name="omnipod_alert_finish_pairing_reminder">Herrinering om Pod initialisatie af te ronden</string>
    <string name="omnipod_alert_finish_setup_reminder_reminder">Herinnering setup afronden</string>
+    <string name="omnipod_alert_expiration">Pod verloopt binnenkort</string>
+    <string name="omnipod_alert_expiration_advisory">Pod verloopt binnenkort</string>
    <string name="omnipod_alert_shutdown_imminent">Schakelt zeer binnenkort uit</string>
    <string name="omnipod_alert_low_reservoir">Laag reservoir</string>
    <string name="omnipod_alert_unknown_alert">Onbekend alarm</string>
+    <!-- Omnipod - History -->
+    <string name="omnipod_history_title">Pod historie</string>
+    <string name="omnipod_history_item_description">Beschrijving</string>
+    <string name="omnipod_history_item_source">Bron</string>
+    <string name="omnipod_history_item_date">Datum</string>
+    <string name="omnipod_history_type">Type:</string>
+    <string name="omnipod_history_bolus_value">%1$.2f E</string>
+    <string name="omnipod_history_bolus_value_with_carbs">%1$.2f E, KH=%2$.1f g</string>
+    <string name="omnipod_history_tbr_value">Basaal: %1$.2f E, Duur: %2$d min</string>
+    <!-- Omnipod - Error -->
+    <string name="omnipod_warning">Waarschuwing</string>
+    <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_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>
+    <string name="omnipod_error_invalid_progress_state">Communicatie mislukt: de Pod bevindt zich in een verkeerde staat</string>
+    <string name="omnipod_error_invalid_response">Communicatie mislukt: ongeldig antwoord ontvangen van de Pod</string>
+    <string name="omnipod_error_invalid_message_sequence_number">Communicatie mislukt: bericht met ongeldig volgnummer ontvangen van de Pod</string>
+    <string name="omnipod_error_invalid_message_address">Communicatie mislukt: bericht met ongeldig adres ontvangen van de Pod</string>
+    <string name="omnipod_error_message_decoding_failed">Communicatie is mislukt: kon bericht van de Pod niet decoderen</string>
+    <string name="omnipod_error_nonce_resync_failed">Communicatie mislukt: nonce resync is mislukt</string>
+    <string name="omnipod_error_nonce_out_of_sync">Communicatie mislukt: nonce out of sync</string>
+    <string name="omnipod_error_not_enough_data">Communicatie mislukt: onvoldoende gegevens ontvangen van de Pod</string>
+    <string name="omnipod_error_pod_fault">Een Podfout (%1$03d %2$s) is gedetecteerd. Deactiveer de Pod en activeer een nieuwe</string>
+    <string name="omnipod_error_pod_returned_error_response">Communicatie mislukt: de Pod heeft een foutrespons gegeven</string>
+    <string name="omnipod_error_communication_failed_no_response_from_riley_link">Geen reactie van RileyLink</string>
+    <string name="omnipod_error_communication_failed_riley_link_interrupted">RileyLink onderbroken</string>
+    <string name="omnipod_error_communication_failed_no_response_from_pod">Geen reactie van de Pod</string>
+    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Instellen van basaal profiel is mislukt. De insulinetoediening kan onderbroken zijn! Vernieuw de Pod-status handmatig in het Omnipod tabblad en hervat de toediening indien nodig.</string>
+    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Instellen van basaal profiel is misschien mislukt. De insulinetoediening kan onderbroken zijn! Vernieuw de Pod-status handmatig in het Omnipod-tabblad en hervat de toediening indien nodig.</string>
+    <string name="omnipod_error_set_basal_failed_delivery_suspended">Instellen van basaal profiel is mislukt. Insulinetoediening is onderbroken! Hervat de toediening handmatig vanaf het Omnipod tabblad.</string>
+    <string name="omnipod_error_set_basal_failed">Instellen van basaal profiel mislukt.</string>
+    <string name="omnipod_error_cancel_temp_basal_failed_uncertain">Het annuleren van de tijdelijk basaal is mogelijk mislukt. Vernieuw de Pod-status handmatig vanaf het Omnipod-tabblad.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Het instellen van een tijdelijke basaal is mislukt. Als een tijdelijk basaal eerder actief was, is deze mogelijk geannuleerd. Vernieuw de Pod-status handmatig vanaf het Omnipod tabblad.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Het instellen van tijdelijk basaal is misschien mislukt. Als een tijdelijke basaal eerder actief was, is deze geannuleerd. Vernieuw de Pod-status handmatig vanaf het Omnipod tabblad.</string>
+    <string name="omnipod_error_set_temp_basal_failed_validation">Tijdelijke basaal duur moet groter zijn dan nul en een veelvoud van %1$s minuten.</string>
+    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Instellen van de tijd is misschien mislukt. De insulinetoediening kan onderbroken zijn! Vernieuw de Pod-status handmatig in het Omnipod tabblad en hervat de toediening indien nodig.</string>
+    <string name="omnipod_error_set_time_failed_delivery_suspended">Het instellen van de tijd is mislukt. Insulinetoediening is onderbroken! Hervat de toediening handmatig vanaf het Omnipod tabblad.</string>
+    <string name="omnipod_error_failed_to_set_profile_empty_profile">Het instellen van het basaal profiel is mislukt: geen profiel ontvangen. Controleer of je profiel geactiveerd is.</string>
+    <string name="omnipod_error_set_initial_basal_schedule_no_profile">Er is geen basaal profiel actief. Activeer een profiel.</string>
+    <string name="omnipod_error_unknown_custom_command">Onbekend commando: %1$s</string>
+    <string name="omnipod_error_failed_to_read_pulse_log">Lezen van Pulslog is mislukt</string>
+    <string name="omnipod_error_failed_to_refresh_status">Verversen van status is mislukt</string>
+    <string name="omnipod_error_failed_to_acknowledge_alerts">Bevestigen van waarschuwingen is mislukt</string>
+    <string name="omnipod_error_failed_to_suspend_delivery">Onderbreken van insulinetoediening is mislukt</string>
+    <string name="omnipod_error_failed_to_set_time">Instellen van de tijd mislukt</string>
+    <string name="omnipod_error_failed_to_resume_delivery">Hervatten van insulinetoediening is mislukt</string>
+    <string name="omnipod_error_automatic_time_or_timezone_change_failed">Het automatisch wijzigen van de tijd op de Pod is mislukt. Synchroniseer de tijd handmatig via het Omnipod-tabblad.</string>
+    <string name="omnipod_error_bolus_failed_uncertain">Kan niet controleren of de bolus is geslaagd. Controleer handmatig of de Pod aan het bolussen is door te luisteren naar klik-geluidjes van de Pod. <b>Als je zeker weet dat de bolus niet is geslaagd, moet je deze bolus handmatig uit \'Behandelingen\' verwijderen, zelfs als je nu op \'Annuleren\' drukt!</b></string>
+    <string name="omnipod_error_bolus_failed_uncertain_smb">Kan niet controleren of SMB bolus (%1$.2f U) geslaagd is. <b>Als je zeker weet dat de bolus niet geslaagd is, moet je deze handmatig verwijderen uit \'Behandelingen\'.</b></string>
+    <string name="omnipod_error_bolus_did_not_succeed">Bolus mislukt.</string>
+    <string name="omnipod_error_failed_to_initialize_pod">Het initialiseren van de Pod is mislukt</string>
+    <string name="omnipod_error_failed_to_insert_cannula">Het inbrengen van de canule is mislukt</string>
+    <string name="omnipod_error_pod_fault_activation_time_exceeded">De activeringstijd van de pod is overschreden. Deze Pod kan niet meer geactiveerd worden.</string>
+    <!-- Omnipod - Confirmation -->
+    <string name="omnipod_confirmation">Bevestiging</string>
+    <string name="omnipod_confirmation_time_or_timezone_change">Tijd en/of tijdzone gewijzigd op de Pod.</string>
+    <string name="omnipod_confirmation_expiration_alerts_updated">De instellingen voor meldingen zijn bijgewerkt in de Pod.</string>
+    <string name="omnipod_confirmation_time_on_pod_updated">De tijd in de Pod is geüpdatet.</string>
+    <string name="omnipod_confirmation_suspended_delivery">Alle insulinetoediening is onderbroken.</string>
+    <string name="omnipod_confirmation_acknowledged_alerts">Actieve meldingen zijn bevestigd.</string>
+    <string name="omnipod_confirmation_delivery_resumed">Insulinetoediening is hervat.</string>
+    <string name="omnipod_confirmation_pod_suspended">Pod onderbroken</string>
+    <!-- Omnipod - Commands -->
+    <string name="omnipod_cmd_deactivate_pod">Deactiveer Pod</string>
+    <string name="omnipod_cmd_discard_pod">Pod verwerpen</string>
+    <string name="omnipod_cmd_set_bolus">Bolus toedienen</string>
+    <string name="omnipod_cmd_cancel_bolus">Annuleer Bolus</string>
+    <string name="omnipod_cmd_set_tbr">Tijdelijke basaal instellen</string>
+    <string name="omnipod_cmd_cancel_tbr_by_driver">Tijdelijke basaal annuleren (intern door driver)</string>
+    <string name="omnipod_cmd_cancel_tbr">Tijdelijk basaal annuleren</string>
+    <string name="omnipod_cmd_set_basal_schedule">Basaalprofiel instellen</string>
+    <string name="omnipod_cmd_get_pod_status">Pod status ophalen</string>
+    <string name="omnipod_cmd_get_pod_info">Pod info ophalen</string>
+    <string name="omnipod_cmd_set_time">Tijd instellen</string>
+    <string name="omnipod_cmd_configure_alerts">Meldingen configureren</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Meldingen bevestigen</string>
+    <string name="omnipod_cmd_suspend_delivery">Insulinetoediening onderbreken</string>
+    <string name="omnipod_cmd_resume_delivery">Insulinetoediening hervatten</string>
+    <string name="omnipod_cmd_unknown_entry">Onbekende invoer</string>
+    <string name="omnipod_cmd_initialize_pod">Pod initialiseren</string>
+    <string name="omnipod_cmd_insert_cannula">Canule inbrengen</string>
+    <string name="omnipod_cmd_read_pulse_log">Pulslog lezen</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>
+    <!-- Omnipod - Pod Management -->
+    <string name="omnipod_pod_management_title">Pod beheer</string>
+    <string name="omnipod_pod_management_waiting_for_rileylink_connection">Wachten op verbinding met RileyLink…</string>
+    <string name="omnipod_pod_management_button_activate_pod">Activeer Pod</string>
+    <string name="omnipod_pod_management_button_deactivate_pod">Deactiveer Pod</string>
+    <string name="omnipod_pod_management_button_discard_pod">Pod verwerpen</string>
+    <string name="omnipod_pod_management_button_pod_history">Pod historie</string>
+    <string name="omnipod_pod_management_discard_pod_state_confirmation">Als je de Pod verwerpt, kun je er niet meer mee communiceren. Doe dit alleen als communicatie met de Pod aanhoudend mislukt. Als je nog steeds kunt communiceren met de Pod, gebruik dan de <b>Pod deactiveren</b> optie.\n\nVerwijder de Pod van de huid als je ervoor kiest om door te gaan!</string>
+    <!-- Omnipod - Wizard common -->
+    <string name="omnipod_wizard_button_cancel">Annuleren</string>
+    <string name="omnipod_wizard_button_finish">Voltooien</string>
+    <string name="omnipod_wizard_button_next">Volgende</string>
+    <string name="omnipod_wizard_button_retry">Opnieuw proberen</string>
+    <string name="omnipod_wizard_button_deactivate_pod">Deactiveer Pod</string>
+    <string name="omnipod_wizard_button_discard_pod">Pod verwerpen</string>
+    <string name="omnipod_wizard_exit_confirmation_text">Je hebt nog niet alle stappen voltooid. Weet je zeker dat je wilt afsluiten?</string>
+    <string name="omnipod_wizard_exit_confirmation_title">Afsluiten</string>
+    <!-- Omnipod - Pod activation Wizard -->
+    <string name="omnipod_pod_activation_wizard_fill_pod_title">Pod vullen</string>
+    <string name="omnipod_pod_activation_wizard_fill_pod_text">\nVul de nieuwe Pod met voldoende insuline voor 3 dagen.\n\nLuister of je twee piepjes hoort tijdens het vullen. Deze geven aan dat de minimum hoeveelheid van 85 eenheden is bereikt. Ook als je de twee piepjes hebt gehoord ga je verder met vullen totdat de vulspuit volledig leeg is.\n\nNa het vullen van de Pod druk je op <b>Volgende</b>.\n\n<b>Opmerking:</b> verwijder de beschermkap van de naald nog niet!\n<b>Opmerking:</b> zet de RileyLink rechtop en leg de Pod er ongeveer 10 centimeter vandaan.</string>
+    <string name="omnipod_pod_activation_wizard_initialize_pod_title">Pod initialiseren</string>
+    <string name="omnipod_pod_activation_wizard_initialize_pod_text">Er wordt nu geprobeerd om de Pod te koppelen en uit te vullen.\n\nWanneer deze stap successvol is afgerond, kan er op <b>Volgende</b> worden gedrukt.\n\n<b>Opmerking:</b> zet de RileyLink rechtop en leg de Pod er ongeveer 10 centimeter vandaan.</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_title">Plaats de Pod</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_text">Bereid het plaatsen voor. Verwijder de beschermkap van de naald en haal de papiertjes van de sticker.\n\nMocht je zien dat de canule uitsteekt, druk dan op <b>Annuleren</b> en begin opnieuw met een andere Pod.\n\nBevestig de Pod op de huid. Druk op <b>Volgende</b> om de canule te gaan inschieten en de insulinetoediening te laten starten.</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_confirm_insert_cannula_text">Als je op <b>OK</b>drukt, wordt de canule ingebracht. Zorg ervoor dat de Pod op de huid geplakt is.</string>
+    <string name="omnipod_pod_activation_wizard_insert_cannula_title">Canule inbrengen</string>
+    <string name="omnipod_pod_activation_wizard_insert_cannula_text">De basaalstand wordt ingesteld en de canule wordt ingebracht.\n\nWanneer de canule succesvol is ingebracht, kun je op <b>Volgende</b> drukken.</string>
+    <string name="omnipod_pod_activation_wizard_pod_activated_title">Pod geactiveerd</string>
+    <string name="omnipod_pod_activation_wizard_pod_activated_text">De nieuwe Pod is nu actief.\n\nJe basaalprofiel is ingeladen in de Pod en de canule is ingebracht.\n\nControleer of de canule correct is geplaatst en vervang de Pod als je denkt dat er iets is misgegaan.</string>
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <string name="omnipod_pod_deactivation_wizard_deactivate_pod_title">Deactiveer Pod</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivate_pod_text">Druk op <b>Volgende</b> om de Pod te deactiveren.\n\n<b>Opmerking:</b> Hiermee wordt de insulinetoediening gestopt en wordt de Pod gedeactiveerd.</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivating_pod_title">Pod wordt gedeactiveerd</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivating_pod_text">De Pod wordt gedeactiveerd.\n\nWanneer de Pod succesvol gedeactiveerd is, kan er op <b>Volgende</b> worden gedrukt.</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_deactivated_title">Pod gedeactiveerd</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_deactivated_text">Pod gedeactiveerd.\n\nVerwijder de Pod van je lichaam en recycle deze.</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_discarded_title">Pod verworpen</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_discarded_text">De Pod is verworpen. De insulineverlevering is mogelijk niet onderbroken omdat de Pod niet correct gedeactiveerd is!\n\nVerwijder de Pod van de huid en recycle deze.</string>
+    <string name="omnipod_pod_deactivation_wizard_discard_pod_confirmation">Als de Pod wordt verwerpt, kan er niet meer mee gecommuniceerd worden. Doe dit alleen indien alle communicatie met de Pod aanhoudend mislukt. Weet je zeker dat je de Pod wilt verwerpen?</string>
+    <string name="omnipod_pod_deactivation_wizard_discard_pod">Pod verwerpen</string>
+    <!-- Omnipod - Overview -->
+    <string name="omnipod_overview_button_set_time">Tijd instellen</string>
+    <string name="omnipod_overview_button_suspend_delivery">Onderbreken</string>
+    <string name="omnipod_overview_button_riley_link_stats">RL stats</string>
+    <string name="omnipod_overview_button_read_pulse_log">Pulslog</string>
+    <string name="omnipod_overview_button_refresh">Vernieuwen</string>
+    <string name="omnipod_overview_button_resume_delivery">Hervat toediening</string>
+    <string name="omnipod_overview_button_pod_management">Pod beheer</string>
+    <string name="omnipod_overview_button_acknowledge_active_alerts">Alarmen bevestigen</string>
+    <string name="omnipod_overview_pod_status">Podstatus</string>
+    <string name="omnipod_overview_total_delivered">Totaal toegediend</string>
+    <string name="omnipod_overview_total_delivered_value">%1$.2f E</string>
+    <string name="omnipod_overview_pod_address">Podadres</string>
+    <string name="omnipod_overview_pod_expiry_date">Pod verloopt</string>
+    <string name="omnipod_overview_last_connection">Laatste verbinding</string>
+    <string name="omnipod_overview_last_bolus">Laatste bolus</string>
+    <string name="omnipod_overview_temp_basal_rate">Tijdelijke basaalstand</string>
+    <string name="omnipod_overview_base_basal_rate">Basis basaalstand</string>
+    <string name="omnipod_overview_reservoir">Reservoir</string>
+    <string name="omnipod_overview_pod_active_alerts">Actieve Pod alarmen</string>
+    <string name="omnipod_overview_firmware_version">Firmwareversie</string>
+    <string name="omnipod_overview_time_on_pod">Tijd op Pod</string>
+    <string name="omnipod_overview_temp_basal_value">%1$.2fE/u @%2$s (%3$d/%4$d minuten)</string>
+    <string name="omnipod_overview_reservoir_value">%1$.2f E over</string>
+    <string name="omnipod_overview_reservoir_value_over50">Meer dan 50 E over</string>
+    <string name="omnipod_overview_errors">Foutmeldingen</string>
+    <!-- Omnipod - Other -->
+    <string name="omnipod_pump_description">Pompintegratie voor Omnipod, vereist RileyLink (met firmwareversie 2.0 of hoger).</string>
+    <string name="omnipod_custom_action_reset_rileylink">Reset RileyLink configuratie</string>
+    <string name="omnipod_uncertain">onzeker</string>
+    <string name="omnipod_pulse_log">Pulslog</string>
+    <string name="omnipod_pulse_log_value">Pulselog (gekopieerd naar klembord)</string>
+    <string name="omnipod_yes">Ja</string>
+    <string name="omnipod_no">Nee</string>
+    <string name="omnipod_ok">OK</string>
+    <string name="omnipod_cancel">Annuleren</string>
+    <!-- Omnipod - Times -->
+    <string name="omnipod_moments_ago">Zojuist</string>
+    <string name="omnipod_less_than_a_minute_ago">Minder dan een minuut geleden</string>
+    <string name="omnipod_composite_time">%1$s en %2$s</string>
+    <string name="omnipod_time_ago">%1$s geleden</string>
+    <plurals name="omnipod_minutes">
+        <item quantity="one">%1$d minuut</item>
+        <item quantity="other">%1$d minuten</item>
+    </plurals>
+    <plurals name="omnipod_hours">
+        <item quantity="one">%1$d uur</item>
+        <item quantity="other">%1$d uren</item>
+    </plurals>
+    <plurals name="omnipod_days">
+        <item quantity="one">%1$d dag</item>
+        <item quantity="other">%1$d dagen</item>
+    </plurals>
 </resources>
--- a/omnipod/src/main/res/values-no-rNO/strings.xml
+++ b/omnipod/src/main/res/values-no-rNO/strings.xml
@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Pumpe-integrering for Omnipod, krever RileyLink (med minst 2.0 firmware) enhet.</string>
-    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
    <string name="omnipod_config_bolus_beeps_enabled">Bolus pip aktivert</string>
    <string name="omnipod_config_basal_beeps_enabled">Bolus pip aktivert</string>
    <string name="omnipod_config_smb_beeps_enabled">SMB pip aktivert</string>
@ -15,59 +14,95 @@
    <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Timer før nedstenging</string>
    <string name="omnipod_config_low_reservoir_alert_enabled">Varsel om lavt reservoar aktivert</string>
    <string name="omnipod_config_low_reservoir_alert_units">Antall enheter</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_moments_ago">For litt siden</string>
-    <string name="omnipod_pod_mgmt">Pod håndtering</string>
-    <string name="omnipod_pod_status">Pod status</string>
-    <string name="omnipod_total_delivered_label">Totalt levert</string>
-    <string name="omnipod_total_delivered">%1$.2f E</string>
-    <string name="omnipod_reservoir_left">%1$.2f E igjen</string>
-    <string name="omnipod_reservoir_over50">Over 50 E</string>
-    <string name="omnipod_pod_address">Pod adresse</string>
-    <string name="omnipod_pod_expiry">Pod utløper</string>
-    <string name="omnipod_warning">Advarsel</string>
+    <string name="omnipod_preference_category_rileylink">RileyLink</string>
+    <string name="omnipod_preference_category_other">Annen</string>
+    <string name="omnipod_preference_category_alerts">Varsler</string>
+    <string name="omnipod_preference_category_confirmation_beeps">Bekreftelse pip</string>
+    <!-- Omnipod - Pod Status -->
    <string name="omnipod_pod_status_no_active_pod">Ingen aktiv Pod</string>
-    <string name="omnipod_pod_status_waiting_for_pair_and_prime">Forberedelse av pod (venter på paring og priming)</string>
+    <string name="omnipod_pod_status_waiting_for_activation">Oppsett pågår (venter på Pod aktivering)</string>
    <string name="omnipod_pod_status_waiting_for_cannula_insertion">Forberedelse av pod (venter på innskyting av kanyle)</string>
    <string name="omnipod_pod_status_running">Kjører</string>
-    <string name="omnipod_pod_status_suspended">Satt på vent</string>
+    <string name="omnipod_pod_status_suspended">Pauset</string>
    <string name="omnipod_pod_status_pod_fault">Pod feil</string>
    <string name="omnipod_pod_status_activation_time_exceeded">Aktiveringstiden er overskredet</string>
    <string name="omnipod_pod_status_inactive">Inaktiv</string>
    <string name="omnipod_pod_status_pod_fault_description">Pod feil: %1$s %2$s</string>
-    <string name="omnipod_pod_active_alerts">Aktive Pod varsler</string>
-    <string name="omnipod_acknowledge_active_alerts_short">Ack varsler</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
+    <!-- Omnipod - Alerts -->
+    <string name="omnipod_alert_finish_pairing_reminder">Fullfør paringspåminnelse</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Påminnelse om å sluttføre oppsett</string>
+    <string name="omnipod_alert_expiration">Pod utløper snart</string>
+    <string name="omnipod_alert_expiration_advisory">Pod utløper snart</string>
+    <string name="omnipod_alert_shutdown_imminent">Nedstenging er nært forestående</string>
+    <string name="omnipod_alert_low_reservoir">Lavt reservoar</string>
+    <string name="omnipod_alert_unknown_alert">Ukjent varsel</string>
+    <!-- Omnipod - History -->
+    <string name="omnipod_history_title">Pod historikk</string>
+    <string name="omnipod_history_item_description">Beskrivelse</string>
+    <string name="omnipod_history_item_source">Kildekode</string>
+    <string name="omnipod_history_item_date">Dato</string>
+    <string name="omnipod_history_type">Type:</string>
+    <string name="omnipod_history_bolus_value">%1$.2f E</string>
+    <string name="omnipod_history_bolus_value_with_carbs">%1$.2f E, KH=%2$.1f g</string>
+    <string name="omnipod_history_tbr_value">Dose: %1$.2f E, varighet: %2$d min</string>
    <!-- Omnipod - Error -->
+    <string name="omnipod_warning">Advarsel</string>
    <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_operation_not_possible_no_profile">Operasjonen er ikke mulig.\n\n Du må vente noen minutter før AAPS prøver å sette basalprofilen for første gang.</string>
-    <string name="omnipod_error_illegal_init_action_type">Ulovlig PodInitActionType: %1$s</string>
    <string name="omnipod_error_pod_not_attached">Ingen aktiv Pod</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Kommandobekreftelse mislyktes</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">En uventet feil oppstod. Vennligst rapporter (type: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Kommunikasjon mislyktes: ugyldige inndataparametere</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Kommunikasjon mislyktes: tidsavbrudd</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Kommunikasjon mislyktes: en uventet feil oppstod. Vennligst rapporter!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Kommunikasjon mislyktes: integritetsbekreftelse av meldinger mislyktes</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Kommunikasjon mislyktes: ugyldig melding fra Pod</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Kommunikasjonen mislyktes: Pod er i feil tilstand</string>
-    <string name="omnipod_driver_error_invalid_response">Kommunikasjon mislyktes: ugyldig svar fra Pod</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Kommunikasjon mislyktes: mottatt en melding med et ugyldig sekvensnummer fra Pod</string>
-    <string name="omnipod_driver_error_invalid_message_address">Kommunikasjon mislyktes: mottatt en melding med en ugyldig adresse fra Pod</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Kommunikasjon mislyktes: kan ikke dekode meldingen fra Pod</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Kommunikasjon mislyktes: nonce resync mislyktes</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Kommunikasjon mislyktes: nonce usynkron</string>
-    <string name="omnipod_driver_error_not_enough_data">Kommunikasjon mislyktes: ikke nok data mottatt fra Pod</string>
-    <string name="omnipod_driver_error_pod_fault">En Pod feil (%1$03d %2$s) ble oppdaget. Vennligst deaktiver Poden din og start en ny Pod</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Kommunikasjonen mislyktes: Poden returnerte et feil svar</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Pod administrasjon</string>
-    <string name="omnipod_cmd_init_pod">Initsialiser Pod</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>
+    <string name="omnipod_error_invalid_progress_state">Kommunikasjonsfeil: Pod er i feil tilstand</string>
+    <string name="omnipod_error_invalid_response">Kommunikasjonsfeil: mottok en ugyldig respons fra Pod</string>
+    <string name="omnipod_error_invalid_message_sequence_number">Kommunikasjonsfeil: mottok en en melding med ugyldig sekvensnummer fra Pod</string>
+    <string name="omnipod_error_invalid_message_address">Kommunikasjonsfeil: mottok en melding fra Pod med ugyldig adresse</string>
+    <string name="omnipod_error_message_decoding_failed">Kommunikasjonsfeil: klarte ikke å tolke meldingen fra Pod</string>
+    <string name="omnipod_error_nonce_resync_failed">Kommunikasjonsfeil: fornying av kommunikasjonsnøkkel (nounce) feilet</string>
+    <string name="omnipod_error_nonce_out_of_sync">Kommunikasjonsfeil: kommunikasjonsnøkkel (nounce) er ikke synkronisert</string>
+    <string name="omnipod_error_not_enough_data">Kommunikasjonsfeil: mottok ikke tilstrekkelig med data fra Pod</string>
+    <string name="omnipod_error_pod_fault">En Pod feil (%1$03d %2$s) er oppdaget. Vennligst deaktiver din Pod og start en ny</string>
+    <string name="omnipod_error_pod_returned_error_response">Kommunikasjonsfeil: Pod returnerte en feilmelding</string>
+    <string name="omnipod_error_communication_failed_no_response_from_riley_link">Ingen respons fra RileyLink</string>
+    <string name="omnipod_error_communication_failed_riley_link_interrupted">Koblingen til RileyLink avbrutt</string>
+    <string name="omnipod_error_communication_failed_no_response_from_pod">Ingen svar fra Pod</string>
+    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Endring av basalprofil mislyktes. Insulinlevering kan bli sperret! Vennligst velg oppdater fra Omnipod fanen og velg gjenoppta levering hvis nødvendig.</string>
+    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Endring av basalprofil mislyktes. Insulinlevering kan bli sperret! Vennligst velg oppdater fra Omnipod fanen og velg gjenoppta levering hvis nødvendig.</string>
+    <string name="omnipod_error_set_basal_failed_delivery_suspended">Endring av basal profil mislyktes. Insulinlevering er sperret! Velg gjenoppta levering manuelt fra Omnipod-fanen.</string>
+    <string name="omnipod_error_set_basal_failed">Feilet i å lagre basalprofilen.</string>
+    <string name="omnipod_error_cancel_temp_basal_failed_uncertain">Mislyktes trolig med å kansellere temp basal. Vennligst oppdater Pod status manuelt fra Omnipod menyen.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Endring av midlertidig basal var mislykket. En tidligere midlertidig basal kan ha blitt kansellert. Oppdater statusen på Pod manuelt fra Omnipod fanen.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Endring av midlertidig basal kan ha vært mislykket. En tidligere midlertidig basal kan ha blitt kansellert. Oppdater statusen på Pod manuelt fra Omnipod fanen.</string>
+    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Innstilling av tid kan ha mislyktes. Insulinlevering kan være kansellert! Oppdater statusen manuelt fra fanen Omnipod og gjenoppta levering hvis nødvendig.</string>
+    <string name="omnipod_error_set_time_failed_delivery_suspended">Endring av tid mislyktes. Insulinlevering er sperret! Velg gjenoppta levering manuelt fra Omnipod-fanen.</string>
+    <string name="omnipod_error_failed_to_set_profile_empty_profile">Feilet i å lagre basal profil: mottok en tom profil. Kontroller at du har aktivert profilen.</string>
+    <string name="omnipod_error_set_initial_basal_schedule_no_profile">Ingen basal profil er aktiv. Sørg for å aktivere din basal profil.</string>
+    <string name="omnipod_error_unknown_custom_command">Ukjent kommando: %1$s</string>
+    <string name="omnipod_error_failed_to_read_pulse_log">Feilet i å lese Pulsloggen</string>
+    <string name="omnipod_error_failed_to_refresh_status">Feilet i å oppdatere status</string>
+    <string name="omnipod_error_failed_to_acknowledge_alerts">Feilet i å bekrefte varsler</string>
+    <string name="omnipod_error_failed_to_suspend_delivery">Feilet i å stoppe leveranser</string>
+    <string name="omnipod_error_failed_to_set_time">Feilet i å angi tid</string>
+    <string name="omnipod_error_failed_to_resume_delivery">Feilet i å gjenoppta leveransen</string>
+    <string name="omnipod_error_automatic_time_or_timezone_change_failed">Feilet i å automatisk endre tid på Pod. Vennligst synkroniser tid manuelt ved å bruke Omnipod menyen.</string>
+    <string name="omnipod_error_bolus_failed_uncertain">Klarte ikke å kontrollere om bolusdosen ble gitt. Kontroller manuelt at Pod leverer bolus ved å lytte etter klikk. <b>Dersom du er sikker på at bolusen ikke var vellykket, bør du manuelt slette bolusoppføring fra Behandlinger, selv om du trykker på \'Avbryt bolus\' nå!</b></string>
+    <string name="omnipod_error_bolus_failed_uncertain_smb">Klarte ikke å bekrefte om SMB bolus (%1$.2f E) ble gitt. <b>Hvis du er helt sikker på at Bolus ikke ble levert, da bør du manuelt slette SMB-oppføringen fra Behandlinger.</b></string>
+    <string name="omnipod_error_bolus_did_not_succeed">Bolus var mislykket.</string>
+    <string name="omnipod_error_failed_to_initialize_pod">Feilet i å initialisere Pod</string>
+    <string name="omnipod_error_failed_to_insert_cannula">Feilet ved innsetting av kanyle</string>
+    <string name="omnipod_error_pod_fault_activation_time_exceeded">Pod\'ens aktiveringstid er overskredet. Denne Pod kan ikke lenger aktiveres.</string>
+    <!-- Omnipod - Confirmation -->
+    <string name="omnipod_confirmation">Bekreftelse</string>
+    <string name="omnipod_confirmation_time_or_timezone_change">Tid og/eller tidssone endret på Pod.</string>
+    <string name="omnipod_confirmation_expiration_alerts_updated">Varselinnstillinger har blitt oppdatert på Pod.</string>
+    <string name="omnipod_confirmation_time_on_pod_updated">Tiden på Pod har blitt oppdatert.</string>
+    <string name="omnipod_confirmation_suspended_delivery">All insulintilførsel har blitt pauset.</string>
+    <string name="omnipod_confirmation_acknowledged_alerts">Aktive varsler har blitt bekreftet.</string>
+    <string name="omnipod_confirmation_delivery_resumed">Insulintilførselen er gjenopptatt.</string>
+    <string name="omnipod_confirmation_pod_suspended">Pod er pauset</string>
+    <!-- Omnipod - Commands -->
    <string name="omnipod_cmd_deactivate_pod">Deaktiviser Pod</string>
    <string name="omnipod_cmd_discard_pod">Forkast Pod</string>
-    <string name="omnipod_cmd_pod_history">Pod historikk</string>
    <string name="omnipod_cmd_set_bolus">Sett bolus</string>
    <string name="omnipod_cmd_cancel_bolus">Avbryt bolus</string>
    <string name="omnipod_cmd_set_tbr">Sett midlertidig basal</string>
@ -82,88 +117,92 @@
    <string name="omnipod_cmd_suspend_delivery">Stopp levering</string>
    <string name="omnipod_cmd_resume_delivery">Gjenoppta levering</string>
    <string name="omnipod_cmd_unknown_entry">Ukjent valg</string>
-    <string name="omnipod_cmd_bolus_value">%1$.2f E</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f E, KH=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Levering: %1$.2f E, varighet: %2$d min</string>
-    <string name="omnipod_cmd_discard_pod_desc">Hvis du trykker <b>OK</b>, Pod statusen bli tvangsmessig tilbakestilt, og du vil ikke lenger kunne kommunisere med Poden. Gjør dette bare hvis du ikke kan kommunisere med Poden lenger. Hvis du fortsatt kan kommunisere med Poden, kan du bruke <b>Deaktiver Pod</b> alternativet.\n\nHvis du ønsker å fortsette, må du fjerne Poden fra kroppen.</string>
-    <string name="omnipod_cmd_pod_history_na">Pod historikken er ikke tilgjengelig for øyeblikket.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Fyll Poden</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nFyll den nye stilen med nok insulin for 3 dager.\n\nLytt til to pip fra Poden under fyllingen. Disse indikerer at minste mengde 85U er satt inn. Pass på å tømme sprøyten helt, også etter å ha hørt de to pipene.\n\nEtter fylling av Poden, vennligst trykk <b>Neste</b>.\n\n<b>Merk:</b> Ikke fjern Poden\'s beskyttelseshette på dette tidspunktet.\n<b>Merk:</b> vennligst plasser RileyLinken i en stående posisjon og plasser Poden 5-10 cm unna.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Fylling av insulin i Poden helt ut i injeksjonsnålen</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Prøver å parre med den nye Poden og klargjøre den.\n\nNår alle trinn er merket, kan du trykke <b>Neste</b>.\n\n<b>Merk:</b> plasser RileyLink i en stående posisjon og plasser Poden ac 5-10 cm vekk fra den.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Fest poden</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nKlargjør infusjonsstedet. Fjern Podens beskyttelseshette og den heftende bakside og fest pumpen til infusjonsstedet.\n\nHvis kanylen stikker ut, trykk <b>Avbryt</b> og forkast tilpasningen.\n\nTrykk <b>Neste</b> for å sette inn kanyle og starte basallevering.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Kanyle blir satt inn</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Prøver å oppdatere første basalprofil og setter inn kanylen.\n\nNår alle punkter er avmerket, kan du trykke <b>Neste</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Informasjon om Pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPod\'en er nå aktivt.\n\nDin basalprofil har blitt programmert og kanylen har blitt satt inn.\n\nVennligst kontroller at kanyle er satt inn riktig og erstatt pod\'en din hvis du føler at noe er feil.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Deaktiviser Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nTrykk <b>Neste</b> for å deaktivere Pod\'en.\n\n<b>Merk:</b> Dette vil stoppe all insulintilførsel og deaktivere Pod\'en.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Pod\'en deaktiviseres</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Deaktiverer Pod\'en.\n\nNår alle punkter er avmerket, kan du trykke <b>Neste</b>.\n\n<b>Merk:</b> Hvis deaktiveringen kontinuerlig svikter, trykk <b>Avbryt</b> og bruk <b>Forkast Pod</b> valget for å tvinge reset av Pod\'en.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod er deaktivert.\n\nVennligst fjern Pod\'en fra kroppen din og kast den.</string>
-    <string name="omnipod_init_pod_pair_pod">Par Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Klargjør insulintilførsel i Pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Fyll kanyle</string>
-    <string name="omnipod_init_pod_set_basal_profile">Sett basalprofil</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Avbryt levering</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Deaktiver Pod</string>
-    <!-- Omnipod - Base -->
-    <string name="omnipod_alert_finish_pairing_reminder">Fullfør paringspåminnelse</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Påminnelse om å sluttføre oppsett</string>
-    <string name="omnipod_alert_expiration">Pod utløper snart</string>
-    <string name="omnipod_alert_expiration_advisory">Pod utløper snart</string>
-    <string name="omnipod_alert_shutdown_imminent">Nedstenging er nært forestående</string>
-    <string name="omnipod_alert_low_reservoir">Lavt reservoar</string>
-    <string name="omnipod_alert_unknown_alert">Ukjent varsel</string>
-    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Endring av basalprofil mislyktes. Insulinlevering kan bli sperret! Vennligst velg oppdater fra Omnipod fanen og velg gjenoppta levering hvis nødvendig.</string>
-    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Endring av basalprofil mislyktes. Insulinlevering kan bli sperret! Vennligst velg oppdater fra Omnipod fanen og velg gjenoppta levering hvis nødvendig.</string>
-    <string name="omnipod_error_set_basal_failed_delivery_suspended">Endring av basal profil mislyktes. Insulinlevering er sperret! Velg gjenoppta levering manuelt fra Omnipod-fanen.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Endring av midlertidig basal var mislykket. En tidligere midlertidig basal kan ha blitt kansellert. Oppdater statusen på Pod manuelt fra Omnipod fanen.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Endring av midlertidig basal kan ha vært mislykket. En tidligere midlertidig basal kan ha blitt kansellert. Oppdater statusen på Pod manuelt fra Omnipod fanen.</string>
-    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Innstilling av tid kan ha mislyktes. Insulinlevering kan være kansellert! Oppdater statusen manuelt fra fanen Omnipod og gjenoppta levering hvis nødvendig.</string>
-    <string name="omnipod_error_set_time_failed_delivery_suspended">Endring av tid mislyktes. Insulinlevering er sperret! Velg gjenoppta levering manuelt fra Omnipod-fanen.</string>
-    <string name="omnipod_bolus_failed_uncertain">Kan ikke kontrollere om bolusdosen ble gitt. Kontroller at Pod\'en gir bolus ved å lytte etter klikkk. <b>Dersom du er sikker på at bolusen ikke var vellykket, bør du manuelt slette bolusoppføring fra behandlingene, selv om du klikker \'Avbryt bolus\' nå!</b></string>
-    <string name="omnipod_bolus_failed_uncertain_smb">Kan ikke bekrefte om SMB bolus (%1$.2f E) lyktes. <b>Hvis du er sikker på at Bolus ikke lyktes, bør du manuelt slette SMB-oppføringen fra behandlinger.</b></string>
-    <string name="omnipod_rl_stats">RL statistikk</string>
-    <string name="omnipod_read_pulse_log_short">Puls logg</string>
-    <string name="omnipod_pod_lot">LOT nummer</string>
-    <string name="omnipod_pod_tid">TID nummer</string>
-    <string name="omnipod_pod_firmware_version">Firmware Versjon</string>
-    <string name="omnipod_errors">Feil</string>
-    <string name="omnipod_cmd_basal_profile_not_set_is_same">Basalprofilen er den samme, så den blir ikke satt igjen.</string>
-    <string name="omnipod_custom_action_reset_rileylink">Tilbakestill RileyLink oppsett</string>
-    <string name="omnipod_time_or_timezone_change">Tids- og/eller tidssone endret på Pod</string>
-    <string name="omnipod_composite_time">%1$s og %2$s</string>
-    <string name="omnipod_time_ago">%1$s siden</string>
-    <string name="omnipod_waiting_for_rileylink_connection">Venter på RileyLink-tilkobling...</string>
-    <string name="omnipod_bolus_did_not_succeed">Bolus lyktes ikke</string>
-    <string name="omnipod_refresh">Oppdater</string>
-    <string name="omnipod_resume_delivery">Gjenoppta leveranse</string>
-    <string name="omnipod_error_pod_suspended">Pod suspendert</string>
-    <string name="omnipod_less_than_a_minute_ago">Mindre enn ett minutt siden</string>
-    <string name="omnipod_suspend_delivery_short">Suspender</string>
-    <string name="omnipod_cmd_pair_and_prime">Paring og klargjøring av insulintilførsel</string>
-    <string name="omnipod_cmd_fill_cannula_set_basal_profile">Fyll kanyle og sett opp basalprofil</string>
-    <string name="omnipod_cmd_get_pulse_log">Hent pulslogg</string>
-    <string name="omnipod_uncertain_failure">Usikker feil</string>
-    <string name="omnipod_cancelled_old_tbr_failed_to_set_new">Annullerte gammel midlertidig basal, men klarte ikke å sette ny midlertidig basal</string>
+    <string name="omnipod_cmd_initialize_pod">Initialiser Pod</string>
+    <string name="omnipod_cmd_insert_cannula">Sett inn kanyle</string>
+    <string name="omnipod_cmd_read_pulse_log">Les pulslogg</string>
    <string name="omnipod_cmd_set_fake_suspended_tbr">Angi vilkårlig midlertidig basal fordi Pod er suspendert</string>
    <string name="omnipod_cmd_cancel_fake_suspended_tbr">Avbryt vilkårlig midlertidig basal som er opprettet fordi Pod var suspendert</string>
-    <string name="omnipod_uncertain">usikker</string>
-    <string name="omnipod_expiration_alerts_updated">Varselkonfigurasjon oppdatert i Pod</string>
-    <string name="omnipod_preference_category_rileylink">RileyLink</string>
-    <string name="omnipod_preference_category_other">Annen</string>
-    <string name="omnipod_preference_category_alerts">Varsler</string>
-    <string name="omnipod_preference_category_confirmation_beeps">Bekreftelse pip</string>
-    <string name="omnipod_wizard_button_exit">Avslutt</string>
-    <string name="omnipod_wizard_button_previous">Foregående</string>
-    <string name="omnipod_wizard_button_next">Neste</string>
+    <!-- Omnipod - Pod Management -->
+    <string name="omnipod_pod_management_title">Pod administrasjon</string>
+    <string name="omnipod_pod_management_waiting_for_rileylink_connection">Venter på RileyLink tilkobling…</string>
+    <string name="omnipod_pod_management_button_activate_pod">Aktiver Pod</string>
+    <string name="omnipod_pod_management_button_deactivate_pod">Deaktiver Pod</string>
+    <string name="omnipod_pod_management_button_discard_pod">Forkast Pod</string>
+    <string name="omnipod_pod_management_button_pod_history">Pod historikk</string>
+    <string name="omnipod_pod_management_discard_pod_state_confirmation">Dersom du forkaster Pod, vil du ikke kunne kommunisere med den lenger. Du skal bare gjøre dette når all kommunikasjon med Pod kontinuerlig mislykkes. Hvis du fortsatt kan kommunisere med Pod, bruk alternativet <b>Deaktiver Pod</b>.\n\nHvis du ønsker å fortsette, må du huske på å fjerne Pod fra kroppen din!</string>
+    <!-- Omnipod - Wizard common -->
+    <string name="omnipod_wizard_button_cancel">Avbryt</string>
    <string name="omnipod_wizard_button_finish">Fullfør</string>
-    <string name="omnipod_history_item_description">Beskrivelse</string>
-    <string name="omnipod_history_item_source">Kildekode</string>
-    <string name="omnipod_history_item_date">Dato</string>
-    <string name="omnipod_history_type">Type:</string>
+    <string name="omnipod_wizard_button_next">Neste</string>
+    <string name="omnipod_wizard_button_retry">Prøv igjen</string>
+    <string name="omnipod_wizard_button_deactivate_pod">Deaktiver Pod</string>
+    <string name="omnipod_wizard_button_discard_pod">Forkast Pod</string>
+    <string name="omnipod_wizard_exit_confirmation_text">Du har ikke fullført alle trinn ennå. Er du sikker på at du vil avslutte?</string>
+    <string name="omnipod_wizard_exit_confirmation_title">Avslutt</string>
+    <!-- Omnipod - Pod activation Wizard -->
+    <string name="omnipod_pod_activation_wizard_fill_pod_title">Fyll Pod</string>
+    <string name="omnipod_pod_activation_wizard_fill_pod_text">Fyll en ny Pod med nok insulin for 3 dager.\n\nLytt etter to lydsignaler fra Pod under fyllingen. Disse indikerer at minimums volum på 85E er fylt opp. Vær nøye med å tømme fyllingssprøyten helt, selv etter at du har hørt de to lydsignalene.\n\nEtter fylling av Pod, vennligst trykk <b>Neste</b>.\n\n<b>Merk:</b> vent med å fjern kanylebeskyttelsen til Pod. \n<b>Merk:</b> plasser RileyLink i en stående posisjon og legg Pod kun noen cm unna denne.</string>
+    <string name="omnipod_pod_activation_wizard_initialize_pod_title">Initialiser Pod</string>
+    <string name="omnipod_pod_activation_wizard_initialize_pod_text">Prøver å koble opp mot den nye Pod og sette påfyllingsbolus.\n\nNår alle oppstartstrinn er utført, kan du trykke <b>Neste</b>.\n\n<b>Merk:</b> plasser RileyLink i en stående posisjon og plasser Pod maks noen centimeter unna den.</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_title">Fest Pod</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_text">Klargjør infusjonsstedet. Fjern Pod\'ens kanylebeskyttelse og papirfolien, og fest Pod til infusjonsstedet.\n\nHvis du oppdager feil med kanylen, trykk <b>Avbryt</b> og forkast Pod.\n\nTrykk <b>Neste</b> for å sette inn kanyle og starte påfyllingsbolus.</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_confirm_insert_cannula_text">Når du trykker <b>OK</b>vil kanylen settes inn. Pass på at du har festet Pod\'en på infusjonsstedet.</string>
+    <string name="omnipod_pod_activation_wizard_insert_cannula_title">Sett inn kanyle</string>
+    <string name="omnipod_pod_activation_wizard_insert_cannula_text">Prøver å sette inn kanylen og tilføre en påfyllingsbolus.\n\nNår kanylen er vellykket på plass kan du trykke på <b>Neste</b>.</string>
+    <string name="omnipod_pod_activation_wizard_pod_activated_title">Pod aktivert</string>
+    <string name="omnipod_pod_activation_wizard_pod_activated_text">Den nye Pod\'en er nå aktiv.\n\nDin basalprofil har blitt lagret og kanelen er inne.\n\nVennligst kontroller at kanylen ble satt riktig inn og skift Pod hvis du tror det har oppstått feil med innsettingen.</string>
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <string name="omnipod_pod_deactivation_wizard_deactivate_pod_title">Deaktiver Pod</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivate_pod_text">Trykk på <b>Neste</b> for å deaktivere Pod.\n\n<b>Merk:</b> Dette vil stanse all insulintilførsel og deaktivere Pod.</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivating_pod_title">Deaktiverer Pod</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivating_pod_text">Deaktivering av Pod.\n\nNår deaktiveringen er vellykket utført, kan du trykke på <b>Neste</b>.</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_deactivated_title">Pod deaktivert</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_deactivated_text">Din Pod er deaktivert.\n\nVennligst fjern Pod\'en fra kroppen din og lever den inn for gjenvinning.</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_discarded_title">Pod forkastet</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_discarded_text">Pod\'ens tilstand er forkastet. Insulintilførsel har ikke blitt stanset fordi Pod ikke har blitt ordentlig deaktivert!\n\nVennligst fjern Pod fra kroppen og lever den inn for gjenvinning.</string>
+    <string name="omnipod_pod_deactivation_wizard_discard_pod_confirmation">Dersom du forkaster Pod vil du ikke være i stand til å kommunisere med den lenger. Du skal bare gjøre dette når all kommunikasjon med Pod konsekvent feiler. Er du sikker på at du vil forkaste Pod?</string>
+    <string name="omnipod_pod_deactivation_wizard_discard_pod">Forkast Pod</string>
+    <!-- Omnipod - Overview -->
+    <string name="omnipod_overview_button_set_time">Angi tid</string>
+    <string name="omnipod_overview_button_suspend_delivery">Pause</string>
+    <string name="omnipod_overview_button_riley_link_stats">RL statistikk</string>
+    <string name="omnipod_overview_button_read_pulse_log">Puls logg</string>
+    <string name="omnipod_overview_button_refresh">Oppdater</string>
+    <string name="omnipod_overview_button_resume_delivery">Fortsett levering</string>
+    <string name="omnipod_overview_button_pod_management">Pod håndtering</string>
+    <string name="omnipod_overview_button_acknowledge_active_alerts">Godkjenn varsler</string>
+    <string name="omnipod_overview_pod_status">Pod status</string>
+    <string name="omnipod_overview_total_delivered">Totalt levert</string>
+    <string name="omnipod_overview_total_delivered_value">%1$.2f E</string>
+    <string name="omnipod_overview_pod_address">Pod adresse</string>
+    <string name="omnipod_overview_pod_expiry_date">Pod utløper</string>
+    <string name="omnipod_overview_last_connection">Siste tilkobling</string>
+    <string name="omnipod_overview_last_bolus">Siste bolus</string>
+    <string name="omnipod_overview_temp_basal_rate">Temp basal rate</string>
+    <string name="omnipod_overview_base_basal_rate">Profilens basal dose</string>
+    <string name="omnipod_overview_reservoir">Reservoar</string>
+    <string name="omnipod_overview_pod_active_alerts">Aktive Pod varsler</string>
+    <string name="omnipod_overview_firmware_version">Firmware versjon</string>
+    <string name="omnipod_overview_time_on_pod">Tid på Pod</string>
+    <string name="omnipod_overview_temp_basal_value">%1$.2fE/t @%2$s (%3$d/%4$d minutter)</string>
+    <string name="omnipod_overview_reservoir_value">%1$.2f E igjen</string>
+    <string name="omnipod_overview_reservoir_value_over50">Over 50 E igjen</string>
+    <string name="omnipod_overview_errors">Feil</string>
+    <!-- Omnipod - Other -->
+    <string name="omnipod_pump_description">Pumpetilkobling for Omnipod krever RileyLink enhet med firmwareversjon 2.0 eller høyere.</string>
+    <string name="omnipod_custom_action_reset_rileylink">Tilbakestill RileyLink oppsett</string>
+    <string name="omnipod_uncertain">usikker</string>
+    <string name="omnipod_pulse_log">Puls logg</string>
+    <string name="omnipod_pulse_log_value">Puls logg (kopiert til utklippstavlen)</string>
+    <string name="omnipod_yes">Ja</string>
+    <string name="omnipod_no">Nei</string>
+    <string name="omnipod_ok">OK</string>
+    <string name="omnipod_cancel">Avbryt</string>
+    <!-- Omnipod - Times -->
+    <string name="omnipod_moments_ago">For litt siden</string>
+    <string name="omnipod_less_than_a_minute_ago">Mindre enn ett minutt siden</string>
+    <string name="omnipod_composite_time">%1$s og %2$s</string>
+    <string name="omnipod_time_ago">%1$s siden</string>
    <plurals name="omnipod_minutes">
        <item quantity="one">%1$d minutt</item>
        <item quantity="other">%1$d minutter</item>
--- a/omnipod/src/main/res/values-pl-rPL/strings.xml
+++ b/omnipod/src/main/res/values-pl-rPL/strings.xml
@ -1,58 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Integracja pompy Omnipod, wymaga RileyLink (z firmwarem 2.0 lub wyższym).</string>
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_total_delivered">%1$.2f U</string>
-    <string name="omnipod_reservoir_left">%1$.2f U zostało</string>
-    <string name="omnipod_reservoir_over50">Ponad 50 U</string>
-    <string name="omnipod_warning">Ostrzeżenie</string>
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <string name="omnipod_preference_category_rileylink">RileyLink</string>
+    <string name="omnipod_preference_category_other">Inne</string>
+    <!-- Omnipod - Pod Status -->
    <string name="omnipod_pod_status_running">W działaniu</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_error_operation_not_possible_no_configuration">To działanie nie jest możliwe.\n\n Musisz skonfigurować Omnipod przed uruchomieniem tego działania.</string>
-    <string name="omnipod_error_illegal_init_action_type">Niedozwolone działanie PodInitActionType: %1$s</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Nieudana weryfikacja polecenia</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Wystąpił nieoczekiwany błąd. Proszę zgłosić! (typ: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Komunikacja nie powiodła się: odebrano niepoprawne parametry wejściowe</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Komunikacja nie powiodła się: przekroczono limit czasu</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Komunikacja nie powiodła się: wystąpił nieoczekiwany błąd. Proszę zgłosić!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Komunikacja nie powiodła się: weryfikacja integralności komunikatu nie powiodła się</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Komunikacja nie powiodła się: odebrano niepoprawny pakiet (komunikat) z Poda</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Komunikacja nie powiodła się: Pod jest w niewłaściwym stanie</string>
-    <string name="omnipod_driver_error_invalid_response">Komunikacja nie powiodła się: odebrano niepoprawną odpowiedź (pakiet) z Poda</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Komunikacja nie powiodła się: odebrano komunikat z niepoprawnym numerem kolejnym z Poda</string>
-    <string name="omnipod_driver_error_invalid_message_address">Komunikacja nie powiodła się: odebrano komunikat z niepoprawną adresacją z Poda</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Komunikacja nie powiodła się: nie powiodło się dekodowanie komunikatu z Poda</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Komunikacja nie powiodła się: synchronizacja unikalnej liczby nie powiodło się</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Komunikacja nie powiodła się: unikalna liczba nie jest zsynchronizowana</string>
-    <string name="omnipod_driver_error_not_enough_data">Komunikacja nie powiodła się: brak wystarczającej ilości danych odebranych z Poda</string>
-    <string name="omnipod_driver_error_pod_fault">Wykryto błąd Poda (%1$03d %2$s). Zdezaktywuj swój Pod i uruchom nowy</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Komunikacja nie powiodła się: Pod odpowiedział komunikatem o błędzie</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_cmd_init_pod">Uruchom Pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Odłącz Pod</string>
-    <string name="omnipod_cmd_bolus_value">%1$.2f U</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f U, Węgl.=%2$.1f g</string>
-    <string name="omnipod_cmd_pod_history_na">Historia Pod nie jest dostępna w tej chwili.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Napełnij Pod</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Wypełnianie</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Przymocuj Poda</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPrzygotowanie miejsca do infuzji. Zdjąć osłonkę igły i zabezpieczenie plastra i przykleić Pod do skóry w miejscu wkłucia.\n\nJeśli kaniula odkleja się, proszę wcisnąć <b>Anuluj</b> i odczepić Pod.\n\nNaciśnij <b>Następny</b> w celu wprowadzenia kaniuli i rozpoczęcia podawania bazy.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Wprowadzanie kaniuli</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Próba ustawienia początkowego planu bazowego i wprowadzeia kaniuli.\n\nKiedy wszystkie elementy są sprawdzane, można nacisnąć <b>Następny</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPod jest teraz aktywny.\n\nTwój plan dawki bazowej został zaprogramowany i wprowadzono kaniulę w miejsce wkłucia.\n\nSprawdź, czy kaniula została prawidłowo włożona i wymień swój Pod, jeśli czujesz, że nie.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Odłącz Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nNaciśnij <b>Następny</b> w celu odłączenia Poda.\n\n<b>Uwaga:</b> To spowoduje zawieszenie wszystkich dostaw insuliny i dezaktywację Poda.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Odłączanie Poda</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod odłączony.\n\nProszę odkleić Pod od ciała i wyrzucić go.</string>
-    <string name="omnipod_init_pod_pair_pod">Sparuj Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Wypełnij Pod</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Odłącz Pod</string>
-    <!-- Omnipod - Base -->
+    <!-- Omnipod - Alerts -->
    <string name="omnipod_alert_finish_pairing_reminder">Przypomnienie o zakończeniu parowania</string>
    <string name="omnipod_alert_finish_setup_reminder_reminder">Zakończ przypomnienie o konfiguracji</string>
    <string name="omnipod_alert_expiration">Pod wkrótce straci ważność</string>
@ -60,16 +15,23 @@
    <string name="omnipod_alert_shutdown_imminent">Wyłączenie jest nieuchronne</string>
    <string name="omnipod_alert_low_reservoir">Niski poziom w zbiorniku</string>
    <string name="omnipod_alert_unknown_alert">Nieznany alarm</string>
-    <string name="omnipod_errors">Błędy</string>
-    <string name="omnipod_cmd_basal_profile_not_set_is_same">Profil bazy jest taki sam, więc nie zostanie ustawiony ponownie.</string>
-    <string name="omnipod_refresh">Odśwież</string>
-    <string name="omnipod_suspend_delivery_short">Wstrzymaj</string>
-    <string name="omnipod_preference_category_rileylink">RileyLink</string>
-    <string name="omnipod_preference_category_other">Inne</string>
-    <string name="omnipod_wizard_button_exit">Wyjście</string>
-    <string name="omnipod_wizard_button_next">Dalej</string>
+    <!-- Omnipod - History -->
    <string name="omnipod_history_item_description">Opis</string>
    <string name="omnipod_history_item_date">Data</string>
+    <!-- Omnipod - Error -->
+    <string name="omnipod_warning">Ostrzeżenie</string>
+    <string name="omnipod_error_operation_not_possible_no_configuration">To działanie nie jest możliwe.\n\n Musisz skonfigurować Omnipod przed uruchomieniem tego działania.</string>
+    <!-- Omnipod - Confirmation -->
+    <!-- Omnipod - Commands -->
+    <string name="omnipod_cmd_deactivate_pod">Odłącz Pod</string>
+    <!-- Omnipod - Pod Management -->
+    <!-- Omnipod - Wizard common -->
+    <string name="omnipod_wizard_button_next">Dalej</string>
+    <!-- Omnipod - Pod activation Wizard -->
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <!-- Omnipod - Overview -->
+    <!-- Omnipod - Other -->
+    <!-- Omnipod - Times -->
    <plurals name="omnipod_minutes">
        <item quantity="one">%1$d minuta</item>
        <item quantity="few">%1$d minuty</item>
--- a/omnipod/src/main/res/values-pt-rBR/strings.xml
+++ b/omnipod/src/main/res/values-pt-rBR/strings.xml
@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <!-- Omnipod - Pod Status -->
+    <!-- Omnipod - Alerts -->
+    <!-- Omnipod - History -->
    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod - Confirmation -->
+    <!-- Omnipod - Commands -->
    <string name="omnipod_cmd_deactivate_pod">Desativado Pod</string>
-    <!-- Omnipod - Base -->
+    <!-- Omnipod - Pod Management -->
+    <!-- Omnipod - Wizard common -->
+    <!-- Omnipod - Pod activation Wizard -->
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <!-- Omnipod - Overview -->
+    <!-- Omnipod - Other -->
+    <!-- Omnipod - Times -->
 </resources>
--- a/omnipod/src/main/res/values-pt-rPT/strings.xml
+++ b/omnipod/src/main/res/values-pt-rPT/strings.xml
@ -1,55 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Integração de bomba para Omnipod, requer RileyLink (com pelo menos firmware 2.0) dispositivo.</string>
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_pod_mgmt">Gestão Pod</string>
-    <string name="omnipod_pod_status">Estado do Pod</string>
-    <string name="omnipod_total_delivered_label">Total Administrado</string>
-    <string name="omnipod_total_delivered">%1$.2f U</string>
-    <string name="omnipod_reservoir_left">%1$.2f U restante</string>
-    <string name="omnipod_reservoir_over50">Mais de 50 U</string>
-    <string name="omnipod_pod_address">Endereço do Pod</string>
-    <string name="omnipod_pod_expiry">Pod Expira</string>
-    <string name="omnipod_warning">Aviso</string>
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <string name="omnipod_preference_category_rileylink">RileyLink</string>
+    <string name="omnipod_preference_category_other">Outro</string>
+    <string name="omnipod_preference_category_alerts">Alertas</string>
+    <string name="omnipod_preference_category_confirmation_beeps">Beeps de confirmação</string>
+    <!-- Omnipod - Pod Status -->
    <string name="omnipod_pod_status_no_active_pod">Nenhum Pod Activo</string>
    <string name="omnipod_pod_status_running">A correr</string>
    <string name="omnipod_pod_status_suspended">Suspenso</string>
    <string name="omnipod_pod_status_pod_fault">Falha no Pod</string>
    <string name="omnipod_pod_status_inactive">Inactivo</string>
    <string name="omnipod_pod_status_pod_fault_description">Falha no Pod: %1$s %2$s</string>
-    <string name="omnipod_acknowledge_active_alerts_short">Reco Alertas</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
+    <!-- Omnipod - Alerts -->
+    <string name="omnipod_alert_finish_pairing_reminder">Lembrete Concluir Emparelhamento</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Lembrete Terminar Configuração</string>
+    <string name="omnipod_alert_expiration">Pod vai expirar em breve</string>
+    <string name="omnipod_alert_expiration_advisory">Pod vai expirar em breve</string>
+    <string name="omnipod_alert_shutdown_imminent">Encerramento iminente</string>
+    <string name="omnipod_alert_low_reservoir">Reservatório baixo</string>
+    <string name="omnipod_alert_unknown_alert">Alerta desconhecido</string>
+    <!-- Omnipod - History -->
+    <string name="omnipod_history_item_description">Descrição</string>
+    <string name="omnipod_history_item_source">Fonte</string>
+    <string name="omnipod_history_item_date">Data</string>
+    <string name="omnipod_history_type">Tipo:</string>
    <!-- Omnipod - Error -->
+    <string name="omnipod_warning">Aviso</string>
    <string name="omnipod_error_operation_not_possible_no_configuration">A operação não é possível.\n\nPrecisa configurar o Omnipod primeiro, antes de pode usar esta operação.</string>
-    <string name="omnipod_error_illegal_init_action_type">PodInitActionType Ilegal: %1$s</string>
    <string name="omnipod_error_pod_not_attached">Nenhum Pod Activo</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">A verificação do comando falhou</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Ocorreu um erro inesperado. Por favor reporte! (digite: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Falha na comunicação: foram recebidos parâmetros de entrada inválidos</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Falha na comunicação: tempo limite</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Falha na comunicação: ocorreu um erro inesperado. Por favor, reporte!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Falha na comunicação: mensagem de falha de verificação de integridade</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Falha na comunicação: recebeu um pacote inválido do Pod</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Falha na comunicação: o Pod está em um estado errado</string>
-    <string name="omnipod_driver_error_invalid_response">Falha na comunicação: recebeu uma resposta inválida do Pod</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Falha na comunicação: recebeu uma mensagem com número de sequência inválido do Pod</string>
-    <string name="omnipod_driver_error_invalid_message_address">Falha na comunicação: recebeu uma mensagem com um endereço inválido do Pod</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Falha na comunicação: falha ao descodificar a mensagem do Pod</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Falha na comunicação: nonce resync falhou</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Falha na comunicação: nonce fora de sincronização</string>
-    <string name="omnipod_driver_error_not_enough_data">Falha na comunicação: não há dados suficientes recebidos do Pod</string>
-    <string name="omnipod_driver_error_pod_fault">Uma falha de Pod (%1$03d %2$s) foi detectada. Por favor, desactive o Pod e inicie um novo</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Falha na comunicação: o Pod devolveu uma resposta de erro</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Gestão Pod</string>
-    <string name="omnipod_cmd_init_pod">Iniciar Pod</string>
+    <!-- Omnipod - Confirmation -->
+    <!-- Omnipod - Commands -->
    <string name="omnipod_cmd_deactivate_pod">Desactivar Pod</string>
    <string name="omnipod_cmd_discard_pod">Descartar Pod</string>
-    <string name="omnipod_cmd_pod_history">Histórico do Pod</string>
    <string name="omnipod_cmd_set_bolus">Definir Bólus</string>
    <string name="omnipod_cmd_cancel_bolus">Cancelar Bólus</string>
    <string name="omnipod_cmd_set_tbr">Definir Basal Temporária</string>
@ -64,61 +49,18 @@
    <string name="omnipod_cmd_suspend_delivery">Suspender Administração</string>
    <string name="omnipod_cmd_resume_delivery">Retomar Administração</string>
    <string name="omnipod_cmd_unknown_entry">Entrada Desconhecida</string>
-    <string name="omnipod_cmd_bolus_value">%1$.2f U</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f U, HC=%2$.1f g</string>
-    <string name="omnipod_cmd_pod_history_na">Histórico do Pod não disponível no momento.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Encher o Pod</string>
-    <string name="omnipod_init_pod_wizard_step2_title">A Purgar</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Anexar o Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPrepare o local de infusão. Remova a tampa da agulha do Pod e o adesivo e fixe o Pod no local de infusão.\n\nSe a canula sair, por favor, pressione <b>Cancelar</b> e descarte o seu Pod.\n\nPressione <b>Próximo</b> para inserir a canula e começar a administração da basal.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">A inserir canula</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">A tentar definir um plano da basal inicial e inserir canula.\n\nQuando todos os itens estiverem verificados, pode pressionar <b>Próximo</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Info Pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nO Pod está agora activo.\n\nO seu plano de basal foi programado e a canula foi inserida.\n\nPor favor, verifique se a canula foi inserida correctamente e substitua o seu Pod se você se sente que não.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Desactivar Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nPressione <b>Próximo</b> para desactivar o Pod.\n\n<b>Nota:</b> Isto irá suspender toda a administração de insulina e desactivar o Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">A Desactivar Pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod desactivado.\n\nPor favor, remova o Pod do seu corpo e descarte-o.</string>
-    <string name="omnipod_init_pod_pair_pod">Emparelhar Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Purgar Pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Preencher Canula</string>
-    <string name="omnipod_init_pod_set_basal_profile">Definir Perfil Basal</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Cancelar Administração</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Desactivar Pod</string>
-    <!-- Omnipod - Base -->
-    <string name="omnipod_alert_finish_pairing_reminder">Lembrete Concluir Emparelhamento</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Lembrete Terminar Configuração</string>
-    <string name="omnipod_alert_expiration">Pod vai expirar em breve</string>
-    <string name="omnipod_alert_expiration_advisory">Pod vai expirar em breve</string>
-    <string name="omnipod_alert_shutdown_imminent">Encerramento iminente</string>
-    <string name="omnipod_alert_low_reservoir">Reservatório baixo</string>
-    <string name="omnipod_alert_unknown_alert">Alerta desconhecido</string>
-    <string name="omnipod_rl_stats">Estatísticas RL</string>
-    <string name="omnipod_pod_firmware_version">Versão do Firmware</string>
-    <string name="omnipod_errors">Erros</string>
-    <string name="omnipod_cmd_basal_profile_not_set_is_same">Perfil Basal é o mesmo, então não será definido novamente.</string>
+    <!-- Omnipod - Pod Management -->
+    <!-- Omnipod - Wizard common -->
+    <string name="omnipod_wizard_button_finish">Terminar</string>
+    <string name="omnipod_wizard_button_next">Seguinte</string>
+    <!-- Omnipod - Pod activation Wizard -->
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <!-- Omnipod - Overview -->
+    <!-- Omnipod - Other -->
+    <string name="omnipod_uncertain">incerto</string>
+    <!-- Omnipod - Times -->
    <string name="omnipod_composite_time">%1$s e %2$s</string>
    <string name="omnipod_time_ago">%1$s atrás</string>
-    <string name="omnipod_refresh">Actualizar</string>
-    <string name="omnipod_resume_delivery">Retomar Administração</string>
-    <string name="omnipod_error_pod_suspended">Pod suspenso</string>
-    <string name="omnipod_suspend_delivery_short">Suspender</string>
-    <string name="omnipod_cmd_pair_and_prime">Emparelhar e Purgar</string>
-    <string name="omnipod_cmd_fill_cannula_set_basal_profile">Preencher canula e definir perfil basal</string>
-    <string name="omnipod_uncertain_failure">Falha incerta</string>
-    <string name="omnipod_uncertain">incerto</string>
-    <string name="omnipod_preference_category_rileylink">RileyLink</string>
-    <string name="omnipod_preference_category_other">Outro</string>
-    <string name="omnipod_preference_category_alerts">Alertas</string>
-    <string name="omnipod_preference_category_confirmation_beeps">Beeps de confirmação</string>
-    <string name="omnipod_wizard_button_exit">Sair</string>
-    <string name="omnipod_wizard_button_previous">Anterior</string>
-    <string name="omnipod_wizard_button_next">Seguinte</string>
-    <string name="omnipod_wizard_button_finish">Terminar</string>
-    <string name="omnipod_history_item_description">Descrição</string>
-    <string name="omnipod_history_item_source">Fonte</string>
-    <string name="omnipod_history_item_date">Data</string>
-    <string name="omnipod_history_type">Tipo:</string>
    <plurals name="omnipod_minutes">
        <item quantity="one">%1$d minuto</item>
        <item quantity="other">%1$d minutos</item>
--- a/omnipod/src/main/res/values-ro-rRO/strings.xml
+++ b/omnipod/src/main/res/values-ro-rRO/strings.xml
@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Integrare pompa pentru Omnipod, necesită dispozitivul RileyLink (cu versiune firmware de cel puțin 2.0).</string>
-    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
    <string name="omnipod_config_bolus_beeps_enabled">Bip pentru Bolus activat</string>
    <string name="omnipod_config_basal_beeps_enabled">Bip pentru Bazală activat</string>
    <string name="omnipod_config_smb_beeps_enabled">Bip pentru SMB activat</string>
@ -15,19 +14,12 @@
    <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Numar de ore înainte de oprire</string>
    <string name="omnipod_config_low_reservoir_alert_enabled">Alertă rezervor aproape gol activată</string>
    <string name="omnipod_config_low_reservoir_alert_units">Număr unități</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_moments_ago">Acum câteva momente</string>
-    <string name="omnipod_pod_mgmt">Managementul POD-ului</string>
-    <string name="omnipod_pod_status">Statusul POD-ului</string>
-    <string name="omnipod_total_delivered_label">Total livrat</string>
-    <string name="omnipod_total_delivered">%1$.2f U</string>
-    <string name="omnipod_reservoir_left">%1$.2f U rămase</string>
-    <string name="omnipod_reservoir_over50">Peste 50 U</string>
-    <string name="omnipod_pod_address">Adresă Pod</string>
-    <string name="omnipod_pod_expiry">Pod-ul expiră</string>
-    <string name="omnipod_warning">Atenție</string>
+    <string name="omnipod_preference_category_rileylink">RileyLink</string>
+    <string name="omnipod_preference_category_other">Altele</string>
+    <string name="omnipod_preference_category_alerts">Alerte</string>
+    <string name="omnipod_preference_category_confirmation_beeps">Bip-uri de confirmare</string>
+    <!-- Omnipod - Pod Status -->
    <string name="omnipod_pod_status_no_active_pod">Niciun Pod activ</string>
-    <string name="omnipod_pod_status_waiting_for_pair_and_prime">Inițializarea este în curs (se așteaptă împerecherea și amorsarea)</string>
    <string name="omnipod_pod_status_waiting_for_cannula_insertion">Inițializarea este în curs (se așteaptă inserarea canulei)</string>
    <string name="omnipod_pod_status_running">Rulează</string>
    <string name="omnipod_pod_status_suspended">Suspendat</string>
@ -35,39 +27,35 @@
    <string name="omnipod_pod_status_activation_time_exceeded">Timp de activare depăşit</string>
    <string name="omnipod_pod_status_inactive">Inactiv</string>
    <string name="omnipod_pod_status_pod_fault_description">Pod defect: %1$s %2$s</string>
-    <string name="omnipod_pod_active_alerts">Alerte active Pod</string>
-    <string name="omnipod_acknowledge_active_alerts_short">Confirmare alerte</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
+    <!-- Omnipod - Alerts -->
+    <string name="omnipod_alert_finish_pairing_reminder">Notificare Finalizare împerechere</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Finalizare memento setare</string>
+    <string name="omnipod_alert_expiration">Pod-ul va expira în curând</string>
+    <string name="omnipod_alert_expiration_advisory">Pod-ul va expira în curând</string>
+    <string name="omnipod_alert_shutdown_imminent">Oprirea este iminentă</string>
+    <string name="omnipod_alert_low_reservoir">Nivel rezervor scăzut</string>
+    <string name="omnipod_alert_unknown_alert">Alertă necunoscută</string>
+    <!-- Omnipod - History -->
+    <string name="omnipod_history_item_description">Descriere</string>
+    <string name="omnipod_history_item_source">Sursă</string>
+    <string name="omnipod_history_item_date">Data</string>
+    <string name="omnipod_history_type">Tip:</string>
    <!-- Omnipod - Error -->
+    <string name="omnipod_warning">Atenție</string>
    <string name="omnipod_error_rileylink_address_invalid">Adresa RileyLink invalidă.</string>
    <string name="omnipod_error_operation_not_possible_no_configuration">Operațiunea nu este posibilă.\n\nTrebuie să configuraţi Omnipod înainte de a putea efectua această operațiune.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Operaţiunea nu este posibilă.\n\n Trebuie să aşteptaţi câteva minute până când AAPS încearcă să seteze profilul bazal pentru prima dată.</string>
-    <string name="omnipod_error_illegal_init_action_type">Acțiune PodInitActionType ilegala: %1$s</string>
    <string name="omnipod_error_pod_not_attached">Niciun Pod activ</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Verificarea comenzii a eşuat</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">A apărut o eroare neașteptată. Vă rugăm să o raportați! (tip: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Comunicarea a eșuat: s-au primit parametri de intrare incorecți</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Comunicarea a eșuat: timpul a expirat</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Comunicarea a eşuat: a apărut o eroare neaşteptată. Vă rugăm să o raportaţi!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Comunicarea a eşuat: verificarea integrităţii mesajului a eşuat</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Comunicarea a eşuat: a fost primit un pachet invalid de la Pod</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Comunicarea a eșuat: Pod-ul este într-o stare incorectă</string>
-    <string name="omnipod_driver_error_invalid_response">Comunicarea a eșuat: s-a primit un răspuns incorect de la Pod</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Comunicarea a eșuat: s-a primit un mesaj cu un număr de secvență invalid de la Pod</string>
-    <string name="omnipod_driver_error_invalid_message_address">Comunicarea a eșuat: s-a primit un mesaj cu o adresă invalidă de la Pod</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Comunicarea a eșuat: nu s-a reușit decodarea mesajului de la Pod</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Comunicarea a eșuat: resincronizarea cheii de securitate nu a reușit</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Comunicarea a eșuat: cheia de securitate nu poate fi sincronizată</string>
-    <string name="omnipod_driver_error_not_enough_data">Comunicarea a eşuat: nu s-au primit suficiente date de la Pod</string>
-    <string name="omnipod_driver_error_pod_fault">A fost detectată o eroare a Pod-ului (%1$03d %2$s). Vă rugăm să îl dezactivați pe acesta și să activați unul nou</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Comunicarea a eșuat: Pod-ul a returnat un răspuns de eroare</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Management Pod</string>
-    <string name="omnipod_cmd_init_pod">Inițializare Pod</string>
+    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Setarea profilului bazal a eșuat. Livrarea ar putea fi suspendată! Vă rugăm să reîmprospătați manual starea Pod-ului din secțiunea Omnipod și să continuați livrarea dacă este necesar.</string>
+    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Setarea profilului bazal s-ar putea sa fi eșuat. Livrarea ar putea fi suspendată! Vă rugăm să reîmprospătați manual starea Pod-ului din secțiunea Omnipod și să continuați livrarea dacă este necesar.</string>
+    <string name="omnipod_error_set_basal_failed_delivery_suspended">Setarea profilului basal a eşuat. Livrarea este suspendată! Vă rugăm să reluați manual livrarea din secțiunea Omnipod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Setarea bazalei temporare a eșuat. Dacă o bazală temporară era activă anterior, ar fi putut fi anulată. Reîmprospătați manual starea Pod-ului din secțiunea Omnipod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Setarea bazalei temporare s-ar putea sa fi eșuat. Dacă o bazală temporară era activă anterior, a fost anulată. Reîmprospătați manual starea Pod-ului din secțiunea Omnipod.</string>
+    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Setarea timpului s-ar putea sa fi eșuat. Livrarea ar putea fi suspendată! Vă rugăm să reîmprospătați manual starea Pod-ului din secțiunea Omnipod și să continuați livrarea dacă este necesar.</string>
+    <string name="omnipod_error_set_time_failed_delivery_suspended">Setarea timpului a eșuat. Livrarea este suspendată! Vă rugăm să reluați manual livrarea din secțiunea Omnipod.</string>
+    <!-- Omnipod - Confirmation -->
+    <!-- Omnipod - Commands -->
    <string name="omnipod_cmd_deactivate_pod">Dezactivare Pod</string>
    <string name="omnipod_cmd_discard_pod">Baandonare Pod</string>
-    <string name="omnipod_cmd_pod_history">Istoric Pod</string>
    <string name="omnipod_cmd_set_bolus">Setează bolus</string>
    <string name="omnipod_cmd_cancel_bolus">Anulează bolus</string>
    <string name="omnipod_cmd_set_tbr">Setează bazala temporară</string>
@ -82,88 +70,23 @@
    <string name="omnipod_cmd_suspend_delivery">Suspendați livrarea</string>
    <string name="omnipod_cmd_resume_delivery">Reluați livrarea</string>
    <string name="omnipod_cmd_unknown_entry">Inregistrare nerecunoscută</string>
-    <string name="omnipod_cmd_bolus_value">%1$.2f U</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f U, CH=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Rata: %1$.2f U, Durata: %2$d min</string>
-    <string name="omnipod_cmd_discard_pod_desc">Dacă apăsați <b>OK</b>, statusul Pod-ului va fi resetat forțat și nu veți mai putea comunica cu Pod-ul. Faceți acest lucru numai dacă nu mai se poate comunica deloc cu Pod-ul. Dacă se mai poate comunica cu Pod-ul, va rugam sa folosiți opțiunea <b>Dezactivare Pod</b>.\n\nDacă doriți să continuați, vă rugăm să vă asigurați, de asemenea, ca îndepărtați Pod-ul de pe corpul dvs.</string>
-    <string name="omnipod_cmd_pod_history_na">Istoricul Pod-ului nu este disponibil momentan.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Umpleţi Pod-ul</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nUmpleți noul Pod cu suficientă insulină pentru 3 zile.\n\nAr trebui sa auziți două bipuri de la Pod în timpul procesului de umplere. Acestea indică faptul că, cantitatea minimă de 85U a fost introdusă. Asigurați-vă ca ați golit complet seringa de umplere, chiar și după ce ați auzit două bipuri.\n\nDupă umplerea Pod-ului, vă rugăm să apăsați <b>Următorul</b>.\n\n<b>Notă:</b> Nu scoateți capacul transparent al acului in acest moment.\n<b>Notă:</b> Va rugam sa puneți RileyLink în poziție verticala și plasați Pod-ul la o distanta de câțiva centimetri.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Amorsare</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Încercare de împerechere cu noul Pod și amorsare.\n\nAtunci când toate etapele sunt gata, puteți apăsa <b>Următorul</b>.\n\n<b>Notă:</b> Vă rugăm sa puneți RileyLInk in poziție verticala si sa plasați Pod-ul la câțiva centimetri distanta.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Atașați Pod-ul</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPregătiți setul de infuzie. Scoateți capacul acului și suport adeziv și atașați Pod-ul la locul de infuzie.\n\nDacă, canula pare in neregulă, apăsați <b>Anulare</b> și aruncați Pod-ul.\n\nApăsați <b>Următorul</b> pentru a introduce canula și a începe livrarea bazalei.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Inserare canulă</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Încercare de programare inițială a ratelor bazale si de insertie a canulei.\n\nCând toate elementele sunt gata, puteți apăsa <b>Următorul</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Informații Pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPod-ul este acum activ.\n\nRatele bazale au fost programate și canula a fost introdusă.\n\nVă rugăm să verificați că acul a fost introdus corect. Dacă considerați ca nu, înlocuiți Pod-ul.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Dezactivare Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nApăsați <b>Următorul</b> pentru a dezactiva Pod-ul.\n\n<b>Notă:</b> Acest lucru va suspenda orice livrare de insulină și va dezactiva Pod-ul.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Dezactivare Pod</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Dezactivare Pod.\n\nAtunci când toate elementele sunt gata, puteți apăsa <b>Următorul</b>.\n\n<b>Notă:</b> Dacă dezactivarea eșuează continuu, vă rugăm să apăsați <b>Anulează</b> și folosiți opțiunea <b>Resetare Pod</b> pentru a forța resetarea Pod-ului.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod dezactivat.\n\nScoateți Pod-ul și aruncați-l.</string>
-    <string name="omnipod_init_pod_pair_pod">Împerechere Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Amorsare Pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Umplere canulă</string>
-    <string name="omnipod_init_pod_set_basal_profile">Setare profil bazala</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Anulare livrare</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Dezactivare Pod</string>
-    <!-- Omnipod - Base -->
-    <string name="omnipod_alert_finish_pairing_reminder">Notificare Finalizare împerechere</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Finalizare memento setare</string>
-    <string name="omnipod_alert_expiration">Pod-ul va expira în curând</string>
-    <string name="omnipod_alert_expiration_advisory">Pod-ul va expira în curând</string>
-    <string name="omnipod_alert_shutdown_imminent">Oprirea este iminentă</string>
-    <string name="omnipod_alert_low_reservoir">Nivel rezervor scăzut</string>
-    <string name="omnipod_alert_unknown_alert">Alertă necunoscută</string>
-    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Setarea profilului bazal a eșuat. Livrarea ar putea fi suspendată! Vă rugăm să reîmprospătați manual starea Pod-ului din secțiunea Omnipod și să continuați livrarea dacă este necesar.</string>
-    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Setarea profilului bazal s-ar putea sa fi eșuat. Livrarea ar putea fi suspendată! Vă rugăm să reîmprospătați manual starea Pod-ului din secțiunea Omnipod și să continuați livrarea dacă este necesar.</string>
-    <string name="omnipod_error_set_basal_failed_delivery_suspended">Setarea profilului basal a eşuat. Livrarea este suspendată! Vă rugăm să reluați manual livrarea din secțiunea Omnipod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Setarea bazalei temporare a eșuat. Dacă o bazală temporară era activă anterior, ar fi putut fi anulată. Reîmprospătați manual starea Pod-ului din secțiunea Omnipod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Setarea bazalei temporare s-ar putea sa fi eșuat. Dacă o bazală temporară era activă anterior, a fost anulată. Reîmprospătați manual starea Pod-ului din secțiunea Omnipod.</string>
-    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Setarea timpului s-ar putea sa fi eșuat. Livrarea ar putea fi suspendată! Vă rugăm să reîmprospătați manual starea Pod-ului din secțiunea Omnipod și să continuați livrarea dacă este necesar.</string>
-    <string name="omnipod_error_set_time_failed_delivery_suspended">Setarea timpului a eșuat. Livrarea este suspendată! Vă rugăm să reluați manual livrarea din secțiunea Omnipod.</string>
-    <string name="omnipod_bolus_failed_uncertain">Nu se poate verifica dacă bolusul a reuşit. Vă rugăm să verificați manual că Pod-ul poate bolusa ascultand click-urile. <b>Daca ești sigur ca bolus nu a reusit, ar trebui să stergi manual intrarea bolus din Tratamente, chiar dacă dai click pe \'Oprește bolus\' acum!</b></string>
-    <string name="omnipod_bolus_failed_uncertain_smb">Nu s-a putut verifica dacă bolusul SMB (%1$.2f U) a reușit. <b>Daca ești sigur ca bolusul nu a reușit, ar trebui să ștergi manual intrarea SMB din Tratamente.</b></string>
-    <string name="omnipod_rl_stats">Statistici RL</string>
-    <string name="omnipod_read_pulse_log_short">Jurnal Pulsuri</string>
-    <string name="omnipod_pod_lot">LOT</string>
-    <string name="omnipod_pod_tid">TID</string>
-    <string name="omnipod_pod_firmware_version">Versiune firmware</string>
-    <string name="omnipod_errors">Erori</string>
-    <string name="omnipod_cmd_basal_profile_not_set_is_same">Profilul bazal este la fel cu cel existent și nu va fi reincărcat.</string>
-    <string name="omnipod_custom_action_reset_rileylink">Resetează configurația RileyLink</string>
-    <string name="omnipod_time_or_timezone_change">Schimbare oră și/sau fus orar în Pod</string>
-    <string name="omnipod_composite_time">%1$s și %2$s</string>
-    <string name="omnipod_time_ago">%1$s în urmă</string>
-    <string name="omnipod_waiting_for_rileylink_connection">Aşteptare conexiune RileyLink...</string>
-    <string name="omnipod_bolus_did_not_succeed">Bolusul nu a reușit</string>
-    <string name="omnipod_refresh">Actualizează</string>
-    <string name="omnipod_resume_delivery">Reluați livrarea</string>
-    <string name="omnipod_error_pod_suspended">Pod suspendat</string>
-    <string name="omnipod_less_than_a_minute_ago">Mai puțin de un minut în urmă</string>
-    <string name="omnipod_suspend_delivery_short">Suspendare</string>
-    <string name="omnipod_cmd_pair_and_prime">Împerechere și amorsare</string>
-    <string name="omnipod_cmd_fill_cannula_set_basal_profile">Umpleţi canula şi setaţi profilul bazal</string>
-    <string name="omnipod_cmd_get_pulse_log">Obțineți jurnalul pulsurilor</string>
-    <string name="omnipod_uncertain_failure">Eroare necunoscută</string>
-    <string name="omnipod_cancelled_old_tbr_failed_to_set_new">S-a anulat vechea bazală temporară, dar nu s-a putut seta o nouă bazală temporară</string>
    <string name="omnipod_cmd_set_fake_suspended_tbr">Se setează o bazală temporară falsă deoarece Pod-ul este suspendat</string>
    <string name="omnipod_cmd_cancel_fake_suspended_tbr">Anulează bazala temporară falsă creată pentru că Pod-ul a fost suspendat</string>
-    <string name="omnipod_uncertain">incert</string>
-    <string name="omnipod_expiration_alerts_updated">Setarile de alertă actualizate în Pod</string>
-    <string name="omnipod_preference_category_rileylink">RileyLink</string>
-    <string name="omnipod_preference_category_other">Altele</string>
-    <string name="omnipod_preference_category_alerts">Alerte</string>
-    <string name="omnipod_preference_category_confirmation_beeps">Bip-uri de confirmare</string>
-    <string name="omnipod_wizard_button_exit">Ieșire</string>
-    <string name="omnipod_wizard_button_previous">Precedent</string>
-    <string name="omnipod_wizard_button_next">Următor</string>
+    <!-- Omnipod - Pod Management -->
+    <!-- Omnipod - Wizard common -->
    <string name="omnipod_wizard_button_finish">Finalizare</string>
-    <string name="omnipod_history_item_description">Descriere</string>
-    <string name="omnipod_history_item_source">Sursă</string>
-    <string name="omnipod_history_item_date">Data</string>
-    <string name="omnipod_history_type">Tip:</string>
+    <string name="omnipod_wizard_button_next">Următor</string>
+    <!-- Omnipod - Pod activation Wizard -->
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <!-- Omnipod - Overview -->
+    <!-- Omnipod - Other -->
+    <string name="omnipod_custom_action_reset_rileylink">Resetează configurația RileyLink</string>
+    <string name="omnipod_uncertain">incert</string>
+    <!-- Omnipod - Times -->
+    <string name="omnipod_moments_ago">Acum câteva momente</string>
+    <string name="omnipod_less_than_a_minute_ago">Mai puțin de un minut în urmă</string>
+    <string name="omnipod_composite_time">%1$s și %2$s</string>
+    <string name="omnipod_time_ago">%1$s în urmă</string>
    <plurals name="omnipod_minutes">
        <item quantity="one">%1$d minut</item>
        <item quantity="few">%1$d minute</item>
--- a/omnipod/src/main/res/values-ru-rRU/strings.xml
+++ b/omnipod/src/main/res/values-ru-rRU/strings.xml
@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Для интеграции с помпой Omnipod требуется устройство RileyLink (с прошивкой 2.0 и выше).</string>
-    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
    <string name="omnipod_config_bolus_beeps_enabled">Звуковой сигнал болюса включен</string>
    <string name="omnipod_config_basal_beeps_enabled">Звуковой сигнал базала включен</string>
    <string name="omnipod_config_smb_beeps_enabled">Звуковой сигнал микроболюса SMB включен</string>
@ -15,19 +14,13 @@
    <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Часов до выключения</string>
    <string name="omnipod_config_low_reservoir_alert_enabled">Предупреждение о низком уровне в резервуаре включено</string>
    <string name="omnipod_config_low_reservoir_alert_units">К-во единиц</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_moments_ago">Только что</string>
-    <string name="omnipod_pod_mgmt">Управление помпой</string>
-    <string name="omnipod_pod_status">Статус помпы</string>
-    <string name="omnipod_total_delivered_label">Всего подано</string>
-    <string name="omnipod_total_delivered">%1$.2f ед</string>
-    <string name="omnipod_reservoir_left">%1$.2f ед. осталось</string>
-    <string name="omnipod_reservoir_over50">Более 50 ед.</string>
-    <string name="omnipod_pod_address">Адрес Пода</string>
-    <string name="omnipod_pod_expiry">Срок Пода истекает</string>
-    <string name="omnipod_warning">Внимание</string>
+    <string name="omnipod_preference_category_rileylink">RileyLink</string>
+    <string name="omnipod_preference_category_other">Другое</string>
+    <string name="omnipod_preference_category_alerts">Оповещения</string>
+    <string name="omnipod_preference_category_confirmation_beeps">Звуковые сигналы подтверждения</string>
+    <!-- Omnipod - Pod Status -->
    <string name="omnipod_pod_status_no_active_pod">Активная помпа не выбрана</string>
-    <string name="omnipod_pod_status_waiting_for_pair_and_prime">Выполняется настройка (ожидание сопряжения и заполнения)</string>
+    <string name="omnipod_pod_status_waiting_for_activation">Выполняется настройка (ожидание активации Pod)</string>
    <string name="omnipod_pod_status_waiting_for_cannula_insertion">Выполняется настройка (ожидание ввода катетера)</string>
    <string name="omnipod_pod_status_running">Выполняется</string>
    <string name="omnipod_pod_status_suspended">Приостановлено</string>
@ -35,39 +28,81 @@
    <string name="omnipod_pod_status_activation_time_exceeded">Превышено время активации</string>
    <string name="omnipod_pod_status_inactive">Неактивирован</string>
    <string name="omnipod_pod_status_pod_fault_description">Ошибка Пода: %1$s %2$s</string>
-    <string name="omnipod_pod_active_alerts">Активные оповещения помпы</string>
-    <string name="omnipod_acknowledge_active_alerts_short">Оповещения активны</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 МГц)</string>
+    <!-- Omnipod - Alerts -->
+    <string name="omnipod_alert_finish_pairing_reminder">Напоминание о завершении сопряжения</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Напоминание о завершении настройки</string>
+    <string name="omnipod_alert_expiration">Срок работы Pod\'a истекает</string>
+    <string name="omnipod_alert_expiration_advisory">Срок Pod\'a истекает в ближайшее время</string>
+    <string name="omnipod_alert_shutdown_imminent">Остановка неизбежна</string>
+    <string name="omnipod_alert_low_reservoir">В резервуаре мало инсулина</string>
+    <string name="omnipod_alert_unknown_alert">Неизвестное оповещение</string>
+    <!-- Omnipod - History -->
+    <string name="omnipod_history_title">Журнал Pod</string>
+    <string name="omnipod_history_item_description">Описание</string>
+    <string name="omnipod_history_item_source">Источник</string>
+    <string name="omnipod_history_item_date">дата</string>
+    <string name="omnipod_history_type">Тип:</string>
+    <string name="omnipod_history_bolus_value">%1$.2f ед</string>
+    <string name="omnipod_history_bolus_value_with_carbs">%1$.2f ед, г у =%2$.1f г</string>
+    <string name="omnipod_history_tbr_value">Баз Скорость: %1$.2f ед, Продолжительность: %2$d мин</string>
    <!-- Omnipod - Error -->
+    <string name="omnipod_warning">Внимание</string>
    <string name="omnipod_error_rileylink_address_invalid">Недопустимый адрес RileyLink.</string>
    <string name="omnipod_error_operation_not_possible_no_configuration">Операция невозможна.\n\n Сначала нужно настроить помпу Omnipod.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Операция невозможна.\n\n Подождите несколько минут, пока AAPS пытается задать профиль.</string>
-    <string name="omnipod_error_illegal_init_action_type">Недопустимый тип инициализации: %1$s</string>
    <string name="omnipod_error_pod_not_attached">Активная помпа не включена</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Командная верификация не состоялась</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Произошла непредвиденная ошибка. Пожалуйста, сообщите об ошибке! (сообщить:: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Ошибка связи: недопустимые входные параметры</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Ошибка связи: время ожидания истекло</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Ошибка связи: возникла непредвиденная ошибка. Пожалуйста, сообщите!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Ошибка связи: проверка целостности сообщения завершилась неудачно</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Ошибка связи: получен недопустимый пакет от Pod</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Ошибка связи: Pod находится в неверном состоянии</string>
-    <string name="omnipod_driver_error_invalid_response">Ошибка связи: недопустимый ответ от помпы</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Ошибка связи: получено сообщение с недопустимым порядковым номером от Pod</string>
-    <string name="omnipod_driver_error_invalid_message_address">Ошибка связи: получено сообщение с некорректным адресом от Pod</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Ошибка связи: не удалось декодировать сообщение от Pod</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Ошибка связи: не удалось выполнить повторную синхронизацию nonce</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Ошибка соединения: вне синхронизации</string>
-    <string name="omnipod_driver_error_not_enough_data">Ошибка связи: недостаточно данных от Pod</string>
-    <string name="omnipod_driver_error_pod_fault">Обнаружена ошибка Pod (%1$03d %2$s). Деактивируйте Pod и запустите новый</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Ошибка связи: Pod ответил ошибкой</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Управление помпой Omnipod</string>
-    <string name="omnipod_cmd_init_pod">Инициализировать Pod</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">Ошибка связи: получен недопустимый пакет от Pod</string>
+    <string name="omnipod_error_invalid_progress_state">Ошибка связи: неверное состояние Pod</string>
+    <string name="omnipod_error_invalid_response">Ошибка связи: недопустимый ответ от Pod</string>
+    <string name="omnipod_error_invalid_message_sequence_number">Ошибка связи: получено сообщение с недопустимым порядковым номером от Pod</string>
+    <string name="omnipod_error_invalid_message_address">Ошибка связи: получено сообщение с некорректным адресом от Pod</string>
+    <string name="omnipod_error_message_decoding_failed">Ошибка связи: не удалось декодировать сообщение от Pod</string>
+    <string name="omnipod_error_nonce_resync_failed">Ошибка связи: не удалось выполнить контрольную синхронизацию</string>
+    <string name="omnipod_error_nonce_out_of_sync">Ошибка соединения: вне синхронизации</string>
+    <string name="omnipod_error_not_enough_data">Ошибка связи: недостаточно данных от Pod</string>
+    <string name="omnipod_error_pod_fault">Обнаружена ошибка Pod (%1$03d %2$s). Деактивируйте Pod и запустите новый</string>
+    <string name="omnipod_error_pod_returned_error_response">Ошибка связи: Pod ответил ошибкой</string>
+    <string name="omnipod_error_communication_failed_no_response_from_riley_link">Нет ответа от RileyLink</string>
+    <string name="omnipod_error_communication_failed_riley_link_interrupted">RileyLink прерван</string>
+    <string name="omnipod_error_communication_failed_no_response_from_pod">Нет ответа от Pod</string>
+    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Не удалось задать базовый профиль. Подача инсулина может быть приостановлена! Обновите вручную состояние Pod на вкладке Omnipod и при необходимости возобновите процесс подачи.</string>
+    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Возможно не удалось задать базовый профиль. Подача инсулина может быть приостановлена! Обновите вручную состояние Pod на вкладке Omnipod и при необходимости возобновите процесс подачи.</string>
+    <string name="omnipod_error_set_basal_failed_delivery_suspended">Не удалось задать базовый профиль. Подача инсулина приостановлена! Вручную возобновите подачу с вкладки Omnipod.</string>
+    <string name="omnipod_error_set_basal_failed">Настройка базального профиля не состоялась.</string>
+    <string name="omnipod_error_cancel_temp_basal_failed_uncertain">Возможно, отмена временного базала завершилась неудачно. Обновите вручную состояние Pod на вкладке Omnipod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Не удалось задать временный базал. Если ранее был запущен временный базал, он мог быть отменен. Обновите вручную состояние Pod на вкладке Omnipod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Не удалось задать временный базал. Если ранее был запущен временный базал, он мог быть отменен. Обновите вручную состояние Pod на вкладке Omnipod.</string>
+    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Возможно, не удалось задать время. Подача инсулина может быть приостановлена! Обновите вручную состояние Pod на вкладке Omnipod и при необходимости возобновите подачу.</string>
+    <string name="omnipod_error_set_time_failed_delivery_suspended">Не удалось задать время. Подача инсулина приостановлена! Вручную возобновите подачу с вкладки Omnipod.</string>
+    <string name="omnipod_error_failed_to_set_profile_empty_profile">Не удалось задать базальный профиль: получен пустой профиль. Активируйте профиль базала.</string>
+    <string name="omnipod_error_set_initial_basal_schedule_no_profile">Базальный профиль не активен. Активируйте профиль базала.</string>
+    <string name="omnipod_error_unknown_custom_command">Неизвестная кастомная команда: %1$s</string>
+    <string name="omnipod_error_failed_to_read_pulse_log">Не удалось прочитать журнал pulse</string>
+    <string name="omnipod_error_failed_to_refresh_status">Не удалось обновить статус</string>
+    <string name="omnipod_error_failed_to_acknowledge_alerts">Не удалось подтвердить оповещения</string>
+    <string name="omnipod_error_failed_to_suspend_delivery">Не удалось приостановить подачу</string>
+    <string name="omnipod_error_failed_to_set_time">Не удалось задать время</string>
+    <string name="omnipod_error_failed_to_resume_delivery">Не удалось возобновить подачу</string>
+    <string name="omnipod_error_automatic_time_or_timezone_change_failed">Не удалось автоматически изменить время в Pod. Следует вручную синхронизировать время на вкладке Omnipod.</string>
+    <string name="omnipod_error_bolus_failed_uncertain">Не удалось проверить, подан ли болюс. Проверьте, издаются ли звуки подачи болюса. <b>Если вы уверены, что болюс не подан, следует вручную удалить запись болюса из Назначений, даже если была нажата \'Отмена болюса\'!</b></string>
+    <string name="omnipod_error_bolus_failed_uncertain_smb">Не удалось проверить, успешно ли подан микроболюс SMB (%1$.2f ед). <b>Если вы уверены, что болюс не подан, следует вручную удалить запись SMB из Назначений.</b></string>
+    <string name="omnipod_error_bolus_did_not_succeed">Болюс не подан.</string>
+    <string name="omnipod_error_failed_to_initialize_pod">Не удалось инициализировать Pod</string>
+    <string name="omnipod_error_failed_to_insert_cannula">Не удалось установить канюлю</string>
+    <string name="omnipod_error_pod_fault_activation_time_exceeded">Превышено время активации Pod. Этот Pod больше не может быть активирован.</string>
+    <!-- Omnipod - Confirmation -->
+    <string name="omnipod_confirmation">Подтверждение</string>
+    <string name="omnipod_confirmation_time_or_timezone_change">Время и/или часовой пояс изменены на Pod.</string>
+    <string name="omnipod_confirmation_expiration_alerts_updated">Конфигурация оповещений обновлена в Pod.</string>
+    <string name="omnipod_confirmation_time_on_pod_updated">Время на Pod обновлено.</string>
+    <string name="omnipod_confirmation_suspended_delivery">Все подачи инсулина приостановлены.</string>
+    <string name="omnipod_confirmation_acknowledged_alerts">Подтверждены активные оповещения.</string>
+    <string name="omnipod_confirmation_delivery_resumed">Подача инсулина возобновлена.</string>
+    <string name="omnipod_confirmation_pod_suspended">Omnipod остановлен</string>
+    <!-- Omnipod - Commands -->
    <string name="omnipod_cmd_deactivate_pod">Деактивировать Pod</string>
    <string name="omnipod_cmd_discard_pod">Выбросить помпу</string>
-    <string name="omnipod_cmd_pod_history">Журнал помпы</string>
    <string name="omnipod_cmd_set_bolus">Настроить болюс</string>
    <string name="omnipod_cmd_cancel_bolus">Отменить болюс</string>
    <string name="omnipod_cmd_set_tbr">Установить временный базал</string>
@ -82,88 +117,92 @@
    <string name="omnipod_cmd_suspend_delivery">Приостановить подачу</string>
    <string name="omnipod_cmd_resume_delivery">Возобновить подачу</string>
    <string name="omnipod_cmd_unknown_entry">Неизвестная запись</string>
-    <string name="omnipod_cmd_bolus_value">%1$.2f ед</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f ед, CH=%2$.1f г</string>
-    <string name="omnipod_cmd_tbr_value">Скорость: %1$.2f ед, Продолжительность: %2$d мин</string>
-    <string name="omnipod_cmd_discard_pod_desc">Если нажать <b>OK</b>, состояние помпы будет принудительно сброшено, и вы больше не сможете обмениваться командами с Pod. Сделайте это только в том случае, если вы не можете связаться с помпой. Если связь с Pod еще возможна, воспользуйтесь опцией <b>Деактивировать Pod</b>.\n\nЕсли хотите продолжить, также снимите помпу с тела.</string>
-    <string name="omnipod_cmd_pod_history_na">В настоящее время история помпы недоступна.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Заполнить Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nЗаполните новый Pod запасом инсулина на 3 дня.\n\nПоступят два звуковых сигнала от помпы во время заправки. Это означает, что минимальное количество 85U заправлено. Не забудьте опустошить заправочный шприц даже после того, как услышите два звуковых сигнала.\n\nПосле заполнения Pod нажмите <b>Next</b>.\n\n<b>Примечание:</b> Пока не снимайте с помпы колпачок с иглой.\n<b>Примечание:</b>поставьте RileyLink вертикально рядом с Pod.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Первичное заполнение инфузионной секции пода</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Попытка сопряжения с новым Podом и первичного заполнения инфузионного отсека..\n\n После проверки всех \'nfgjd можно нажать <b>Далее</b>.\n\n<b>Примечание:</b> В это время RileyLink должен находиться в вертикальном положении рядом с Pod.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Подключить Под</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nПодготовьте место инфузии. Удалите колпачок с иглы и защиту липкого слоя, Установите Pod на тело.\n\nесли канюля выступает, нажмите <b>отменить</b> и утилизируйте Pod.\n\Нажмите <b>Далее</b> чтобы вставить канюлю и начать подачу базала.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Установка канюли (катетера) </string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Определение графика подачи базала и установка канюли. \n\n Когда проверены все шаги, нажмите <b>Далее</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Информация о Pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nПомпа сейчас активна.\n\nБазальный график запрограммирован и катетер установлен.\n\nУбедитесь в том, что канюля установлена правильно и замените Pod, если такой уверенности нет.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Деактивировать Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nНажмите <b>Далее</b> для деактивации Пода\n\n<b>Примечание:</b> Это Приостановит всякую подачу инсулина и деактивирует помпу.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Деактивация помпы</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Деактивация помпы.\n\n, Когда проверены все элементы, нажмите <b>Далее</b>.\n\n<b>Примечание:</b> Если деактивация постоянно завершается ошибкой, нажмите <b>Отменить</b> и примените <b>Сброс помпы</b> чтобы принудительно сбросить состояние Pod\'a.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod деактивирован.\n\nУдалите и утилизируйте Pod.</string>
-    <string name="omnipod_init_pod_pair_pod">Сопряжение Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Заполнение инфузионной секции Pod\'a</string>
-    <string name="omnipod_init_pod_fill_cannula">Заполнение катетера</string>
-    <string name="omnipod_init_pod_set_basal_profile">Установка базального профиля</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Отмена подачи инсулина</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Деактивировать Pod</string>
-    <!-- Omnipod - Base -->
-    <string name="omnipod_alert_finish_pairing_reminder">Напоминание о завершении сопряжения</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Напоминание о завершении настройки</string>
-    <string name="omnipod_alert_expiration">Срок работы Pod\'a истекает</string>
-    <string name="omnipod_alert_expiration_advisory">Срок Pod\'a истекает в ближайшее время</string>
-    <string name="omnipod_alert_shutdown_imminent">Остановка неизбежна</string>
-    <string name="omnipod_alert_low_reservoir">В резервуаре мало инсулина</string>
-    <string name="omnipod_alert_unknown_alert">Неизвестное оповещение</string>
-    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Не удалось задать базовый профиль. Подача инсулина может быть приостановлена! Обновите вручную состояние Pod на вкладке Omnipod и при необходимости возобновите процесс подачи.</string>
-    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Возможно не удалось задать базовый профиль. Подача инсулина может быть приостановлена! Обновите вручную состояние Pod на вкладке Omnipod и при необходимости возобновите процесс подачи.</string>
-    <string name="omnipod_error_set_basal_failed_delivery_suspended">Не удалось задать базовый профиль. Подача инсулина приостановлена! Вручную возобновите подачу с вкладки Omnipod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Не удалось задать временный базал. Если ранее был запущен временный базал, он мог быть отменен. Обновите вручную состояние Pod на вкладке Omnipod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Не удалось задать временный базал. Если ранее был запущен временный базал, он мог быть отменен. Обновите вручную состояние Pod на вкладке Omnipod.</string>
-    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Возможно, не удалось задать время. Подача инсулина может быть приостановлена! Обновите вручную состояние Pod на вкладке Omnipod и при необходимости возобновите подачу.</string>
-    <string name="omnipod_error_set_time_failed_delivery_suspended">Не удалось задать время. Подача инсулина приостановлена! Вручную возобновите подачу с вкладки Omnipod.</string>
-    <string name="omnipod_bolus_failed_uncertain">Не удалось проверить, подан ли болюс. Проверьте, издаются ли звуки подачи болюса. <b>Если вы уверены, что болюс не подан, следует вручную удалить запись болюса из Treatments, даже если вы нажмете \'Cancel bolus\' сейчас!</b></string>
-    <string name="omnipod_bolus_failed_uncertain_smb">Не удалось проверить, успешно ли выполнен микроболюс SMB (%1$.2f ед). <b>Если вы уверены, что болюс не подан, следует вручную удалить запись SMB из Treatments.</b></string>
-    <string name="omnipod_rl_stats">Статистика RL</string>
-    <string name="omnipod_read_pulse_log_short">Журнал Pulse</string>
-    <string name="omnipod_pod_lot">LOT</string>
-    <string name="omnipod_pod_tid">TID</string>
-    <string name="omnipod_pod_firmware_version">Версия прошивки</string>
-    <string name="omnipod_errors">ошибки</string>
-    <string name="omnipod_cmd_basal_profile_not_set_is_same">Базовый профиль идентичен, он не будет задан повторно.</string>
-    <string name="omnipod_custom_action_reset_rileylink">Сбросить конфигурацию RileyLink</string>
-    <string name="omnipod_time_or_timezone_change">Время и/или часовой пояс изменены на Pod</string>
-    <string name="omnipod_composite_time">%1$s и %2$s</string>
-    <string name="omnipod_time_ago">%1$s назад</string>
-    <string name="omnipod_waiting_for_rileylink_connection">Ожидание соединения RileyLink...</string>
-    <string name="omnipod_bolus_did_not_succeed">Болюс не подан</string>
-    <string name="omnipod_refresh">Обновить</string>
-    <string name="omnipod_resume_delivery">Возобновить подачу</string>
-    <string name="omnipod_error_pod_suspended">Omnipod остановлен</string>
-    <string name="omnipod_less_than_a_minute_ago">Менее минуты назад</string>
-    <string name="omnipod_suspend_delivery_short">Останов</string>
-    <string name="omnipod_cmd_pair_and_prime">Выполнить сопряжение и заполнить</string>
-    <string name="omnipod_cmd_fill_cannula_set_basal_profile">Заполнить катетер и установить базовый профиль</string>
-    <string name="omnipod_cmd_get_pulse_log">Получить журнал импульсов</string>
-    <string name="omnipod_uncertain_failure">Неизвестная ошибка</string>
-    <string name="omnipod_cancelled_old_tbr_failed_to_set_new">Старый временный базал отменен, но не удалось установить новый</string>
+    <string name="omnipod_cmd_initialize_pod">Инициализировать Pod</string>
+    <string name="omnipod_cmd_insert_cannula">Вставить катетер</string>
+    <string name="omnipod_cmd_read_pulse_log">Читать журнал импульсов</string>
    <string name="omnipod_cmd_set_fake_suspended_tbr">Установить фейковый временный базал, так как Pod остановлен</string>
    <string name="omnipod_cmd_cancel_fake_suspended_tbr">Отменить фейковый временный базал, который был создан из-за приостановки действия Pod</string>
-    <string name="omnipod_uncertain">не подтверждено</string>
-    <string name="omnipod_expiration_alerts_updated">Конфигурация оповещений обновлена в Pod</string>
-    <string name="omnipod_preference_category_rileylink">RileyLink</string>
-    <string name="omnipod_preference_category_other">Другое</string>
-    <string name="omnipod_preference_category_alerts">Оповещения</string>
-    <string name="omnipod_preference_category_confirmation_beeps">Звуковые сигналы подтверждения</string>
-    <string name="omnipod_wizard_button_exit">Выход</string>
-    <string name="omnipod_wizard_button_previous">Предыдущие</string>
-    <string name="omnipod_wizard_button_next">Далее</string>
+    <!-- Omnipod - Pod Management -->
+    <string name="omnipod_pod_management_title">Управление помпой Omnipod</string>
+    <string name="omnipod_pod_management_waiting_for_rileylink_connection">Ожидание соединения RileyLink…</string>
+    <string name="omnipod_pod_management_button_activate_pod">Активировать Pod</string>
+    <string name="omnipod_pod_management_button_deactivate_pod">Деактивировать Pod</string>
+    <string name="omnipod_pod_management_button_discard_pod">Утилизировать Pod</string>
+    <string name="omnipod_pod_management_button_pod_history">Журнал Pod</string>
+    <string name="omnipod_pod_management_discard_pod_state_confirmation">Если нажать Утилизировать Pod, вы больше не сможете обмениваться командами с Pod. Сделайте это только в том случае, если связь с помпой постоянно отсутствует. Если связь с Pod еще возможна, воспользуйтесь опцией <b>Деактивировать Pod</b>.\n\n Если все же хотите продолжить, снимите помпу с тела!</string>
+    <!-- Omnipod - Wizard common -->
+    <string name="omnipod_wizard_button_cancel">Отменить</string>
    <string name="omnipod_wizard_button_finish">Завершить</string>
-    <string name="omnipod_history_item_description">Описание</string>
-    <string name="omnipod_history_item_source">Источник</string>
-    <string name="omnipod_history_item_date">дата</string>
-    <string name="omnipod_history_type">Тип:</string>
+    <string name="omnipod_wizard_button_next">Далее</string>
+    <string name="omnipod_wizard_button_retry">Повторить</string>
+    <string name="omnipod_wizard_button_deactivate_pod">Деактивировать Pod</string>
+    <string name="omnipod_wizard_button_discard_pod">Утилизировать Pod</string>
+    <string name="omnipod_wizard_exit_confirmation_text">Вы еще не выполнили все шаги. Действительно хотите выйти?</string>
+    <string name="omnipod_wizard_exit_confirmation_title">Выход</string>
+    <!-- Omnipod - Pod activation Wizard -->
+    <string name="omnipod_pod_activation_wizard_fill_pod_title">Заполнить Pod</string>
+    <string name="omnipod_pod_activation_wizard_fill_pod_text">Заполните новый Pod инсулином на 3 дня.\n\nПоступят два звуковых сигнала от помпы во время заправки. Это означает, что минимальное количество 85U заправлено. Не забудьте опустошить заправочный шприц даже после того, как услышите два звуковых сигнала.\n\nПосле заполнения Pod нажмите <b>Next</b>.\n\n<b>Примечание:</b> Пока не снимайте с помпы колпачок с иглой.\n<b>Примечание:</b>поставьте RileyLink вертикально рядом с Pod.</string>
+    <string name="omnipod_pod_activation_wizard_initialize_pod_title">Инициализировать Pod</string>
+    <string name="omnipod_pod_activation_wizard_initialize_pod_text">Попытка сопряжения с новым Podом и первичного заполнения инфузионного отсека..\n\n После успешного процесса инициализации можно нажать <b>Далее</b>.\n\n<b>Примечание:</b> В это время RileyLink должен находиться в вертикальном положении рядом с Pod.</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_title">Подключить Pod</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_text">Подготовьте место инфузии. Удалите колпачок с иглы и защиту липкого слоя, Установите Pod на тело.\n\nесли канюля выступает, нажмите <b>Отмена</b> и утилизируйте Pod.\n\nНажмите <b>Далее</b> чтобы установить катетер и начать подачу базала.</string>
+    <string name="omnipod_pod_activation_wizard_attach_pod_confirm_insert_cannula_text">При нажатии <b>OK</b>будет установлен катетер. Убедитесь, что вы подключили Pod к инфузионному отсеку.</string>
+    <string name="omnipod_pod_activation_wizard_insert_cannula_title">Вставить катетер</string>
+    <string name="omnipod_pod_activation_wizard_insert_cannula_text">Определение графика подачи базала и установка катетера. \n\n После установки катетера нажмите <b>Далее</b>.</string>
+    <string name="omnipod_pod_activation_wizard_pod_activated_title">Pod активирован</string>
+    <string name="omnipod_pod_activation_wizard_pod_activated_text">Новый Pod активирован.\n\nБазальный график запрограммирован и катетер установлен.\n\nУбедитесь в том, что катетер установлен правильно и замените Pod, если такой уверенности нет.</string>
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <string name="omnipod_pod_deactivation_wizard_deactivate_pod_title">Деактивировать Pod</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivate_pod_text">\nНажмите <b>Далее</b> для деактивации Pod \n\n<b>Примечание:</b> Это Приостановит любую подачу инсулина и деактивирует помпу.</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivating_pod_title">Деактивировать Pod</string>
+    <string name="omnipod_pod_deactivation_wizard_deactivating_pod_text">Деактивация Pod.\n\nПри успешной деактивации можно нажать <b>Далее</b>.</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_deactivated_title">Pod деактивирован</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_deactivated_text">Pod деактивирован.\n\nУдалите и утилизируйте Pod.</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_discarded_title">Pod сброшен</string>
+    <string name="omnipod_pod_deactivation_wizard_pod_discarded_text">Состояние Pod cброшено. Подача инсулина не была приостановлена, так как Pod не был правильно деактивирован!\n\nУдалите Pod с тела и утилизируйте его.</string>
+    <string name="omnipod_pod_deactivation_wizard_discard_pod_confirmation">Если сбросить Pod, дальнейшая коммуникация с ним невозможна. Делайте это только тогда, когда все попытки связи с Pod неудачны. Вы уверены, что хотите cбросить Pod?</string>
+    <string name="omnipod_pod_deactivation_wizard_discard_pod">Утилизировать Pod</string>
+    <!-- Omnipod - Overview -->
+    <string name="omnipod_overview_button_set_time">Установить время</string>
+    <string name="omnipod_overview_button_suspend_delivery">Останов</string>
+    <string name="omnipod_overview_button_riley_link_stats">Статистика RL</string>
+    <string name="omnipod_overview_button_read_pulse_log">Журнал Pulse</string>
+    <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_pod_status">Статус Pod</string>
+    <string name="omnipod_overview_total_delivered">Всего подано</string>
+    <string name="omnipod_overview_total_delivered_value">%1$.2f ед</string>
+    <string name="omnipod_overview_pod_address">Адрес Pod</string>
+    <string name="omnipod_overview_pod_expiry_date">Pod действителен до</string>
+    <string name="omnipod_overview_last_connection">Прошлое соединение</string>
+    <string name="omnipod_overview_last_bolus">Предыдущий болюс</string>
+    <string name="omnipod_overview_temp_basal_rate">Временная базальная скорость</string>
+    <string name="omnipod_overview_base_basal_rate">Базовая базальная скорость</string>
+    <string name="omnipod_overview_reservoir">Резервуар</string>
+    <string name="omnipod_overview_pod_active_alerts">Активные оповещения помпы</string>
+    <string name="omnipod_overview_firmware_version">Версия прошивки</string>
+    <string name="omnipod_overview_time_on_pod">Время на Pod</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 - Other -->
+    <string name="omnipod_pump_description">Для интеграции с помпой Omnipod требуется устройство RileyLink (с прошивкой 2.0 и выше).</string>
+    <string name="omnipod_custom_action_reset_rileylink">Сбросить конфигурацию RileyLink</string>
+    <string name="omnipod_uncertain">не подтверждено</string>
+    <string name="omnipod_pulse_log">Журнал Pulse</string>
+    <string name="omnipod_pulse_log_value">Журнал отладки из буфера обмена</string>
+    <string name="omnipod_yes">Да</string>
+    <string name="omnipod_no">Нет</string>
+    <string name="omnipod_ok">OK</string>
+    <string name="omnipod_cancel">Отменить</string>
+    <!-- Omnipod - Times -->
+    <string name="omnipod_moments_ago">Только что</string>
+    <string name="omnipod_less_than_a_minute_ago">Менее минуты назад</string>
+    <string name="omnipod_composite_time">%1$s и %2$s</string>
+    <string name="omnipod_time_ago">%1$s назад</string>
    <plurals name="omnipod_minutes">
        <item quantity="one">%1$d минута</item>
        <item quantity="few">%1$d мин</item>
--- a/omnipod/src/main/res/values-sk-rSK/strings.xml
+++ b/omnipod/src/main/res/values-sk-rSK/strings.xml
@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Integrácia pumpy pre Omnipod, vyžaduje zariadenie RileyLink (s firmwarom aspoň 2.0).</string>
-    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
    <string name="omnipod_config_bolus_beeps_enabled">Pípnutie pri boluse povolené</string>
    <string name="omnipod_config_basal_beeps_enabled">Pípnutie pri bazále povolené</string>
    <string name="omnipod_config_smb_beeps_enabled">Pípnutie pri SMB povolené</string>
@ -15,19 +14,12 @@
    <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Hodiny pred vypnutím</string>
    <string name="omnipod_config_low_reservoir_alert_enabled">Upozornenie na nízký stav zásobníka povolené</string>
    <string name="omnipod_config_low_reservoir_alert_units">Počet jednotiek</string>
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_moments_ago">Pred chvíľou</string>
-    <string name="omnipod_pod_mgmt">Správa Podu</string>
-    <string name="omnipod_pod_status">Stav Podu</string>
-    <string name="omnipod_total_delivered_label">Celkovo podané</string>
-    <string name="omnipod_total_delivered">%1$.2f JI</string>
-    <string name="omnipod_reservoir_left">Zostáva %1$.2f JI</string>
-    <string name="omnipod_reservoir_over50">Viac ako 50 JI</string>
-    <string name="omnipod_pod_address">Adresa Podu</string>
-    <string name="omnipod_pod_expiry">Expirácia Podu</string>
-    <string name="omnipod_warning">Upozornenie</string>
+    <string name="omnipod_preference_category_rileylink">RileyLink</string>
+    <string name="omnipod_preference_category_other">Iné</string>
+    <string name="omnipod_preference_category_alerts">Výstrahy</string>
+    <string name="omnipod_preference_category_confirmation_beeps">Potvrdzujúce pípnutie</string>
+    <!-- Omnipod - Pod Status -->
    <string name="omnipod_pod_status_no_active_pod">Žiadny aktívny Pod</string>
-    <string name="omnipod_pod_status_waiting_for_pair_and_prime">Inštalácia prebieha (čakanie na párovanie a plnenie)</string>
    <string name="omnipod_pod_status_waiting_for_cannula_insertion">Inštalácia prebieha (čaká sa na vloženie kanyly)</string>
    <string name="omnipod_pod_status_running">V prevádzke</string>
    <string name="omnipod_pod_status_suspended">Pozastavené</string>
@ -35,39 +27,35 @@
    <string name="omnipod_pod_status_activation_time_exceeded">Bol prekročený čas aktivácie</string>
    <string name="omnipod_pod_status_inactive">Neaktívny</string>
    <string name="omnipod_pod_status_pod_fault_description">Chyba Podu: %1$s %2$s</string>
-    <string name="omnipod_pod_active_alerts">Výstrahy aktívneho Podu</string>
-    <string name="omnipod_acknowledge_active_alerts_short">Potvrdiť upozornenie</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
+    <!-- Omnipod - Alerts -->
+    <string name="omnipod_alert_finish_pairing_reminder">Pripomienka ukončenia párovania</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Pripomienka ukončenia nastavenia</string>
+    <string name="omnipod_alert_expiration">Pod čoskoro expiruje</string>
+    <string name="omnipod_alert_expiration_advisory">Pod čoskoro expiruje</string>
+    <string name="omnipod_alert_shutdown_imminent">Vypnutie je bezprostredné</string>
+    <string name="omnipod_alert_low_reservoir">Nízka hladina zásobníka</string>
+    <string name="omnipod_alert_unknown_alert">Neznáma výstraha</string>
+    <!-- Omnipod - History -->
+    <string name="omnipod_history_item_description">Popis</string>
+    <string name="omnipod_history_item_source">Zdroj</string>
+    <string name="omnipod_history_item_date">Dátum</string>
+    <string name="omnipod_history_type">Typ:</string>
    <!-- Omnipod - Error -->
+    <string name="omnipod_warning">Upozornenie</string>
    <string name="omnipod_error_rileylink_address_invalid">Neplatná adresa RileyLinku.</string>
    <string name="omnipod_error_operation_not_possible_no_configuration">Operácia nie je možná.\n\nNajskôr je nutné nakonfigurovať Omnipod, kým bude možné túto funkciu použiť.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">Operácia nie je možná.\n\n Je potrebné niekoľko minút počkať, pokiaľ sa AAPS nepokúsi prvý krát nastaviť bazálny profil.</string>
-    <string name="omnipod_error_illegal_init_action_type">Neplatný atribút PodInitActionType: %1$s</string>
    <string name="omnipod_error_pod_not_attached">Žiadny aktívny Pod</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">Overenie príkazu zlyhalo</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Došlo k neočakávanej chybe. Nahláste ju! (typ: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Komunikácia zlyhala: boli prijaté neplatné vstupné parametre</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Komunikácia zlyhala: časový limit vypršal</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Komunikácia zlyhala: vyskytla sa neočakávaná chyba. Prosím, nahláste to!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Komunikácia zlyhala: overenie integrity správy zlyhalo</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Komunikácia zlyhala: boli prijaté neplatné pakety z Podu</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Komunikácia zlyhala: Pod je v chybnom stave</string>
-    <string name="omnipod_driver_error_invalid_response">Komunikácia zlyhala: bola prijatá neplatná odozva z Podu</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Komunikácia zlyhala: bola prijatá správa s neplatným poradovým číslom z Podu</string>
-    <string name="omnipod_driver_error_invalid_message_address">Komunikácia zlyhala: bola prijatá správa s neplatnou adresou z Podu</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Komunikácia zlyhala: nepodarilo se dekódovať správu z Podu</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Komunikácia zlyhala: opakovaná synchronizácia Nonce hodnoty zlyhala</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Komunikácia zlyhala: hodnota Nonce nebola synchronizovaná</string>
-    <string name="omnipod_driver_error_not_enough_data">Komunikácia zlyhala: nedostatok dát prijatých z Podu</string>
-    <string name="omnipod_driver_error_pod_fault">Bola zistená chyba Podu (%1$03d %2$s). Deaktivujte Pod a spustite nový</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Komunikácia zlyhala: Pod vrátil chybovú odozvu</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Správa Podu</string>
-    <string name="omnipod_cmd_init_pod">Inicializovať Pod</string>
+    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Nastavenie bazálneho profilu zlyhalo. Podávanie môže byť pozastavené! Manuálne obnovte stav Podu zo záložky Omnipod a pokračujte v podávaní, ak je to potrebné.</string>
+    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Nastavenie bazálneho profilu zlyhalo. Podávanie môže byť pozastavené! Manuálne obnovte stav Podu zo záložky Omnipod a pokračujte v podávaní, ak je to potrebné.</string>
+    <string name="omnipod_error_set_basal_failed_delivery_suspended">Nastavenie bazálneho profilu zlyhalo. Podávanie je pozastavené! Manuálne obnovte podávanie zo záložky Omnipod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Nastavenie dočasného bazálu zlyhalo. Ak bol predtým spustený dočasný bazál, mohol byť zrušený. Manuálne obnovte stav Podu zo záložky Omnipod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Nastavenie dočasného bazálu zlyhalo. Ak bol predtým spustený dočasný bazál, mohol byť zrušený. Manuálne obnovte stav Podu zo záložky Omnipod.</string>
+    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Nastavenie času, pravdepodobne zlyhalo. Podávanie môže byť pozastavené! Manuálne obnovte stav Podu zo záložky Omnipod a pokračujte v podávaní, ak je to potrebné.</string>
+    <string name="omnipod_error_set_time_failed_delivery_suspended">Nastavenie času zlyhalo. Podávanie je pozastavené! Manuálne obnovte podávanie zo záložky Omnipod.</string>
+    <!-- Omnipod - Confirmation -->
+    <!-- Omnipod - Commands -->
    <string name="omnipod_cmd_deactivate_pod">Deaktivovať Pod</string>
    <string name="omnipod_cmd_discard_pod">Vyradiť Pod</string>
-    <string name="omnipod_cmd_pod_history">História Podu</string>
    <string name="omnipod_cmd_set_bolus">Nastaviť bolus</string>
    <string name="omnipod_cmd_cancel_bolus">Zrušiť bolus</string>
    <string name="omnipod_cmd_set_tbr">Nastaviť dočasný bazál</string>
@ -82,88 +70,23 @@
    <string name="omnipod_cmd_suspend_delivery">Pozastaviť dodávanie inzulínu</string>
    <string name="omnipod_cmd_resume_delivery">Pokračovať v dodávaní inzulínu</string>
    <string name="omnipod_cmd_unknown_entry">Neznáma položka</string>
-    <string name="omnipod_cmd_bolus_value">%1$.2f JI</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.2f JI, CH=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Rýchlosť: %1$.2f JI, Doba trvania: %2$d min</string>
-    <string name="omnipod_cmd_discard_pod_desc">Keď stlačíte <b>OK</b>, bude pripojenie na Pod nútene prerušené a nebudete sa môcť k nemu už viac pripojiť. Urob tak iba vtedy, ak AAPS nemôže viac komunikovať s Podom. Ak stále môžete komunikovať s Podom, prosím použite možnosť <b>Deaktivovať Pod</b>.\n\nPokiaľ chcete pokračovať, uistite sa, že je Pod odstránený z tela.</string>
-    <string name="omnipod_cmd_pod_history_na">História Podu momentálne nie je dostupná.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Naplňte Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nNaplňte nový Pod dostatočným množstvom inzulínu na 3 dni.\n\nSledujte dve pípnutia z Podu v priebehu procesu plnenia. Tieto ukazujú, že minimálne množstvo 85JI bolo naplnené. Uistite sa, že striekačka je úplne vyprázdnená a to i po vypočutí dvoch pípnutí.\n\nPo naplnení Podu, prosím, stlačte <b>Další</b>.\n\n<b>Poznámka:</b> zatiaľ nedávajte dole kryt ihly.\n<b>Poznámka:</b>prosím umiestnite RileyLink vo zvislej pozícii blízko Podu.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Plnenie</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">Pokúste sa spárovať s novým Podom a naplňte ho.\n\nKeď sú všetky položky zaškrtnuté, môžete stlačiť <b>Ďalej</b>.\n\n<b>Poznámka:</b> prosím držte teraz Pod veľmi blízko RileyLinku.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Pripevni Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPripravte infúzny set. Odstráňte krytku ihly na Pode a ochranu samolepky a pripojte Pod k infúznemu setu. \n\nAk sa kanyla odlepí, prosím stlačte <b>Zrušiť</b> a zahoďte Váš Pod.\n\nStlačte <b>Ďalšia</b> na zavedenie kanyly a začiatok podávania bazálu.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Zavedenie kanyly</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Pokúšam sa nastaviť počiatočnú bazálnu dávku a zaviesť kanylu.\n\nAk sú všetky položky označené, môžete stlačiť <b>Ďalší</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Informácie o Pode</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPod je teraz aktívny.\n\nVaša bazálna dávka je nastavená a kanyla bola zavedená.\n\nProsím skontrolujte, či bola kanyla zavedená správne a ak máte pocit, že nie, tak vymeňte Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Deaktivovať Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nStlačte <b>Ďalej</b> pre deaktiváciu Podu.\n\n<b>Poznámka:</b> Toto preruší celkovo podávanie inzulínu a deaktivuje Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Deaktivácia Podu</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">Deaktivujem Pod.\n\nKeď sú všetky položky zaškrtnuté, môžete stlačiť <b>Ďalej</b>.\n\n<b>Poznámka:</b> Ak deaktivácia neustále zlyháva, stlačte prosím <b>Zrušiť</b> a použite možnosť <b>Resetovať Pod</b>, na nútené obnovenie stavu Podu.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod deaktivovaný.\n\nProsím odstráňte Pod z Vášho tela a zlikvidujte ho.</string>
-    <string name="omnipod_init_pod_pair_pod">Spárujte Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Naplňte Pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Naplňte kanylu</string>
-    <string name="omnipod_init_pod_set_basal_profile">Nastavte bazálny profil</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Zrušte podávanie</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Deaktivujte Pod</string>
-    <!-- Omnipod - Base -->
-    <string name="omnipod_alert_finish_pairing_reminder">Pripomienka ukončenia párovania</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Pripomienka ukončenia nastavenia</string>
-    <string name="omnipod_alert_expiration">Pod čoskoro expiruje</string>
-    <string name="omnipod_alert_expiration_advisory">Pod čoskoro expiruje</string>
-    <string name="omnipod_alert_shutdown_imminent">Vypnutie je bezprostredné</string>
-    <string name="omnipod_alert_low_reservoir">Nízka hladina zásobníka</string>
-    <string name="omnipod_alert_unknown_alert">Neznáma výstraha</string>
-    <string name="omnipod_error_set_basal_failed_delivery_might_be_suspended">Nastavenie bazálneho profilu zlyhalo. Podávanie môže byť pozastavené! Manuálne obnovte stav Podu zo záložky Omnipod a pokračujte v podávaní, ak je to potrebné.</string>
-    <string name="omnipod_error_set_basal_might_have_failed_delivery_might_be_suspended">Nastavenie bazálneho profilu zlyhalo. Podávanie môže byť pozastavené! Manuálne obnovte stav Podu zo záložky Omnipod a pokračujte v podávaní, ak je to potrebné.</string>
-    <string name="omnipod_error_set_basal_failed_delivery_suspended">Nastavenie bazálneho profilu zlyhalo. Podávanie je pozastavené! Manuálne obnovte podávanie zo záložky Omnipod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Nastavenie dočasného bazálu zlyhalo. Ak bol predtým spustený dočasný bazál, mohol byť zrušený. Manuálne obnovte stav Podu zo záložky Omnipod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Nastavenie dočasného bazálu zlyhalo. Ak bol predtým spustený dočasný bazál, mohol byť zrušený. Manuálne obnovte stav Podu zo záložky Omnipod.</string>
-    <string name="omnipod_error_set_time_failed_delivery_might_be_suspended">Nastavenie času, pravdepodobne zlyhalo. Podávanie môže byť pozastavené! Manuálne obnovte stav Podu zo záložky Omnipod a pokračujte v podávaní, ak je to potrebné.</string>
-    <string name="omnipod_error_set_time_failed_delivery_suspended">Nastavenie času zlyhalo. Podávanie je pozastavené! Manuálne obnovte podávanie zo záložky Omnipod.</string>
-    <string name="omnipod_bolus_failed_uncertain">Nedá sa overiť, či bol bolus úspešný. Prosím manuálne overte, či Váš Pod podáva bolus počúvaním klikania. <b>Ak ste si istý, že bolus nebol úspešný, mali by ste ručne odstrániť záznam o boluse z ošetrení, aj keď kliknete na \'Zrušiť bolus\' teraz!</b></string>
-    <string name="omnipod_bolus_failed_uncertain_smb">Nedá sa overiť, či bol bolus SMB (%1$.2f JI) úspešný. <b>Ak ste si istí, že bolus nebol úspešný, mali by ste ručne vymazať záznam SMB z ošetrení.</b></string>
-    <string name="omnipod_rl_stats">Štatistiky RL</string>
-    <string name="omnipod_read_pulse_log_short">Pulse Log</string>
-    <string name="omnipod_pod_lot">LOT</string>
-    <string name="omnipod_pod_tid">TID</string>
-    <string name="omnipod_pod_firmware_version">Verzia firmvéru</string>
-    <string name="omnipod_errors">Chyby</string>
-    <string name="omnipod_cmd_basal_profile_not_set_is_same">Bazálny profil je rovnaký, takže nebude znovu nastavený.</string>
-    <string name="omnipod_custom_action_reset_rileylink">Resetovať konfiguráciu RileyLinku</string>
-    <string name="omnipod_time_or_timezone_change">Zmena času a/alebo časovej zóny na Pode</string>
-    <string name="omnipod_composite_time">%1$s a %2$s</string>
-    <string name="omnipod_time_ago">pred %1$s min</string>
-    <string name="omnipod_waiting_for_rileylink_connection">Čaká sa na pripojenie RileyLinku...</string>
-    <string name="omnipod_bolus_did_not_succeed">Bolus nebol úspešný</string>
-    <string name="omnipod_refresh">Aktualizovať</string>
-    <string name="omnipod_resume_delivery">Pokračovať v podávaní inzulínu</string>
-    <string name="omnipod_error_pod_suspended">Pod pozastavený</string>
-    <string name="omnipod_less_than_a_minute_ago">Pred menej ako minútou</string>
-    <string name="omnipod_suspend_delivery_short">Pozastavenia</string>
-    <string name="omnipod_cmd_pair_and_prime">Spáruj a naplň</string>
-    <string name="omnipod_cmd_fill_cannula_set_basal_profile">Naplňte kanylu a nastavte bazálny profil</string>
-    <string name="omnipod_cmd_get_pulse_log">Získaj pulse log</string>
-    <string name="omnipod_uncertain_failure">Neznáma chyba</string>
-    <string name="omnipod_cancelled_old_tbr_failed_to_set_new">Bol zrušený starý dočasný bazál, ale nový dočasný bazál sa nepodarilo nastaviť</string>
    <string name="omnipod_cmd_set_fake_suspended_tbr">Nastaviť falošný dočasný bazál, pretože Pod je pozastavený</string>
    <string name="omnipod_cmd_cancel_fake_suspended_tbr">Zrušiť falošný dočasný bazál ktorý bol vytvorený, pretože Pod bol pozastavený</string>
-    <string name="omnipod_uncertain">neznáme</string>
-    <string name="omnipod_expiration_alerts_updated">Nastavenie výstrahy bolo v Pode aktualizované</string>
-    <string name="omnipod_preference_category_rileylink">RileyLink</string>
-    <string name="omnipod_preference_category_other">Iné</string>
-    <string name="omnipod_preference_category_alerts">Výstrahy</string>
-    <string name="omnipod_preference_category_confirmation_beeps">Potvrdzujúce pípnutie</string>
-    <string name="omnipod_wizard_button_exit">Ukončiť</string>
-    <string name="omnipod_wizard_button_previous">Predošlá</string>
-    <string name="omnipod_wizard_button_next">Ďalšia</string>
+    <!-- Omnipod - Pod Management -->
+    <!-- Omnipod - Wizard common -->
    <string name="omnipod_wizard_button_finish">Dokončiť</string>
-    <string name="omnipod_history_item_description">Popis</string>
-    <string name="omnipod_history_item_source">Zdroj</string>
-    <string name="omnipod_history_item_date">Dátum</string>
-    <string name="omnipod_history_type">Typ:</string>
+    <string name="omnipod_wizard_button_next">Ďalšia</string>
+    <!-- Omnipod - Pod activation Wizard -->
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <!-- Omnipod - Overview -->
+    <!-- Omnipod - Other -->
+    <string name="omnipod_custom_action_reset_rileylink">Resetovať konfiguráciu RileyLinku</string>
+    <string name="omnipod_uncertain">neznáme</string>
+    <!-- Omnipod - Times -->
+    <string name="omnipod_moments_ago">Pred chvíľou</string>
+    <string name="omnipod_less_than_a_minute_ago">Pred menej ako minútou</string>
+    <string name="omnipod_composite_time">%1$s a %2$s</string>
+    <string name="omnipod_time_ago">pred %1$s min</string>
    <plurals name="omnipod_minutes">
        <item quantity="one">%1$d minúta</item>
        <item quantity="few">%1$d minút</item>
--- a/omnipod/src/main/res/values-sl-rSI/strings.xml
+++ b/omnipod/src/main/res/values-sl-rSI/strings.xml
@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <!-- Omnipod - Pod Status -->
+    <!-- Omnipod - Alerts -->
+    <!-- Omnipod - History -->
    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod - Base -->
+    <!-- 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>
--- a/omnipod/src/main/res/values-sv-rSE/strings.xml
+++ b/omnipod/src/main/res/values-sv-rSE/strings.xml
@ -1,39 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Pumpintegrering för Omnipod. Kräver Riley Link med minst v2-firmware.</string>
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <string name="omnipod_reservoir_left">%1$.2f U återstår</string>
-    <string name="omnipod_reservoir_over50">Över 50 U</string>
-    <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
-    <!-- Omnipod - Error -->
-    <string name="omnipod_error_illegal_init_action_type">Ogiltig PodInitActionType: %1$s</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Ett oväntat fel uppstod. Vänligen rapportera! (typ: %1$s).</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Kommunikationsfel: Ett oväntat fel inträffade. Rapportera!</string>
-    <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_cmd_init_pod">Initiera pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Inaktivera pod</string>
-    <string name="omnipod_cmd_pod_history_na">Pod-historik är inte tillgänglig för tillfället.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Fyll pod</string>
-    <string name="omnipod_init_pod_wizard_step2_title">Förfyllning</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Fäst podden</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nFörbered infusionsplatsen. Ta bort poddens nålskydd och fäst podden på infusionsplatsen.\n\nOm kanylen sticker ut, tryck på <b>Avbryt</b> och kasta din pod.\n\nTryck <b>Nästa</b> för att skjuta in kanylen och påbörja basaldoseringen.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">Skjuter in kanylen</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">Försöker att ställa in basaldoser och skjuta in kanylen.\n\nNär alla steg är slutförda, kan du trycka på <b>Nästa</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPodden är nu aktiverad.\n\nDina basaldoser har programmerats och kanylen har skjutits in in.\n\nKontrollera att kanylen sitter på rätt sätt och byt pod om den inte gjort det.</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nTryck på <b>Nästa</b> för att inaktivera podden.\n\n<b>OBS!</b> Det här stoppar all insulintillförsel och inaktiverar podden.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">Inaktiverar pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod inaktiverad.\n\nTa bort podden och kasta den.</string>
-    <string name="omnipod_init_pod_pair_pod">Parkoppla pod</string>
-    <string name="omnipod_init_pod_prime_pod">Förfyll pod</string>
-    <!-- Omnipod - Base -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <!-- Omnipod - Pod Status -->
+    <!-- Omnipod - Alerts -->
    <string name="omnipod_alert_finish_setup_reminder_reminder">Påminnelse att slutföra installation</string>
    <string name="omnipod_alert_expiration">Pod löper snart ut</string>
    <string name="omnipod_alert_expiration_advisory">Pod kommer att gå ut inom kort</string>
    <string name="omnipod_alert_shutdown_imminent">Pod kommer snart att stängas av</string>
    <string name="omnipod_alert_low_reservoir">Låg reservoar</string>
    <string name="omnipod_alert_unknown_alert">Okänd varning</string>
+    <!-- Omnipod - History -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Confirmation -->
+    <!-- Omnipod - Commands -->
+    <string name="omnipod_cmd_deactivate_pod">Inaktivera pod</string>
+    <!-- Omnipod - Pod Management -->
+    <!-- Omnipod - Wizard common -->
+    <!-- Omnipod - Pod activation Wizard -->
+    <!-- Omnipod - Pod deactivation Wizard -->
+    <!-- Omnipod - Overview -->
+    <!-- Omnipod - Other -->
+    <!-- Omnipod - Times -->
 </resources>
--- a/omnipod/src/main/res/values-tr-rTR/strings.xml
+++ b/omnipod/src/main/res/values-tr-rTR/strings.xml
@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <!-- Omnipod - Pod Status -->
+    <!-- Omnipod - Alerts -->
+    <!-- Omnipod - History -->
    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod - Base -->
+    <!-- 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>
--- a/omnipod/src/main/res/values-zh-rCN/strings.xml
+++ b/omnipod/src/main/res/values-zh-rCN/strings.xml
@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Omnipod -->
-    <!-- Omnipod - Base -->
-    <!-- Omnipod Configuration -->
-    <!-- Omnipod - Fragment -->
-    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Keys -->
+    <!-- Omnipod - Non translatable -->
+    <!-- Omnipod - Preferences -->
+    <!-- Omnipod - Pod Status -->
+    <!-- Omnipod - Alerts -->
+    <!-- Omnipod - History -->
    <!-- Omnipod - Error -->
-    <!-- Omnipod - Pod Mgmt -->
-    <!-- Omnipod - Base -->
+    <!-- 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>
--- a/rileylink/src/main/res/values-nl-rNL/strings.xml
+++ b/rileylink/src/main/res/values-nl-rNL/strings.xml
@ -6,9 +6,11 @@
    <string name="rileylink_scanner_selected_device">Geselecteerd</string>
    <string name="rileylink_scanner_title">RileyLink Scan</string>
    <string name="location_yes">Inschakelen</string>
+    <string name="location_no">Nee</string>
    <string name="rileylink_scanner_scanning">Scannen</string>
    <string name="rileylink_scanner_scanning_finished">Scannen voltooid</string>
    <string name="rileylink_scanner_scanning_error">Scanfout: %1$d</string>
+    <string name="common_never">Nooit</string>
    <!-- RL Status Page -->
    <string name="rileylink_settings_tab1">Instellingen</string>
    <string name="rileylink_settings_tab2">Geschiedenis</string>
@ -35,14 +37,25 @@
    <string name="rileylink_state_rl_error">RileyLink fout</string>
    <string name="rileylink_state_pc_tune_up">Tuning van RileyLink en Pomp</string>
    <string name="rileylink_state_pc_error">Probleem tijdens verbinden met de pomp</string>
+    <string name="rileylink_state_connected">Verbonden</string>
+    <string name="rileylink_state_rl_ready">RileyLink gereed</string>
    <!-- RL Errors -->
    <string name="rileylink_error_not_rl">Apparaat is geen RileyLink</string>
    <string name="rileylink_error_unreachable">RileyLink onbereikbaar</string>
    <string name="rileylink_error_bt_disabled">Bluetooth is uitgeschakeld</string>
    <string name="rileylink_error_no_bt_adapter">Geen Bluetooth Adapter</string>
    <string name="rileylink_error_tuneup_failed">Verbinding maken mislukt</string>
+    <string name="rileylink_error_pump_unreachable">Pomp niet beschikbaar</string>
    <string name="rileylink_error_pod_unreachable">Pod niet bereikbaar</string>
    <!-- RL Target Device -->
    <string name="rileylink_target_device_medtronic">Medtronic Pomp</string>
    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d dag</item>
+        <item quantity="other">%1$d dagen</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d uur</item>
+        <item quantity="other">%1$d uren</item>
+    </plurals>
 </resources>