diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index 809877af52..9748d50fcb 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -500,7 +500,6 @@
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Verhoog sensitiwiteit vir tydelike doelwitte > = 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Lae tydelike doelwitte verlaag sensitiwiteit</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Laer sensitiwiteit vir tydelike doelwitte < 100]]></string>
-    <string name="careportal_removestartedevents">Skoon AndroidAPS begin</string>
     <string name="storedsettingsfound">Gestoorde instellings gevind</string>
     <string name="allow_hardware_pump_text">Aandag: As jy aktiveer en koppel aan \'n hardeware pomp, AndroidAPS sal die basale instellings uit die profiel aan die pomp kopieer, die bestaande basale koers gestoor op die pomp sal oorskryf word. Maak seker jy het die korrekte basale instelling in AndroidAPS. As jy nie seker is of nie die basale instellings wil oorskryf op jou pomp, druk Kanselleer en herhaal oorskakel na die pomp op \'n later tyd.</string>
     <string name="error_adding_treatment_title">Behandeling data onvolledig</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 0cd5f28707..68d6c733ef 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -644,7 +644,6 @@
     <string name="resistance_lowers_target_summary">Когато се установи резистентност, намалява целевата глюкоза.</string>
     <string name="sensitivity_raises_target_title">Чувствителността увеличава целта</string>
     <string name="sensitivity_raises_target_summary">Когато се установи чувствителност, повишаване на целевата глюкоза</string>
-    <string name="careportal_removestartedevents"> AndroidAPS стартира</string>
     <string name="storedsettingsfound">Открити са предишни настройки</string>
     <string name="allow_hardware_pump_text">Внимание: Ако активирате и свържете с хардуерна помпа, AndroidAPS ще копира основните настройки от профила в помпата, като презапише съществуващата базова скорост, съхранявана на помпата. Уверете се, че имате правилните основни настройки в AndroidAPS. Ако не сте сигурни или не искате да презапишете основните настройки на помпата, натиснете Cancel и повторете превключването към помпата по-късно.</string>
     <string name="error_adding_treatment_title">Данните за лечението не са пълни</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 5ad8496331..8336c1a0de 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -665,7 +665,7 @@
     <string name="resistance_lowers_target_summary">Je-li zjištěna rezistence, sníží nastavenou cílovou glykémii</string>
     <string name="sensitivity_raises_target_title">Citlivost zvyšuje cíl</string>
     <string name="sensitivity_raises_target_summary">Je-li zjištěna vyšší citlivost, zvýší nastavenou cílovou glykémii</string>
-    <string name="careportal_removestartedevents">Vyčistit události \"AndroidAPS restartován\"</string>
+    <string name="careportal_removestartedevents">Odebrat záznamy spuštěné AAPS</string>
     <string name="show_invalidated">Zobrazit neplatné</string>
     <string name="hide_invalidated">Skrýt zneplatněné</string>
     <string name="remove_items">Odstranit položky</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index bcf53355b6..24e3c26317 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -665,7 +665,6 @@
     <string name="resistance_lowers_target_summary">Når der påvises resistens, sænkes målglukosen</string>
     <string name="sensitivity_raises_target_title">Følsomhed hæver midlertidige mål</string>
     <string name="sensitivity_raises_target_summary">Når der påvises følsomhed, skal målglukosen hæves</string>
-    <string name="careportal_removestartedevents">Ren AndroidAPS startet</string>
     <string name="show_invalidated">Vis ugyldige</string>
     <string name="hide_invalidated">Skjul ugyldige</string>
     <string name="remove_items">Fjern elementer</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 3c49f37964..a5a1293fa4 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -665,7 +665,6 @@
     <string name="resistance_lowers_target_summary">Wenn Resistenz festgestellt wird, senke den Glukose-Zielwert</string>
     <string name="sensitivity_raises_target_title">Empfindlichkeit erhöht den Zielwert</string>
     <string name="sensitivity_raises_target_summary">Wenn eine höhere Empfindlichkeit festgestellt wird, wird der Glukose-Zielwert erhöht.</string>
-    <string name="careportal_removestartedevents">\"AndroidAPS gestartet\" Ereignisse löschen</string>
     <string name="show_invalidated">Zeige Ungültige</string>
     <string name="hide_invalidated">Verstecke Ungültige</string>
     <string name="remove_items">Objekte entfernen</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index f7514986ed..da7295dcea 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -502,7 +502,6 @@
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Αύξηση ευαισθησίας για προσωρινό στόχο > = 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Ο χαμηλός προσωρινός στόχος μειώνει την ευαισθησία</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Χαμηλότερη ευαισθησία για προσωρινό στόχο < 100]]></string>
-    <string name="careportal_removestartedevents">Ξεκίνησε το AndroidAPS καθαρό</string>
     <string name="storedsettingsfound">Βρέθηκαν αποθηκευμένες ρυθμίσεις</string>
     <string name="allow_hardware_pump_text">Προσοχή: Εάν ενεργοποιήσετε και συνδεθείτε με μια αντλία, το AndroidAPS θα αντιγράψει τις ρυθμίσεις βασικού από το προφίλ στην αντλία, αντικαθιστώντας τον υπάρχων βασικό ρυθμό της αντλίας. Βεβαιωθείτε ότι έχετε τον σωστό βασικό ρυθμό στο AndroidAPS. Εάν δεν είστε βέβαιοι ή δεν θέλετε να αντικαταστήσετε τον βασικό ρυθμό στην αντλία σας, πατήστε Άκυρο και επαναλάβετε εναλλαγή προς την αντλία σε μεταγενέστερο χρόνο.</string>
     <string name="error_adding_treatment_title">Ελλιπή δεδομένα θεραπείας</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index bd0344b9bf..e8f55b0a79 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -665,7 +665,7 @@
     <string name="resistance_lowers_target_summary">Cuando se detecta resistencia a la insulina, disminuye el objetivo de glucosa</string>
     <string name="sensitivity_raises_target_title">Sensibilidad aumenta el objetivo</string>
     <string name="sensitivity_raises_target_summary">Cuando se detecta sensibilidad a la insulina, aumenta el objetivo de glucosa</string>
-    <string name="careportal_removestartedevents">Comenzar la limpieza de AndroidAPS</string>
+    <string name="careportal_removestartedevents">Eliminar registros de inicio de AAPS</string>
     <string name="show_invalidated">Mostrar invalidados</string>
     <string name="hide_invalidated">Ocultar invalidados</string>
     <string name="remove_items">Eliminar elementos</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 94b233ece4..a166f7fd52 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -666,7 +666,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="resistance_lowers_target_summary">Quand une résistance est détectée, baisse de la glycémie cible</string>
     <string name="sensitivity_raises_target_title">Sensibilité augmente la cible</string>
     <string name="sensitivity_raises_target_summary">Quand une sensibilité est détectée, augmentation de la glycémie cible</string>
-    <string name="careportal_removestartedevents">Réinitialiser AndroidAPS</string>
+    <string name="careportal_removestartedevents">Suppr. entrées \"Démarrage AAPS\"</string>
     <string name="show_invalidated">Montrer les entrées invalides</string>
     <string name="hide_invalidated">Masquer les entrées invalides</string>
     <string name="remove_items">Supprimer des entrées</string>
diff --git a/app/src/main/res/values-ga-rIE/strings.xml b/app/src/main/res/values-ga-rIE/strings.xml
index 115e43452f..b73615f8f0 100644
--- a/app/src/main/res/values-ga-rIE/strings.xml
+++ b/app/src/main/res/values-ga-rIE/strings.xml
@@ -3,184 +3,6 @@
     <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
     <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
-    <string name="nav_preferences_plugin">%1$s Sainroghanna</string>
-    <string name="nav_preferences">Sainroghanna</string>
-    <string name="reset_db_confirm">An bhfuil tú cinnte gur mian leat an bhunachair sonraí a athshocrú?</string>
-    <string name="nav_exit">Scoir</string>
-    <string name="description_source_mm640g">Luachanna BG a fháil ón 600SeriesAndroidUploader.</string>
-    <string name="description_source_ns_client">Sonraí a íoslódáil ó Nightscout</string>
-    <string name="description_source_xdrip">Luachanna BG a fháil ó xDrip+.</string>
-    <string name="treatments_insulin_label_string">Inslin:</string>
-    <string name="treatments_carbs_label_string">Carbí:</string>
-    <string name="treatments_iob_label_string">IOB:</string>
-    <string name="sms_iob">IOB:</string>
-    <string name="treatments_iobtotal_label_string">Lomlán IOB:</string>
-    <string name="tempbasals_realduration_label_string">Fad:</string>
-    <string name="tempbasals_netratio_label_string">Cóimheas:</string>
-    <string name="tempbasals_netinsulin_label_string">Ins:</string>
-    <string name="tempbasals_iob_label_string">IOB:</string>
-    <string name="tempbasals_iobtotal_label_string">Lomlán IOB:</string>
-    <string name="treatments_wizard_bg_label">BG</string>
-    <string name="treatments_wizard_tt_label">TT</string>
-    <string name="treatments_wizard_carbs_label">Carbí</string>
-    <string name="treatments_wizard_correction_label">Cear</string>
-    <string name="openapsma_run">Reáchtáil anois</string>
-    <string name="openapsma_lastrun_label">Reáchtáil deiridh</string>
-    <string name="openapsma_glucosestatus_label">Glúcóis stádas</string>
-    <string name="openapsma_profile_label">Próifíl</string>
-    <string name="result">Toradh</string>
-    <string name="result_insulin_carbs">Toradh: %1$s %2$s</string>
-    <string name="delta">Deilte</string>
-    <string name="sms_delta">Deilte:</string>
-    <string name="treatments">Cóireálacha</string>
-    <string name="configbuilder_pump">Caidéil</string>
-    <string name="configbuilder_profile">Próifíl</string>
-    <string name="configbuilder_aps">APS</string>
-    <string name="configbuilder_general">Ginearálta</string>
-    <string name="constraints">Srianta</string>
-    <string name="configbuilder_loop">Lúb</string>
-    <string name="loop_aps_label">APS</string>
-    <string name="overview_calculator_label">Áireamhán</string>
-    <string name="sms_bolus">Bólas:</string>
-    <string name="sms_basal">Bunaidh:</string>
-    <string name="configbuilder_bgsource">Foinse BG</string>
-    <string name="xdrip">xDrip+</string>
-    <string name="apsmode_title">APS mód</string>
-    <string name="closedloop">Lúb dúnta</string>
-    <string name="openloop">Lúb oscailte</string>
-    <string name="disabledloop">Lúb díchumasaithe</string>
-    <string name="treatments_wizard_basaliob_label">Bunaidh IOB</string>
-    <string name="careportal_newnstreatment_other">Eile</string>
-    <string name="careportal_newnstreatment_sensor">Braiteoir</string>
-    <string name="careportal_newnstreatment_duration_label">Fad</string>
-    <string name="careportal_newnstreatment_glucosetype">Glúcóis cineál</string>
-    <string name="exported">Easpórtáil Socruithe</string>
-    <string name="export_to">Socruithe Easpórtáil chun</string>
-    <string name="nav_export">Socruithe Easpórtáil</string>
-    <string name="nav_import">Socruithe Iompórtáil</string>
-    <string name="check_preferences_import_btn">Iompórtáil</string>
-    <string name="save">Sábháil</string>
-    <string name="reloadprofile">Athlódáil próifíl</string>
-    <string name="smscommunicator_loophasbeendisabled">Is lúb díchumasaithe</string>
-    <string name="smscommunicator_loophasbeenenabled">Is lúb cumasaithe</string>
-    <string name="smscommunicator_loopisenabled">Is lúb cumasaithe</string>
-    <string name="smscommunicator_tempbasalcancelfailed">Cealú TBR teip</string>
-    <string name="overview_editquickwizard_carbs">Carbí:</string>
-    <string name="overview_editquickwizard_valid">Bailí:</string>
-    <string name="overview_editquickwizardlistactivity_add">Cuir</string>
-    <string name="overview_quickwizard_item_edit_button">In eagar</string>
-    <string name="correctionbous">Cear</string>
-    <string name="actions">Gníomhartha</string>
-    <string name="button1">Cnaipe 1</string>
-    <string name="button2">Cnaipe 2</string>
-    <string name="button3">Cnaipe 3</string>
-    <string name="units_colon">Aonaid:</string>
-    <string name="units">Aonaid</string>
-    <string name="dia">DIA</string>
-    <string name="sms_actualbg">BG:</string>
-    <string name="sms_lastbg">GF deiridh:</string>
-    <string name="MM640g">MM640g</string>
-    <string name="sms_minago">%1$dnóim ó shin</string>
-    <string name="openapsama">OpenAPS AMA</string>
-    <string name="actions_shortname">GNÍ</string>
-    <string name="loop_shortname">LÚB</string>
-    <string name="oaps_shortname">OAPS</string>
-    <string name="overview_shortname">BAILE</string>
-    <string name="wear_shortname">WEAR</string>
-    <string name="smscommunicator_shortname">SMS</string>
-    <string name="profile">Próifíl</string>
-    <string name="overview_calibration">Calabrú</string>
-    <string name="pumpsuspended">Caidéil ar fionraí</string>
-    <string name="executing">Feidhmiú</string>
-    <string name="nsclientinternal_url">URL:</string>
-    <string name="restart">Atosaigh</string>
-    <string name="deliver_now">Seachadadh anois</string>
-    <string name="status">Stádas:</string>
-    <string name="patientage">Othar cineál</string>
-    <string name="child">Páiste</string>
-    <string name="teenage">Déagóirí</string>
-    <string name="adult">Duine fásta</string>
-    <string name="patient_name">Ainm cineál</string>
-    <string name="Glimp">Glimp</string>
-    <string name="loopsuspended">Lúb ar fionraí</string>
-    <string name="loopsuspendedfor">Ar fionraí (%1$d nóim)</string>
-    <string name="suspendloopfor1h">Fionraí lúb do 1 u</string>
-    <string name="suspendloopfor2h">Fionraí lúb do 2 u</string>
-    <string name="suspendloopfor3h">Fionraí lúb do 3 u</string>
-    <string name="suspendloopfor10h">Fionraí lúb do 10 u</string>
-    <string name="disconnectpump">Dhícheangal Caidéil</string>
-    <string name="disconnectpumpfor15m">Dhícheangal Caidéil do 15 nóim</string>
-    <string name="disconnectpumpfor30m">Dhícheangal Caidéil do 30 nóim</string>
-    <string name="disconnectpumpfor1h">Dhícheangal Caidéil do 1 u</string>
-    <string name="disconnectpumpfor2h">Dhícheangal Caidéil do 2 u</string>
-    <string name="disconnectpumpfor3h">Dhícheangal Caidéil do 3 u</string>
-    <string name="duration15m">15 nóim</string>
-    <string name="duration30m">30 nóim</string>
-    <string name="duration1h">1 uair</string>
-    <string name="duration2h">2 uair</string>
-    <string name="duration3h">3 uair</string>
-    <string name="duration10h">10 uair</string>
-    <string name="resume">Atosú</string>
-    <string name="smscommunicator_loopsuspended">Lúb ar fionraí</string>
-    <string name="smscommunicator_loopresumed">Lúb atógáil</string>
-    <string name="treatments_wizard_cob_label">COB</string>
-    <string name="ultrafastactinginsulincomment">Fiasp</string>
-    <string name="insulin_shortname">INS</string>
-    <string name="basal_shortname">BUN</string>
-    <string name="activity_shortname">GNÍ</string>
-    <string name="nav_about">Faoi</string>
-    <string name="xdripstatus_shortname">xds</string>
-    <string name="careportal_sensor_label">Braiteoir</string>
-    <string name="careportal_insulin_label">Inslin</string>
-    <string name="careportal_pb_label">Caidéil ceallraí</string>
-    <string name="careportal_age_label">aois:</string>
-    <string name="ns_alarmoptions">Aláraim roghanna</string>
-    <string name="openaps">OpenAPS</string>
-    <string name="openaps_short">OAPS</string>
-    <string name="basal_short">BUN</string>
-    <string name="openapssmb">OpenAPS SMB</string>
-    <string name="rapid_acting_oref">Rapid-Acting Oref</string>
-    <string name="lyumjev">Lyumjev</string>
-    <string name="careportal_newnstreatment_percentage_label">Céatadán</string>
-    <string name="activity_duration">Gníomhaíocht fad</string>
-    <string name="activity_target">Gníomhaíocht sprioc</string>
-    <string name="food">Bia</string>
-    <string name="shortgramm">g</string>
-    <string name="shortkilojoul">kJ</string>
-    <string name="loopenabled">Lúb cumasaithe</string>
-    <string name="apsselected">APS  roghnaithe</string>
-    <string name="overview_insulin_label">Inslin</string>
-    <string name="overview_buttons_selection">Cnaipi</string>
-    <string name="overview_cgm">CGM</string>
-    <string name="temptargetshort">TT</string>
-    <string name="category">Catagóir</string>
-    <string name="overview_show_activity">Gníomhaíocht</string>
-    <string name="overview_show_basals">Bunaidhi</string>
-    <string name="food_short">Bia</string>
-    <string name="next_button">Ar Aghaidh</string>
-    <string name="previous_button">Roimhe seo</string>
-    <string name="cgm">CGM</string>
-    <string name="ns_wifi_ssids">WiFi SSID</string>
-    <string name="wear_general_settings">Socruithe Ginearálta</string>
-    <string name="poctech">Poctech</string>
-    <string name="treatments_wizard_total_label">Lomlán</string>
-    <string name="profile_total">== ∑  %1$s A</string>
-    <string name="tomato">Tomato (MiaoMiao)</string>
-    <string name="tomato_short">Tomato</string>
-    <string name="tidepool">Tidepool</string>
-    <string name="tidepool_shortname">TDP</string>
-    <string name="twohours">2u</string>
-    <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
-    <string name="format_carbs_ic">%1$.0fg IC: %2$.1f</string>
-    <string name="format_cob_ic">%1$.1fg IC: %2$.1f</string>
-    <string name="format_percent">%1$d%%</string>
-    <string name="unit_minute_short">nóim</string>
-    <string name="profile_name">Ainm Próifíle:</string>
-    <string name="unitsnosemicolon">Aonaid</string>
-    <string name="dia_short">DIA</string>
-    <string name="ic_short">IC</string>
-    <string name="isf_short">ISF</string>
-    <string name="randombg_short">BG</string>
     <!-- SMS Communicator & OTP Authenticator -->
     <!-- Theme switcher dark and light mode-->
     <!-- WEAR OS-->
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 191d76f1b6..4b4ccb5887 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -665,7 +665,6 @@
     <string name="resistance_lowers_target_summary">Quando viene rilevata resistenza, ridurre la glicemia target</string>
     <string name="sensitivity_raises_target_title">La sensibilità aumenta il target</string>
     <string name="sensitivity_raises_target_summary">Quando viene rilevata sensibilità, aumentare la glicemia target</string>
-    <string name="careportal_removestartedevents">Rimuovi gli eventi \"AndroidAPS avviato\"</string>
     <string name="show_invalidated">Mostra invalidato</string>
     <string name="hide_invalidated">Nascondi invalidato</string>
     <string name="remove_items">Rimuovi elementi</string>
@@ -1044,4 +1043,6 @@
     <string name="blocked_by_charging">Bloccato dalle opzioni di ricarica</string>
     <string name="blocked_by_connectivity">Bloccato dalle opzioni di connettività</string>
     <string name="no_watch_connected">(Nessuno smartwatch connesso)</string>
+    <string name="error_asking_for_permissions">Errore nel richiedere le autorizzazioni</string>
+    <string name="dynisf_adjust_sensitivity">Regola sensibilità e BG</string>
 </resources>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index 94931d92f5..438fa5b589 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -665,7 +665,6 @@
     <string name="resistance_lowers_target_summary">כשמזוהה תנגודת, הורד את ערך המטרה של הגלוקוז</string>
     <string name="sensitivity_raises_target_title">רגישות מעלה את ערך המטרה</string>
     <string name="sensitivity_raises_target_summary">כשמזוהה רגישות, הגדל את ערך המטרה של הגלוקוז</string>
-    <string name="careportal_removestartedevents">מחק אירועי \"AndroidAPS Started\"</string>
     <string name="show_invalidated">הצג פסולים</string>
     <string name="hide_invalidated">הסתר פסולים</string>
     <string name="remove_items">הסר פריטים</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 90652a8a7a..76e284a2c5 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -639,7 +639,6 @@
     <string name="resistance_lowers_target_summary">저항성이 감지되면, 목표 혈당을 낮춥니다.</string>
     <string name="sensitivity_raises_target_title">민감성이 목표 올리기</string>
     <string name="sensitivity_raises_target_summary">민감성이 감지되면, 목표 혈당을 높입니다.</string>
-    <string name="careportal_removestartedevents">\"AndroidAPS 시작\" 기록 삭제하기</string>
     <string name="storedsettingsfound">저장된 설정이 있습니다.</string>
     <string name="allow_hardware_pump_text">주의: 활성화하고 펌프에 연결하게되면, AndroidAPS는 프로파일의 Basal설정을 복사해서 기존에 펌프에 저장되어 있던 Basal설정을 덮어쓰게 될것입니다. AndroidAPS의 Basal설정이 올바른지 반드시 확인하세요. 만약 확실치 않거나 Basal설정을 덮어씌우길 원치않는다면, 취소버튼을 누르고 나중에 다시 연결하세요.</string>
     <string name="error_adding_treatment_title">관리 데이터가 불완전합니다</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index dcf41407e5..60086670bb 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -651,7 +651,6 @@
     <string name="resistance_lowers_target_summary">Kai nustatoma rezistencija, tikslinė gliukozės vertė sumažinama</string>
     <string name="sensitivity_raises_target_title">Jautrumas didina tikslą</string>
     <string name="sensitivity_raises_target_summary">Kai aptinkamas padidėjęs jautrumas insulinui, tikslinis gliukozės lygis padidinamas</string>
-    <string name="careportal_removestartedevents">Ištrinti \"AndroidAPS paleista\" įrašus</string>
     <string name="storedsettingsfound">Rasti išsaugoti nustatymai</string>
     <string name="allow_hardware_pump_text">Dėmesio: jei aktyvuosite ir prijungsite prie aparatinės pompos, AndroidAPS nukopijuos bazės nustatymus iš profilio į pompą, pakeisdamas esančius nustatymus pompoje. Įsitikinkite, kad turimi bazės nustatymai AndroidAPS yra teisingi. Jei nesate tikri arba nenorite iš naujo keisti bazės nustatymų jūsų pompoje, paspauskite atšaukti ir pakartokite prijungimą prie pompos kitą kartą.</string>
     <string name="error_adding_treatment_title">Terapijos duomenys nepilni</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index d9a282aaf0..d87c17473e 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -665,7 +665,6 @@
     <string name="resistance_lowers_target_summary">Wanneer insulineresistentie wordt gedetecteerd, wordt het BG streefdoel verlaagd</string>
     <string name="sensitivity_raises_target_title">Gevoeligheid verhoogt het doel</string>
     <string name="sensitivity_raises_target_summary">Wanneer insulinegevoeligheid wordt gedetecteerd, wordt het BG streefdoel verhoogd</string>
-    <string name="careportal_removestartedevents">Verwijder AndroidAPS start-meldingen</string>
     <string name="show_invalidated">Toon ongeldig</string>
     <string name="hide_invalidated">Verberg ongeldig</string>
     <string name="remove_items">Items verwijderen</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index d96b9c7cc6..9641693ebc 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -665,7 +665,6 @@
     <string name="resistance_lowers_target_summary">Hvis resistens oppdages vil det redusere BS målverdi</string>
     <string name="sensitivity_raises_target_title">Sensitivitet øker BS målverdi</string>
     <string name="sensitivity_raises_target_summary">Når systemet oppdager økt insulinsensitivitet, vil BS målverdi økes</string>
-    <string name="careportal_removestartedevents">Basis AndroidAPS startet</string>
     <string name="show_invalidated">Vis ugyldige oppføringer</string>
     <string name="hide_invalidated">Skjul ugyldige oppføringer</string>
     <string name="remove_items">Fjern oppføringer</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index f91047c74f..3b71aea876 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -652,7 +652,6 @@
     <string name="resistance_lowers_target_summary">Po wykryciu oporności obniża się docelowy poziom cukru</string>
     <string name="sensitivity_raises_target_title">Wrażliwość podnosi docelowy poziom glukozy</string>
     <string name="sensitivity_raises_target_summary">Po zwiększeniu wrażliwości zwiększ docelowy poziom glukozy</string>
-    <string name="careportal_removestartedevents">Wyczyść zdarzenia \"Start AndroidAPS\"</string>
     <string name="storedsettingsfound">Znaleziono zapisane ustawienia</string>
     <string name="allow_hardware_pump_text">Uwaga: Jeśli aktywujesz połączenie z pompą inną niż wirtualna, AndroidAPS skopiuje ustawienia bazy do profilu pompy, zastępując istniejące ustawienia w niej zapisane. Upewnij się, że ustawienia bazy w AndroidAPS są poprawne. Jeśli nie jesteś pewien lub nie chcesz nadpisywać podstawowych ustawień pompy, naciśnij przycisk anuluj i połącz ponownie w innym czasie.</string>
     <string name="error_adding_treatment_title">Niekompletne dane leczenie</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 27bfd34a25..52d2a80004 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -616,7 +616,6 @@
     <string name="resistance_lowers_target_summary">Quando a resistência for detectada, diminui o alvo de glicose</string>
     <string name="sensitivity_raises_target_title">Sensibilidade aumenta o alvo</string>
     <string name="sensitivity_raises_target_summary">Quando a sensibilidade é detectada, aumenta o alvo glicose</string>
-    <string name="careportal_removestartedevents">Limpar AndroidAPS iniciado</string>
     <string name="sort_items">Ordenar itens</string>
     <string name="storedsettingsfound">Configurações encontradas</string>
     <string name="allow_hardware_pump_text">Atenção: Se conectar à sua bomba física e ativar o perfil, o AndroidAPS irá copiar as definições desse perfil para as definições da bomba, apagando o memorizado na bomba. Por favor verifique que o que preencheu no perfil do app tem os mesmos valores que estão na bomba. Em caso contrário pressione imediatamente cancelar e corrija antes de voltar a ligar à bomba.</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index b435fbeb69..74e3f6421f 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -651,7 +651,6 @@
     <string name="resistance_lowers_target_summary">Quando a resistência for detectada, diminui o alvo de glicose</string>
     <string name="sensitivity_raises_target_title">Sensibilidade aumenta o alvo</string>
     <string name="sensitivity_raises_target_summary">Quando a sensibilidade é detectada, aumenta o alvo glicose</string>
-    <string name="careportal_removestartedevents">Limpar AndroidAPS iniciado</string>
     <string name="storedsettingsfound">Definições armazenadas encontradas</string>
     <string name="allow_hardware_pump_text">Atenção: Se conectar à sua bomba física e activar o perfil, a AndroidAPS irá copiar as definições desse perfil para as definições da bomba, apagando o perfil memorizado na bomba. Por favor verifique se o que preencheu no perfil da app tem os mesmos valores que estão na bomba. Caso contrário pressione imediatamente cancelar e corrija antes de voltar a ligar à bomba.</string>
     <string name="error_adding_treatment_title">Dados tratamento incompletos</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 44c5283a22..764d305a65 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -651,7 +651,6 @@
     <string name="resistance_lowers_target_summary">Când e detectata rezistență la insulină, coboară targetul</string>
     <string name="sensitivity_raises_target_title">Sensibilitatea la insulină crește targetul</string>
     <string name="sensitivity_raises_target_summary">Când este detectată sensibilitate la insulină, crește targetul</string>
-    <string name="careportal_removestartedevents">AndroidAPS pornit curat</string>
     <string name="storedsettingsfound">Au fost găsite setări stocate</string>
     <string name="allow_hardware_pump_text">Atenție: Dacă activați și conectați o pompă fizică, AndroidAPS va copia setările bazalelor din profilurile din aplicație în pompă, suprascriindu-le pe cele existente deja în pompă. Asigurați-vă că aveți setările corecte ale bazalelor în AndroidAPS. Dacă aveți dubii sau nu doriți suprascrierea setărilor bazalelor existente în pompă, apăsați butonul de anulare și repetați acțiunea mai târziu.</string>
     <string name="error_adding_treatment_title">Date incomplete despre tratament</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index b8fd6d5a81..0bf687cd4a 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -665,7 +665,7 @@
     <string name="resistance_lowers_target_summary">При обнаружении сопротивляемости целевой уровень гликемии понижается</string>
     <string name="sensitivity_raises_target_title">Чувствительность поднимает цель</string>
     <string name="sensitivity_raises_target_summary">При обнаружении чувствительности целевой уровень глюкозы повышается</string>
-    <string name="careportal_removestartedevents">AndroidAPS перезапущен</string>
+    <string name="careportal_removestartedevents">Удалить начатые записи AAPS</string>
     <string name="show_invalidated">Показать недействительные</string>
     <string name="hide_invalidated">Скрыть недействительные</string>
     <string name="remove_items">Удалить элементы</string>
@@ -1044,4 +1044,5 @@
     <string name="blocked_by_connectivity">Заблокировано настройками подключения</string>
     <string name="no_watch_connected">(Часы не подключены)</string>
     <string name="error_asking_for_permissions">Ошибка при запросе разрешения</string>
+    <string name="dynisf_adjust_sensitivity">Настроить чувствительность относительно ГК</string>
 </resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 5173d5ea18..6fd9a964c7 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -665,7 +665,7 @@
     <string name="resistance_lowers_target_summary">Ak je zistená rezistancia, znížiť cieľovú hladinu glykémie</string>
     <string name="sensitivity_raises_target_title">Citlivosť zvyšuje cieľ</string>
     <string name="sensitivity_raises_target_summary">Ak je zistená vyššia citlivosť, zvýši cieľovú hladinu glykémie</string>
-    <string name="careportal_removestartedevents">Vymazať udalosti \"AndroidAPS reštartovaný\"</string>
+    <string name="careportal_removestartedevents">Odstrániť všetky záznamy AAPS spustený</string>
     <string name="show_invalidated">Zobraziť neplatné</string>
     <string name="hide_invalidated">Skryť zneplatnené</string>
     <string name="remove_items">Odstrániť položky</string>
@@ -1044,4 +1044,6 @@
     <string name="blocked_by_charging">Zablokované možnosti nabíjania</string>
     <string name="blocked_by_connectivity">Zablokované možnosti pripojenia</string>
     <string name="no_watch_connected">(Žiadne hodinky nie sú pripojené)</string>
+    <string name="error_asking_for_permissions">Chyba pri žiadosti o oprávnenie</string>
+    <string name="dynisf_adjust_sensitivity">Upraviť citlivosť a glykémiu</string>
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 3a6718d5c3..8a91b5eee2 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -656,7 +656,6 @@ Eversense-appen.</string>
     <string name="resistance_lowers_target_summary">Om systemet upptäcker tillfällig insulinresistens, sänk mål-BG för att på så sätt tillåta mer insulin</string>
     <string name="sensitivity_raises_target_title">Insulinkänslighet höjer mål-BG</string>
     <string name="sensitivity_raises_target_summary">Om systemet upptäcker tillfällig insulinkänslighet, höj mål-BG för att på så sätt minska insulindoseringen</string>
-    <string name="careportal_removestartedevents">Rensa alla \"AndroidAPS startad\"</string>
     <string name="storedsettingsfound">Tidigare sparade inställningar hittade</string>
     <string name="allow_hardware_pump_text">Varning: Om du aktiverar och ansluter en pump, kommer AndroidAPS skriva över pumpens basalprofil med den aktiva profilen i AndroidAPS. Se till att ha rätt inställningar i appen innan du ansluter. Om du är osäker, tryck på Avbryt och anslut pumpen på nytt vid ett senare tillfälle.</string>
     <string name="error_adding_treatment_title">Behandlingsdata ofullständigt</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index b8dc1dfd69..a75a61225e 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -666,7 +666,7 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="resistance_lowers_target_summary">Direnç tespit edildiğinde KŞ hedefini düşürün</string>
     <string name="sensitivity_raises_target_title">Duyarlılık hedefi yükseltir</string>
     <string name="sensitivity_raises_target_summary">Hassasiyet tespit edildiğinde, KŞ hedefini yükseltin</string>
-    <string name="careportal_removestartedevents">Temiz AndroidAPS başladı</string>
+    <string name="careportal_removestartedevents">AAPS tarafından başlatılmış girdileri kaldırın</string>
     <string name="show_invalidated">Geçersiz olanları göster</string>
     <string name="hide_invalidated">Geçersiz olanları gizle</string>
     <string name="remove_items">Öğeleri kaldır</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 47018ea425..ef92a77915 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -657,7 +657,6 @@
     <string name="resistance_lowers_target_summary">当检测到胰岛素抵抗时，降低血糖的目标值。</string>
     <string name="sensitivity_raises_target_title">敏感时提高目标</string>
     <string name="sensitivity_raises_target_summary">当检测到胰岛素敏感时，提高血糖的目标值。</string>
-    <string name="careportal_removestartedevents">Clean AndroidAPS 启动了</string>
     <string name="show_invalidated">显示无效项</string>
     <string name="hide_invalidated">隐藏失效项</string>
     <string name="remove_items">删除项目</string>
diff --git a/automation/src/main/res/values-ga-rIE/strings.xml b/automation/src/main/res/values-ga-rIE/strings.xml
index 464cd30486..3ea04e700d 100644
--- a/automation/src/main/res/values-ga-rIE/strings.xml
+++ b/automation/src/main/res/values-ga-rIE/strings.xml
@@ -1,18 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="alarm_message">Aláram: %1$s</string>
-    <string name="suspendloopforXmin">Fionraí lúb do %1$d nóim</string>
-    <string name="iobcompared">IOB %1$s %2$.1f</string>
-    <string name="and">Agus</string>
-    <string name="or">Nó</string>
-    <string name="delta">Deilte</string>
-    <string name="locationis">%1$s %2$s</string>
-    <string name="add_short">CUIR</string>
-    <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
-    <string name="deltacompared">%3$s %1$s %2$s</string>
-    <string name="glucose_u">Glúcóis [%1$s]:</string>
-    <string name="cobcompared">COB %1$s %2$.0f</string>
-    <string name="iob_u">IOB [U]:</string>
-    <string name="never">Riamh</string>
-    <string name="action">Gníomh:</string>
-</resources>
+<resources></resources>
diff --git a/combo/src/main/res/values-ga-rIE/strings.xml b/combo/src/main/res/values-ga-rIE/strings.xml
index 51f3d46c65..3ea04e700d 100644
--- a/combo/src/main/res/values-ga-rIE/strings.xml
+++ b/combo/src/main/res/values-ga-rIE/strings.xml
@@ -1,30 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="combo_programming_bolus">Cláir Caidéil bólas</string>
-    <string name="combo_pump_state_label">Stáit</string>
-    <string name="combo_pump_activity_label">Gníomhaíocht</string>
-    <string name="combo_no_pump_connection">Níl nasc le haghaidh %1$d nóim</string>
-    <string name="combo_tbr_remaining">%1$d%% (%2$d nóim fágtha)</string>
-    <string name="combo_pump_state_initializing">Tosaithe</string>
-    <string name="combo_pump_state_suspended_due_to_error">Ar fionraí ag earráid</string>
-    <string name="combo_pump_state_suspended_by_user">Ar fionraí ag úsáideoir</string>
-    <string name="combo_pump_state_running">Ag reáchtáil</string>
-    <string name="combo_pump_action_cancelling_tbr">Cealú BRS</string>
-    <string name="combo_pump_action_setting_tbr">Socrú BRS (%1$d%% / %2$d nóim)</string>
-    <string name="combo_pump_action_bolusing">Ag bólas (%1$.1f A)</string>
-    <string name="combo_pump_action_refreshing">Athnuaigh</string>
-    <string name="combo_pump_connected_now">Anois</string>
-    <string name="combo_activity_reading_pump_history">Léigh stair caidéil</string>
-    <string name="combo_activity_setting_basal_profile">Socrú próifíl bunaidh</string>
-    <string name="combo_pump_cartridge_low_warrning">Is leibhéal cartús íseal</string>
-    <string name="combo_pump_battery_low_warrning">Is ceallraí Caidéil íseal</string>
-    <string name="combo_reservoir_low">Íseal</string>
-    <string name="combo_reservoir_empty">Folamh</string>
-    <string name="combo_reservoir_normal">Gnáth</string>
-    <string name="combo_notification_check_time_date">Is nuashonrú gá clog Caidéil</string>
-    <string name="combo_actvity_reading_basal_profile">Léigh próifíl bunaidh</string>
-    <string name="combo_activity_checking_pump_state">Athnuaigh caidéil stáit</string>
-    <string name="combo_activity_checking_for_history_changes">Ag féachaint d\'athruithe stair</string>
-    <string name="bolusstopped">Bólas stopadh</string>
-    <string name="bolusstopping">Ag stopadh bólas</string>
-</resources>
+<resources></resources>
diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
index e6b584986c..12f2e3e579 100644
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d мин</string>
     <string name="pumpbusy">Помпата е заета</string>
     <string name="connectionerror">Грешка при връзка с помпата</string>
-    <string name="youareonallowedlimit">Достигнахте лимита</string>
     <string name="objectives">Цели</string>
     <string name="close">Затвори</string>
     <string name="please_wait">Моля изчакайте...</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">Натиснат е СТОП!</string>
     <string name="stop">Стоп</string>
     <string name="carbs">въглехидрати</string>
-    <string name="invalidprofile">Грешен профил !!!</string>
     <string name="noprofileset">НЕ Е АКТИВИРАН ПРОФИЛ</string>
     <string name="active"><![CDATA[<Активно>]]></string>
     <string name="date">Дата</string>
@@ -132,7 +130,6 @@
     <string name="passwords_dont_match">Паролите не съвпадат</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Базалните стойности не са за кръгли часове: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Базалната стойност е заместена от минимално поддържаната стойност %1$s</string>
     <string name="maximumbasalvaluereplaced">Базалната стойност е заместена от максимално поддържаната стойност %1$s</string>
     <string name="profile_per_unit">/Е</string>
     <string name="profile_ins_units_per_hour">Е/ч</string>
@@ -210,7 +207,6 @@
     <string name="waitingforpumpresult">Изчаква резултат от помпата</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$dгр допълнителни въглехидрати ще са необходими до %2$d минути</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Статистика</string>
     <string name="cumulative_tdd">Комулативна TDD</string>
@@ -222,7 +218,6 @@
     <string name="amount_days"># дни</string>
     <string name="weight">Тегло</string>
     <string name="warning_Message">Възможна неточност, ако сте използвали болус за презареждане!</string>
-    <string name="olddata_Message">Стари данни - натиснете \"ПРЕЗАРЕДИ\"</string>
     <string name="tbb">Общо базален инсулин</string>
     <string name="tbb2">ОБИ * 2</string>
     <!--    Ntp-->
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index 81d72c8309..5a8348357b 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -31,7 +31,7 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Pumpa je zaneprázdněna</string>
     <string name="connectionerror">Chyba připojování pumpy</string>
-    <string name="youareonallowedlimit">Dosaženo limitu</string>
+    <string name="youareonallowedlimit">Byl dosažen povolený limit</string>
     <string name="objectives">Cíle</string>
     <string name="close">Zavřít</string>
     <string name="please_wait">Počkejte prosím…</string>
@@ -40,7 +40,7 @@
     <string name="stoppressed">STISKNUTO STOP</string>
     <string name="stop">Stop</string>
     <string name="carbs">Sacharidy</string>
-    <string name="invalidprofile">Chybný profil !!!</string>
+    <string name="invalidprofile">Neplatný profil!</string>
     <string name="noprofileset">ŽÁDNÝ PROFIL NENASTAVEN</string>
     <string name="active"><![CDATA[<Aktivní>]]></string>
     <string name="date">Datum</string>
@@ -140,7 +140,7 @@
     <string name="pin_dont_match">PIN kódy se neshodují</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Hodnoty bazálů nejsou zarovnané na celé hodiny: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Hodnota bazálu nahrazena minimální možnou: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Hodnota bazálu byla nahrazena minimální možnou: %1$s</string>
     <string name="maximumbasalvaluereplaced">Hodnota bazálu nahrazena maximální možnou: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -233,7 +233,7 @@
     <string name="amount_days">Dní</string>
     <string name="weight">Váha</string>
     <string name="warning_Message">Pravděpodobně nepřesné při používání bolusů k doplňování</string>
-    <string name="olddata_Message">Zastaralá data. Prosím načtěte je znovu</string>
+    <string name="olddata_Message">Zastaralá data. Klepněte na tlačítko „OBNOVIT“.</string>
     <string name="tbb">Celk. denní bazál</string>
     <string name="tbb2">CZB * 2</string>
     <!--    Ntp-->
@@ -397,7 +397,7 @@
     <string name="valueoutofrange">»%1$s« je mimo pevně nastavené limity</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f je mimo pevně nastavené limity</string>
     <string name="basal_value">Hodnota bazálu</string>
-    <string name="nsclient_version_does_not_match">Verze NSClient se neshoduje s AndroidAPS. Aktualizujte prosím.</string>
+    <string name="nsclient_version_does_not_match">Verze NSClientu se neshoduje s verzí AndroidAPS. Aktualizujte prosím.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f U</string>
     <string name="carbs_g">SACHARIDY %1$d g</string>
diff --git a/core/src/main/res/values-da-rDK/strings.xml b/core/src/main/res/values-da-rDK/strings.xml
index 2b88c0a550..1578d41134 100644
--- a/core/src/main/res/values-da-rDK/strings.xml
+++ b/core/src/main/res/values-da-rDK/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Pumpe er optaget</string>
     <string name="connectionerror">Forbindelsesfejl til pumpe</string>
-    <string name="youareonallowedlimit">Du har nået den tilladte grænse</string>
     <string name="objectives">Mål</string>
     <string name="close">Luk</string>
     <string name="please_wait">Vent venligst…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">STOP TRYKKET</string>
     <string name="stop">Stop</string>
     <string name="carbs">Kulhydrater</string>
-    <string name="invalidprofile">Ugyldig profil !!!</string>
     <string name="noprofileset">INGEN PROFIL SAT</string>
     <string name="active"><![CDATA[<Active>]]></string>
     <string name="date">Dato</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">Varighed af insulin aktivitet</string>
     <string name="ic_long_label">Insulin til kulhydrat forhold</string>
     <string name="isf_long_label">Insulinfølsomhedsfaktor</string>
-    <string name="basal_long_label">Basal rate</string>
     <string name="target_long_label">Blodsukker mål</string>
     <string name="initializing">Initialiserer ...</string>
     <string name="serialnumber">Serienummer</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">PIN-koder ikke identiske</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Basalværdier ikke angivet i hele timer: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Basal dosis erstattet af minimal understøttet dosis: %1$s</string>
     <string name="maximumbasalvaluereplaced">Basal dosis erstattet af maximal understøttet dosis: %1$s</string>
     <string name="profile_per_unit">/IE</string>
     <string name="profile_ins_units_per_hour">E/t</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">Venter på resultat</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g ekstra kulhydrater krævet inden for %2$d minutter</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistik</string>
     <string name="cumulative_tdd">Akkumuleret TDD</string>
@@ -233,7 +228,6 @@
     <string name="amount_days"># Dage</string>
     <string name="weight">Vægt</string>
     <string name="warning_Message">Muligvis unøjagtig, hvis du bruger bolusser til priming/fyldning!</string>
-    <string name="olddata_Message">Gammel data. Tryk venligst På \"GENINDLÆS\"</string>
     <string name="tbb">Basis Basal I Alt</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <string name="valueoutofrange">»%1$s« er uden for absolutte grænser</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f er uden for absolutte grænser</string>
     <string name="basal_value">Basalværdi</string>
-    <string name="nsclient_version_does_not_match">NSClient version matcher ikke AndroidAPS. Opdater venligst.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f IE</string>
     <string name="carbs_g">KH %1$d g</string>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index 6932c25155..90b2a2d451 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min.</string>
     <string name="pumpbusy">Pumpe ist beschäftigt</string>
     <string name="connectionerror">Pumpen-Verbindungsfehler</string>
-    <string name="youareonallowedlimit">Limit erreicht</string>
     <string name="objectives">Objectives (Ziele)</string>
     <string name="close">Schließen</string>
     <string name="please_wait">Bitte warten…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">STOPP GEDRÜCKT</string>
     <string name="stop">Stopp</string>
     <string name="carbs">Kohlenhydrate</string>
-    <string name="invalidprofile">Ungültiges oder defektes Profil!</string>
     <string name="noprofileset">KEIN PROFIL GESETZT</string>
     <string name="active"><![CDATA[<Aktiv>]]></string>
     <string name="date">Datum</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">Insulinwirkdauer (duration of insulin action)</string>
     <string name="ic_long_label">Insulin-zu-KH-Faktor</string>
     <string name="isf_long_label">ISF: Insulin Sensitivitäts-Faktor (\"Korrektur-Faktor\")</string>
-    <string name="basal_long_label">Basalrate</string>
     <string name="target_long_label">BZ Ziel</string>
     <string name="initializing">Initialisierung...</string>
     <string name="serialnumber">Seriennummer</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">PINs stimmen nicht überein</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Basalraten beginnen nicht zur vollen Stunde: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Basal-Wert wurde durch den kleinst möglichen Wert ersetzt: %1$s</string>
     <string name="maximumbasalvaluereplaced">Basal-Wert wurde durch größt möglichen Wert ersetzt: %1$s</string>
     <string name="profile_per_unit">/IE</string>
     <string name="profile_ins_units_per_hour">IE/h</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">Auf Pumpenergebnis warten</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g zusätzliche Kohlenhydrate innerhalb von %2$d Minuten erforderlich</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistik</string>
     <string name="cumulative_tdd">Kumulative TDD</string>
@@ -233,7 +228,6 @@
     <string name="amount_days"># Tage</string>
     <string name="weight">Gewichtung</string>
     <string name="warning_Message">Möglicherweise ungenau, wenn zum Befüllen ein Bolus verwendet wurde!</string>
-    <string name="olddata_Message">Veraltete Daten, bitte klicke auf \"NEU LADEN\"</string>
     <string name="tbb">Tägl. Basalmenge</string>
     <string name="tbb2">Tägl. Basalmenge * 2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <string name="valueoutofrange">»%1$s« ist außerhalb der fest programmierten Grenzen</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f ist außerhalb der fest programmierten Grenzen</string>
     <string name="basal_value">Basal-Wert</string>
-    <string name="nsclient_version_does_not_match">Die Versionen von NSClient und AndroidAPS passen nicht zueinander. Führe bitte ein Update durch.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f IE</string>
     <string name="carbs_g">KH %1$d g</string>
diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml
index 502b29f99b..6e004b1947 100644
--- a/core/src/main/res/values-es-rES/strings.xml
+++ b/core/src/main/res/values-es-rES/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Bomba ocupada</string>
     <string name="connectionerror">Error de conexión de la bomba</string>
-    <string name="youareonallowedlimit">Límite permitido alcanzado</string>
     <string name="objectives">Objetivos</string>
     <string name="close">Cerrar</string>
     <string name="please_wait">Por favor, espere…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">STOP pulsado</string>
     <string name="stop">Detener</string>
     <string name="carbs">Carbohidratos [g]</string>
-    <string name="invalidprofile">Perfil inválido !!!</string>
     <string name="noprofileset">NINGÚN PERFIL ACTIVO</string>
     <string name="active"><![CDATA[<Activo>]]></string>
     <string name="date">Fecha</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">Duración de la insulina activa</string>
     <string name="ic_long_label">Ratio de insulina/carbohidratos</string>
     <string name="isf_long_label">Factor de sensibilidad a la insulina</string>
-    <string name="basal_long_label">Tasa Basal</string>
     <string name="target_long_label">Objetivo de glucosa en sangre</string>
     <string name="initializing">Iniciando...</string>
     <string name="serialnumber">Número de serie</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">Los códigos PIN no coinciden</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Valores basales no alineados a las horas: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Valor basal reemplazado por el valor mínimo soportado: %1$s</string>
     <string name="maximumbasalvaluereplaced">Valor basal reemplazado por el valor máximo soportado: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">Esperando resultado</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$dg Carbohidratos adicionales necesarios dentro de %2$d minutos</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Estadísticas</string>
     <string name="cumulative_tdd">TDD acumulada</string>
@@ -233,7 +228,6 @@
     <string name="amount_days"># Días</string>
     <string name="weight">Peso</string>
     <string name="warning_Message">Probablemente impreciso si se usan bolos para llenar/rellenar!</string>
-    <string name="olddata_Message">Datos caducados por favor pulsa RELOAD</string>
     <string name="tbb">Basal total</string>
     <string name="tbb2">Basal diaria *2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <string name="valueoutofrange">»%1$s« está fuera del límite estricto</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f está fuera de los límites estrictos</string>
     <string name="basal_value">Valor basal</string>
-    <string name="nsclient_version_does_not_match">La versión de NSClient no coincide con AndroidAPS. Actualízala.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLO %1$.2f U</string>
     <string name="carbs_g">CARBOHIDRATOS %1$d g</string>
diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
index 9d13c4bb50..ac6f8ca25a 100644
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -20,7 +20,7 @@
     <string name="disconnected">Déconnectée</string>
     <string name="disconnecting">Déconnexion en cours</string>
     <string name="waiting_for_disconnection">Attente de déconnexion</string>
-    <string name="androidaps_start">AndroidAPS est lancé</string>
+    <string name="androidaps_start">Démarrage AndroidAPS</string>
     <string name="formatinsulinunits1">%1$.1f U</string>
     <string name="formatinsulinunits">%1$.2f U</string>
     <string name="formatsignedinsulinunits">%1$+.2f U</string>
@@ -31,7 +31,7 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Pompe occupée</string>
     <string name="connectionerror">Erreur connection pompe</string>
-    <string name="youareonallowedlimit">Vous avez atteint la limite maximale</string>
+    <string name="youareonallowedlimit">Limite autorisée atteinte</string>
     <string name="objectives">Objectifs</string>
     <string name="close">Fermer</string>
     <string name="please_wait">Merci de patienter...</string>
@@ -40,7 +40,7 @@
     <string name="stoppressed">ARRÊT APPUYÉ</string>
     <string name="stop">Arrêt</string>
     <string name="carbs">Glucides</string>
-    <string name="invalidprofile">Profil incorrect !!!</string>
+    <string name="invalidprofile">Profil incorrect!</string>
     <string name="noprofileset">PAS DE PROFIL SELECTIONNÉ</string>
     <string name="active"><![CDATA[<Actif>]]></string>
     <string name="date"> Date</string>
diff --git a/core/src/main/res/values-ga-rIE/strings.xml b/core/src/main/res/values-ga-rIE/strings.xml
index 0ab0b703fd..6f676893c7 100644
--- a/core/src/main/res/values-ga-rIE/strings.xml
+++ b/core/src/main/res/values-ga-rIE/strings.xml
@@ -2,112 +2,22 @@
 <resources>
     <!--    Keys-->
     <!--    General-->
-    <string name="error">Earráid</string>
-    <string name="save">Sábháil</string>
-    <string name="waitingforpump">Ag fanacht do caidéil</string>
-    <string name="connectingfor">Ag nascadh le %1$d s</string>
-    <string name="bolusdelivering">Ag seachadadh %1$.2f A</string>
-    <string name="connecting">Ag nascadh</string>
-    <string name="connected">Nasctha</string>
-    <string name="disconnected">Dínasctha</string>
-    <string name="disconnecting">Dícheangal</string>
-    <string name="androidaps_start">AndroidAPS thosaigh</string>
-    <string name="formatinsulinunits1">%1$.1f A</string>
-    <string name="formatinsulinunits">%1$.2f A</string>
-    <string name="formatsignedinsulinunits">%1$+.2f A</string>
-    <string name="format_carbs">%1$d g</string>
-    <string name="reservoirvalue">%1$.0f / %2$d A</string>
-    <string name="pump_basebasalrate">%1$.2f A/u</string>
-    <string name="format_hours">%1$.2f u</string>
-    <string name="format_mins">%1$d nóim</string>
-    <string name="close">Dún</string>
-    <string name="mute">Balbh</string>
-    <string name="reload">Athlódáil</string>
-    <string name="stop">Stad</string>
-    <string name="carbs">Carbí</string>
-    <string name="invalidprofile">Próifíl neamhbhailí !!!</string>
-    <string name="date">Dáta</string>
-    <string name="units_label">Aonaid</string>
-    <string name="dia_label">DIA</string>
-    <string name="ic_label">IC</string>
-    <string name="isf_label">ISF</string>
-    <string name="basal_label">Bunaidh</string>
-    <string name="target_label">Cuspóir</string>
-    <string name="initializing">Tosaithe ...</string>
-    <string name="serialnumber">Sraithuimhir</string>
-    <string name="battery_label">Ceallraí</string>
-    <string name="lastconnection_label">Nasc deiridh</string>
-    <string name="lastbolus_label">Bólas deiridh</string>
-    <string name="dailyunits">Aonaid lá</string>
-    <string name="basebasalrate_label">Bunaidh ráta bonn</string>
-    <string name="reservoir_label">Taiscumar</string>
-    <string name="pumphistory">Stair caidéil</string>
-    <string name="mgdl">mg/dL</string>
-    <string name="mmol">mmol/l</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="yes">Tá</string>
-    <string name="no">Níl</string>
-    <string name="loopdisabled">LÚB DÍCHUMASAITHE LE SRIANTA</string>
-    <string name="disableloop">Díchumasaigh lúb</string>
-    <string name="enableloop">Cumasaigh lúb</string>
-    <string name="resumeloop">Lúb Atosú</string>
-    <string name="suspendloop">Fionraí lúb</string>
-    <string name="glucose">Glúcóis</string>
-    <string name="name_short">Ainm:</string>
-    <string name="time">Am</string>
-    <string name="ns_wifi_ssids">WiFi SSID</string>
-    <string name="addnew">Cuir nua</string>
     <!--    Constraints-->
     <!--    Dialogs-->
-    <string name="confirmation">Deimhniú</string>
-    <string name="message">Teachtaireacht</string>
-    <string name="ok">Ceart go leor</string>
-    <string name="cancel">Cuir ar ceal</string>
     <!--    BlePreCheck-->
     <!--    Protection-->
     <!--    Profile-->
-    <string name="profile_per_unit">/A</string>
-    <string name="profile_ins_units_per_hour">A/u</string>
-    <string name="profile_carbs_per_unit">g/A</string>
     <!--    ProfileFunction-->
     <!--    PumpType-->
     <!--    APSResult-->
-    <string name="canceltemp">Cealú BRS</string>
-    <string name="rate">Ráta</string>
-    <string name="duration">Fad</string>
-    <string name="reason">Cúis</string>
     <!--    ProfileSwitch-->
-    <string name="zerovalueinprofile">Próifíl neamhbhailí: %1$s</string>
     <!--    Temptarget-->
-    <string name="mins">%1$d nóim</string>
     <!--    Translator-->
-    <string name="careportal_announcement">Fógra</string>
-    <string name="careportal_note">Nóta</string>
-    <string name="careportal_question">Ceist</string>
-    <string name="careportal_exercise">Cleachtadh</string>
-    <string name="careportal_insulincartridgechange">Athrú Cartús Inslin</string>
-    <string name="glucosetype_finger">Méar</string>
-    <string name="glucosetype_sensor">Braiteoir</string>
-    <string name="activity">Gníomhaíocht</string>
     <!--    Command-->
     <!--    PumpEnactResult-->
-    <string name="comment">Tuairim</string>
-    <string name="success">Rathúlacht</string>
-    <string name="percent">Faoin gcéad</string>
-    <string name="absolute">Iomlán</string>
-    <string name="configbuilder_insulin">Inslin</string>
-    <string name="insulin_unit_shortname">A</string>
-    <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
-    <string name="basalrate">Bunaidh</string>
-    <string name="bolus">Bólas</string>
-    <string name="tdd">TDD</string>
-    <string name="ratio">Cóimheas</string>
-    <string name="amount_days"># Lá</string>
-    <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
-    <string name="format_hour_minute">%1$du %2$dn</string>
     <!-- Maintenance -->
     <!-- VersionChecker -->
     <!-- Permissions -->
@@ -115,6 +25,5 @@
     <!-- User Entry -->
     <!-- HardLimits -->
     <!-- Command Queue + readStatus reasons -->
-    <string name="basal">Bunaidh</string>
     <!-- Autotune -->
 </resources>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index 752b4f9264..a7f4e0fd5e 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Il micro è occupato</string>
     <string name="connectionerror">Errore connessione micro</string>
-    <string name="youareonallowedlimit">Hai raggiunto il limite consentito</string>
     <string name="objectives">Obiettivi</string>
     <string name="close">Chiudi</string>
     <string name="please_wait">Attendi…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">STOP PREMUTO</string>
     <string name="stop">Stop</string>
     <string name="carbs">CHO</string>
-    <string name="invalidprofile">Profilo non valido !!!</string>
     <string name="noprofileset">NESSUN PROFILO IMPOSTATO</string>
     <string name="active"><![CDATA[<Active>]]></string>
     <string name="date">Data</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">Durata dell’azione dell’insulina</string>
     <string name="ic_long_label">Rapporto Insulina-Carboidrati (I:C)</string>
     <string name="isf_long_label">Fattore di sensibilità insulinica (ISF)</string>
-    <string name="basal_long_label">Velocità basale</string>
     <string name="target_long_label">Target glicemia</string>
     <string name="initializing">Inizializzazione...</string>
     <string name="serialnumber">Numero seriale</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">I PIN non coincidono</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Valori basali non allineati alle ore: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Valore basale sostituito dal minimo valore supportato: %1$s</string>
     <string name="maximumbasalvaluereplaced">Valore basale sostituito dal massimo valore supportato: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">In attesa del risultato</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g di CHO aggiuntivi richiesti entro %2$d minuti</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistiche</string>
     <string name="cumulative_tdd">TDD cumulativo</string>
@@ -233,7 +228,6 @@
     <string name="amount_days"># Giorni</string>
     <string name="weight">Peso</string>
     <string name="warning_Message">Probabilmente inaccurato se per il caricamento/riempimento si usano i boli al posto dell\'apposita funzione!</string>
-    <string name="olddata_Message">Dati vecchi, premi \"RICARICA\"</string>
     <string name="tbb">Basale originale totale</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <string name="valueoutofrange">»%1$s« è fuori dai limiti consentiti</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f è fuori dai limiti consentiti</string>
     <string name="basal_value">Valore basale</string>
-    <string name="nsclient_version_does_not_match">La versione di NSClient non corrisponde ad AndroidAPS. Aggiorna.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLO %1$.2f U</string>
     <string name="carbs_g">CHO %1$d g</string>
diff --git a/core/src/main/res/values-iw-rIL/strings.xml b/core/src/main/res/values-iw-rIL/strings.xml
index c837a798e3..c8d3f5d271 100644
--- a/core/src/main/res/values-iw-rIL/strings.xml
+++ b/core/src/main/res/values-iw-rIL/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d דק\'</string>
     <string name="pumpbusy">המשאבה אינה פנויה</string>
     <string name="connectionerror">שגיאה בחיבור המשאבה</string>
-    <string name="youareonallowedlimit">הגעתם למגבלה המותרת</string>
     <string name="objectives">משימות</string>
     <string name="close">סגור</string>
     <string name="please_wait">נא להמתין…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">עצור נלחץ!</string>
     <string name="stop">עצור</string>
     <string name="carbs">פחמימות</string>
-    <string name="invalidprofile">פרופיל לא חוקי !!!</string>
     <string name="noprofileset">לא הוגדר פרופיל</string>
     <string name="active"><![CDATA[<פועל>]]></string>
     <string name="date">תאריך</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">משך פעילות האינסולין</string>
     <string name="ic_long_label">יחס אינסולין-פחמימות </string>
     <string name="isf_long_label">יחס התיקון (ISF)</string>
-    <string name="basal_long_label">מינון בזאלי</string>
     <string name="target_long_label">ערך מטרה</string>
     <string name="initializing">מאתחל...</string>
     <string name="serialnumber">מספר סידורי</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">קודי PIN אינם תואמים</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">ערכי הבזאלי לא מותאמים לשעות: %1$s</string>
-    <string name="minimalbasalvaluereplaced">ערכי הבזאלי הוחלפו בהערכים המינימליים שנתמכים: %1$s</string>
     <string name="maximumbasalvaluereplaced">ערכי הבזאלי הוחלפו בערכים הנתמכים המינימליים: %1$s</string>
     <string name="profile_per_unit">/יח\'</string>
     <string name="profile_ins_units_per_hour">יח\'\\שעה</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">ממתין לתוצאות</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d גר\' פחמימות דרושות ב-%2$d הדקות הקרובות</string>
     <!--    TDDStatsActivity-->
     <string name="stats">סטטיסטיקה</string>
     <string name="cumulative_tdd">מינון יומי מצטבר (TDD)</string>
@@ -233,7 +228,6 @@
     <string name="amount_days"># ימים</string>
     <string name="weight">משקל</string>
     <string name="warning_Message">שימוש בבולוס למילוי \\ תיחול עשוי לגרום לחוסר דיוק!</string>
-    <string name="olddata_Message">הנתונים ישנים. לרענון לחצו \"טען מחדש\"</string>
     <string name="tbb">סה\"כ בזאלי בסיסי</string>
     <string name="tbb2">סה\"כ בזאלי בסיסי * 2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <string name="valueoutofrange">»הערך %1$s« מחוץ לתחום הקשיח</string>
     <string name="value_out_of_hard_limits">»הערך %1$s« %2$.2f מחוץ לתחום הקשיח</string>
     <string name="basal_value">ערך בזאלי</string>
-    <string name="nsclient_version_does_not_match">גרסת NSClient לא תואמת את גרסת AndroidAPS. נא לעדכן.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">בולוס %1$.2f יח\'</string>
     <string name="carbs_g">פחמימות %1$d גרם</string>
diff --git a/core/src/main/res/values-ko-rKR/strings.xml b/core/src/main/res/values-ko-rKR/strings.xml
index c04e9ec5b3..f75531ba68 100644
--- a/core/src/main/res/values-ko-rKR/strings.xml
+++ b/core/src/main/res/values-ko-rKR/strings.xml
@@ -30,7 +30,6 @@
     <string name="format_mins">%1$d 분</string>
     <string name="pumpbusy">펌프가 바쁩니다</string>
     <string name="connectionerror">펌프 연결 에러</string>
-    <string name="youareonallowedlimit">허용된 제한값에 도달하였습니다</string>
     <string name="objectives">목표</string>
     <string name="close">닫기</string>
     <string name="please_wait">잠시 기다려 주세요...</string>
@@ -39,7 +38,6 @@
     <string name="stoppressed">정지 누름</string>
     <string name="stop">정지</string>
     <string name="carbs">탄수화물</string>
-    <string name="invalidprofile">프로파일이 유효하지 않습니다!!!</string>
     <string name="noprofileset">프로파일이 설정되지 않았습니다.</string>
     <string name="active"><![CDATA[<Active>]]></string>
     <string name="date">날짜</string>
@@ -131,7 +129,6 @@
     <string name="passwords_dont_match">비밀번호가 일치하지 않습니다.</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Basal값이 시간단위로 설정되지 않았습니다: %1$s</string>
-    <string name="minimalbasalvaluereplaced">지원되는 최소값으로 Basal값이 대체되었습니다:%1$s</string>
     <string name="maximumbasalvaluereplaced">지원되는 최대값으로 Basal값이 대체되었습니다:%1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -204,7 +201,6 @@
     <string name="waitingforpumpresult">결과 기다리는 중</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%2$d 분 안에 %1$d g의 추가적인 탄수화물이 요구됨</string>
     <!--    TDDStatsActivity-->
     <string name="stats">통계</string>
     <string name="cumulative_tdd">누적 일총량</string>
@@ -216,7 +212,6 @@
     <string name="amount_days">#일</string>
     <string name="weight">가중</string>
     <string name="warning_Message">교체/채움을 위해 Bolus를 사용한 경우 부정확할 수 있습니다!!</string>
-    <string name="olddata_Message">오래된 데이터입니다. \"새로고침\"을 누르세요.</string>
     <string name="tbb">총 기본 Basal</string>
     <string name="tbb2">총기초량 * 2</string>
     <!--    Ntp-->
diff --git a/core/src/main/res/values-lt-rLT/strings.xml b/core/src/main/res/values-lt-rLT/strings.xml
index 7a1c1ae6e6..447d12baef 100644
--- a/core/src/main/res/values-lt-rLT/strings.xml
+++ b/core/src/main/res/values-lt-rLT/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min.</string>
     <string name="pumpbusy">Pompa šiuo metu veikia</string>
     <string name="connectionerror">Pompos prisijungimo klaida</string>
-    <string name="youareonallowedlimit">Pasiekėte leistiną ribą</string>
     <string name="objectives">Tikslai</string>
     <string name="close">Uždaryti</string>
     <string name="please_wait">Palaukite…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">Paspausta STOP</string>
     <string name="stop">Stop</string>
     <string name="carbs">AV</string>
-    <string name="invalidprofile">Netinkamas profilis!!!</string>
     <string name="noprofileset">Nenustatytas profilis</string>
     <string name="active"><![CDATA[<Active>]]></string>
     <string name="date">Data</string>
@@ -132,7 +130,6 @@
     <string name="passwords_dont_match">Slaptažodžiai nesutampa</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Bazės reikšmės nesuderintos su valandomis: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Valandinė bazė pakeista mažiausia palaikoma verte: %1$s</string>
     <string name="maximumbasalvaluereplaced">Valandinė bazė pakeista didžiausia palaikoma verte: %1$s</string>
     <string name="profile_per_unit">/vv</string>
     <string name="profile_ins_units_per_hour">Vv/val</string>
@@ -213,7 +210,6 @@
     <string name="waitingforpumpresult">Laukiama rezultato</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">Būtina suvartoti %1$d g papildomų AV per %2$d min</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistika</string>
     <string name="cumulative_tdd">BPD viso</string>
@@ -225,7 +221,6 @@
     <string name="amount_days"># d.</string>
     <string name="weight">Svoris</string>
     <string name="warning_Message">Duomenys netikslūs, jei bolusai naudojami kateterių užpildymui!</string>
-    <string name="olddata_Message">Duomenys seni, spauskite \"ATNAUJINTI\"</string>
     <string name="tbb">Pagrindinė bazė (PB)</string>
     <string name="tbb2">PB * 2</string>
     <!--    Ntp-->
@@ -388,7 +383,6 @@
     <string name="valueoutofrange">»%1$s« viršija griežtą limitą</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f viršija griežtą limitą</string>
     <string name="basal_value">Valandinė bazė</string>
-    <string name="nsclient_version_does_not_match">NSClient ir AndroidAPS versijos nesutampa. Atnaujinkite.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUSAS %1$.2f vv</string>
     <string name="carbs_g">AV %1$d g</string>
diff --git a/core/src/main/res/values-nl-rNL/strings.xml b/core/src/main/res/values-nl-rNL/strings.xml
index 9a314f98f1..bd825ded72 100644
--- a/core/src/main/res/values-nl-rNL/strings.xml
+++ b/core/src/main/res/values-nl-rNL/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d minuten</string>
     <string name="pumpbusy">Pomp is bezig</string>
     <string name="connectionerror">Pomp verbindingsstoring</string>
-    <string name="youareonallowedlimit">Limiet bereikt</string>
     <string name="objectives">Doelen</string>
     <string name="close">Sluiten</string>
     <string name="please_wait">Even geduld a.u.b.…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">STOP INGEDRUKT</string>
     <string name="stop">Stop</string>
     <string name="carbs">Koolhydraten</string>
-    <string name="invalidprofile">Ongeldig profiel !!!</string>
     <string name="noprofileset">Geen profiel ingesteld</string>
     <string name="active"><![CDATA[<Huidig>]]></string>
     <string name="date">Datum</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">Duur van insuline activiteit</string>
     <string name="ic_long_label">Insuline - Koolhydraat ratio</string>
     <string name="isf_long_label">Insuline gevoeligheidsfactor</string>
-    <string name="basal_long_label">Basaalstand</string>
     <string name="target_long_label">Bloedglucose doelwaarde</string>
     <string name="initializing">Initialiseren...</string>
     <string name="serialnumber">Serie nummer</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">PIN-codes 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>
     <string name="maximumbasalvaluereplaced">Basale waarde vervangen door maximale ondersteunde waarde: %1$s</string>
     <string name="profile_per_unit">/E</string>
     <string name="profile_ins_units_per_hour">E/u</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">Wachtend op resultaat</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g extra koolhydraten nodig binnen %2$d minuten</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistieken</string>
     <string name="cumulative_tdd">Cumulatieve TDD</string>
@@ -233,7 +228,6 @@
     <string name="amount_days"># Dagen</string>
     <string name="weight">Gewicht</string>
     <string name="warning_Message">Mogelijks inaccuraat bij gebruik van bolussen om infusieset te vullen!</string>
-    <string name="olddata_Message">Oude gegevens, druk op \"VERNIEUW\"</string>
     <string name="tbb">Totaal basaal</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <string name="valueoutofrange">»%1$s« is buiten de harde limiet</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f is buiten de harde limiet</string>
     <string name="basal_value">Basaal waarde</string>
-    <string name="nsclient_version_does_not_match">NSClient versie werkt niet samen met AndroidAPS. Update gewenst.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f E</string>
     <string name="carbs_g">KOOLHYDRATEN %1$d gr</string>
diff --git a/core/src/main/res/values-no-rNO/strings.xml b/core/src/main/res/values-no-rNO/strings.xml
index 9e40af43c0..6bc8659f74 100644
--- a/core/src/main/res/values-no-rNO/strings.xml
+++ b/core/src/main/res/values-no-rNO/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Pumpen er opptatt</string>
     <string name="connectionerror">Tilkoblingsfeil til pumpe</string>
-    <string name="youareonallowedlimit">Du har nådd din tillatte grense</string>
     <string name="objectives">Opplæringsmål</string>
     <string name="close">Lukk</string>
     <string name="please_wait">Vennligst vent…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">STOPP trykket</string>
     <string name="stop">Stopp</string>
     <string name="carbs">Karbohydrater</string>
-    <string name="invalidprofile">Ugyldig profil!!!</string>
     <string name="noprofileset">INGEN PROFIL VALGT</string>
     <string name="active"><![CDATA[<Active>]]></string>
     <string name="date">Dato</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">Insulinets virkningstid (DIA)</string>
     <string name="ic_long_label">Insulin- til karbohydratfaktor</string>
     <string name="isf_long_label">Insulin sensitivitetsfaktor (ISF)</string>
-    <string name="basal_long_label">Basal rate</string>
     <string name="target_long_label">Blodsukkermål</string>
     <string name="initializing">Starter opp...</string>
     <string name="serialnumber">Serienummer</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">PIN-kodene samsvarer ikke</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Basal verdier er ikke angitt på hele timer: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Basal verdi erstattet med laveste tillate verdi: %1$s</string>
     <string name="maximumbasalvaluereplaced">Basal verdi erstattet med høyeste tillate verdi: %1$s</string>
     <string name="profile_per_unit">/E</string>
     <string name="profile_ins_units_per_hour">E/t</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">Venter på resultat</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g ekstra karbohydrater kreves innen %2$d minutter</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistikk</string>
     <string name="cumulative_tdd">Akkumulert TDD</string>
@@ -233,7 +228,6 @@
     <string name="amount_days">Antall dager</string>
     <string name="weight">Vekt</string>
     <string name="warning_Message">Kan vise feil hvis bolus brukes for priming/fylling!</string>
-    <string name="olddata_Message">Gamle data. Vennligst trykk \"HENT\"</string>
     <string name="tbb">Total grunnbasal</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <string name="valueoutofrange">»%1$s« er utenfor lovlige grenseverdier</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f er utenfor lovlige grenseverdier</string>
     <string name="basal_value">Basal verdi</string>
-    <string name="nsclient_version_does_not_match">NSKlient versjonen samsvarer ikke med AndroidAPS. Vennligst oppdater.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f E</string>
     <string name="carbs_g">CARBS %1$d g</string>
diff --git a/core/src/main/res/values-pl-rPL/strings.xml b/core/src/main/res/values-pl-rPL/strings.xml
index 9c1bd98569..d46768339a 100644
--- a/core/src/main/res/values-pl-rPL/strings.xml
+++ b/core/src/main/res/values-pl-rPL/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min.</string>
     <string name="pumpbusy">Pompa jest zajęta</string>
     <string name="connectionerror">Błąd połączenia z pompą</string>
-    <string name="youareonallowedlimit">Osiągnąłeś dozwolony limit</string>
     <string name="objectives">Zadania</string>
     <string name="close">Zamknij</string>
     <string name="please_wait">Proszę czekać…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">NACIŚNIĘTY STOP</string>
     <string name="stop">Stop</string>
     <string name="carbs">Węglowodany</string>
-    <string name="invalidprofile">Nieprawidłowy profil !!!</string>
     <string name="noprofileset">NIE USTAWIONO PROFILU</string>
     <string name="active"><![CDATA[<Aktywny>]]></string>
     <string name="date">Data</string>
@@ -132,7 +130,6 @@
     <string name="passwords_dont_match">Hasła się nie zgadzają</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Wartości bazy nie są ustawione w pełnych godzinach: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Wartość bazy zastąpiona minimalną obsługiwaną wartością: %1$s</string>
     <string name="maximumbasalvaluereplaced">Wartość bazy zastąpiona maksymalną obsługiwaną wartością: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -213,7 +210,6 @@
     <string name="waitingforpumpresult">Oczekiwanie na wynik</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">Zalecane podanie %1$d g węglowodanów w przeciągu %2$d minut</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statystyki</string>
     <string name="cumulative_tdd">Kumulatywna TDD (dawka dzienna)</string>
@@ -225,7 +221,6 @@
     <string name="amount_days"># Dni</string>
     <string name="weight">Waga</string>
     <string name="warning_Message">Możliwa niedokładność jeśli używasz bolusów do wypełnień!</string>
-    <string name="olddata_Message">Stare dane, naciśnij \"RELOAD\"</string>
     <string name="tbb">Suma dzienna bazy (TBB)</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -388,7 +383,6 @@
     <string name="valueoutofrange">Wartość »%1$s« jest poza dopuszczalną granicą</string>
     <string name="value_out_of_hard_limits">Wartość »%1$s« %2$.2f jest poza dopuszczalną granicą</string>
     <string name="basal_value">Wartość bazy</string>
-    <string name="nsclient_version_does_not_match">Wersja NSClient nie jest zgodna z AndroidAPS. Proszę zaktualizować.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f U</string>
     <string name="carbs_g">WĘGLOW. %1$d g</string>
diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
index d9a500837e..e1b07da0bd 100644
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -22,7 +22,6 @@
     <string name="format_hours">%1$.2f h</string>
     <string name="pumpbusy">A bomba está ocupada</string>
     <string name="connectionerror">Erro de conexão com a bomba</string>
-    <string name="youareonallowedlimit">Atingiu o limite autorizado</string>
     <string name="objectives">Objetivos</string>
     <string name="close">Fechar</string>
     <string name="please_wait">Por favor aguarde…</string>
@@ -31,7 +30,6 @@
     <string name="stoppressed">STOP PRESSIONADO</string>
     <string name="stop">Parar</string>
     <string name="carbs">Carbos</string>
-    <string name="invalidprofile">Perfil inválido !!!</string>
     <string name="noprofileset">SEM PERFIL DEFINIDO</string>
     <string name="date">Data</string>
     <string name="units_label">Unidades</string>
@@ -106,7 +104,6 @@
     <string name="passwords_dont_match">As passwords não coincidem</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Valores das basais não definidos por horas: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Valor da basal alterado para o valor mínimo suportado: %1$s</string>
     <string name="maximumbasalvaluereplaced">Valor da basal alterado para o valor máximo suportado: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -180,7 +177,6 @@
     <string name="amount_days"># Dias</string>
     <string name="weight">Peso</string>
     <string name="warning_Message">Possivelmente impreciso se o bolus for usado para purgar!</string>
-    <string name="olddata_Message">Dados antigos, pressione \"Recarregar\"</string>
     <string name="tbb">Basal Diária Total</string>
     <string name="tbb2">Basal diária * 2</string>
     <!--    Ntp-->
diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml
index d4773c312c..a5ed713284 100644
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@@ -30,7 +30,6 @@
     <string name="format_mins">%1$d mins</string>
     <string name="pumpbusy">A bomba está ocupada</string>
     <string name="connectionerror">Erro de ligação da bomba</string>
-    <string name="youareonallowedlimit">Atingiu o limite autorizado</string>
     <string name="objectives">Objectivos</string>
     <string name="close">Fechar</string>
     <string name="please_wait">Por favor aguarde…</string>
@@ -39,7 +38,6 @@
     <string name="stoppressed">PARAR PRESSIONADO</string>
     <string name="stop">Parar</string>
     <string name="carbs">Hidratos</string>
-    <string name="invalidprofile">Perfil inválido !!!</string>
     <string name="noprofileset">SEM PERFIL DEFINIDO</string>
     <string name="active"><![CDATA[<Activo>]]></string>
     <string name="date">Data</string>
@@ -130,7 +128,6 @@
     <string name="passwords_dont_match">Palavras-passe não correspondem</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Valores das basais não definidos por horas: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Valor da basal alterado para o valor mínimo suportado: %1$s</string>
     <string name="maximumbasalvaluereplaced">Valor da basal alterado para o valor máximo suportado: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -199,7 +196,6 @@
     <string name="waitingforpumpresult">À espera de resultado</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g Hidratos Adicionais Necessários Dentro de %2$d Minutos</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Estatísticas</string>
     <string name="cumulative_tdd">Cumulativo TDI</string>
@@ -211,7 +207,6 @@
     <string name="amount_days"># Dias</string>
     <string name="weight">Peso</string>
     <string name="warning_Message">Possivelmente impreciso se foram usados bólus para purgar/preencher!</string>
-    <string name="olddata_Message">Dados antigos, pressione \"Recarregar\"</string>
     <string name="tbb">Basal Diária Total</string>
     <string name="tbb2">Basal diária * 2</string>
     <!--    Ntp-->
diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/src/main/res/values-ro-rRO/strings.xml
index 61976e3db9..9754e3cd00 100644
--- a/core/src/main/res/values-ro-rRO/strings.xml
+++ b/core/src/main/res/values-ro-rRO/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Pompa face altă acțiune</string>
     <string name="connectionerror">Eroare de conexiune cu pompa</string>
-    <string name="youareonallowedlimit">Ați atins limita permisă</string>
     <string name="objectives">Obiective</string>
     <string name="close">Închide</string>
     <string name="please_wait">Așteptați…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">STOP APĂSAT</string>
     <string name="stop">Stop</string>
     <string name="carbs">Carbohidrați</string>
-    <string name="invalidprofile">Profil invalid!!!</string>
     <string name="noprofileset">NICIUN PROFIL SETAT</string>
     <string name="active"><![CDATA[<Activ>]]></string>
     <string name="date">Data</string>
@@ -132,7 +130,6 @@
     <string name="passwords_dont_match">Parolele nu corespund</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Valori bazale nesincronizate cu ora: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Valoarea bazalei a fost înlocuită cu valoarea minimă posibilă: %1$s</string>
     <string name="maximumbasalvaluereplaced">Valoarea bazalei a fost înlocuită cu valoarea maximă posibilă: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -214,7 +211,6 @@
     <string name="waitingforpumpresult">Se așteaptă rezultatul</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g carbohidrați suplimentari necesari în %2$d minute</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistici</string>
     <string name="cumulative_tdd">TDD cumulat</string>
@@ -226,7 +222,6 @@
     <string name="amount_days"># Zile</string>
     <string name="weight">Greutate</string>
     <string name="warning_Message">Posibil fără acuratețe bună dacă folosiți bolus de insulină pentru amorsare/umplere!</string>
-    <string name="olddata_Message">Date vechi, apăsați \"REÎNCĂRCARE\"</string>
     <string name="tbb">Total bazală implicită</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -389,7 +384,6 @@
     <string name="valueoutofrange">»%1$s« este in afara limitelor stabilite</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f este in afara limitelor stabilite</string>
     <string name="basal_value">Valoare rata bazală</string>
-    <string name="nsclient_version_does_not_match">Versiunea NSClient nu se potrivește cu versiunea AndroidAPS. Vă rugăm să o actualizați.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f U</string>
     <string name="carbs_g">CARB %1$d g</string>
diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/src/main/res/values-ru-rRU/strings.xml
index 4fe3c93e3a..1d16f4c8bc 100644
--- a/core/src/main/res/values-ru-rRU/strings.xml
+++ b/core/src/main/res/values-ru-rRU/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d мин</string>
     <string name="pumpbusy">помпа занята</string>
     <string name="connectionerror">ошибка соединения</string>
-    <string name="youareonallowedlimit">разрешенный предел достигнут</string>
     <string name="objectives">Цели</string>
     <string name="close">Закрыть</string>
     <string name="please_wait">Подождите…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">нажат стоп</string>
     <string name="stop">стоп</string>
     <string name="carbs">Углеводы</string>
-    <string name="invalidprofile">Неверный профиль !!!</string>
     <string name="noprofileset">ПРОФИЛЬ НЕ ЗАДАН</string>
     <string name="active"><![CDATA[Активен]]></string>
     <string name="date">дата</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">Продолжительность действия инсулина</string>
     <string name="ic_long_label">Соотношение инсулин/углеводы I: C</string>
     <string name="isf_long_label">Фактор Чувствительности к Инсулину (ISF)</string>
-    <string name="basal_long_label">Скорость базала</string>
     <string name="target_long_label">Целевая ГК</string>
     <string name="initializing">инициализация...</string>
     <string name="serialnumber">Серийный номер</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">PIN-коды не совпадают</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Базальные значения не выровнены по часам: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Значение базала заменено минимальной поддерживаемой величиной: %1$s</string>
     <string name="maximumbasalvaluereplaced">Значение базала заменено максимальной поддерживаемой величиной: %1$s</string>
     <string name="profile_per_unit">/ед</string>
     <string name="profile_ins_units_per_hour">ед/ч</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">Ожидание результата</string>
     <string name="smb_shortname">Супер микро болюс SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">Необходимо дополнительно %1$d г углеводов в течение %2$d минут</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Статистика</string>
     <string name="cumulative_tdd">накопительные TDD</string>
@@ -233,7 +228,6 @@
     <string name="amount_days">количество дней</string>
     <string name="weight">вес</string>
     <string name="warning_Message">возможны неточности если болюсы использовались для заполнения</string>
-    <string name="olddata_Message">старые данные. нажмите \"перезагрузка\"</string>
     <string name="tbb">общий базал</string>
     <string name="tbb2">общий базал*2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <string name="valueoutofrange">»%1$s« за пределами жестких ограничений</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f за пределами жестких ограничений</string>
     <string name="basal_value">Величина базала</string>
-    <string name="nsclient_version_does_not_match">Версия NSClient не совпадает с версией AndroidAPS. Пожалуйста, обновите.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">БОЛЮС %1$.2f ЕД</string>
     <string name="carbs_g">УГЛ %1$d г</string>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index 2d02b16fcb..1b5c7a61dd 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -31,16 +31,16 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Pumpa je zaneprázdnená</string>
     <string name="connectionerror">Chyba pripájania pumpy</string>
-    <string name="youareonallowedlimit">Dosiahnutý limit</string>
+    <string name="youareonallowedlimit">Dosiahnutý povolený limit</string>
     <string name="objectives">Ciele</string>
     <string name="close">Zavrieť</string>
     <string name="please_wait">Čakajte prosím...</string>
     <string name="mute">Stíšiť</string>
-    <string name="reload">Načítať</string>
+    <string name="reload">Znova načítať</string>
     <string name="stoppressed">STLAČENÝ STOP</string>
     <string name="stop">Stop</string>
     <string name="carbs">Sacharidy</string>
-    <string name="invalidprofile">Chybný profil !!!</string>
+    <string name="invalidprofile">Neplatný profil!</string>
     <string name="noprofileset">Nenastavený žiadny profil</string>
     <string name="active"><![CDATA[<Aktívny>]]></string>
     <string name="date">Dátum</string>
@@ -221,7 +221,7 @@
     <string name="waitingforpumpresult">Čakanie na výsledok</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$d g dodatočných sacharidov požadovaných v priebehu %2$d minút</string>
+    <string name="carbsreq">Požadovaných dodatočných %1$d g sacharidov v priebehu %2$d minút</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Štatistiky</string>
     <string name="cumulative_tdd">Kumulatívny TDD</string>
@@ -233,7 +233,7 @@
     <string name="amount_days">Dní</string>
     <string name="weight">Váha</string>
     <string name="warning_Message">Pravdepodobne nepresné, ak bol použitý bolus na plnenie!</string>
-    <string name="olddata_Message">Zastaralé dáta. Prosím načítajte ich znovu</string>
+    <string name="olddata_Message">Zastaralé dáta. Stlačte tlačítko „ZNOVA NAČÍTAŤ“</string>
     <string name="tbb">Celk. denný bazál</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
diff --git a/core/src/main/res/values-sv-rSE/strings.xml b/core/src/main/res/values-sv-rSE/strings.xml
index 06ace5156d..cc95cd1e14 100644
--- a/core/src/main/res/values-sv-rSE/strings.xml
+++ b/core/src/main/res/values-sv-rSE/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d min</string>
     <string name="pumpbusy">Pump upptagen</string>
     <string name="connectionerror">Anslutningsfel</string>
-    <string name="youareonallowedlimit">Du har nått din tillåtna gräns</string>
     <string name="objectives">Mål</string>
     <string name="close">Stäng</string>
     <string name="please_wait">Var god vänta…</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">Stopp nedtryckt</string>
     <string name="stop">Stopp</string>
     <string name="carbs">Kolhydrater</string>
-    <string name="invalidprofile">Ogiltig profil!</string>
     <string name="noprofileset">INGEN PROFIL VALD</string>
     <string name="active"><![CDATA[<Aktiv>]]></string>
     <string name="date">Datum</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">Insulinets verkningstid</string>
     <string name="ic_long_label">Insulin till kolhydratförhållande</string>
     <string name="isf_long_label">Insulinkänslighetsfaktor</string>
-    <string name="basal_long_label">Basaldos</string>
     <string name="target_long_label">Mål-BG</string>
     <string name="initializing">Startar...</string>
     <string name="serialnumber">Serienummer</string>
@@ -138,7 +135,6 @@
     <string name="passwords_dont_match">Lösenorden stämmer inte överens</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Profilens basaler är inte satta på hel timme: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Basalvärdet ersatt med det lägsta tillåtna: %1$s</string>
     <string name="maximumbasalvaluereplaced">Basalvärdet ersatt med det högsta tillåtna: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -219,7 +215,6 @@
     <string name="waitingforpumpresult">Väntar på resultat</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%1$dg KH behövs inom %2$d minuter</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistik</string>
     <string name="cumulative_tdd">Kumulativ TDD</string>
@@ -231,7 +226,6 @@
     <string name="amount_days">Antal dagar</string>
     <string name="weight">Vikt</string>
     <string name="warning_Message">Kan visa fel om man använder bolus för förfyllning!</string>
-    <string name="olddata_Message">Gammalt data. Tryck på Hämta</string>
     <string name="tbb">Total grundbasal</string>
     <string name="tbb2">TDB * 2</string>
     <!--    Ntp-->
@@ -394,7 +388,6 @@
     <string name="valueoutofrange">»%1$s« är utanför de hårda gränserna</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f är utanför hårda gränser</string>
     <string name="basal_value">Basaldos</string>
-    <string name="nsclient_version_does_not_match">NS Client-versionen matchar inte Android APS. Vänligen uppdatera.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f U</string>
     <string name="carbs_g">KH %1$d g</string>
diff --git a/core/src/main/res/values-tr-rTR/strings.xml b/core/src/main/res/values-tr-rTR/strings.xml
index 1aec44dfd1..b3c48e0def 100644
--- a/core/src/main/res/values-tr-rTR/strings.xml
+++ b/core/src/main/res/values-tr-rTR/strings.xml
@@ -31,7 +31,7 @@
     <string name="format_mins">%1$d dakika</string>
     <string name="pumpbusy">Pompa meşgul</string>
     <string name="connectionerror">Pompa bağlantı hatası</string>
-    <string name="youareonallowedlimit">İzin verilen sınıra ulaştınız</string>
+    <string name="youareonallowedlimit">İzin verilen limite ulaşıldı</string>
     <string name="objectives">Görevler</string>
     <string name="close">Kapat</string>
     <string name="please_wait">Lütfen bekleyin…</string>
@@ -40,7 +40,7 @@
     <string name="stoppressed">DURDUR BASILI</string>
     <string name="stop">Dur</string>
     <string name="carbs">Karbonhidrat</string>
-    <string name="invalidprofile">Geçersiz profil!!!</string>
+    <string name="invalidprofile">Geçersiz profil!</string>
     <string name="noprofileset">PROFİL AYARLANMADI</string>
     <string name="active"><![CDATA[<Aktif>]]></string>
     <string name="date">Tarih</string>
@@ -140,7 +140,7 @@
     <string name="pin_dont_match">PIN\'ler eşleşmiyor</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Bazal değerler saatlerle uyumlu değil: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Bazal değeri minimum desteklenen değerle değiştirilir: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Desteklenen minimum değerle değiştirilen bazal değer: %1$s</string>
     <string name="maximumbasalvaluereplaced">Bazal değeri maksimum desteklenen değerle değiştirilir: %1$s</string>
     <string name="profile_per_unit">/Ü</string>
     <string name="profile_ins_units_per_hour">Ü/s</string>
@@ -221,7 +221,7 @@
     <string name="waitingforpumpresult">Sonuç bekleniyor...</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">%2$d Dakika İçinde %1$d g Ek Karbonhidrat Gerekiyor</string>
+    <string name="carbsreq">%2$d dakika içinde %1$d g ek karbonhidrat gerekiyor</string>
     <!--    TDDStatsActivity-->
     <string name="stats">İstatistikler</string>
     <string name="cumulative_tdd">Kümülatif GTD (Günlük Toplam Doz)</string>
@@ -233,7 +233,7 @@
     <string name="amount_days"># Gün</string>
     <string name="weight">Ağırlık</string>
     <string name="warning_Message">Hazırlama / doldurma için boluslar kullanılıyorsa muhtemelen yanlış!</string>
-    <string name="olddata_Message">Eski Veri Lütfen \"Yeniden Yükle\"ye Basın</string>
+    <string name="olddata_Message">Eski veriler, lütfen \"YENİDEN YÜKLE\"ye basın</string>
     <string name="tbb">Günlük bazal miktarı</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -397,7 +397,7 @@
     <string name="valueoutofrange">»%1$s« sınırların dışında</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f sınırların dışında</string>
     <string name="basal_value">Bazal değer</string>
-    <string name="nsclient_version_does_not_match">NSClient sürümü AndroidAPS ile eşleşmiyor. Lütfen güncelle.</string>
+    <string name="nsclient_version_does_not_match">NSClient sürümü, AndroidAPS sürümü ile eşleşmiyor. Lütfen güncelle.</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">BOLUS %1$.2f Ü</string>
     <string name="carbs_g">Karbonhidrat %1$d g</string>
diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml
index 6d270b5a14..d773218257 100644
--- a/core/src/main/res/values-zh-rCN/strings.xml
+++ b/core/src/main/res/values-zh-rCN/strings.xml
@@ -31,7 +31,6 @@
     <string name="format_mins">%1$d 分钟</string>
     <string name="pumpbusy">胰岛素泵忙碌中</string>
     <string name="connectionerror">泵连接错误</string>
-    <string name="youareonallowedlimit">你达到了允许的极限</string>
     <string name="objectives">目标</string>
     <string name="close">关闭</string>
     <string name="please_wait">请稍等...</string>
@@ -40,7 +39,6 @@
     <string name="stoppressed">停止键按下了</string>
     <string name="stop">停止</string>
     <string name="carbs">碳水化合物</string>
-    <string name="invalidprofile">无效的配置文件!!!</string>
     <string name="noprofileset">没有设置配置文件</string>
     <string name="active"><![CDATA[<Active>]]></string>
     <string name="date">日期</string>
@@ -53,7 +51,6 @@
     <string name="dia_long_label">胰岛素作用持续时间DIA</string>
     <string name="ic_long_label">碳水化合物系数（ICR）</string>
     <string name="isf_long_label">胰岛素敏感系数ISF</string>
-    <string name="basal_long_label">基础率</string>
     <string name="target_long_label">血糖目标</string>
     <string name="initializing">正在初始化</string>
     <string name="serialnumber">序列号</string>
@@ -140,7 +137,6 @@
     <string name="pin_dont_match">PIN 码不匹配。</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">基础率值与小时数不一致:%1$s</string>
-    <string name="minimalbasalvaluereplaced">基础率值被泵支持的最小值: %1$s 替换了</string>
     <string name="maximumbasalvaluereplaced">基础率值被泵支持的最大值:%1$s 替换了</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -221,7 +217,6 @@
     <string name="waitingforpumpresult">正在等待结果</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">在 %2$d 分钟内需要 %1$d 克碳水化合物</string>
     <!--    TDDStatsActivity-->
     <string name="stats">统计信息</string>
     <string name="cumulative_tdd">累积的每日胰岛素输注的总量</string>
@@ -233,7 +228,6 @@
     <string name="amount_days"># 天</string>
     <string name="weight">权重</string>
     <string name="warning_Message">如果使用大剂量来充盈排气的话，活性胰岛素的量显示的可能不准确</string>
-    <string name="olddata_Message">旧数据请按 \"重新加载\"</string>
     <string name="tbb">基础率总量</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
@@ -397,7 +391,6 @@
     <string name="valueoutofrange">»%1$s« 超出了硬限制</string>
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f 超出了硬限制</string>
     <string name="basal_value">基础率值</string>
-    <string name="nsclient_version_does_not_match">NS客户端版本与AndroidAPS不匹配，请更新。</string>
     <!-- Command Queue + readStatus reasons -->
     <string name="bolus_u_min">大剂量 %1$.2f U</string>
     <string name="carbs_g">碳水 %1$d 克</string>
diff --git a/dana/src/main/res/values-ga-rIE/strings.xml b/dana/src/main/res/values-ga-rIE/strings.xml
index a4dd30318f..3ea04e700d 100644
--- a/dana/src/main/res/values-ga-rIE/strings.xml
+++ b/dana/src/main/res/values-ga-rIE/strings.xml
@@ -1,25 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="overview_bolusprogress_delivered">Seachadta</string>
-    <string name="overview_bolusprogress_stoped">Stopadh</string>
-    <string name="lowbattery">Ceallraí Íseal</string>
-    <string name="danar_history_alarm">Aláraim</string>
-    <string name="danar_history_bolus">Bólasi</string>
-    <string name="danar_history_carbohydrates">Carbaihiodráití</string>
-    <string name="danar_history_dailyinsulin">Inslin lá</string>
-    <string name="danar_history_errors">Earráidí</string>
-    <string name="danar_history_glucose">Glúcóis</string>
-    <string name="danar_history_refill">Athlán</string>
-    <string name="danar_history_syspend">Fionraí</string>
-    <string name="danar_pumpalarm">Aláram</string>
-    <string name="danar_glucoseunits">Aonaid Glúcóis</string>
-    <string name="danarpump_shortname">DANA</string>
-    <string name="danarkoreanpump">DanaR Cóiréis</string>
-    <string name="danarpump">DanaR</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="danar_bluetooth_status">Bluetooth stádas</string>
-    <string name="timeformat12h">12u</string>
-    <string name="timeformat24h">24u</string>
-    <string name="danar_bt_name_title">DanaR Bluetooth gléas</string>
-</resources>
+<resources></resources>
diff --git a/diaconn/src/main/res/values-ga-rIE/strings.xml b/diaconn/src/main/res/values-ga-rIE/strings.xml
index 52b4accfd3..3ea04e700d 100644
--- a/diaconn/src/main/res/values-ga-rIE/strings.xml
+++ b/diaconn/src/main/res/values-ga-rIE/strings.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="bolus_step">Bólas Céim</string>
-    <string name="basal_step">Bunaidh Céim</string>
-</resources>
+<resources></resources>
diff --git a/insight/src/main/res/values-ga-rIE/strings.xml b/insight/src/main/res/values-ga-rIE/strings.xml
index 9a5c82d1d2..3ea04e700d 100644
--- a/insight/src/main/res/values-ga-rIE/strings.xml
+++ b/insight/src/main/res/values-ga-rIE/strings.xml
@@ -1,17 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="insight_status">Stádas</string>
-    <string name="started">Thosaigh</string>
-    <string name="tdd_bolus">TDD Bólas</string>
-    <string name="tdd_basal">TDD Bunaidh</string>
-    <string name="tdd_total">TDD Lomlán</string>
-    <string name="eb_formatter">%1$.2f / %2$.2f A do %3$d nom</string>
-    <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_alert_formatter">%1$s: %2$s</string>
-    <string name="pump_stopped">Caidéil stopadh</string>
-    <string name="pump_started">Caidéil tosú</string>
-    <string name="pump_paused">Caidéil ar sos</string>
-    <string name="short_status_tdd">TDD: %1$.2f</string>
-    <string name="short_status_battery">Ceal.: %1$d%%</string>
-    <string name="mute_alert">Balbh</string>
-</resources>
+<resources></resources>
diff --git a/medtronic/src/main/res/values-ga-rIE/strings.xml b/medtronic/src/main/res/values-ga-rIE/strings.xml
index 124cf31da4..7dd05e5965 100644
--- a/medtronic/src/main/res/values-ga-rIE/strings.xml
+++ b/medtronic/src/main/res/values-ga-rIE/strings.xml
@@ -4,7 +4,6 @@
     <!-- MDT Configuration -->
     <!-- MDT Fragment -->
     <!-- MDT Errors -->
-    <string name="medtronic_errors">Earráidí</string>
     <!-- MDT History -->
     <!--    <string name="medtronic_history_group_basal">Basals</string>-->
     <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
@@ -13,11 +12,7 @@
     <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
     <!--    <string name="medtronic_history_group_all">All</string>-->
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_warning">Rabhadh</string>
     <!-- medtronic_warning -->
-    <string name="medtronic_pump_connected_now">Anois</string>
     <!-- combo_pump_connected_now -->
-    <string name="ago">ó shin</string>
-    <string name="medtronic_notification_check_time_date">Is nuashonrú gá clog Caidéil</string>
     <!-- combo_notification_check_time_date -->
 </resources>
diff --git a/openhumans/src/main/res/values-ga-rIE/strings.xml b/openhumans/src/main/res/values-ga-rIE/strings.xml
index d1e993eb08..3ea04e700d 100644
--- a/openhumans/src/main/res/values-ga-rIE/strings.xml
+++ b/openhumans/src/main/res/values-ga-rIE/strings.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="cancel">Cuir ar ceal</string>
-    <string name="close">Dún</string>
-</resources>
+<resources></resources>
diff --git a/pump-common/src/main/res/values-ga-rIE/strings.xml b/pump-common/src/main/res/values-ga-rIE/strings.xml
index 6bf78d23ab..33c77af761 100644
--- a/pump-common/src/main/res/values-ga-rIE/strings.xml
+++ b/pump-common/src/main/res/values-ga-rIE/strings.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
-    <string name="common_resultok">Ceart go leor</string>
     <!-- PumpCommon - Pump Status -->
-    <string name="pump_status_active">Gníomhach</string>
     <!-- PumpCommon - History Group -->
-    <string name="history_group_basal">Bunaidhi</string>
-    <string name="history_group_all">Ar fad</string>
-    <string name="history_group_bolus">Bólasi</string>
-    <string name="history_group_alarm">Aláraim</string>
-    <string name="history_group_glucose">Glúcóis</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
diff --git a/pump-common/src/main/res/values-it-rIT/strings.xml b/pump-common/src/main/res/values-it-rIT/strings.xml
index 010278c8ce..af17f3e0a7 100644
--- a/pump-common/src/main/res/values-it-rIT/strings.xml
+++ b/pump-common/src/main/res/values-it-rIT/strings.xml
@@ -5,6 +5,7 @@
     <string name="pump_operation_not_yet_supported_by_pump">Operazione NON ANCORA supportata dal micro.</string>
     <string name="common_resultok">OK</string>
     <string name="pump_serial_number">Numero seriale micro</string>
+    <string name="bolus_delivered">%1$.2f U / %2$.2f U erogate</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">Mai connesso</string>
     <string name="pump_status_waking_up">Risveglio</string>
diff --git a/pump-common/src/main/res/values-sk-rSK/strings.xml b/pump-common/src/main/res/values-sk-rSK/strings.xml
index c9521993ae..fb265967e8 100644
--- a/pump-common/src/main/res/values-sk-rSK/strings.xml
+++ b/pump-common/src/main/res/values-sk-rSK/strings.xml
@@ -5,6 +5,7 @@
     <string name="pump_operation_not_yet_supported_by_pump">Operácia zatiaľ nepodporovaná pumpou.</string>
     <string name="common_resultok">OK</string>
     <string name="pump_serial_number">Sériové číslo pumpy</string>
+    <string name="bolus_delivered">Podané %1$.2f JI / %2$.2f JI</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">Nikdy nepripojené</string>
     <string name="pump_status_waking_up">Prebúdzanie</string>
diff --git a/shared/src/main/res/values-ga-rIE/strings.xml b/shared/src/main/res/values-ga-rIE/strings.xml
index 8d4df752e5..554d7a16e3 100644
--- a/shared/src/main/res/values-ga-rIE/strings.xml
+++ b/shared/src/main/res/values-ga-rIE/strings.xml
@@ -1,21 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--    DateUtil-->
-    <string name="minago">%1$d nóim ó shin</string>
-    <string name="hoursago">%1$.1f u ó shin</string>
-    <string name="shorthour">u</string>
-    <string name="days">lá</string>
-    <string name="hours">uair</string>
-    <string name="unit_second">soicind</string>
-    <string name="unit_minute">nóiméad</string>
-    <string name="unit_hour">uair</string>
-    <string name="unit_day">lá</string>
-    <string name="unit_week">seachtain</string>
-    <string name="unit_seconds">soicind</string>
-    <string name="unit_minutes">nóiméad</string>
-    <string name="unit_hours">uair</string>
-    <string name="unit_days">lá</string>
-    <string name="unit_weeks">seachtaine</string>
-    <string name="shortminute">n</string>
-    <string name="shortday">lá</string>
 </resources>