New Crowdin updates (#202)

* New translations strings.xml (French) * New translations strings.xml (Dutch) * New translations strings.xml (Portuguese) * New translations exam.xml (Portuguese) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese) * New translations exam.xml (Portuguese) * New translations objectives.xml (Portuguese) * New translations strings.xml (German) * New translations strings.xml (Portuguese) * New translations strings.xml (Italian) * New translations insight_alert_descriptions.xml (Chinese Simplified) * New translations strings.xml (Romanian) * New translations strings.xml (Dutch) * New translations strings.xml (Swedish) * New translations strings.xml (Slovak) * New translations strings.xml (Russian) * New translations strings.xml (Portuguese) * New translations strings.xml (Norwegian) * New translations strings.xml (Lithuanian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Italian) * New translations strings.xml (German) * New translations strings.xml (Spanish) * New translations strings.xml (French) * New translations strings.xml (Polish) * New translations strings.xml (Hebrew) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations exam.xml (Russian) * New translations strings.xml (Hebrew) * New translations strings.xml (Russian) * New translations exam.xml (Russian) * New translations strings.xml (Russian) * New translations exam.xml (Russian) * New translations objectives.xml (Russian) * New translations strings.xml (Romanian) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (Italian) * New translations strings.xml (Dutch) * New translations strings.xml (Romanian) * New translations strings.xml (Russian) * New translations strings.xml (Dutch) * New translations strings.xml (Italian) * New translations strings.xml (French) * New translations strings.xml (Hebrew) * New translations strings.xml (Romanian) * New translations strings.xml (Russian) * New translations strings.xml (Swedish) * New translations strings.xml (Turkish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Norwegian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Portuguese) * New translations strings.xml (Slovak) * New translations strings.xml (Dutch) * New translations strings.xml (Spanish) * New translations strings.xml (Hebrew) * New translations strings.xml (Lithuanian) * New translations strings.xml (Czech) * New translations strings.xml (French) * New translations strings.xml (Afrikaans) * New translations strings.xml (German) * New translations strings.xml (Greek) * New translations strings.xml (Irish) * New translations strings.xml (Italian) * New translations strings.xml (Korean) * New translations strings.xml (Polish) * New translations exam.xml (Hebrew) * New translations exam.xml (German) * New translations exam.xml (Czech) * New translations exam.xml (Dutch) * New translations exam.xml (Polish) * New translations exam.xml (Portuguese) * New translations insight_alert_descriptions.xml (Danish) * New translations insight_alert_codes.xml (Danish) * New translations insight_exceptions.xml (Danish) * New translations strings.xml (Portuguese) * New translations strings.xml (Dutch) * New translations insight_alert_titles.xml (Danish) * New translations exam.xml (Danish) * New translations objectives.xml (Danish) * New translations strings.xml (Danish) * New translations strings.xml (Danish) * New translations strings.xml (Danish) * New translations strings.xml (Danish) * New translations strings.xml (Danish) * New translations strings.xml (German) * New translations strings.xml (Czech) * New translations objectives.xml (Polish) * New translations strings.xml (Hebrew) * New translations strings.xml (Portuguese) * New translations strings.xml (Norwegian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Afrikaans) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Turkish) * New translations strings.xml (Slovenian) * New translations strings.xml (Lithuanian) * New translations strings.xml (Slovak) * New translations strings.xml (Russian) * New translations strings.xml (Portuguese) * New translations strings.xml (Hebrew) * New translations strings.xml (Portuguese) * New translations strings.xml (Slovak) * New translations strings.xml (Russian) * New translations strings.xml (Hebrew) * New translations strings.xml (Bulgarian) * New translations strings.xml (Czech) * New translations strings.xml (Portuguese) * New translations strings.xml (Croatian) * New translations insight_alert_descriptions.xml (Hebrew) * New translations insight_alert_descriptions.xml (Turkish) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (Czech)
2021-01-10 22:38:13 +01:00 · 2021-01-10 22:38:13 +01:00 · fb1a4d40bc
commit fb1a4d40bc
parent 6d121e4e36
77 changed files with 518 additions and 387 deletions
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@ -38,7 +38,6 @@
    <string name="description_source_glimp">Ontvang BG waardes vanaf Glimp.</string>
    <string name="description_source_mm640g">Onvang BG waardes vanaf die 600SeriesAndroidUploader.</string>
    <string name="description_source_ns_client">Laai BG data af vanaf Nightscout</string>
-    <string name="description_source_xdrip">Ontvang BG waardes vana xDrip.</string>
    <string name="description_treatments">Stoor alle behandelings wat gedoen was</string>
    <string name="description_wear">Monitor en beheer AndroidAPS met jou WearOS horlosie.</string>
    <string name="description_xdrip_status_line">Wys informasie van jou loop op jou xDrip+ horlosie-gesig.</string>
@ -114,7 +113,6 @@
    <string name="changeyourinput">Verander jou insette!</string>
    <string name="configbuilder_bgsource">BG bron</string>
    <string name="configbuilder_bgsource_description">Waarvandaan  moet AndroidAPS data kry?</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">APS modus</string>
    <string name="closedloop">Geslote lus</string>
    <string name="openloop">Oop lus</string>
@ -197,7 +195,6 @@
    <string name="mealbolus">Maaltyd</string>
    <string name="correctionbous">Corr</string>
    <string name="actions">Aksies</string>
-    <string name="ns_upload_only">NS laai net op (opgeskorte sinkro)</string>
    <string name="pumpNotInitialized">Pomp nie geïnisialiseer nie!</string>
    <string name="primefill">Prima/vul</string>
    <string name="fillwarning">Maak asseblief seker dat die hoeveelheid ooreenstem met die spesifikasies van jou infusie stel!</string>
@ -247,7 +244,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Verkort oortjie titels</string>
    <string name="always_use_shortavg">Gebruik altyd kort gemiddelde delta in plaas van eenvoudige delta</string>
-    <string name="always_use_shortavg_summary">Nuttig wanneer data van ongefiltreerde bronne soos xDrip baie raas.</string>
    <string name="profile">Profiel</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Verstek waarde: 3 dit is \'n sleutel OpenAPS veiligheidsdrumpels. Wat dit doen is om jou basale te berk tot 3 x (in hierdie mense) jou grootste basale koers. Jy sal waarskynlik nooit dit hoef te verander, maar jy moet bewus wees wat bespreek is oor \"3 x max daaglikse; 4 x huidige\"vir veiligheidsdrumpels.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Verstek waarde: 4 dit is die helfte van die sleutel OpenAPS veiligheid limiete, en die ander helfte van \"3 x maks daaglikse; 4 x huidige\"van die veiligheid limiet. Dit beteken jou basale, ongeag max basale stel op jou pomp, kan enige hoër wees as hierdie nommer tye die huidige vlak van jou basale. Dit is om te verhoed dat mense in gevaarlike gebied deur instelling buitensporig hoë max basals voor om te verstaan hoe die algoritme werk. Weer, die verstek is 4 x; die meeste mense sal nooit moet dit aanpas en is eerder meer geneig om te moet aanpas ander instellings as hulle voel hulle \"loop in\" hierdie veiligheid limiet.</string>
@ -260,9 +256,6 @@
    <string name="smscommunicator_invalidphonennumber">Ongeldige SMS selfoon nommer</string>
    <string name="overview_calibration">Kalibrasie</string>
    <string name="xdripnotinstalled">xDrip + nie geïnstalleerd nie</string>
-    <string name="calibrationsent">Kalibrasie gestuur na xDrip</string>
-    <string name="smscommunicator_calibrationsent">Kalibrasie gestuur. Ontvang moet geaktiveer word in xDrip.</string>
-    <string name="smscommunicator_calibrationfailed">xDrip ontvang nie kalibrasies</string>
    <string name="pumpsuspended">Pomp opgeskort</string>
    <string name="executing">Besig met uitvoering</string>
    <string name="virtualpump_settings">Virtuele pomp instellings</string>
@ -333,8 +326,6 @@
    <string name="nav_about">Omtrent</string>
    <string name="smscommunicator_missingsmspermission">Vermiste SMS toestemming</string>
    <string name="smscommunicator_missingphonestatepermission">Toestemming vir foon status nog nie gegee nie</string>
-    <string name="xdripstatus_settings">xDrip Status (horlosie)</string>
-    <string name="xdripstatus">xDrip Statusline (horlosie)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">Wys BGI</string>
    <string name="wear_showbgi_summary">Voeg BGI by status lyn</string>
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@ -42,7 +42,6 @@
    <string name="description_source_glimp">Получава данни за КЗ от Glimp.</string>
    <string name="description_source_mm640g">Получават стойности на КЗ от 600SeriesAndroidUploader.</string>
    <string name="description_source_ns_client">Изтегля стойности на КЗ от Nightscout</string>
-    <string name="description_source_xdrip">Получава данни за КЗ от xDrip.</string>
    <string name="description_treatments">Записва всички процедури, които са били направени</string>
    <string name="description_wear">Наблюдавайте и контролирайте AndroidAPS, от вашия WearOS часовник.</string>
    <string name="description_xdrip_status_line">Покажи информация за вашия APS на xDrip + циферблат на часовник.</string>
@ -119,7 +118,6 @@
    <string name="changeyourinput">Променете данните!</string>
    <string name="configbuilder_bgsource">Източник на данни за КЗ</string>
    <string name="configbuilder_bgsource_description">От къде трябва да AndroidAPS да си взима данни?</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">APS режим</string>
    <string name="closedloop">Затворен кръг</string>
    <string name="openloop">Отворен кръг</string>
@ -285,7 +283,6 @@
    <string name="mealbolus">Хранене</string>
    <string name="correctionbous">Корекция</string>
    <string name="actions">Действия</string>
-    <string name="ns_upload_only">Само качва данни в NS (изключва синхронизацията)</string>
    <string name="pumpNotInitialized">Помпата не е инициализирана!</string>
    <string name="primefill">Пълнене на сет</string>
    <string name="fillwarning">Моля, уверете се, че стойността съответсва на вашият сет! Този инсулин не се включва в IOB!</string>
@ -340,7 +337,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Използвай къси имена</string>
    <string name="always_use_shortavg">Използвай краткоср. Δ вместо разлика от последната КЗ</string>
-    <string name="always_use_shortavg_summary">Полезно при данни за КЗ с много шум</string>
    <string name="profile">Профил</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">По подразбиране: 3 Това е основен параметър в сигурността на OpenAPS. Той ограничава максималният базал да бъде 3 пъти най-голямата стойност от дневните базали. Не би трябвало да има нужа от промяна, защото от опит сме проверили, че максимумите са “3x от най-високия дневен; 4x от текущия”.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">По подразбиране: 4\nТова е другият основен параметър в сигурността на OpenAPS, и другата половина от \"3x от най-високия дневен; 4x от текущия\". Това означава, че независимо от макс базал настроен в помпата, стойността на базала не може да е по-висока от тази стойност умножена по стойността на базала за текущият час от денонощието. Това е с цел да предпази от прекалено високи стойности на максималния базал преди да разбират как работи алгоритъма. Повечето от Вас няма да имат нужда от смяна на тази стойност и могат да се справят с настойки на другите параметри.</string>
@ -354,9 +350,6 @@
    <string name="smscommunicator_invalidphonennumber">Грешен тел номер за SMS</string>
    <string name="overview_calibration">Калибрация</string>
    <string name="xdripnotinstalled">xDrip+ не е инсталиран</string>
-    <string name="calibrationsent">Калибрацията е изпратена към xDrip</string>
-    <string name="smscommunicator_calibrationsent">Неуспешно. Получаването трябва да е разрешено в xDrip.</string>
-    <string name="smscommunicator_calibrationfailed">xDrip не получава калибрации</string>
    <string name="pumpsuspended">Помпата е спряна</string>
    <string name="executing">Изпълнява</string>
    <string name="virtualpump_settings">Настойки Виртуална Помпа</string>
@ -459,8 +452,6 @@
    <string name="nav_about">За приложението</string>
    <string name="smscommunicator_missingsmspermission">SMS команда забранена</string>
    <string name="smscommunicator_missingphonestatepermission">Липсва разрешение до данни от телефона</string>
-    <string name="xdripstatus_settings">xDrip статус (часовник)</string>
-    <string name="xdripstatus">xDrip статус (часовник)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">Показвай BGI</string>
    <string name="wear_showbgi_summary">Добави BGI към статуса</string>
@ -503,7 +494,6 @@
    <string name="mdtp_cancel">Откажи</string>
    <string name="notloadedplugins">Не всички профили са заредени!</string>
    <string name="valuesnotstored">Стойностите не са запазени!</string>
-    <string name="ns_localbroadcasts">Активирайте предаване на данни към други приложения (като xDrip). Не активирайте, ако имате повече от един AAPS или имате инсталиран NSClient!</string>
    <string name="ns_localbroadcasts_title">Разреши локално предаване на данни</string>
    <string name="careportal_newnstreatment_duration_min_label">Продължителност [мин.]</string>
    <string name="openapssmb">OpenAPS SMB</string>
@ -1174,7 +1164,6 @@
    <string name="donate_your_data_to_science">Дарете данните си на науката.</string>
    <string name="open_humans_short">OH</string>
    <string name="you_have_been_signed_out_of_open_humans">Излязохте от \"Open Humans\".</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Натиснете тук за да влезете отново, ако това не е било нарочно.</string>
    <string name="only_upload_if_connected_to_wifi">Качване, само при свързано WiFi</string>
    <string name="only_upload_if_charging">Качване само при зареждане</string>
    <string name="worker_state">Статус: %s</string>
@ -1186,7 +1175,6 @@
    <string name="cta_dont_kill_my_app_info">Не убивай приложението?</string>
    <string name="alarm">Аларма</string>
    <string name="smscommunicator_report_pump_ureachable_summary">Изпращане на SMS, ако помпата е недостъпна</string>
-    <string name="smscommunicator_pump_ureachable">Докладвай недостъпна помпа</string>
    <string name="advisoralarm">Алармата, когато е време за хранене.</string>
    <string name="alarminxmin">Сларма след %1$d мин</string>
    <string name="bolusadvisor">Съветник на болус</string>
--- a/app/src/main/res/values-cs-rCZ/exam.xml
+++ b/app/src/main/res/values-cs-rCZ/exam.xml
@ -138,7 +138,7 @@
    <string name="iob_label">Aktivní inzulín (IOB)</string>
    <string name="iob_which">Zatrhněte všechny správné odpovědi.</string>
    <string name="iob_value">Hodnota IOB je ovlivněna vydanými dočasnými bazály.</string>
-    <string name="iob_hightemp">Vysoký dočasný bazál nebude spuštěn, pokud je Váše glykémie nižší než cíl.</string>
+    <string name="iob_hightemp">Vysoký dočasný bazál nebude spuštěn, pokud je Vaše glykémie nižší než cíl.</string>
    <string name="iob_negiob">Negativní IOB po značnou dobu bez cvičení naznačuje, že váš profil je příliš \"silný\" a ve vašem profilu je potřeba méně inzulínu.</string>
    <string name="iob_posiob">Pozitivní IOB na značnou dobu naznačuje rezistenci vůči inzulinu nebo neohlášené jídlo.</string>
    <string name="breadgrams_label">Zadávání sacharidů a bolusy</string>
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@ -42,7 +42,7 @@
    <string name="description_source_glimp">Příjem glykémií z Glimpu.</string>
    <string name="description_source_mm640g">Příjem glykémií z Uploaderu 640G.</string>
    <string name="description_source_ns_client">Příjem glykémií z Nightscoutu</string>
-    <string name="description_source_xdrip">Příjem glykémií z xDripu.</string>
+    <string name="description_source_xdrip">Příjem glykémií z xDripu+.</string>
    <string name="description_treatments">Ukládá všechny ošetření do databáze</string>
    <string name="description_wear">Zobrazování stavu a řízení AndroidAPS z hodinek s WearOS</string>
    <string name="description_xdrip_status_line">Zobrazování informací o smyčce na xDrip+ watchface.</string>
@ -119,7 +119,7 @@
    <string name="changeyourinput">Změňte zadání!</string>
    <string name="configbuilder_bgsource">Zdroj glykémie</string>
    <string name="configbuilder_bgsource_description">Odkud má získávat AndroidAPS glykémie?</string>
-    <string name="xdrip">xDrip</string>
+    <string name="xdrip">xDrip+</string>
    <string name="apsmode_title">Typ smyčky</string>
    <string name="closedloop">Uzavřená smyčka</string>
    <string name="openloop">Otevřená smyčka</string>
@ -285,8 +285,8 @@
    <string name="mealbolus">Bolus</string>
    <string name="correctionbous">Korekce</string>
    <string name="actions">Akce</string>
-    <string name="ns_upload_only">Pouze nahrávání do NS (zakázaná synchronizace)</string>
-    <string name="ns_upload_only_summary">Pouze nahrávání do NS. Neplatí pro glykémie, pokud je NS vybrán jako zdroj glykémií. Neplatí pro profily, pokud je vybraný NS Profil.\n!!! VAROVÁNÍ!!! Vypnutí této možnosti může způsobit chybné chování a předávkování inzulínem, pokud je některá z vašich komponent (AAPS, NS, xDrip) špatně nastavena. Pečlivě sledujte, jestli data zobrazená AAPS odpovídají stavu pumpy!</string>
+    <string name="ns_upload_only">(NEBEZPEČNÉ ZAKÁZAT) Pouze odeslání NS</string>
+    <string name="ns_upload_only_summary">Pouze nahrávání do NS. Neplatí pro glykémie, pokud je NS vybrán jako zdroj glykémií. Neplatí pro profily, pokud je vybraný NS Profil.\n!!! VAROVÁNÍ!!! Vypnutí této možnosti může způsobit chybné chování a předávkování inzulínem, pokud je některá z vašich komponent (AAPS, NS, xDrip+) špatně nastavena. Pečlivě sledujte, jestli data zobrazená AAPS odpovídají stavu pumpy!</string>
    <string name="pumpNotInitialized">Pumpa není inicializována!</string>
    <string name="primefill">Plnění/doplňování</string>
    <string name="fillwarning">Prosím ujistěte se, že hodnota odpovídá specifikaci Vašeho setu!</string>
@ -341,7 +341,7 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Krátké názvy modulů</string>
    <string name="always_use_shortavg">Vždy používat krátkodobý průměrný rozdíl glykémií místo rozdílu posledních 2 hodnot</string>
-    <string name="always_use_shortavg_summary">Výhodné, pokud data z xDripu obsahují velký šum.</string>
+    <string name="always_use_shortavg_summary">Výhodné, pokud data z xDripu+ obsahují velký šum.</string>
    <string name="profile">Profil</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Výchozí hodnota: 3 Toto je klíčová hodnota zabezpečení. Říká, že maximální nastavitelný bazál je trojnásobkem maximálního denního bazálu. Patrně to nebudete muset měnit, případně si přečtete o tématu \"3x max denní; 4x aktuální\".</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Výchozí hodnota: 4 Toto je druhá klíčová hodnota. Říká, že maximální hodnota dočasného bazálu nikdy nebude větší, než čtyřnásobek aktuálního bazálu. Je to proto, aby se lidé nedostali do nebezpečných hodnot dříve, než pochopí jak OpenAPS pracuje. Znovu, výchozí hodnota je 4 a většina lidí ji nikdy nebude muset změnit. Pokud nestačí, obvykle je problém někde jinde.</string>
@ -355,9 +355,9 @@
    <string name="smscommunicator_invalidphonennumber">Špatné telefonní číslo</string>
    <string name="overview_calibration">Kalibrace</string>
    <string name="xdripnotinstalled">xDrip+ není nainstalován</string>
-    <string name="calibrationsent">Kalibrace odeslána do xDripu</string>
-    <string name="smscommunicator_calibrationsent">Kalibrace odeslána. Příjem musí být v xDripu povolený.</string>
-    <string name="smscommunicator_calibrationfailed">xDrip nepřijímá kalibrace</string>
+    <string name="calibrationsent">Kalibrace odeslána do xDripu+</string>
+    <string name="smscommunicator_calibrationsent">Kalibrace odeslána. Příjem musí být v xDripu+ povolený.</string>
+    <string name="smscommunicator_calibrationfailed">xDrip+ nepřijímá kalibrace</string>
    <string name="pumpsuspended">Pumpa pozastavena</string>
    <string name="executing">Provádím</string>
    <string name="virtualpump_settings">Nastavení virtuální pumpy</string>
@ -460,8 +460,8 @@
    <string name="nav_about">O aplikaci</string>
    <string name="smscommunicator_missingsmspermission">Chybějící povolení SMS</string>
    <string name="smscommunicator_missingphonestatepermission">Chybí oprávnění pro zjišťování stavu telefonu</string>
-    <string name="xdripstatus_settings">Status z xDripu (hodinky)</string>
-    <string name="xdripstatus">Statusový řádek xDripu (hodinky)</string>
+    <string name="xdripstatus_settings">Status z xDripu+ (hodinky)</string>
+    <string name="xdripstatus">Stavová řádka xDrip+ (hodinky)</string>
    <string name="xdripstatus_shortname">XDS</string>
    <string name="wear_showbgi_title">Zobrazovat BGI</string>
    <string name="wear_showbgi_summary">Přidat BGI do stavové řádky</string>
@ -504,7 +504,7 @@
    <string name="mdtp_cancel">Zrušit</string>
    <string name="notloadedplugins">Všechny profily nenačteny!</string>
    <string name="valuesnotstored">Hodnoty nejsou uloženy!</string>
-    <string name="ns_localbroadcasts">Povolit vysílání do jiných aplikací (například xDrip). Nepovolujte, pokud máte instalovánu více než jednu instanci AAPS nebo NSClient!</string>
+    <string name="ns_localbroadcasts">Povolit vysílání do jiných aplikací (například xDrip+). Nepovolujte, pokud máte instalovánu více než jednu instanci AAPS nebo NSClient!</string>
    <string name="ns_localbroadcasts_title">Povolení odesílaní</string>
    <string name="careportal_newnstreatment_duration_min_label">Trvání [min]</string>
    <string name="openapssmb">OpenAPS SMB</string>
@ -1197,4 +1197,5 @@
    <string name="time_to_eat">Čas k jídlu!\nSpusťte Bolusovou kalkulačku a proveďte výpočet znovu.</string>
    <string name="timetoeat">Čas k jídlu</string>
    <string name="fabric_upload_disabled">Nahrávání protokolů o pádech zakázáno!</string>
+    <string name="graph_menu_divider_header">Graf</string>
 </resources>
--- a/app/src/main/res/values-da-rDK/exam.xml
+++ b/app/src/main/res/values-da-rDK/exam.xml
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
--- a/app/src/main/res/values-da-rDK/insight_alert_codes.xml
+++ b/app/src/main/res/values-da-rDK/insight_alert_codes.xml
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
--- a/app/src/main/res/values-da-rDK/insight_alert_descriptions.xml
+++ b/app/src/main/res/values-da-rDK/insight_alert_descriptions.xml
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
--- a/app/src/main/res/values-da-rDK/insight_alert_titles.xml
+++ b/app/src/main/res/values-da-rDK/insight_alert_titles.xml
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
--- a/app/src/main/res/values-da-rDK/insight_exceptions.xml
+++ b/app/src/main/res/values-da-rDK/insight_exceptions.xml
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
--- a/app/src/main/res/values-da-rDK/objectives.xml
+++ b/app/src/main/res/values-da-rDK/objectives.xml
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
--- a/app/src/main/res/values-de-rDE/exam.xml
+++ b/app/src/main/res/values-de-rDE/exam.xml
@ -87,7 +87,7 @@
    <string name="prerequisites_supportedcgm">Ein unterstütztes CGM.</string>
    <string name="prerequisites2_label">Voraussetzungen</string>
    <string name="prerequisites2_what">Was ist wichtig für die Einrichtung und Nutzung von AndroidAPS?</string>
-    <string name="prerequisites2_profile">Geprüfte Informationen zum Einrichten eines Profils (ISF, I:C Verhältnis, Basalraten, DIA etc.).</string>
+    <string name="prerequisites2_profile">Überprüfte und belastbare Profileinstellungen (ISF, I:C Verhältnis, Basalraten, DIA etc.).</string>
    <string name="prerequisites2_device">Ein kompatibles Android-Gerät (z.B. Handy, Android-Uhr oder Tablet).</string>
    <string name="prerequisites2_internet">AndroidAPS benötigt eine Internetverbindung, um im Closed Loop laufen zu können.</string>
    <string name="prerequisites2_supportedcgm">Ein unterstütztes CGM und eine passende App, um Blutzuckerwerte auf dem Gerät zu erhalten.</string>
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@ -42,7 +42,6 @@
    <string name="description_source_glimp">Empfange Blutzuckerwerte von Glimp.</string>
    <string name="description_source_mm640g">Empfange Blutzuckerwerte vom 600SeriesAndroidUploader.</string>
    <string name="description_source_ns_client">Lade Blutzuckerdaten von Nightscout</string>
-    <string name="description_source_xdrip">Empfange Blutzuckerwerte von xDrip.</string>
    <string name="description_treatments">Speichert alle eingegebenen Behandlungen</string>
    <string name="description_wear">Überwache und steuere AndroidAPS mit Deiner WearOS-Smartwatch.</string>
    <string name="description_xdrip_status_line">Zeige Loop-Informationen auf Deinem xDrip+-Watchface.</string>
@ -119,7 +118,6 @@
    <string name="changeyourinput">Ändere deine Eingabe!</string>
    <string name="configbuilder_bgsource">BZ-Quelle</string>
    <string name="configbuilder_bgsource_description">Woher soll AndroidAPS seine Blutzuckerwerte beziehen?</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">APS-Modus</string>
    <string name="closedloop">Closed Loop</string>
    <string name="openloop">Open Loop</string>
@ -285,8 +283,6 @@
    <string name="mealbolus">Essensbolus</string>
    <string name="correctionbous">Korr</string>
    <string name="actions">Aktionen</string>
-    <string name="ns_upload_only">Zu Nightscout nur hochladen (keine Synchronisation)</string>
-    <string name="ns_upload_only_summary">Zu Nightscout nur hochladen (keine Synchronisation). Gilt nicht für CGM-Werte falls nicht eine lokale Quelle wie xDrip+ ausgewählt wurde. Gilt ebenfalls nicht für Profildaten, wenn ein NS-Profil genutzt wird. \n!!! WARNUNG !!! Deaktivieren dieser Option kann zu Fehlfunktionen und Insulin-Überdosierung führen, wenn eine der Komponenten (AAPS, NS, xDrip+) falsch konfiguriert ist. Achte sorgfältig darauf, ob die in AAPS angezeigten Daten mit denen der Pumpe übereinstimmen!</string>
    <string name="pumpNotInitialized">Pumpe nicht initialisiert!</string>
    <string name="primefill">Katheterwechsel</string>
    <string name="fillwarning">Bitte vergewissere Dich, dass die Füllmenge den Eigenschaften des Katheters entspricht!</string>
@ -341,7 +337,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Kurze Tab-Überschriften</string>
    <string name="always_use_shortavg">Verwende immer das kurze durchschnittliche Delta statt des einfachen Deltas</string>
-    <string name="always_use_shortavg_summary">Das ist sinnvoll, wenn die Daten von einer ungefilterten Quelle Signalrauschen haben.</string>
    <string name="profile">Profil</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Standardwert: 3\nDies ist eine wichtige Sicherheitseinstellung. Sie begrenzt die maximale Basal-Abgabe auf die dreifache Menge (im Standardfall) deiner größten Basalrate im Profil. In der Regel solltest Du diesen Wert nicht ändern. Aber Du solltest wissen, was \"3x max daily, 4x current\" als Sicherheitseinstellung bedeutet.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Standardwert: 4\nDies ist die andere wichtige Sicherheitseinstellung, die zweite Hälfte von \"3x max daily, 4x current\". Diese Grenze beschränkt die Basal-Abgabe auf die (im Standardfall) vierfache Menge der aktuellen Basalrate im Profil. Dies ist wichtig, um Nutzer davor zu bewahren, zuviel Basal-Insulin zu verabreichen. Nochmals, der Standardwert ist 4x. Die meisten Nutzer werden niemals diese Einstellung verändern, sondern andere Einstellungen anpassen, um sich nicht dieser Sicherheitsgrenze zu nähern.</string>
@ -355,9 +350,6 @@
    <string name="smscommunicator_invalidphonennumber">Falsche/ungültige Telefonnummer</string>
    <string name="overview_calibration">Kalibrierung</string>
    <string name="xdripnotinstalled">xDrip+ nicht installiert</string>
-    <string name="calibrationsent">Kalibrierung an xDrip+ gesendet</string>
-    <string name="smscommunicator_calibrationsent">Kalibrierung gesendet. Das Empfangen von Kalbrierungen muss in xDrip+ aktiviert sein.</string>
-    <string name="smscommunicator_calibrationfailed">xDrip+ hat die Kalbrierung nicht erhalten</string>
    <string name="pumpsuspended">Pumpe pausiert</string>
    <string name="executing">Wird ausgeführt</string>
    <string name="virtualpump_settings">Einstellungen der virtuellen Pumpe</string>
@ -460,8 +452,6 @@
    <string name="nav_about">Über</string>
    <string name="smscommunicator_missingsmspermission">SMS-Steuerung nicht erlaubt</string>
    <string name="smscommunicator_missingphonestatepermission">Fehlende Berechtigung für den Zugriff auf den Telefonstatus</string>
-    <string name="xdripstatus_settings">xDrip+ Status (Uhr)</string>
-    <string name="xdripstatus">xDrip+ Statuszeile (Uhr)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">Zeige BGI</string>
    <string name="wear_showbgi_summary">Füge BGI zur Statuszeile hinzu.</string>
@ -504,7 +494,6 @@
    <string name="mdtp_cancel">Abbrechen</string>
    <string name="notloadedplugins">Es sind nicht alle Profile geladen!</string>
    <string name="valuesnotstored">Werte nicht gespeichert!</string>
-    <string name="ns_localbroadcasts">Aktiviere die Datenübertragung zu anderen Apps (z.B. xDrip). Nicht aktivieren, falls Du mehr als eine Instanz von AAPS oder NSClient installiert hast!</string>
    <string name="ns_localbroadcasts_title">Aktiviere lokale Broadcasts</string>
    <string name="careportal_newnstreatment_duration_min_label">Dauer [min]</string>
    <string name="openapssmb">OpenAPS SMB</string>
@ -1188,7 +1177,7 @@ Unerwartetes Verhalten.</string>
    <string name="cta_dont_kill_my_app_info">Don\'t kill my app?</string>
    <string name="alarm">Alarm</string>
    <string name="smscommunicator_report_pump_ureachable_summary">SMS senden, wenn Pumpe nicht erreichbar</string>
-    <string name="smscommunicator_pump_ureachable">Bericht Pumpe nicht erreichbar</string>
+    <string name="smscommunicator_pump_ureachable">Hinweis Pumpe nicht erreichbar</string>
    <string name="advisoralarm">Alarmiere mich, wenn es Zeit zum Essen ist. </string>
    <string name="alarminxmin">Alarm in %1$d Min.</string>
    <string name="bolusadvisor">Bolus-Berater</string>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@ -39,7 +39,6 @@
    <string name="description_source_glimp">Λάβετε τις τιμές BG από το Glimp.</string>
    <string name="description_source_mm640g">Λάβετε τις τιμές BG από το 600SeriesAndroidUploader.</string>
    <string name="description_source_ns_client">Λήψη δεδομένων BG από Nightscout</string>
-    <string name="description_source_xdrip">Λάβετε τις τιμές BG από το xDrip.</string>
    <string name="description_treatments">Σώζει όλες τις θεραπείες που έγιναν</string>
    <string name="description_wear">Παρακολουθεί και ελέγχει το AndroidAPS χρησιμοποιώντας το ρολόι σας WearOS.</string>
    <string name="description_xdrip_status_line">Δείτε πληροφορίες σχετικά με το κύκλωμά σας στην πρόσοψη xDrip +.</string>
@ -116,7 +115,6 @@
    <string name="changeyourinput">Αλλάξτε αυτό που εισάγατε!</string>
    <string name="configbuilder_bgsource">Πηγή BG</string>
    <string name="configbuilder_bgsource_description">Από πού πρέπει το AndroidAPS να πάρει τα δεδομένα του;</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">Λειτουργία APS</string>
    <string name="closedloop">Κλειστό Κύκλωμα</string>
    <string name="openloop">Ανοιχτό Κύκλωμα</string>
@ -199,7 +197,6 @@
    <string name="mealbolus">Γεύμα</string>
    <string name="correctionbous">Διορθ</string>
    <string name="actions">Ενέργειες</string>
-    <string name="ns_upload_only">NS φορτώνεται μόνο (απενεργοποίηση συγχρ)</string>
    <string name="pumpNotInitialized">Η αντλία δεν έχει ρυθμιστεί!</string>
    <string name="primefill">Πλήρωση/Γέμισμα</string>
    <string name="fillwarning">Παρακαλώ ελέγξτε ότι η ποσότητα ταιριάζει με τις προδιαγραφές του σετ έγχυσης!</string>
@ -249,7 +246,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Συντομογραφίες ενοτήτων</string>
    <string name="always_use_shortavg">Χρησιμοποιείτε πάντα τη βραχυπρόθεσμη μέση διαφορά αντί της απλής διαφοράς</string>
-    <string name="always_use_shortavg_summary">Χρήσιμο όταν δεδομένα από μη φιλτραρισμένες πηγές όπως το xDrip αποκτούν θόρυβο.</string>
    <string name="profile">Προφίλ</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Προεπιλεγμένη τιμή: 3 Αυτό είναι ένα κλειδί ασφαλείας του OpenAPS. Αυτό περιορίζει την αύξηση του βασικού x3 (σε αυτούς τους ανθρώους) από την μεγαλύτερη τιμή του. Συνήθως δεν χρειάζεται να το αλλάξετε, αλλά πρέπει να ξέρετε τι σημαίνει “3x μέγιστο ημερήσιο; 4x τρέχων” για λόγους ασφαλείας.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Προεπιλεγμένη τιμή: 4 Αυτό είναι το μισό του θέματος ασφαλείας του OpenAPS, και το άλλο μισό του «3 x μέγιστο ημέρας: 4 x τρέχων» των θεμάτων ασφαλείας. Αυτό σημαίνει ότι ο βασικός ρυθμός, ανεξάρτητα από την μέγιστη τιμή βασικού ρυθμού στην αντλία σας, δεν μπορεί να είναι υψηλότερος από το πολλαπλάσιο αυτού του αριθμού. Αυτό γίνεται για να αποτρέψει τους ανθρώπους από το να μπουν σε επικίνδυνες καταστάσεις θέτωντας υψηλό βασικό πριν κατανοήσουν πλήρως πώς λειτουργεί ο αλγόριθμος. Και πάλι, η προεπιλεγμένη τιμή είναι 4x: οι περισσότεροι άνθρωποι ποτέ δεν θα χρειαστεί να το προσαρμόσουν και αντίθετα είναι πιο πιθανό να χρειαστεί να προσαρμόσουν άλλες ρυθμίσεις αν αισθάνονται ότι κινούνται με ασφάλεια.</string>
@ -262,9 +258,6 @@
    <string name="smscommunicator_invalidphonennumber">Μη έγκυρος αριθμός τηλεφώνου για SMS</string>
    <string name="overview_calibration">Καλιμπράρισμα</string>
    <string name="xdripnotinstalled">xDrip+ μη εγκατεστημένο</string>
-    <string name="calibrationsent">Το καλιμπράρισμα εστάλει στο xDrip</string>
-    <string name="smscommunicator_calibrationsent">Το καλιμπράρισμα στάλθηκε. Η λήψη πρέπει να είναι ενεργοποιημένη στο xDrip.</string>
-    <string name="smscommunicator_calibrationfailed">το xDrip δεν λαμβάνει καλιμπραρίσματα</string>
    <string name="pumpsuspended">Η αντλία είναι σε παύση</string>
    <string name="executing">Εκτελείτε</string>
    <string name="virtualpump_settings">Ρυθμίσεις Εικονικής αντλίας</string>
@ -335,8 +328,6 @@
    <string name="nav_about">Σχετικά με</string>
    <string name="smscommunicator_missingsmspermission">Απουσία δικαιωμάτων SMS</string>
    <string name="smscommunicator_missingphonestatepermission">Λείπει η άδεια κατάστασης τηλεφώνου</string>
-    <string name="xdripstatus_settings">Κατάσταση xDrip (ρολόι)</string>
-    <string name="xdripstatus">Γραμμή Κατάστασης xDrip (ρολόι)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">Δείξε BGI</string>
    <string name="wear_showbgi_summary">Πρόσθεσε BGI στην γραμμή κατάστασης</string>
@ -370,7 +361,6 @@
    <string name="mdtp_cancel">Ακύρωση</string>
    <string name="notloadedplugins">Δεν έχουν φορτωθεί όλα τα προφίλ!</string>
    <string name="valuesnotstored">Οι τιμές δεν αποθηκεύτηκαν!</string>
-    <string name="ns_localbroadcasts">Ενεργοποιήστε εκπομπές σε άλλες εφαρμογές (όπως το xDrip). Μην το ενεργοποιήσετε εάν έχετε περισσότερες από μία εγκατεστημένες εφαρμογές του AAPS ή NSClient!</string>
    <string name="ns_localbroadcasts_title">Ενεργοποιήστε τις τοπικές αποστολές.</string>
    <string name="careportal_newnstreatment_duration_min_label">Διάρκεια [min]</string>
    <string name="openapssmb">OpenAPS SMB</string>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -42,7 +42,6 @@
    <string name="description_source_glimp">Recibir valores de glucosa de Glimp.</string>
    <string name="description_source_mm640g">Recibir valores de glucosa del 600SeriesAndroidUploader.</string>
    <string name="description_source_ns_client">Descarga los datos de glucosa de Nightscout</string>
-    <string name="description_source_xdrip">Recibir los valores de glucosa de xDrip.</string>
    <string name="description_treatments">Guarda todos los tratamientos que se realizaron</string>
    <string name="description_wear">Usar tu reloj WearOS para observar y controlar AndroidAPS.</string>
    <string name="description_xdrip_status_line">Mostrar información sobre tu lazo en tu esfera xDrip+.</string>
@ -119,7 +118,6 @@
    <string name="changeyourinput">¡Cambiar datos!</string>
    <string name="configbuilder_bgsource">Origen BG</string>
    <string name="configbuilder_bgsource_description">¿De donde debe AndroidAPS obtener sus datos?</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">Modo APS</string>
    <string name="closedloop">Lazo cerrado</string>
    <string name="openloop">Lazo abierto</string>
@ -285,7 +283,6 @@
    <string name="mealbolus">Bolo Comida</string>
    <string name="correctionbous">Corrección</string>
    <string name="actions">Acciones</string>
-    <string name="ns_upload_only">NS solo subida (sinc. inactiva)</string>
    <string name="pumpNotInitialized">¡Bomba no iniciada!</string>
    <string name="primefill">Rellenar/Llenar</string>
    <string name="fillwarning">¡Por favor asegurar que la cantidad coincide con la especificación del set de infusión!</string>
@ -340,7 +337,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Título corto en pestaña</string>
    <string name="always_use_shortavg">Usa siempre delta media corto en vez de delta simple</string>
-    <string name="always_use_shortavg_summary">Útil cuando los datos de fuentes sin filtrar como los de xDrip son inestables.</string>
    <string name="profile">Perfiles</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Valor predeterminado: 3 Esta es una protección de seguridad en OpenAPS. Lo que esto hace es limitar tus basales a 3x (en este caso) tu mayor índice basal. Probablemente no necesites cambiar esto, pero debes tener en cuenta las discusiones sobre \"3x max diaria; 4x actual\" para protecciones de seguridad.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Ajuste pro defecto: 4 Esto es la otra mitad de los ajustes de seguridad de OpenAPS y la otra mitad de la protección de seguridad de \"3x max diaria, 4x actual\". Esto significa, que tu basal, independientemente de tu máxima basal ajustada en la bomba, no puede ser mas alta que este número de veces el actual nivel de basal. Esto es para evitar que las personas se encuentren en situaciones peligrosas por aumentar mucho la basal sin entender como trabaja el algoritmo. El ajuste por defecto es 4x; la mayoría de las personas nunca tendrá que cambiar estos ajustes, sino que debe modificar otros ajustes en la terapia si se encuentran cerca de este límite de seguridad.</string>
@ -354,9 +350,6 @@
    <string name="smscommunicator_invalidphonennumber">Número de teléfono incorrecto para SMS</string>
    <string name="overview_calibration">Calibración</string>
    <string name="xdripnotinstalled">xDrip+ no instalado</string>
-    <string name="calibrationsent">Calibración mandada a xDrip</string>
-    <string name="smscommunicator_calibrationsent">Calibración enviada. La recepción debe estar habilitada en xDrip.</string>
-    <string name="smscommunicator_calibrationfailed">xDrip no recibe calibraciones</string>
    <string name="pumpsuspended">Bomba parada</string>
    <string name="executing">Ejecutando</string>
    <string name="virtualpump_settings">Ajustes bomba virtual</string>
@ -455,8 +448,6 @@
    <string name="nav_about">Acerca de</string>
    <string name="smscommunicator_missingsmspermission">Falta permiso SMS</string>
    <string name="smscommunicator_missingphonestatepermission">Falta permiso de estado del teléfono</string>
-    <string name="xdripstatus_settings">xDrip Status (reloj)</string>
-    <string name="xdripstatus">Linea de estado xDrip (reloj)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">Mostrar BGI</string>
    <string name="wear_showbgi_summary">Agregar BGI a línea de estado</string>
@ -499,7 +490,6 @@
    <string name="mdtp_cancel">Cancelar</string>
    <string name="notloadedplugins">Faltan perfiles por cargar!</string>
    <string name="valuesnotstored">Valores no guardados!</string>
-    <string name="ns_localbroadcasts">Habilite las transmisiones a otras aplicaciones (como xDrip). ¡ No habilite si tiene más de una instancia de AAPS o NSClient instalada!</string>
    <string name="ns_localbroadcasts_title">Permitir emisión de mensajes localmente.</string>
    <string name="careportal_newnstreatment_duration_min_label">Duración [min]</string>
    <string name="openapssmb">OpenAPS SMB</string>
@ -1170,7 +1160,6 @@
    <string name="donate_your_data_to_science">Dona tus datos a la ciencia</string>
    <string name="open_humans_short">OH</string>
    <string name="you_have_been_signed_out_of_open_humans">Has cerrado la sesión de Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Haga clic aquí para iniciar sesión de nuevo si no tenía esa intención.</string>
    <string name="only_upload_if_connected_to_wifi">Subir datos solo si está conectado a WiFi</string>
    <string name="only_upload_if_charging">Sólo subir datos si se está cargando</string>
    <string name="worker_state">Worker State: %s</string>
@ -1182,7 +1171,6 @@
    <string name="cta_dont_kill_my_app_info">¿No matar mi aplicación?</string>
    <string name="alarm">Alarma</string>
    <string name="smscommunicator_report_pump_ureachable_summary">Enviar SMS si se activa un evento de bomba inaccesible</string>
-    <string name="smscommunicator_pump_ureachable">Reportar bomba no alcanzable</string>
    <string name="advisoralarm">Ejecutar alarma cuando es hora de comer</string>
    <string name="alarminxmin">Ejecutar alarma en %1$d min</string>
    <string name="bolusadvisor">Asistente de bolo</string>
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@ -42,7 +42,7 @@
    <string name="description_source_glimp">Recevoir les glycémies depuis Glimp.</string>
    <string name="description_source_mm640g">Recevoir les glycémies depuis le 600SeriesAndroidUploder.</string>
    <string name="description_source_ns_client">Télécharge les glycémies depuis Nightscout</string>
-    <string name="description_source_xdrip">Recevoir les glycémies depuis xDrip.</string>
+    <string name="description_source_xdrip">Recevoir les glycémies depuis xDrip+.</string>
    <string name="description_treatments">Enregistre tous les traitements qui ont été effectués</string>
    <string name="description_wear">Surveillez et contrôlez AndroidAPS en utilisant votre montre WearOS.</string>
    <string name="description_xdrip_status_line">Afficher les informations de votre Boucle sur votre écran de montre xDrip+.</string>
@ -61,7 +61,7 @@
    <string name="treatments_wizard_bg_label">Gly</string>
    <string name="treatments_wizard_tt_label">TT</string>
    <string name="treatments_wizard_carbs_label">Glucides</string>
-    <string name="treatments_wizard_correction_label">Corr</string>
+    <string name="treatments_wizard_correction_label">Correction</string>
    <string name="treatments_wizard_bolusiob_label">Bolus IA</string>
    <string name="openapsma_run">Exécuter maintenant</string>
    <string name="vitualpump_label">POMPE VIRTUELLE</string>
@ -284,10 +284,10 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="overview_quickwizard_item_edit_button">Éditer</string>
    <string name="overview_quickwizard_item_remove_button">Supprimer</string>
    <string name="mealbolus">Repas</string>
-    <string name="correctionbous">Corr</string>
+    <string name="correctionbous">Correction</string>
    <string name="actions">Actions</string>
-    <string name="ns_upload_only">Remonter uniquement vers NS (sync désactivée)</string>
-    <string name="ns_upload_only_summary">Envoi NS uniquement. Inactif sur les Gly capteurs sauf si une source locale comme xDrip est sélectionnée. Inactif sur les profils si Profil NS est sélectionné.\n!!! ATTENTION !!! La désactivation de cette option peut causer des dysfonctionnements et une surdose d\'insuline si l\'un de vos composants (AAPS, NS, xDrip) est mal configuré. Vérifiez bien si les données affichées par AAPS correspondent à l’état de la pompe !</string>
+    <string name="ns_upload_only">(DÉSACTIVATION DANGEREUSE) Envoi NS uniquement</string>
+    <string name="ns_upload_only_summary">Envoi NS uniquement (sync désactivée). Inactif sur les Glycémie des capteurs sauf si une source locale comme xDrip+ est sélectionnée. Inactif sur les profils si Profil NS est sélectionné.\n!!! ATTENTION !!! La désactivation de cette option peut causer des dysfonctionnements et une surdose d\'insuline si l\'un de vos composants (AAPS, NS, xDrip+) est mal configuré. Vérifiez bien si les données affichées par AAPS correspondent à l’état de la pompe !</string>
    <string name="pumpNotInitialized">Pompe non initialisée !</string>
    <string name="primefill">Amorcer/Remplir</string>
    <string name="fillwarning">Veuillez à ce que la quantité corresponde aux caractéristiques de votre cathéter !</string>
@ -342,7 +342,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Raccourcir les titres des onglets</string>
    <string name="always_use_shortavg">Utiliser delta basé sur moyenne courte</string>
-    <string name="always_use_shortavg_summary">Utiliser toujours un delta basé sur une moyenne courte au lieu d’une moyenne normale. Utile lorsque les données provenant de sources non filtrées comme xDrip devient incohérentes.</string>
+    <string name="always_use_shortavg_summary">Utile lorsque les données provenant de sources non filtrées comme xDrip+ deviennent incohérentes.</string>
    <string name="profile">Profil</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Valeur par défaut : 3 Ceci est un paramètre important de sécurité de l’OpenAPS. Ceci va limiter vos débits basal à 3 fois votre débit Basal maximum. Il est probable que vous n’aurez pas besoin de changer cela, mais vous devez être conscient de ce qui est discuté pour les limites de sécurité dans “3x max daily; 4x current”.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Valeur par défaut : 4 Ceci est l’autre moitié des paramètres de sécurité limitant l’OpenAPS, et l’autre moitié de “3x max daily, 4x current” des paramètres de sécurité. Quel que soit le basal maximum prédéfini dans votre pompe, il ne pourra pas être plus haut que ce nombre multiplié par le Basal actuel. Ceci est fait pour ne pas mettre l’utilisateur en danger en programmant des débits Basal maximum trop élevés avant de comprendre comment l’algorithme fonctionne. Encore une fois, la valeur par défaut est 4x, la plupart des gens n’auront jamais besoin d’ajuster ce paramètre, plutôt ils auront tendance à ajuster d’autres paramètres s’ils voient qu’ils atteignent ce paramètre de limite de sécurité.</string>
@ -356,9 +356,9 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="smscommunicator_invalidphonennumber">Num tél du SMS est invalide</string>
    <string name="overview_calibration">Étalonnage</string>
    <string name="xdripnotinstalled">xDrip+ n\'est pas installé</string>
-    <string name="calibrationsent">Étalonnage envoyé à xDrip</string>
-    <string name="smscommunicator_calibrationsent">Étalonnage envoyé. La réception doit être activée dans xDrip.</string>
-    <string name="smscommunicator_calibrationfailed">xDrip ne reçoit pas les étalonnages</string>
+    <string name="calibrationsent">Étalonnage envoyé à xDrip+</string>
+    <string name="smscommunicator_calibrationsent">Étalonnage envoyé. La réception doit être activée dans xDrip+.</string>
+    <string name="smscommunicator_calibrationfailed">xDrip+ ne reçoit pas les étalonnages</string>
    <string name="pumpsuspended">Pompe arrêtée</string>
    <string name="executing">Exécution en cours</string>
    <string name="virtualpump_settings">Paramètres pompe virtuelle</string>
@ -375,12 +375,12 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="nsclientinternal_secret_dialogtitle">NS API Secret</string>
    <string name="nsclientinternal_secret_dialogmessage">Entrez NS API secret (12 carac. min)</string>
    <string name="deliver_now">Transmettre maintenant</string>
-    <string name="clear_queue">Vider la file d\'attente</string>
-    <string name="show_queue">Afficher la file d\'attente</string>
-    <string name="queue">File d\'attente :</string>
+    <string name="clear_queue">Vider queue</string>
+    <string name="show_queue">Afficher queue</string>
+    <string name="queue">Queue :</string>
    <string name="status">État :</string>
    <string name="paused">En pause</string>
-    <string name="clearlog">Effacer logs</string>
+    <string name="clearlog">Effacer histo</string>
    <string name="nowritepermission">NSCLIENT ne possède pas la permission d\'écriture. Mauvais API secret?</string>
    <string name="wear_settings">Paramètres Wear</string>
    <string name="wear_detailedIOB_title">Afficher l\'IA détaillée</string>
@ -461,8 +461,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="nav_about">À propos</string>
    <string name="smscommunicator_missingsmspermission">Autorisation SMS manquante</string>
    <string name="smscommunicator_missingphonestatepermission">Autorisation du téléphone manquante</string>
-    <string name="xdripstatus_settings">état Xdrip (montre)</string>
-    <string name="xdripstatus">Barre d\'état pour xDrip (Montre)</string>
+    <string name="xdripstatus_settings">état Xdrip+ (montre)</string>
+    <string name="xdripstatus">Barre d\'état pour xDrip+ (Montre)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">Afficher l’Impact Glycémie</string>
    <string name="wear_showbgi_summary">Ajouter l’IGly sur la vue générale</string>
@ -505,7 +505,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="mdtp_cancel">Annuler</string>
    <string name="notloadedplugins">Les profils ne sont pas tous téléchargés !</string>
    <string name="valuesnotstored">Valeurs non enregistrées !</string>
-    <string name="ns_localbroadcasts">Active les diffusions vers d\'autres applications (comme xDrip). Ne pas activer si plusieurs instances d\'AAPS ou de NSClient sont installées !</string>
+    <string name="ns_localbroadcasts">Active les diffusions vers d\'autres applications (comme xDrip+). Ne pas activer si plusieurs instances d\'AAPS ou de NSClient sont installées !</string>
    <string name="ns_localbroadcasts_title">Activer les transmissions locales</string>
    <string name="careportal_newnstreatment_duration_min_label">Durée [min]</string>
    <string name="openapssmb">OpenAPS SMB</string>
@ -751,7 +751,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="virtualpump_definition">Définition de pompe</string>
    <string name="virtualpump_pump_def">Bolus : Étape =%1$s\nExtended Bolus : [Étape =%2$s, Durée =%3$smin -%4$sh]\nBasal : Étape =%5$s\nTBR : %6$s (par %7$s), Durée =%8$smin -%9$sh\n%10$s</string>
    <string name="ns_autobackfill_title">Remplissage automatique G</string>
-    <string name="wear_wizard_settings">Paramètres de l’Assistant</string>
+    <string name="wear_wizard_settings">Paramètres assistant</string>
    <string name="wear_wizard_settings_summary">Calculs inclus dans le résultat de l’Assistant :</string>
    <string name="wear_display_settings">Parametres d\'affichage</string>
    <string name="wear_general_settings">Paramètres généraux</string>
@ -1092,7 +1092,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="show_calculation">Afficher le calcul</string>
    <string name="automation_event">Evénement auto.</string>
    <string name="alreadyset">Déjà configuré</string>
-    <string name="clearqueueconfirm">Effacer la file d\'attente ? Toutes les données en file d\'attente seront perdues !</string>
+    <string name="clearqueueconfirm">Effacer la queue ? Toutes les données en attente seront perdues !</string>
    <string name="ebstopsloop">L\'utilisation du bolus étendu arrètera la boucle fermée pour la durée d\'exécution du bolus étendu. Voulez-vous vraiment le faire ?</string>
    <string name="closed_loop_disabled_with_eb">Boucle fermée désactivée à cause du bolus étendu</string>
    <string name="phonechecker">\"Vérif. du téléphone\"</string>
@ -1198,4 +1198,5 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="time_to_eat">Il est temps de manger !\nExécutez l\'assistant Bolus et refaites le calcul.</string>
    <string name="timetoeat">Il est temps de manger</string>
    <string name="fabric_upload_disabled">Téléchargement logs crashs désactivé!</string>
+    <string name="graph_menu_divider_header">Graph</string>
 </resources>
--- a/app/src/main/res/values-ga-rIE/strings.xml
+++ b/app/src/main/res/values-ga-rIE/strings.xml
@ -10,7 +10,6 @@
    <string name="alert_dialog_storage_permission_text">Le do thoil atosaigh do ghuthán nó atosaigh AndroidAPS ó Socruithe an Chórais \nmura dhéanann tú é seo, ní bheidh logáil ag na appana AndroidAPS (tá sé tábhachtach na halgartaim a rianú agus a fhíorú go bhfuil siad ag obair i gceart)!</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="MM640g">MM640g</string>
    <string name="iob">IOB</string>
    <string name="cob">COB</string>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@ -42,7 +42,6 @@
    <string name="description_source_glimp">Ricevi valori glicemia da Glimp.</string>
    <string name="description_source_mm640g">Ricevi valori glicemia da 600SeriesAndroidUploader.</string>
    <string name="description_source_ns_client">Scarica dati glicemia da Nightscout</string>
-    <string name="description_source_xdrip">Ricevi valori glicemia da xDrip.</string>
    <string name="description_treatments">Salva tutti i trattamenti che sono stati fatti</string>
    <string name="description_wear">Monitora e controlla AndroidAPS usando il tuo smartwatch WearOS.</string>
    <string name="description_xdrip_status_line">Mostra le informazioni del loop sulla watchface di xDrip+.</string>
@ -119,7 +118,6 @@
    <string name="changeyourinput">Cambia il tuo input!</string>
    <string name="configbuilder_bgsource">Origine BG</string>
    <string name="configbuilder_bgsource_description">Da dove AndroidAPS dovrebbe ottenere i suoi dati?</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">Modalità APS</string>
    <string name="closedloop">Loop chiuso</string>
    <string name="openloop">Loop aperto</string>
@ -285,8 +283,6 @@
    <string name="mealbolus">Pasto</string>
    <string name="correctionbous">Corr</string>
    <string name="actions">Azioni</string>
-    <string name="ns_upload_only">NS: solo upload (sincron. disabilitata)</string>
-    <string name="ns_upload_only_summary">Solo upload su NS. Non ha effetto su SGV a meno che non sia selezionata una fonte locale come xDrip. Non ha effetto sui profili mentre vengono usati i profili NS.\n!!! ATTENZIONE !!! Disabilitare questa opzione potrebbe causare malfunzionamenti e sovra-dosaggio di insulina se uno dei tuoi strumenti (AAPS, NS, xDrip) è configurato in modo errato. Guarda attentamente se i dati visualizzati da AAPS corrispondono allo stato del micro!</string>
    <string name="pumpNotInitialized">Micro non inizializzato!</string>
    <string name="primefill">Carica/Riempi</string>
    <string name="fillwarning">Assicurati che la quantità corrisponda alla specifica del tuo set di infusione!</string>
@ -341,7 +337,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Accorcia titoli schede</string>
    <string name="always_use_shortavg">Usa sempre il delta medio ridotto</string>
-    <string name="always_use_shortavg_summary">Utile quando i dati provenienti da sorgenti non filtrate come xDrip diventano \"rumorosi\" (instabili).</string>
    <string name="profile">Profilo</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">[Valore predefinito: 3] Questo è un parametro di sicurezza chiave in OpenAPS. Ciò che fa è limitare le tue basali a essere 3 volte, al più, la tua velocità basale massima. Probabilmente non avrai bisogno di cambiare questo valore, ma dovresti essere consapevole di cosa significa il gruppo di parametri \"3x max giornaliera; 4x corrente\" e per quali motivi di sicurezza siano stati impostati tali valori.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">[Valore predefinito: 4] Questo è un ulteriore parametro di sicurezza chiave in OpenAPS. La tua basale temporanea, indipendentemente dalla basale massima impostata sul micro, non può mai essere più alta di questo valore moltiplicato per la tua basale corrente in ogni specifico momento. Questo serve a impedire alle persone di addentrarsi in \"territori pericolosi\" impostando basali massime eccessivamente alte prima di aver capito come funziona l\'algoritmo. Ancora una volta, il valore predefinito è 4x; la maggior parte delle persone non avrà bisogno di modificare questo valore e avrà, invece, maggiori probabilità di dover regolare altre impostazioni se ha la sensazione di \"scontrarsi\" con questo limite di sicurezza.</string>
@ -355,9 +350,6 @@
    <string name="smscommunicator_invalidphonennumber">Numero di telefono SMS non valido</string>
    <string name="overview_calibration">Calibrazione</string>
    <string name="xdripnotinstalled">xDrip+ non installato</string>
-    <string name="calibrationsent">Calibrazione inviata a xDrip</string>
-    <string name="smscommunicator_calibrationsent">Calibrazione inviata. La ricezione deve essere abilitata in xDrip.</string>
-    <string name="smscommunicator_calibrationfailed">xDrip non sta ricevendo calibrazioni</string>
    <string name="pumpsuspended">Micro sospeso</string>
    <string name="executing">Esecuzione</string>
    <string name="virtualpump_settings">Impostazioni micro virtuale</string>
@ -460,8 +452,6 @@
    <string name="nav_about">Informazioni su</string>
    <string name="smscommunicator_missingsmspermission">Autorizzazione SMS mancante</string>
    <string name="smscommunicator_missingphonestatepermission">Autorizzazione stato telefono mancante</string>
-    <string name="xdripstatus_settings">Stato xDrip (smartwatch)</string>
-    <string name="xdripstatus">xDrip Statusline (smartwatch)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">Mostra BGI</string>
    <string name="wear_showbgi_summary">Aggiungi BGI alla statusline</string>
@ -504,7 +494,6 @@
    <string name="mdtp_cancel">Annulla</string>
    <string name="notloadedplugins">Non tutti i profili caricati!</string>
    <string name="valuesnotstored">Valori non memorizzati!</string>
-    <string name="ns_localbroadcasts">Abilita le trasmissioni ad altre app (come xDrip). Non abilitare se hai installato più di un\'istanza di AAPS o NSClient!</string>
    <string name="ns_localbroadcasts_title">Abilita le trasmissioni locali.</string>
    <string name="careportal_newnstreatment_duration_min_label">Durata [min]</string>
    <string name="openapssmb">OpenAPS SMB</string>
@ -1196,4 +1185,5 @@
    <string name="enablebolusadvisor_summary">Usa un promemoria per iniziare a mangiare invece del risultato del calcolatore durante la glicemia alta (\"pre-bolo\")</string>
    <string name="time_to_eat">Tempo di mangiare!\nEsegui il calcolatore e fai di nuovi i calcoli.</string>
    <string name="timetoeat">Tempo di mangiare</string>
+    <string name="fabric_upload_disabled">Caricamento log dei crash disabilitato!</string>
 </resources>
--- a/app/src/main/res/values-iw-rIL/exam.xml
+++ b/app/src/main/res/values-iw-rIL/exam.xml
@ -41,7 +41,7 @@
    <string name="noisycgm_label">נתוני הסנסור אינם יציבים.</string>
    <string name="noisycgm_whattodo">מה לעשות אם נתוני הסנסור לא יציבים?</string>
    <string name="noisycgm_nothing">אין צורך לעשות כלום - AndroidAPS יטפל בכך.</string>
-    <string name="noisycgm_pause">הפסיקו את הלולאה כדי למנוע מינון איסולין גבוה מדי \ נמוך מדי.</string>
+    <string name="noisycgm_pause">הפסיקו את הלולאה כדי למנוע מינון איסולין גבוה מדי \\ נמוך מדי.</string>
    <string name="noisycgm_replacesensor">יש להחליף סנסור שבאופן קבוע מספק נתוני רועשים ו/או לא מדויקים.</string>
    <string name="noisycgm_checksmoothing">יש לוודא שיישום הסנסור מספק נתונים איכותיים ו- \"חלקים\".</string>
    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
@ -60,19 +60,19 @@
    <string name="exercise_15g">המתן עד שהגלוקוז בדם יירד מתחת לערך המטרה של היפו ואז אכלו 15 גרם של פחמימות מהירות.</string>
    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
    <string name="suspendloop_label">השבתת / השהיית לולאה</string>
-    <string name="suspendloop_doigetinsulin">האם אני מקבל\ת אינסולין כאשר הלולאה מושבתת/מושהית?</string>
+    <string name="suspendloop_doigetinsulin">האם אני מקבל/ת אינסולין כאשר הלולאה מושבתת\\מושהית?</string>
    <string name="suspendloop_yes">כן, אינסולין בזאלי ממשיך להינתן.</string>
    <string name="suspendloop_no">לא, אספקת האינסולין נפסקת.</string>
    <string name="basaltest_label">מינון באזלי, יחס תיקון, ויחס פחמימות.</string>
    <string name="basaltest_when">מתי יש לאמת את הערכים האלה?</string>
-    <string name="basaltest_beforeloop">לפני שאני מתחיל\ה לולאה.</string>
+    <string name="basaltest_beforeloop">לפני שאני מתחיל\\ה לולאה.</string>
    <string name="basaltest_havingregularhighlow">כאשר חווים רמת סוכר גבוהה או נמוכה לעיתים קרובות.</string>
    <string name="basaltest_weekly">לפחות פעם אחת בשבוע.</string>
    <string name="basaltest_fixed">לאחר שהוגדרו ואומתו, ערכים אלה אינם צריכים להשתנות לאורך הזמן.</string>
    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
    <string name="prerequisites_label">דרישות מקדימות</string>
    <string name="prerequisites_what">מה חיוני להגדרה ולשימוש ב-AndroidAPS?</string>
-    <string name="prerequisites_determinedcorrectprofile">הגדרת פרופיל אישי (מינון בזאלי-Basal, יחס אינסולין\פחמימה- IC, יחס תיקון-ISF, משך פעילות אינסולין-DIA).</string>
+    <string name="prerequisites_determinedcorrectprofile">הגדרת פרופיל אישי (מינון בזאלי-Basal, יחס אינסולין\\פחמימה- IC, יחס תיקון-ISF, משך פעילות אינסולין-DIA).</string>
    <string name="prerequisites_computer">מחשב עם Android Studio מותקן ומוגדר.</string>
    <string name="prerequisites_phone">טלפון נתמך.</string>
    <string name="prerequisites_pump">משאבת אינסולין מתאימה אם אתם מתכננים להפעיל לולאה סגורה.</string>
@ -90,7 +90,7 @@
    <string name="prerequisites2_profile">מידע מאומת כדי להגדיר פרופיל (יחסי תיקון, יחסי פחמימות, מינונים בזאליים, משך פעילות האינסולין וכו\').</string>
    <string name="prerequisites2_device">מכשיר Android תואם (לדוגמה טלפון נייד, שעון אנדרואיד או טאבלט).</string>
    <string name="prerequisites2_internet">AndroidAPS חייב חיבור לאינטרנט כדי להפעיל לולאה סגורה.</string>
-    <string name="prerequisites2_supportedcgm">חיישן סוכר נתמך ואפליקציה מתאימה לקבלת ערכי הסוכר בטלפון\התקן.</string>
+    <string name="prerequisites2_supportedcgm">חיישן סוכר נתמך ואפליקציה מתאימה לקבלת ערכי הסוכר בטלפון\\התקן.</string>
    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
    <string name="update_label">עדכון AndroidAPS</string>
    <string name="whatistrue">בחרו את כל ההיגדים הנכונים.</string>
@ -105,7 +105,7 @@
    <string name="troubleshooting_fb">אפשר לבקש עצות בקבוצת הפייסבוק \"AndroidAPS Users\" (אנגלית).</string>
    <string name="troubleshooting_wiki">צריך לקרוא (ולקרוא מחדש) את מסמכי AndroidAPS.</string>
    <string name="troubleshooting_gitter">תוכלו לבקש עצות ולרשום בעיות טכניות או בעיות בחדר ה-Gitter של AndroidAPS.</string>
-    <string name="troubleshooting_yourendo">עליכם לשאול את המרפאה\הרופא האנדוקרינולוג שלכם.</string>
+    <string name="troubleshooting_yourendo">עליכם לשאול את המרפאה\\הרופא האנדוקרינולוג שלכם.</string>
    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
    <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
    <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
@ -129,29 +129,29 @@
    <string name="wrongcarbs_addinsulin">בולוס עם אינסולין תוך שימוש בתפריט התיחול של העירוי.</string>
    <string name="wrongcarbs_donothing">עשו כלום-AndroidAPS יעשה את ההתאמות הנדרשות.</string>
    <string name="wrongcarbs_bolus">מתן בולוס אינסולין באמצעות כפתור האינסולין בדף הסקירה הכללית.</string>
-    <string name="wronginsulin_label">שגיאות ברישום\הזרקת אינסולין</string>
+    <string name="wronginsulin_label">שגיאות ברישום\\הזרקת אינסולין</string>
    <string name="wronginsulin_whattodo">מה עליכם לעשות אם מקבלים פחות אינסולין מאשר המוצע ע\"י היסטוריית המשאבה למשל עקב חסימה, צינורית כושלת או אי חיבור מחדש של המשאבה אחרי מקלחת? </string>
    <string name="wronginsulin_careportal">מחקו את נתוני האינסולין מפורטל הטיפולים של נייטסקאוט כדי לסלק אותו מהיסטוריית המשאבה.</string>
    <string name="wronginsulin_compare">השווה ערכים ב-AndroidAPS ובהיסטוריית משאבה.</string>
-    <string name="wronginsulin_prime">מזריקים בולוס על חלק מהאינסולין המחושב \"שחסר\" עם מזרק\עט או באמצעות תיחול (Prime).</string>
+    <string name="wronginsulin_prime">מזריקים בולוס על חלק מהאינסולין המחושב \"שחסר\" עם מזרק\\עט או באמצעות תיחול (Prime).</string>
    <string name="wronginsulin_donothing">לא לעשות דבר ולאפשר ל-AndroidAPS לתקן כל רמת סוכר גבוהה.</string>
    <string name="iob_label">אינסולין פעיל בגוף (IOB)</string>
    <string name="iob_which">בחרו את כל ההיגדים הנכונים.</string>
    <string name="iob_value">ערך האינסולין הפעיל (IOB) מושפע ממינונים בזאליים זמניים שסופקו.</string>
    <string name="iob_hightemp">מינון בזאלי גבוה לא יינתן כאשר רמת הסוכר נמוכה מערך המטרה.</string>
    <string name="iob_negiob">אינסולין פעיל שלילי בתקופה משמעותית בה לא נעשית פעילות מצביעה על כך שהפרופיל הוא חזק מדי, נדרש פחות אינסולין ויש להגדיר זאת בהגדרות.</string>
-    <string name="iob_posiob">אינסולין פעיל חיובי עבור תקופה משמעותית מצביעה על תנגודת לאינסולין או על ארוחות שלא הוכרזו.</string>
+    <string name="iob_posiob">אינסולין פעיל חיובי עבור תקופה משמעותית מצביע על תנגודת לאינסולין או על ארוחות שלא הוכרזו.</string>
    <string name="breadgrams_label">רישום פחמימות ובולוסים</string>
    <string name="breadgrams_grams">יש להשתמש אך ורק בגרמים להערכה ורישום צריכת הפחמימות.</string>
-    <string name="breadgrams_exchange">ניתן לתעד צריכת פחמימות באמצעות מערכת המרה מתאימה (לדוגמה, המרות DAFNE \"CHO\", מערכת המרת \"יחידות לחם\" אירופאית).</string>
-    <string name="breadgrams_decay">AndroidAPS משתמש במודל דינאמי כדי להעריך את דעיכת הפחמימות ולחשב פחמימות פעילות.</string>
+    <string name="breadgrams_exchange">ניתן לתעד צריכת פחמימות באמצעות מערכת המרה מתאימה (לדוגמה, המרות \"DAFNE \"CHO, מערכת המרת \"יחידות לחם\" אירופאית).</string>
+    <string name="breadgrams_decay">אפליקציית AndroidAPS משתמש במודל דינאמי כדי להעריך את דעיכת הפחמימות ולחשב פחמימות פעילות.</string>
    <string name="breadgrams_calc">אם רמות הסוכר מחוץ לערכים המקובלים (נמוך מדי או גבוה מדי) ניתן להשתמש במחשבון הבולוס כדי לספק הצעות לתיקוני פחמימות או אינסולין.</string>
    <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
    <string name="extendedcarbs_label">פחמימות ממושכות</string>
    <string name="extendedcarbs_handling">מה עושים עם פחמימות ממושכות?</string>
    <string name="extendedcarbs_future">מתזמנים פחמימות עתידיות, שניתן לפזר במרווחי זמן (בדומה לבולוס ממושך שמפזר את ההזרקות על פני מרווחי זמן).</string>
    <string name="extendedcarbs_free">רישום פחמימות שהרווחתם בפעילות גופנית שאתם רוצים להסתיר מ-AndroidAPS.</string>
-    <string name="extendedcarbs_fat">פחמימות ממושכות (המפוזרות בעתיד) יכולות לסייע AndroidAPS בהתמודדות עם ארוחות עשירות בשומן\חלבון.</string>
+    <string name="extendedcarbs_fat">פחמימות ממושכות (המפוזרות בעתיד) יכולות לסייע AndroidAPS בהתמודדות עם ארוחות עשירות בשומן\\חלבון.</string>
    <string name="extendedcarbs_rescue">רישום פחמימות בהם השתמשתם להצלה מהיפוגליקמיה. </string>
    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
    <string name="nsclient_label">ניטור מרוחק</string>
@ -188,7 +188,7 @@
    <string name="profileswitch2_label">החלפת פרופילים</string>
    <string name="profileswitch2_pctwillchange"> בעת החלפה לפרופיל 120%, מהם ההיגדים הנכונים?</string>
    <string name="profileswitch2_bghigher">ערך מטרת הסוכר בדם יהיה גבוה ב-20%.</string>
-    <string name="profileswitch2_basalhigher">המינון הבזאלי יהיה נמוך ב-20%.</string>
+    <string name="profileswitch2_basalhigher">המינון הבזאלי יהיה גבוה ב-20%.</string>
    <string name="profileswitch2_bgunchanged">ערך מטרת רמת הסוכר לא ישתנה.</string>
    <string name="profileswitch2_isfhigher">ערך פקטור התיקון (ISF) יהיה גבוה ב-20%.</string>
    <string name="profileswitchtime_label">החלפת פרופיל</string>
@ -196,13 +196,13 @@
    <string name="profileswitchtime_2">אפעיל מצב פרופיל זמני עם היסט זמן של 2+</string>
    <string name="profileswitchtime__2">אפעיל מצב פרופיל זמני עם היסט זמן של 2-</string>
    <string name="profileswitchtime_tt">הגדרת ערך מטרה זמני לאכילה בקרוב.</string>
-    <string name="profileswitchtime_100">יש לבצע שינוי פרופיל ליותר מ- 100%</string>
+    <string name="profileswitchtime_100">יש לבצע שינוי פרופיל ליותר מ- 100% </string>
    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
    <string name="profileswitch4_label">שינויים בפרופילים</string>
    <string name="profileswitch4_rates">על המינונים בזאליים, יחס התיקון, יחס הפחמימות וכו\' להיות מוגדרים בפרופילים.</string>
    <string name="profileswitch4_internet">הפעלת שינויים בפרופיל הנייטסקאוט שלכם דורשת שהמכשיר עליו AndroidAPS מותקן יהיה מחובר לאינטרנט.</string>
    <string name="profileswitch4_sufficient">עריכת פרופילים לשינוי ערכים מספיקה כדי להחיל שינויים כלשהם שבוצעו.</string>
-    <string name="profileswitch4_multi">ניתן להגדיר פרופילים מרובים כדי להתאים לנסיבות משתנות (לדוגמה שינויים הורמונליים, עבודת משמרת, ימי חול\אורח חיים של סופ\"ש).</string>
+    <string name="profileswitch4_multi">ניתן להגדיר פרופילים מרובים כדי להתאים לנסיבות משתנות (לדוגמה שינויים הורמונליים, עבודת משמרת, ימי חול\\אורח חיים של סופ\"ש).</string>
    <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
    <string name="basalhelp_label">נושא: עזרה עם מינונים בזאליים</string>
    <string name="basalhelp_where">היכן ניתן לקבל עזרה בנושא מינון בזאלי וכו\'.</string>
--- a/app/src/main/res/values-iw-rIL/insight_alert_descriptions.xml
+++ b/app/src/main/res/values-iw-rIL/insight_alert_descriptions.xml
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="alert_r7_description"><![CDATA[כמות: <b>%1$d%%</b>\nמשך: <b>%2$s h</b>]]></string>
+    <string name="alert_r7_description"><![CDATA[כמות: <b>%1$d%%</b>\nמשך: <b>%2$s ש\'</b>]]></string>
    <string name="alert_w31_description"><![CDATA[תכולת מיכל: <b>%1$s U</b>]]></string>
    <string name="alert_w32_description">החלף סוללה.</string>
    <string name="alert_w33_description">קבע זמן/תאריך.</string>
    <string name="alert_w34_description">צור קשר עם תמיכת Accu-Chek.</string>
-    <string name="alert_w36_description"><![CDATA[כמות: <b>%1$d%%</b>\nמשך: <b>%2$s h</b>]]></string>
+    <string name="alert_w36_description"><![CDATA[<b>%1$d%%</b><br/>משך: <b>%2$s שעות</b>]]></string>
    <string name="alert_w38_description"><![CDATA[כמות מתוכננת: <b>%1$s U</b><br/>כמות שניתנה: <b>%2$s U</b>]]></string>
    <string name="alert_m20_description">הכנס מיכל.</string>
    <string name="alert_m21_description">החלף מיכל.</string>
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@ -42,7 +42,6 @@
    <string name="description_source_glimp">קבלת ערכי סוכר בדם מ-Glimp.</string>
    <string name="description_source_mm640g">קבלת ערכי סוכר בדם מ-600SeriesAndroidUploader.</string>
    <string name="description_source_ns_client">הורדת ערכי סוכר בדם מ-Nightscout</string>
-    <string name="description_source_xdrip">קבלת ערכי סוכר בדם מ-xDrip.</string>
    <string name="description_treatments">שמירת כל הטיפולים שנעשו</string>
    <string name="description_wear">ניטור ושליטה ב-AndroidAPS באמצעות שעון WearOS.</string>
    <string name="description_xdrip_status_line">הצג מידע אודות הלולאה במסך Xdrip בשעון החכם.</string>
@ -119,7 +118,6 @@
    <string name="changeyourinput">שנה קלט!</string>
    <string name="configbuilder_bgsource">מקור ערכי הסוכר</string>
    <string name="configbuilder_bgsource_description">מהו מקור הנתונים של AndroidAPS?</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">מצב APS</string>
    <string name="closedloop">לולאה סגורה</string>
    <string name="openloop">לולאה פתוחה</string>
@ -285,7 +283,6 @@
    <string name="mealbolus">ארוחה</string>
    <string name="correctionbous">תיקון</string>
    <string name="actions">פעולות</string>
-    <string name="ns_upload_only">העלאה בלבד לנייטסקאוט (סנכרון מבוטל)</string>
    <string name="pumpNotInitialized">משאבה לא הופעלה!</string>
    <string name="primefill">תיחול\\מילוי</string>
    <string name="fillwarning">נא ודאו שהכמות מתאימה למפרט ערכת העירוי שלכם!</string>
@ -340,7 +337,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">קצר את כותרות הלשוניות</string>
    <string name="always_use_shortavg">התבסס על הפרש ממוצע קצר במקום הפרש פשוט\\רגיל</string>
-    <string name="always_use_shortavg_summary">לשימוש כאשר נתונים ממקור לא מפוקח כמו Xdrip אינם יציבים.</string>
    <string name="profile">פרופיל</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">ערך ברירת מחדל: 3 מנגנון הגנה עיקרי של OpenAPS. מגביל את המינון הבזאלי לעד פי 3 מהמינון הבזאלי הגבוה ביותר שהוגדר. ברוב המקרים אין צורך לשנות ערך זה, אך יש לזכור שזו המשמעות של “3x max daily; 4x current” בדיון על מנגנוני הגנה.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">ערך ברירת מחדל: 4 זהו החצי השני של מנגנון הגנה עיקרי של OpenAPS, והחצי השני של \"3x max daily; 4x current\" במנגנוני ההגנה. המשמעות היא שהמינון הבזאלי, ללא קשר למקסימום שנקבע במשאבה, אינו יכול להיות גבוה יותר ממספר זה כפול הקצב הבזאלי הנוכחי. מיועד למנוע כניסה לתחומים מסוכנים ע\"י קביעת קצב בזאלי גבוה לפני הבנה של פעולת האלגוריתם. שוב: ברירת המחדל היא x4, רוב המשתמשים לעולם אינם צריכים לשנות ערך זה ואם הם מרגישים שמנגנון הגנה זה מפריע להם, הפתרון הוא בשינוי של הגדרות אחרות.</string>
@ -354,9 +350,6 @@
    <string name="smscommunicator_invalidphonennumber">מספר טלפון ל SMS לא תקין</string>
    <string name="overview_calibration">כיול</string>
    <string name="xdripnotinstalled">xDrip+ אינו מותקן</string>
-    <string name="calibrationsent">כיול נשלח xDrip</string>
-    <string name="smscommunicator_calibrationsent">הכיול נשלח. יש לאשר את הקבלה ב-xDrip.</string>
-    <string name="smscommunicator_calibrationfailed">xDrip אינו מקבל כיולים</string>
    <string name="pumpsuspended">משאבה מושהית</string>
    <string name="executing">מבצע</string>
    <string name="virtualpump_settings">הגדרות משאבה וירטואלית</string>
@ -459,8 +452,6 @@
    <string name="nav_about">אודות</string>
    <string name="smscommunicator_missingsmspermission">הרשאות SMS חסרות</string>
    <string name="smscommunicator_missingphonestatepermission">הרשאת סטטוס הטלפון חסרה</string>
-    <string name="xdripstatus_settings">מצב xDrip (שעון)</string>
-    <string name="xdripstatus">שורת מצב xDrip (שעון)</string>
    <string name="xdripstatus_shortname">xDS</string>
    <string name="wear_showbgi_title">הצג השפעת רמת הסוכר</string>
    <string name="wear_showbgi_summary">הוסף השפעת הסוכר לשורת הסטטוס</string>
@ -503,7 +494,6 @@
    <string name="mdtp_cancel">ביטול</string>
    <string name="notloadedplugins">לא כל הפרופילים נטענו!</string>
    <string name="valuesnotstored">הערכים לא נשמרו</string>
-    <string name="ns_localbroadcasts">אפשר שידורים לאפליקציות אחרות (כגון xDrip). אין להפעיל אם מותקן לכם יותר ממופע אחד של AAPS או NSClient!</string>
    <string name="ns_localbroadcasts_title">אפשר שידורים מקומיים.</string>
    <string name="careportal_newnstreatment_duration_min_label">משך [min]</string>
    <string name="openapssmb">OpenAPS SMB</string>
@ -1174,7 +1164,6 @@
    <string name="donate_your_data_to_science">תרמו את נתוניכם למדע</string>
    <string name="open_humans_short">OH</string>
    <string name="you_have_been_signed_out_of_open_humans">התנתקתם מ-Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">לחצו כאן כדי להתחבר מחדש אם זה לא היה בכוונה.</string>
    <string name="only_upload_if_connected_to_wifi">אפשר העלאה רק אם מחובר ל-WiFi</string>
    <string name="only_upload_if_charging">אפשר העלאה רק בזמן טעינת הסוללה</string>
    <string name="worker_state">מצב עובד: %s</string>
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@ -39,7 +39,6 @@
    <string name="description_source_glimp">Glimp에서 혈당값 받기</string>
    <string name="description_source_mm640g">600SeriesAndroidUploader에서 혈당값 받기</string>
    <string name="description_source_ns_client">Nightscout에서 다운로드하여 혈당값 받기</string>
-    <string name="description_source_xdrip">xDrip에서 혈당값 받기</string>
    <string name="description_treatments">모든 관리를 저장합니다.</string>
    <string name="description_wear">WearOS 워치를 이용하여 AndroidAPS를 모니터하고 제어합니다.</string>
    <string name="description_xdrip_status_line">xDrip+ 워치페이스에서 Loop정보 보여주기</string>
@ -116,7 +115,6 @@
    <string name="changeyourinput">입력값을 변경하세요!</string>
    <string name="configbuilder_bgsource">혈당 출처</string>
    <string name="configbuilder_bgsource_description">AndroidAPS가 어디에서 데이터를 가져옵니까?</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">APS 모드</string>
    <string name="closedloop">Closed Loop</string>
    <string name="openloop">Open Loop</string>
@ -213,7 +211,6 @@
    <string name="mealbolus">Meal</string>
    <string name="correctionbous">교정주입</string>
    <string name="actions">실행</string>
-    <string name="ns_upload_only">NS에 업로드만 하기(동기화 안됨)</string>
    <string name="pumpNotInitialized">펌프가 초기화 되지 않았습니다!</string>
    <string name="primefill">교체/채움</string>
    <string name="fillwarning">양이 인퓨전세트의 사양과 일치하는지 확인하세요!</string>
@ -267,7 +264,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">탭 이름 단축</string>
    <string name="always_use_shortavg">단순증분값 대신 단기평균증분값을 항상 사용합니다.</string>
-    <string name="always_use_shortavg_summary">xDrip의 혈당데이터에 노이즈가 심할경우 유용합니다.</string>
    <string name="profile">프로파일</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">기본값: 3\n이 값은 중요한 OpenAPS 안전장치입니다. 이 값의 역할은 펌프에 설정되어 있는 최대Basal보다 3배를 초과할 수 없게 제한하는 것입니다. 이 값을 변경할 필요는 없을 것이지만, 안전을 위해 \"3x max daily; 4x current\"이 의미하는 바를 알고 있어야 합니다.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">기본값: 4\n이 값은 \"3x max daily; 4x current\"의 나머지 절반에 해당하는 또 다른 중요한 OpenAPS 안전장치입니다. 이것은, 펌프에 설정된 최대 Basal과는 관계없이, Basal이 설정된 현재시간의 Basal에 이 값을 곱한 양을 초과할 수 없다는 것을 의미합니다. 이는 알고리즘의 작동 방식을 이해하기 전에 과도하게 높은 최대 기본을 설정하여 위험한 상황에 빠지지 않도록 보호하기 위한 것입니다. 다시한번, 기본 값은 4배인 것을 알아두세요; 일반적으로 이것을 조정할 필요는 전혀 없으며, 대신 이 안전장치를 변경해야할것처럼 생각이 된다면, 다른 설정을 변경해야 할 가능성이 더 큽니다.</string>
@ -280,9 +276,6 @@
    <string name="smscommunicator_invalidphonennumber">SMS폰번호가 유효하지 않습니다</string>
    <string name="overview_calibration">보정</string>
    <string name="xdripnotinstalled">xDrip+가 설치되지 않았습니다</string>
-    <string name="calibrationsent">보정이 xDrip으로 전송되었습니다</string>
-    <string name="smscommunicator_calibrationsent">보정 전송됨. xDrip에서 수신이 되도록 설정되어 있어야 합니다.</string>
-    <string name="smscommunicator_calibrationfailed">xDrip에서 보정을 받지 못합니다.</string>
    <string name="pumpsuspended">펌프 일시중지됨</string>
    <string name="executing">실행중</string>
    <string name="virtualpump_settings">가상펌프 설정</string>
@ -353,8 +346,6 @@
    <string name="nav_about">버전정보</string>
    <string name="smscommunicator_missingsmspermission">SMS 권한 누락</string>
    <string name="smscommunicator_missingphonestatepermission">전화 상태 권한이 허가되지 않았습니다</string>
-    <string name="xdripstatus_settings">xDrip 상태(워치)</string>
-    <string name="xdripstatus">xDrip 상태표시라인(워치)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">BGI 보기</string>
    <string name="wear_showbgi_summary">BGI를 상태라인에 추가하기</string>
@ -389,7 +380,6 @@
    <string name="mdtp_cancel">취소</string>
    <string name="notloadedplugins">모든 프로파일이 로드되지 않았습니다.</string>
    <string name="valuesnotstored">값이 저장되지 않았습니다!</string>
-    <string name="ns_localbroadcasts">다른 앱 (예 : xDrip)으로 데이터 전송을 활성화합니다. AAPS 또는 NSClient 인스턴스를 두 개 이상 설치 한 경우 활성화하지 마세요!</string>
    <string name="ns_localbroadcasts_title">Local Broadcasts 활성화하기</string>
    <string name="careportal_newnstreatment_duration_min_label">기간 [min]</string>
    <string name="openapssmb">OpenAPS SMB</string>
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@ -42,7 +42,6 @@
    <string name="description_source_glimp">Gauti kraujo gliukozės vertes iš Glimp.</string>
    <string name="description_source_mm640g">Gauti kraujo gliukozės vertes iš 600SeriesAndroidUploader.</string>
    <string name="description_source_ns_client">Gauti kraujo gliukozės vertes iš Nightscout</string>
-    <string name="description_source_xdrip">Gauti kraujo gliukozės vertes iš xDrip.</string>
    <string name="description_treatments">Išsaugoti visus terapijos pakeitimus</string>
    <string name="description_wear">Stebėti ir kontroliuoti AndroidAPS naudojant WearOS laikrodį.</string>
    <string name="description_xdrip_status_line">Rodyti Ciklo informaciją laikrodyje, xDrip+ pradžios ekrane.</string>
@ -119,7 +118,6 @@
    <string name="changeyourinput">Pakeiskite įvestus duomenis!</string>
    <string name="configbuilder_bgsource">Glikemijos šaltinis</string>
    <string name="configbuilder_bgsource_description">Iš kur AndroidAPS gaus duomenis?</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">DKS režimas</string>
    <string name="closedloop">Uždaras Ciklas</string>
    <string name="openloop">Atviras Ciklas</string>
@ -285,7 +283,6 @@
    <string name="mealbolus">Maistas</string>
    <string name="correctionbous">Korekcija</string>
    <string name="actions">Veiksmai</string>
-    <string name="ns_upload_only">Tik įkelti duomenis į NS (ne sinchronizuoti)</string>
    <string name="pumpNotInitialized">Pompa neprijungta!</string>
    <string name="primefill">Užpildymas</string>
    <string name="fillwarning">Įsitikinkite, kad nurodytas kiekis atitinka Jūsų infuzijos rinkinio specifikaciją!</string>
@ -340,7 +337,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Naudoti sutrumpintus skirtukų pavadinimus</string>
    <string name="always_use_shortavg">Visada naudoti trumpo laikotarpio vidutinį pokyti vietoj paprasto pokyčio</string>
-    <string name="always_use_shortavg_summary">Naudinga, kai duomenys, gaunami iš nefiltruoto šaltinio, tokio kaip xDrip, tampa nestabilūs.</string>
    <string name="profile">Profilis</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Numatytoji reikšmė: 3 tai pagrindinis OpenAPS saugiklis. Jis apriboja Jūsų valandinę bazę iki trigubos maksimalios valandinės bazės (standartiniu atveju). Jums greičiausiai neprireiks šios reikšmės keisti, tačiau turėtumėte žinoti, kad ji naudojama kaip saugiklis apskaičiuojant \"3x maksimali dienos bazė; 4x dabartinė valandinė bazė\".</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Numatytoji reikšmė: 4 tai antras pagrindinis OpenAPS saugiklis, apskaičiuojant \"3x maksimali dienos bazė; 4x dabartinė valandinė bazė\". Jis reiškia, kad jūsų valandinė bazė, nepriklausomai nuo to, kokia maksimali valandinė bazė suprogramuota pompoje, negali būti didesnė, nei keturguba dabartinė valandinė bazė. Tai apsaugo Jus nuo pavojingų situacijų, kai nustatoma pernelyg didelė valandinė bazė, pilnai nesuprantant, kaip veikia algoritmas. Numatytoji reikšmė yra 4x; daugumai vartotojų niekada neprireikia šio skaičiaus keisti, o pajutus, kad \"atsitrenkiama\" į saugiklį, rekomenduojama peržiūrėti kitus nustatymus.</string>
@ -354,9 +350,6 @@
    <string name="smscommunicator_invalidphonennumber">Neteisingas SMS telefono numeris</string>
    <string name="overview_calibration">Kalibravimas</string>
    <string name="xdripnotinstalled">xDrip+ neįdiegta</string>
-    <string name="calibrationsent">Kalibracija nusiųsta į xDrip</string>
-    <string name="smscommunicator_calibrationsent">Kalibracija išsiųsta. xDrip programoje turi būti įgalintas gavimas.</string>
-    <string name="smscommunicator_calibrationfailed">xDrip negauna kalibracijų</string>
    <string name="pumpsuspended">Pompa sustabdyta</string>
    <string name="executing">Vykdoma</string>
    <string name="virtualpump_settings">Virtualios pompos nustatymai</string>
@ -455,8 +448,6 @@
    <string name="nav_about">Apie</string>
    <string name="smscommunicator_missingsmspermission">Trūksta leidimo SMS</string>
    <string name="smscommunicator_missingphonestatepermission">Trūksta telefono būsenos leidimo</string>
-    <string name="xdripstatus_settings">xDrip statusas (laikrodžio)</string>
-    <string name="xdripstatus">xDrip linija (laikrodžio)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">Rodyti KG</string>
    <string name="wear_showbgi_summary">Pridėti KG prie statuso linijos</string>
@ -499,7 +490,6 @@
    <string name="mdtp_cancel">Atšaukti</string>
    <string name="notloadedplugins">Ne visi profiliai įkelti!</string>
    <string name="valuesnotstored">Reikšmės neišsaugotos!</string>
-    <string name="ns_localbroadcasts">Įgalinti perdavimą į kitas programas (pvz., „XDrip“). Neįgalinkite, jei įdiegta daugiau nei vienas AAPS arba NSClient egzempliorius!</string>
    <string name="ns_localbroadcasts_title">Įgalinti lokalų duomenų perdavimą.</string>
    <string name="careportal_newnstreatment_duration_min_label">Trukmė [min]</string>
    <string name="openapssmb">OpenAPS SMB</string>
@ -1170,7 +1160,6 @@
    <string name="donate_your_data_to_science">Paaukokite savo duomenis mokslui</string>
    <string name="open_humans_short">OH</string>
    <string name="you_have_been_signed_out_of_open_humans">Jūs buvote atjungtas iš Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Spustelėkite čia, kad prisijungtumėte dar kartą, jei tai atsitiko netyčia.</string>
    <string name="only_upload_if_connected_to_wifi">Tik įkelti, jei prijungta prie WiFi</string>
    <string name="only_upload_if_charging">Įkelti tik akumuliatoriaus įkrovimo metu</string>
    <string name="worker_state">Darbinė Būklė: %s</string>
@ -1182,7 +1171,6 @@
    <string name="cta_dont_kill_my_app_info">Don\'t kill my app?</string>
    <string name="alarm">Aliarmas</string>
    <string name="smscommunicator_report_pump_ureachable_summary">Siųsti SMS, jei aptinkamas įrašas apie nepasiekiamą pompą</string>
-    <string name="smscommunicator_pump_ureachable">Pranešti apie nepasiekiamą pompą</string>
    <string name="advisoralarm">Pranešti apie laiką valgyti</string>
    <string name="alarminxmin">Pranešti po %1$d min</string>
    <string name="bolusadvisor">Boluso patarėjas</string>
--- a/app/src/main/res/values-nl-rNL/exam.xml
+++ b/app/src/main/res/values-nl-rNL/exam.xml
@ -175,8 +175,8 @@
    <string name="ic_increasingvalue">Hogere KH-ratio\'s leiden tot minder insulinetoediening voor dezelfde hoeveelheid koolhydraten.</string>
    <string name="ic_decreasingvalue">Lagere KH-ratio\'s leiden tot minder insulinetoediening voor dezelfde hoeveelheid koolhydraten.</string>
    <string name="ic_noeffect">Als je 0 COB hebt zal het veranderen van KH-ratio leiden tot een andere hoeveelheid insuline om jouw BG te corrigeren.</string>
-    <string name="ic_different">KH-ratio is anders als je een brood-eenheid telt als10g of als 12g koolhydraten.</string>
-    <string name="ic_meaning">KH-ratio betekent: hoeveel brood-eenheden gebruik je voor 1U insuline.</string>
+    <string name="ic_different">De KH-ratio is anders als je een brood-eenheid telt als 10g of als 12g koolhydraten.</string>
+    <string name="ic_meaning">KH-ratio betekent: hoeveel brood-eenheden gebruik je voor 1E insuline.</string>
    <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Getting-Started/FAQ.html#Koolhydraat-ratio-KH-g-E</string>
    <string name="profileswitch_label">Profielwissels</string>
    <string name="profileswitch_pctwillchange"> Welke antwoorden zijn correct bij het opgeven van een 90% profielwissel?</string>
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@ -42,7 +42,7 @@
    <string name="description_source_glimp">Ontvang BG waardes van Glimp.</string>
    <string name="description_source_mm640g">Ontvang BG waardes van 600SeriesAndroidUploader.</string>
    <string name="description_source_ns_client">Download BG waardes van Nightscout</string>
-    <string name="description_source_xdrip">Ontvang BG waardes van xDrip.</string>
+    <string name="description_source_xdrip">Ontvang BG waardes van xDrip+.</string>
    <string name="description_treatments">Sla alle behandelingen op</string>
    <string name="description_wear">AndroidAPS controleren en bedienen met behulp van uw WearOS-horloge.</string>
    <string name="description_xdrip_status_line">Toon informatie over de Loop op jouw xDrip+ wijzerplaat.</string>
@ -119,7 +119,7 @@
    <string name="changeyourinput">Wijzig het ingegevene!</string>
    <string name="configbuilder_bgsource">BG bron</string>
    <string name="configbuilder_bgsource_description">Waar moet de AndroidAPS zijn gegevens vandaan halen?</string>
-    <string name="xdrip">xDrip</string>
+    <string name="xdrip">xDrip+</string>
    <string name="apsmode_title">APS Mode</string>
    <string name="closedloop">Closed loop</string>
    <string name="openloop">Open loop</string>
@ -217,11 +217,11 @@
    <string name="smscommunicator">SMS Commando\'s</string>
    <string name="smscommunicator_allowednumbers">Geautoriseerde telefoon nummers</string>
    <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
-    <string name="smscommunicator_bolusreplywithcode">Om de bolus %1$.2fU toe te dienen antwoord met de code %2$s</string>
-    <string name="smscommunicator_mealbolusreplywithcode">Antwoord met de code %2$s om de bolus %1$.2fE toe te dienen</string>
-    <string name="smscommunicator_temptargetwithcode">Antwoord met code %2$s om tijdelijk streefdoel %1$s in te stellen</string>
-    <string name="smscommunicator_temptargetcancel">Antwoord met code %1$s om tijdelijk streefdoel te annuleren</string>
-    <string name="smscommunicator_stopsmswithcode">Antwoord met code %1$s om de controle via SMS uit te zetten. \n\nDenk er aan dat je deze alleen weer aan kunt zetten op de AAPS master smartphone.</string>
+    <string name="smscommunicator_bolusreplywithcode">Om een bolus van %1$.2fE te geven antwoord met de code %2$s</string>
+    <string name="smscommunicator_mealbolusreplywithcode">Om een maaltijd bolus van %1$.2fE te geven antwoord met de code %2$s</string>
+    <string name="smscommunicator_temptargetwithcode">Om tijdelijk streefdoel %1$s in te stellen antwoord met code %2$s</string>
+    <string name="smscommunicator_temptargetcancel">Om tijdelijk streefdoel te annuleren antwoord met code %1$s</string>
+    <string name="smscommunicator_stopsmswithcode">Om de SMS Remote Service uit te zetten, antwoord met code %1$s. \n\nDenk er aan dat je deze alleen weer aan kunt zetten op de AAPS master smartphone.</string>
    <string name="smscommunicator_stoppedsms">De controle via SMS is uitgezet. Gebruik AAPS op de master smartphone om deze weer te aan te zetten.</string>
    <string name="smscommunicator_calibrationreplywithcode">Om calibratie %1$.2f te verzenden antwoord met de code %2$s</string>
    <string name="smscommunicator_bolusfailed">Bolus mislukt</string>
@ -246,17 +246,17 @@
    <string name="valueoutofrange">Waarde %1$s valt buiten de toegestane harde limieten</string>
    <string name="smscommunicator_pumpconnectwithcode">Om verbinding te maken met pomp antwoord met code %1$s</string>
    <string name="smscommunicator_pumpconnectfail">Verbinding maken met pomp is mislukt</string>
-    <string name="smscommunicator_pumpdisconnectwithcode">Om de pomp te ontkoppelen voor %1$d minuten antwoord met code %2$s</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Om de pomp te ontkoppelen gedurende %1$d minuten antwoord met code %2$s</string>
    <string name="smscommunicator_pumpdisconnected">Pomp verbinding verbroken</string>
    <string name="smscommunicator_reconnect">Pomp opnieuw verbonden</string>
    <string name="smscommunicator_remotecommandnotallowed">Commando\'s op afstand zijn niet toegestaan</string>
    <string name="smscommunicator_remotebolusnotallowed">Bolus op afstand niet beschikbaar. Probeer het later opnieuw.</string>
-    <string name="smscommunicator_basalreplywithcode">Om een basaal van %1$.2f E/uur voor %2$d min te starten, antwoord met code %3$s</string>
+    <string name="smscommunicator_basalreplywithcode">Om een basaal van %1$.2f E/uur gedurende %2$d min te starten, antwoord met code %3$s</string>
    <string name="smscommunicator_profilereplywithcode">Om naar profiel %1$s %2$d%% te wisselen antwoord met code %3$s</string>
-    <string name="smscommunicator_extendedreplywithcode">Om een vertraagde bolus van %1$.2f E voor %2$d min te starten, antwoord met code %3$s</string>
-    <string name="smscommunicator_carbsreplywithcode">Antwoord met code %3$s om %1$dg in te voeren op %2$s</string>
-    <string name="smscommunicator_basalpctreplywithcode">Om een basaal van %1$d%% voor %2$d min te starten antwoord met code %3$s</string>
-    <string name="smscommunicator_suspendreplywithcode">Om de loop te onderbreken voor %1$d minuten antwoord met de code %2$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Om een vertraagde bolus van %1$.2f E gedurende %2$d min te starten, antwoord met code %3$s</string>
+    <string name="smscommunicator_carbsreplywithcode">Om %1$dg in te voeren om %2$s antwoord met code %3$s</string>
+    <string name="smscommunicator_basalpctreplywithcode">Om een basaal van %1$d%% gedurende %2$d min te starten antwoord met code %3$s</string>
+    <string name="smscommunicator_suspendreplywithcode">Om de loop te onderbreken gedurende %1$d minuten antwoord met de code %2$s</string>
    <string name="smscommunicator_loopresumereplywithcode">Om loop te hervatten antwoord met code %1$s</string>
    <string name="smscommunicator_loopenablereplywithcode">Om loop in te schakelen antwoord met code %1$s</string>
    <string name="smscommunicator_loopdisablereplywithcode">Om loop uit te schakelen antwoord met code %1$s</string>
@ -285,7 +285,7 @@
    <string name="mealbolus">Maaltijd bolus</string>
    <string name="correctionbous">Correctie</string>
    <string name="actions">Acties</string>
-    <string name="ns_upload_only">Alleen NS upload (sync. gedeactiveerd)</string>
+    <string name="ns_upload_only">(GEVAARLIJK OM UIT TE SCHAKELEN) alleen NS upload</string>
    <string name="ns_upload_only_summary">Alleen NS-upload. Heeft geen effect op de SGV, behalve als een lokale bron als xDrip geselecteerd is. Heeft geen effect op profielen wanneer NS-Profielen gebruikt worden.\n!!! WAARSCHUWING !!! Het uitschakelen van deze optie kan fouten veroorzaken en mogelijk resulteren in een overdosis insuline als een van de onderdelen (AAPS, NS, xDrip) onjuist is geconfigureerd. Let goed op of de gegevens van AAPS overeenkomen met de pompstatus!</string>
    <string name="pumpNotInitialized">Pomp niet geïnitialiseerd!</string>
    <string name="primefill">Ontlucht/vul</string>
@ -341,7 +341,7 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Afgekorte tab titels</string>
    <string name="always_use_shortavg">Gebruik altijd korte gemiddeld verschil ipv gewone verschil</string>
-    <string name="always_use_shortavg_summary">Nuttig wanneer gegevens van niet gedempte bronnen zoals Xdrip noisy zijn.</string>
+    <string name="always_use_shortavg_summary">Nuttig wanneer gegevens van niet gefilterde bronnen zoals xDrip+ veel ruis heeft.</string>
    <string name="profile">Profiel</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Standaard waarde: 3.0 Dit is een belangrijke veiligheid parameter van OpenAPS. Dit limiteert je basaal met een max van 3 maal je hoogste basale dosis. Normaal hoef je deze niet te veranderen. Het is echter belangrijk dat je de ingebouwde limieten kent.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Standaard waarde: 4 Dit is een combinatie van enerzijds het OpenAPS veiligheid limieten en anderzijds van “3 x max dagelijks basaal; 4x actueel”. Dit betekent dat het basaal niet hoger kan ingesteld worden dan het ingestelde nummer keer het actueel basaal waarbij de limiet in de pomp geen invloed heeft. Dit is een veiligheidsmaatregel om te voorkomen dat patiënten in gevaarlijke laag bereik komen zonder te snappen hoe het algoritme werkt. Nogmaals de standaard waarde is 4x; de meeste zullen deze waarde nooit moeten aanpassen maar zullen eerder andere waardes moeten aanpassen als ze tegen een limiet aanstoten.</string>
@ -355,9 +355,9 @@
    <string name="smscommunicator_invalidphonennumber">Foutief SMS telefoon nummer</string>
    <string name="overview_calibration">Kalibratie</string>
    <string name="xdripnotinstalled">xDrip+ niet geïnstalleerd</string>
-    <string name="calibrationsent">Kalibratie naar xDrip verzonden</string>
-    <string name="smscommunicator_calibrationsent">Kalibratie verzonden. Het ontvangen van kalibraties moet actief zijn in xDrip.</string>
-    <string name="smscommunicator_calibrationfailed">XDrip ontvangt geen kalibraties</string>
+    <string name="calibrationsent">Kalibratie verzonden naar xDrip+</string>
+    <string name="smscommunicator_calibrationsent">Kalibratie verzonden. xDrip+ moet zo zijn ingesteld dat hij het ontvangen van kalibraties toestaat.</string>
+    <string name="smscommunicator_calibrationfailed">xDrip+ ontvangt geen kalibraties</string>
    <string name="pumpsuspended">Pomp onderbreken</string>
    <string name="executing">Uitvoeren</string>
    <string name="virtualpump_settings">Virtuele pomp instellingen</string>
@ -460,8 +460,8 @@
    <string name="nav_about">Over</string>
    <string name="smscommunicator_missingsmspermission">Geen SMS bevoegdheid</string>
    <string name="smscommunicator_missingphonestatepermission">Machtiging ontbreekt voor telefoon gebruik</string>
-    <string name="xdripstatus_settings">xDrip Status (Horloge)</string>
-    <string name="xdripstatus">xDrip Statuslijn (Horloge)</string>
+    <string name="xdripstatus_settings">xDrip+ Status (horloge)</string>
+    <string name="xdripstatus">xDrip+ Statuslijn (horloge)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">Toon BGI</string>
    <string name="wear_showbgi_summary">Voeg BGI toe aan status lijn</string>
@ -504,7 +504,7 @@
    <string name="mdtp_cancel">Afbreken</string>
    <string name="notloadedplugins">Niet alle profielen zijn geladen!</string>
    <string name="valuesnotstored">Waarden niet opgeslagen!</string>
-    <string name="ns_localbroadcasts">Schakel broadcasts in naar andere apps (zoals xDrip). Schakel niet in als je NSClient of meer dan één installatie van AAPS hebt geïnstalleerd!</string>
+    <string name="ns_localbroadcasts">Schakel lokaal data delen naar andere apps (zoals xDrip) in. Schakel dit niet in als je NSClient of meer dan één installatie van AAPS op je telefoon hebt staan!</string>
    <string name="ns_localbroadcasts_title">Activeer locaal delen.</string>
    <string name="careportal_newnstreatment_duration_min_label">Tijdsduur [min]</string>
    <string name="openapssmb">OpenAPS SMB</string>
@ -1187,7 +1187,7 @@
    <string name="cta_dont_kill_my_app_info">Don\'t kill my app?</string>
    <string name="alarm">Alarm</string>
    <string name="smscommunicator_report_pump_ureachable_summary">Stuur SMS wanneer de pomp onbereikbaar is</string>
-    <string name="smscommunicator_pump_ureachable">Melden wanneer de pomp onbereikbaar is</string>
+    <string name="smscommunicator_pump_ureachable">Melding pomp onbereikbaar</string>
    <string name="advisoralarm">Start alarm wanneer het tijd is om te eten</string>
    <string name="alarminxmin">Start alarm over %1$d min</string>
    <string name="bolusadvisor">Bolusadviseur</string>
@ -1197,4 +1197,5 @@
    <string name="time_to_eat">Tijd om te eten!\nVoer de boluswizard opnieuw uit.</string>
    <string name="timetoeat">Tijd om te eten</string>
    <string name="fabric_upload_disabled">Upload van crashrapporten is uitgeschakeld!</string>
+    <string name="graph_menu_divider_header">Grafiek</string>
 </resources>
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@ -42,7 +42,6 @@
    <string name="description_source_glimp">Motta BS verdier fra Glimp.</string>
    <string name="description_source_mm640g">Motta BS verdier fra 600SeriesAndroidUploader.</string>
    <string name="description_source_ns_client">Last ned BS verdier fra Nightscout</string>
-    <string name="description_source_xdrip">Motta BS verdier fra xDrip.</string>
    <string name="description_treatments">Lagre data om alle behandlinger som er utført</string>
    <string name="description_wear">Monitorer og kontroller AndroidAPS med din WearOS klokke.</string>
    <string name="description_xdrip_status_line">Vis informasjon om loop på din xDrip+ urskive.</string>
@ -119,7 +118,6 @@
    <string name="changeyourinput">Endre dine inndata!</string>
    <string name="configbuilder_bgsource">BS kilde</string>
    <string name="configbuilder_bgsource_description">Hvor skal AndroidAPS hente sine data fra?</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">APS modus</string>
    <string name="closedloop">Lukket loop</string>
    <string name="openloop">Åpen loop</string>
@ -285,8 +283,6 @@
    <string name="mealbolus">Måltid</string>
    <string name="correctionbous">Korreksjon</string>
    <string name="actions">Handlinger</string>
-    <string name="ns_upload_only">Kun NS opplasting (deaktivert sync)</string>
-    <string name="ns_upload_only_summary">Kun NS opplasting. Ikke effektiv på SGV med mindre en lokal kilde som xDrip er valgt. Ikke effektiv på Profiler mens NS-Profiler brukes.\n!!! ADVARSEL !!! Deaktivering av dette alternativet kan føre til funksjonsfeil og overdosering av insulin hvis noen av dine komponenter (AAPS, NS, xDrip) er feil konfigurert. Observer at data som vises i AAPS samsvarer med pumpestatus!</string>
    <string name="pumpNotInitialized">Pumpen ikke initialisert!</string>
    <string name="primefill">Prime/fylling</string>
    <string name="fillwarning">Kontroller at mengden samsvarer med spesifikasjonen for slangesettet ditt!</string>
@ -341,7 +337,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Korte navn i menyfaner</string>
    <string name="always_use_shortavg">Bruk alltid kort gjennomsnittsverdi delta i stedet for enkel delta</string>
-    <string name="always_use_shortavg_summary">Nyttig når data fra ufiltrerte kilder som xDrip registrerer mye støy.</string>
    <string name="profile">Profil</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Standardverdi: 3 Dette er en viktig OpenAPS sikkerhetsbegrensning. Dette begrenser dine basaler til maks 3x av din høyeste basalverdi. Du vil trolig ikke behøve å endre denne verdien, men les og forstå hva som menes med \"3x max daglig; 4x gjeldende\" som sikkerhetsinnstilling.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Standardverdi: 4 Dette er en viktig OpenAPS sikkerhetsbegrensning. Dette begrenser dine temp basal til max 4 ganger din nåværende basal dose, uansett hva som er maks basal i pumpen. Dette er for å unngå at man setter farlige høye maks basal doser uten at man har forstått algoritmene. Når du taket i denne begrensningen bør du i stedet fokusere på å endre andre innstillinger.</string>
@ -355,9 +350,6 @@
    <string name="smscommunicator_invalidphonennumber">Ugyldig SMS mobilnummer</string>
    <string name="overview_calibration">Kalibrering</string>
    <string name="xdripnotinstalled">xDrip+ ikke installert</string>
-    <string name="calibrationsent">Kalibrering er sendt til xDrip</string>
-    <string name="smscommunicator_calibrationsent">Kalibrering sendt. Vær oppmerksom på at xDrip må være konfigurert til å ta imot kalibreringer.</string>
-    <string name="smscommunicator_calibrationfailed">xDrip tar ikke imot kalibreringer</string>
    <string name="pumpsuspended">Pumpen er pauset</string>
    <string name="executing">Utfører</string>
    <string name="virtualpump_settings">Virtuelle pumpe innstillinger</string>
@ -460,8 +452,6 @@
    <string name="nav_about">Om</string>
    <string name="smscommunicator_missingsmspermission">Mangler SMS tillatelse</string>
    <string name="smscommunicator_missingphonestatepermission">Mangler app tillatelse til telefon</string>
-    <string name="xdripstatus_settings">xDrip Status (klokke)</string>
-    <string name="xdripstatus">xDrip Statuslinje (klokke)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">Vis BGI</string>
    <string name="wear_showbgi_summary">Legg til BGI i statuslinje</string>
@ -504,7 +494,6 @@
    <string name="mdtp_cancel">Avbryt</string>
    <string name="notloadedplugins">Ikke alle profiler ble lastet!</string>
    <string name="valuesnotstored">Verdier ikke lagret!</string>
-    <string name="ns_localbroadcasts">Aktiver sending til andre apper (som xDrip). Ikke aktiver dette hvis du har mer enn en AAPS eller NSClient installert!</string>
    <string name="ns_localbroadcasts_title">Aktiver lokale sendinger.</string>
    <string name="careportal_newnstreatment_duration_min_label">Varighet [min]</string>
    <string name="openapssmb">OpenAPS SMB</string>
@ -1175,7 +1164,6 @@
    <string name="donate_your_data_to_science">Doner dine data til vitenskapen</string>
    <string name="open_humans_short">OH</string>
    <string name="you_have_been_signed_out_of_open_humans">Du har blitt logget ut fra Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Klikk her for å logge inn igjen hvis dette ikke var hensikten.</string>
    <string name="only_upload_if_connected_to_wifi">Last opp kun dersom du er koblet til WiFi</string>
    <string name="only_upload_if_charging">Last opp kun ved mobillading</string>
    <string name="worker_state">Fremdrift: %s</string>
@ -1187,7 +1175,6 @@
    <string name="cta_dont_kill_my_app_info">Avslutte app?</string>
    <string name="alarm">Alarm</string>
    <string name="smscommunicator_report_pump_ureachable_summary">Send SMS hvis det ikke oppnås kontakt med pumpa</string>
-    <string name="smscommunicator_pump_ureachable">Rapporter når pumpe ikke kan tilkobles</string>
    <string name="advisoralarm">Aktiver alarm når det er på tide å spise</string>
    <string name="alarminxmin">Aktiver alarm om %1$d min</string>
    <string name="bolusadvisor">Bolusguide</string>
--- a/app/src/main/res/values-pl-rPL/exam.xml
+++ b/app/src/main/res/values-pl-rPL/exam.xml
@ -93,7 +93,7 @@
    <string name="prerequisites2_supportedcgm">Wspierany CGM i odpowiednia aplikacja, aby otrzymywać wartości glukozy we krwi na telefonie/urządzeniu.</string>
    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
    <string name="update_label">Aktualizowanie AndroidAPS</string>
-    <string name="whatistrue">Sprawdź/Zaznacz wszystkie prawidłowe odpowiedzi.</string>
+    <string name="whatistrue">Zaznacz wszystkie prawidłowe odpowiedzi.</string>
    <string name="update_git">Musisz mieć zainstalowany i skonfigurowany Git na komputerze.</string>
    <string name="update_asap">Po wydaniu zaktualizowanych wersji AndroidAPS wcześniejsze wersje mogą być zdalnie ograniczone po określonym czasie.</string>
    <string name="update_keys">Powinieneś/powinnaś zapisać i zanotować lokalizację swojego klucza i użyć tego samego klucza do aktualizacji jak dla poprzedniej instalacji.</string>
@ -117,7 +117,7 @@
    <string name="insulin_actrapid">Actrapid ® /Humulin R ®/\"zwykła\" insulina ludzka.</string>
    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
    <string name="sensitivity_label">Wtyczki wrażliwości</string>
-    <string name="sensitivity_which">Sprawdź/Zaznacz wszystkie prawidłowe odpowiedzi.</string>
+    <string name="sensitivity_which">Zaznacz wszystkie prawidłowe odpowiedzi.</string>
    <string name="sensitivity_adjust">Wtyczki wrażliwości pozwalają AndroidAPS dostosować się do czasowych lub krótkotrwałych zmian wrażliwości na insulinę (na przykład zmiany hormonalne lub problemy z wchłanianiem w miejscu wkłucia).</string>
    <string name="sensitivity_edit">Wtyczki wrażliwości dostarczają użytkownikowi sugerowane zmiany w dawkach bazowych, współczynnikach I:C i ISF, które mogą być używane do edycji profilu.</string>
    <string name="sensitivity_cannula">Rejestracja zmiany wkłucia spowoduje zresetowanie współczynnika Autosens z powrotem do 100%.</string>
--- a/app/src/main/res/values-pl-rPL/objectives.xml
+++ b/app/src/main/res/values-pl-rPL/objectives.xml
@ -40,12 +40,12 @@
    <string name="codeaccepted">Kod został zaakceptowany</string>
    <string name="codeinvalid">Niepoprawny kod</string>
    <string name="objectives_exam_objective">Potwierdź swoje umiejętności</string>
-    <string name="objectives_exam_gate">Przestudiuj pytania.  Na każde pytanie masz cztery możliwe odpowiedzi. Może być więcej niż jedna poprawna odpowiedź. Sprawdź wszystkie poprawne i wybierz WERYFIKUJ.</string>
+    <string name="objectives_exam_gate">Przestudiuj pytania.  Na każde pytanie masz cztery możliwe odpowiedzi. Może być więcej niż jedna poprawna odpowiedź. Zaznacz wszystkie poprawne i wybierz WERYFIKUJ.</string>
    <string name="answerdisabledto">Odpowiadanie wyłączone na: %1$s</string>
    <string name="wronganswer">Odpowiedź nieprawidłowa!</string>
    <string name="unfinshed_button">Następny niedokończony</string>
    <string name="requestcode">Kod zapytania: %1$s</string>
-    <string name="objectives_hint">(sprawdź wszystkie poprawne odpowiedzi)</string>
+    <string name="objectives_hint">(zaznacz wszystkie poprawne odpowiedzi)</string>
    <string name="disconnectpump_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-to-do-when-taking-a-shower-or-bath</string>
    <string name="usetemptarget_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#the-homescreen</string>
    <string name="useaction_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#config-builder</string>
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@ -42,7 +42,6 @@
    <string name="description_source_glimp">Pobieraj wartości BG z Glimp.</string>
    <string name="description_source_mm640g">Pobieraj wartości BG z uploadera pomp serii 600.</string>
    <string name="description_source_ns_client">Pobieraj wartości BG z Nightscout</string>
-    <string name="description_source_xdrip">Pobieraj wartości BG z xDrip.</string>
    <string name="description_treatments">Zapisuje wszystkie wykonane czynności leczenia</string>
    <string name="description_wear">Monitoruj i kontroluj AndroidAPS, korzystając z SmartWatch WearOS.</string>
    <string name="description_xdrip_status_line">Pokaż informacje o swojej pętli na watchface xDrip+.</string>
@ -119,7 +118,6 @@
    <string name="changeyourinput">Zmień wprowadzone dane!</string>
    <string name="configbuilder_bgsource">Źródło BG</string>
    <string name="configbuilder_bgsource_description">Skąd AndroidAPS powinien czerpać dane?</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">Tryb APS</string>
    <string name="closedloop">Zamknięta pętla</string>
    <string name="openloop">Otwarta pętla</string>
@ -285,7 +283,6 @@
    <string name="mealbolus">Posiłek</string>
    <string name="correctionbous">Korekta</string>
    <string name="actions">Akcje</string>
-    <string name="ns_upload_only">NS tylko przesył. (wyłączona synch.)</string>
    <string name="pumpNotInitialized">Pompa nie zainicjowana!</string>
    <string name="primefill">Rozpocznij/Wypełnij</string>
    <string name="fillwarning">Proszę upewnij się, że ilość wypełnienia odpowiada ilości właściwej dla twojego wkłucia!</string>
@ -340,7 +337,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Skrócone tytuły kart</string>
    <string name="always_use_shortavg">Zawsze używaj krótkiej średniej delty zamiast prostej delta</string>
-    <string name="always_use_shortavg_summary">Użyteczne, jeżeli dane z niefiltrowanego źródła jak xDrip mają rozrzut.</string>
    <string name="profile">Profil</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Wartość domyślna: 3 To jest kluczowy współczynnik bezpieczeństwa OpenAPS. Ogranicza dawki bazowe do 3x twojej największej dawki bazowej. Prawdopodobnie nie będziesz musiał tego zmieniać, ale powinieneś być świadomy tego, co się rozumie przez “3x max dzienna; 4x aktualna” dla współczynników bezpieczeństwa.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Wartość domyślna: 4 To jest drugi kluczowy współczynnik bezpieczeństwa OpenAPS, i druga wartość z “3x max dzienna; 4x aktualna”. To oznacza, że Twoja dawka bazowa niezależnie od maksymalnej bazy ustawionej na pompie nie może być większa niż ta ustawiona wartość razy twoja aktualna dawka bazowa. To ma na celu przestrzec ludzi przed ustawieniem zbyt wysokiej dawki maksymalnej przed zrozumieniem jak działa algorytm. Ponownie, wartość domyślna to 4x; większość ludzi nie będzie potrzebowała tego zmienić i raczej będą potrzebować dostosować inne ustawienia, jeśli czują, że zbliżają się do współczynnika bezpieczeństwa.</string>
@ -354,9 +350,6 @@
    <string name="smscommunicator_invalidphonennumber">Nieprawidłowy numer telefonu SMS</string>
    <string name="overview_calibration">Kalibracja</string>
    <string name="xdripnotinstalled">xDrip+ nie zainstalowany</string>
-    <string name="calibrationsent">Kalibracja przesłana do xDrip</string>
-    <string name="smscommunicator_calibrationsent">Kalibracja wysłana. Odbiór musi być dozwolony w xDrip.</string>
-    <string name="smscommunicator_calibrationfailed">xDrip nie odbiera kalibracji</string>
    <string name="pumpsuspended">Pompa wstrzymana</string>
    <string name="executing">Wykonywanie</string>
    <string name="virtualpump_settings">Ustawienia pompy wirtualnej</string>
@ -455,8 +448,6 @@
    <string name="nav_about">O programie</string>
    <string name="smscommunicator_missingsmspermission">Brak uprawnień SMS</string>
    <string name="smscommunicator_missingphonestatepermission">Brak uprawnień do wykrywania stanu telefonu</string>
-    <string name="xdripstatus_settings">xDrip Status (watch)</string>
-    <string name="xdripstatus">Linia Statusu xDrip (watch)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">Pokaż BGI</string>
    <string name="wear_showbgi_summary">Dodaj BGI do Linii Statusu</string>
@ -500,7 +491,6 @@
    <string name="mdtp_cancel">Anuluj</string>
    <string name="notloadedplugins">Nie wszystkie profile zostały załadowane!</string>
    <string name="valuesnotstored">Wartości nie są przechowywane!</string>
-    <string name="ns_localbroadcasts">Włącz rozgłaszanie do innych aplikacji (takich jak xDrip). Nie należy włączać, jeśli zainstalowana jest więcej niż jedna instancja AAPS lub NSClient!</string>
    <string name="ns_localbroadcasts_title">Włącz transmisję lokalnie.</string>
    <string name="careportal_newnstreatment_duration_min_label">Czas trwania [min]</string>
    <string name="openapssmb">OpenAPS SMB</string>
@ -1171,7 +1161,6 @@
    <string name="donate_your_data_to_science">Przekaż swoje dane na rzecz nauki</string>
    <string name="open_humans_short">OH</string>
    <string name="you_have_been_signed_out_of_open_humans">Zostałeś wylogowany z Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Kliknij tutaj, aby zalogować się ponownie, jeśli wylogowanie nie było celowe.</string>
    <string name="only_upload_if_connected_to_wifi">Prześlij tylko jeśli połączono poprzez WiFi</string>
    <string name="only_upload_if_charging">Prześlij tylko gdy telefon jest ładowany</string>
    <string name="worker_state">Stan procesu: %s</string>
@ -1183,7 +1172,6 @@
    <string name="cta_dont_kill_my_app_info">Nie zabij mojej aplikacji?</string>
    <string name="alarm">Alarm</string>
    <string name="smscommunicator_report_pump_ureachable_summary">Wyślij SMS, jeśli wyzwolone jest zdarzenie pompy nieosiągalnej</string>
-    <string name="smscommunicator_pump_ureachable">Zgłoś pompę nieosiągalną</string>
    <string name="advisoralarm">Uruchom alarm kiedy będzie czas na jedzenie</string>
    <string name="alarminxmin">Uruchom alarm za %1$d min</string>
    <string name="bolusadvisor">Doradca bolusa</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -40,7 +40,6 @@
    <string name="description_source_glimp">Receber valores BG do Glimp.</string>
    <string name="description_source_mm640g">Receber valores de Glucose do 600SeriesAndroidUploader.</string>
    <string name="description_source_ns_client">Downloads de dados de Glicose do Nightscout</string>
-    <string name="description_source_xdrip">Receber valores BG de xDrip.</string>
    <string name="description_treatments">Salva todos os tratamentos que foram feitos</string>
    <string name="description_wear">Monitore e controle AndroidAPS usando seu relógio WearOS.</string>
    <string name="description_xdrip_status_line">Mostrar informações sobre o loop no watchface do xDrip+.</string>
@ -117,7 +116,6 @@
    <string name="changeyourinput">Altere sua entrada!</string>
    <string name="configbuilder_bgsource">Fonte de BG</string>
    <string name="configbuilder_bgsource_description">De onde o AndroidAPS deve obter os dados?</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">Modo APS</string>
    <string name="closedloop">Loop Fechado</string>
    <string name="openloop">Loop Aberto</string>
@ -260,7 +258,6 @@
    <string name="mealbolus">Refeição</string>
    <string name="correctionbous">Correção</string>
    <string name="actions">Ações</string>
-    <string name="ns_upload_only">Envio do NS apenas (sincronização desativada)</string>
    <string name="pumpNotInitialized">Bomba não inicializada!</string>
    <string name="primefill">Purgar/Preencher</string>
    <string name="fillwarning">Por favor certifique-se que o valor corresponde ao especificado para o seu conjunto de infusão!</string>
@ -315,7 +312,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Abreviar títulos dos separadores</string>
    <string name="always_use_shortavg">Usar sempre delta médio curto em vez de delta simples</string>
-    <string name="always_use_shortavg_summary">Útil quando há ruído nos dados de fontes sem filtro como o xDrip.</string>
    <string name="profile">Perfil</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Valor padrão: 3 Por segurança é o valor limite estabelecido por OpenAPS. O que faz é limitar a basal a x3 a basal mázima. Se necessário modificar este valor, por favor ter em conta que os dados apontam para que os limites de segurança sejam - 3 x max diario ou 4x valor atual (qual seja menor) como valores máximos.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Valor padrão: 4 Esta é a outra parte dos valores limites de segurança - 3 x max diário ou 4x valor actual - do OpenAPS. Isto define que não importa o valor da basal máxima definido na bomba, o valor máximo da basal temporária não pode ser maior que 4 x o valor da basal definida na bomba. O objetivo é evitar que sejam determinadas basais temporárias muito elevadas antes que se perceba como o algoritmo funciona. 4x é um valor que a maior parte das pessoas nunca necessitará de alterar pois o mais provável é necessitar de alterar outras definições para não necessitar de \"ultrapassar\" este limite de segurança.</string>
@ -329,9 +325,6 @@
    <string name="smscommunicator_invalidphonennumber">SMS número de telefone inválido</string>
    <string name="overview_calibration">Calibração</string>
    <string name="xdripnotinstalled">xDrip+ não está instalado</string>
-    <string name="calibrationsent">Calibração enviada para o xDrip</string>
-    <string name="smscommunicator_calibrationsent">Calibração enviada. Recepção têm de estar activada no xDrip.</string>
-    <string name="smscommunicator_calibrationfailed">O xDrip não esta a receber as calibrações</string>
    <string name="pumpsuspended">Bomba suspensa</string>
    <string name="executing">Executando</string>
    <string name="virtualpump_settings">Definições da bomba virtual</string>
@ -407,8 +400,6 @@
    <string name="nav_about">Sobre</string>
    <string name="smscommunicator_missingsmspermission">Falta de permissão SMS</string>
    <string name="smscommunicator_missingphonestatepermission">Falta permissão do estado do telefone</string>
-    <string name="xdripstatus_settings">Estado xDrip (relógio)</string>
-    <string name="xdripstatus">Linha estado xDrip (relógio)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">Mostrar BGI</string>
    <string name="wear_showbgi_summary">Adicionar BGI à linha de status</string>
@ -443,7 +434,6 @@
    <string name="mdtp_cancel">Cancelar</string>
    <string name="notloadedplugins">Nem todos perfis foram carregados!</string>
    <string name="valuesnotstored">Valores não guardados!</string>
-    <string name="ns_localbroadcasts">Ative as transmissões para outros apps (como xDrip). Não ative se você tiver mais de uma instância de AAPS ou NSClient instalada!</string>
    <string name="ns_localbroadcasts_title">Ativar partilha local.</string>
    <string name="careportal_newnstreatment_duration_min_label">Duração [min]</string>
    <string name="openapssmb">SMB OpenAPS</string>
--- a/app/src/main/res/values-pt-rPT/exam.xml
+++ b/app/src/main/res/values-pt-rPT/exam.xml
@ -1,23 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="dia_whatmeansdia">O que é verdade sobre DIA?</string>
+    <string name="dia_label_exam">Duração da Acção de Insulina (DIA)</string>
+    <string name="dia_profile">Deve definir o valor da DIA no seu perfil.</string>
+    <string name="dia_minimumis5h">O valor mínimo permitido são 5 horas.</string>
    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
+    <string name="hypott_label">Hipo Alvo-Temp</string>
    <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
    <string name="offlineprofile_whatprofile">Qual perfil pode ser usado e configurado offline?</string>
    <string name="offlineprofile_label">Tópico: Perfil Offline</string>
    <string name="offlineprofile_nsprofile">Perfil NS pode ser usado, mas não configurado.</string>
    <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
+    <string name="pumpdisconnect_label">Razões para aplicar \"Desconectar bomba\" no AndroidAPS</string>
    <string name="pumpdisconnect_whattodo">O que deve ser feito ao desligar a bomba?</string>
    <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
+    <string name="objectives_label">Definições AndroidAPS</string>
+    <string name="objectives2_label">Definições AndroidAPS</string>
    <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
    <string name="noisycgm_whattodo">O que deve ser feito se os dados do CGM são irregulares?</string>
    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
    <string name="suspendloop_doigetinsulin">Eu recebo insulina quando o loop estiver desactivado/suspenso?</string>
    <string name="suspendloop_yes">Sim, a insulina basal continua a ser administrada.</string>
    <string name="suspendloop_no">Não, administração da insulina está parada.</string>
+    <string name="basaltest_label">Testes de Basal, FSI e I:C</string>
+    <string name="basaltest_when">Quando esses valores devem ser validados?</string>
+    <string name="basaltest_beforeloop">Antes de começar com o looping.</string>
+    <string name="basaltest_weekly">Pelo menos uma vez por semana.</string>
    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
+    <string name="prerequisites_label">Pré-requisitos</string>
    <string name="prerequisites_determinedcorrectprofile">Informações do perfil validadas (Basal, IC, FSI, DIA).</string>
    <string name="prerequisites_phone">Um telefone compatível.</string>
    <string name="prerequisites_tidepoolaccount">Uma conta Tidepool.</string>
@ -27,24 +40,43 @@
    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
    <string name="prerequisites_smartwatch">Um Smartwatch.</string>
    <string name="prerequisites_supportedcgm">Um CGM Suportado.</string>
+    <string name="prerequisites2_label">Pré-requisitos</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="update_label">Actualizar AndroidAPS</string>
+    <string name="whatistrue">Seleccione todas as respostas correctas.</string>
    <string name="update_neverupdate">Nunca actualize se o sistema estiver a funcionar bem.</string>
    <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
+    <string name="troubleshooting_label">Resolução de Problemas</string>
    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
    <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
    <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
+    <string name="insulin_label">Plugins de Insulina</string>
    <string name="insulin_fiasp">Fiasp®</string>
+    <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
    <string name="insulin_humalog">Humalog ®</string>
+    <string name="insulin_actrapid">Actrapid®/Humalin R®/\"regular\" insulina humana.</string>
    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
+    <string name="sensitivity_label">Plugins de Sensibilidade</string>
+    <string name="sensitivity_which">Marque todas as respostas correctas.</string>
    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
    <string name="wrongcarbs_whattodo">O que deve fazer se tiver feito uma entrada incorrecta de hidratos?</string>
+    <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
+    <string name="extendedcarbs_label">hidratos-e</string>
+    <string name="extendedcarbs_handling">Para que poderia usar os hidratos-e (hidratos estendidos)?</string>
+    <string name="extendedcarbs_fat">Os hidratos-e (distribuídos no futuro) podem ajudar o AndroidAPS a lidar com comidas gorduras/proteínas elevadas.</string>
    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
+    <string name="nsclient_label">Monitorização Remota</string>
    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
    <string name="isf_profile">A alteração do valor do FSI no seu perfil é suficiente para aplicar a mudança.</string>
    <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
    <string name="ic_noeffect">Se tiver 0 COB, alterar o rácio IC irá levar a uma quantidade diferente de insulina para corrigir um determinado valor da Glic.</string>
    <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
+    <string name="profileswitch_label">Troca de Perfil</string>
    <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
+    <string name="profileswitchtime_label">Troca de Perfil</string>
+    <string name="profileswitchtime_2">Iniciar uma mudança de perfil com uma alteração de turno de 2</string>
+    <string name="profileswitchtime__2">Iniciar uma mudança de perfil com uma alteração de turno de -2</string>
    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
    <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
    <string name="basalhelp_where">Onde ir para obter ajuda com rácios da basal, etc.</string>
--- a/app/src/main/res/values-pt-rPT/objectives.xml
+++ b/app/src/main/res/values-pt-rPT/objectives.xml
@ -28,7 +28,7 @@
    <string name="objectives_usage_objective">Aprenda como controlar AndroidAPS</string>
    <string name="objectives_usage_gate">Executar diferentes acções no AndroidAPS</string>
    <string name="objectives_useprofileswitch">Definir perfil de 90% por 10 min (pressione longo no nome de perfil na Visão Geral)</string>
-    <string name="objectives_usedisconnectpump">Simular chuveiro. Desligar a bomba de 1h (Pressione longo em Open Loop)</string>
+    <string name="objectives_usedisconnectpump">Simular chuveiro. Desconectar a bomba por 1h (Pressione longo em Open Loop)</string>
    <string name="objectives_usereconnectpump">... e volte a ligar de volta da mesma forma</string>
    <string name="objectives_usetemptarget">Crie um alvo temporário personalizado com 10 min de duração (pressione longo no seu alvo actual)</string>
    <string name="objectives_useactions">No Configurador active o plugiin de Acções, torne-o visível e exiba o seu conteúdo no menu superior</string>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -7,13 +7,14 @@
    <string name="treatmentssafety_title">Segurança de tratamentos</string>
    <string name="treatmentssafety_maxbolus_title">Max bolus permitido [U]</string>
    <string name="treatmentssafety_maxcarbs_title">Max hidratos permitidos [g]</string>
+    <string name="nav_preferences_plugin">%1$s Preferências</string>
    <string name="nav_preferences">Preferências</string>
    <string name="nav_refreshtreatments">Actualizar tratamentos do NS</string>
    <string name="nav_resetdb">Reinicializar base de dados</string>
    <string name="reset_db_confirm">Quer realmente reiniciar a base de dados?</string>
    <string name="nav_exit">Sair</string>
    <string name="ns_sync_use_absolute_title">Usar sempre valores absolutos de basal</string>
-    <string name="alert_dialog_storage_permission_text">Por favor, reinicie o telefone ou reinicie o AndroidAPS a partir das Configurações do Sistema \ncaso contrário, o AndroidAPS não terá registo (importante para controlar e verificar se os algoritmos estão a funcionar correctamente)!</string>
+    <string name="alert_dialog_storage_permission_text">Por favor, reinicie o telefone ou reinicie o AndroidAPS a partir das Definições do Sistema \ncaso contrário, o AndroidAPS não terá registo (importante para controlar e verificar se os algoritmos estão a funcionar correctamente)!</string>
    <string name="alert_dialog_permission_battery_optimization_failed">Este dispositivo não parece suportar a optimização de bateria na lista de permissões - pode ter problemas de desempenho.</string>
    <string name="description_actions">Alguns botões para aceder rapidamente a funções comuns</string>
    <string name="description_config_builder">Usado para configurar os plugins ativos</string>
@ -34,17 +35,16 @@
    <string name="description_pump_combo">Integração para bombas Accu-Chek Combo, requer ter o ruffy instalado</string>
    <string name="description_pump_mdi">Integração para as pessoas que fazem múltiplas injeções diárias para a sua terapia de diabetes</string>
    <string name="description_pump_virtual">Integração para as bombas que não têm qualquer driver ainda (Open Loop)</string>
-    <string name="description_sensitivity_aaps">A sensibilidade é calculada da mesma forma que Oref0, mas você pode especificar o período de tempo para o passado. A absorção mínima de hidratos de carbono é calculada a partir do tempo máximo de absorção de hidratos de carbono das preferências.</string>
+    <string name="description_sensitivity_aaps">A sensibilidade é calculada da mesma forma que Oref0, mas pode especificar o período de tempo para o passado. A absorção mínima de hidratos de carbono é calculada a partir do tempo máximo de absorção de hidratos de carbono das preferências.</string>
    <string name="description_sensitivity_oref1">A sensibilidade é calculada a partir de dados das últimas 8h ou 24h (usando qualquer um que é mais sensível). Hidratos são cortados (se não absorvidos) após o tempo especificado nas preferências. O Plugin também calcula o UAM.</string>
    <string name="description_sensitivity_weighted_average">A sensibilidade é calculada como uma média ponderada de desvios. Desvios mais recentes têm maior peso. A absorção mínima de hidratos de carbono é calculada a partir do tempo máximo de absorção de hidratos de carbono das preferências. Este algoritmo é o mais rápido em seguir as mudanças de sensibilidade.</string>
    <string name="description_source_eversense">Receber valores de Glicose da aplicação Eversense modificada.</string>
    <string name="description_source_glimp">Receber valores Glucose do Glimp.</string>
    <string name="description_source_mm640g">Receber valores de Glucose do 600SeriesAndroidUploader.</string>
    <string name="description_source_ns_client">Descarrega dados de Glucose do Nightscout</string>
-    <string name="description_source_xdrip">Receber valores de Glucose do xDrip.</string>
    <string name="description_treatments">Guarda todos os tratamentos que foram feitos</string>
    <string name="description_wear">Monitorizar e controlar o AndroidAPS usando o seu relógio WearOS.</string>
-    <string name="description_xdrip_status_line">Mostrar informações sobre o loop no watchface do xDrip+.</string>
+    <string name="description_xdrip_status_line">Mostrar informações sobre o loop no mostrador do xDrip+.</string>
    <string name="description_sms_communicator">Controlar remotamente o AndroidAPS usando comandos SMS.</string>
    <string name="treatments_insulin_label_string">Insulina:</string>
    <string name="treatments_carbs_label_string">Hidratos:</string>
@ -118,7 +118,6 @@
    <string name="changeyourinput">Altere o seu input!</string>
    <string name="configbuilder_bgsource">Origem dos valores de Glucose</string>
    <string name="configbuilder_bgsource_description">De onde deve o AndroidAPS obter os dados?</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">Modo APS</string>
    <string name="closedloop">Closed Loop</string>
    <string name="openloop">Open Loop</string>
@ -136,7 +135,7 @@
    <string name="careportal_newnstreatment_other">Outro</string>
    <string name="careportal_newnstreatment_meter">Medidor</string>
    <string name="careportal_newnstreatment_sensor">Sensor</string>
-    <string name="careportal_newnstreatment_carbtime_label">Tempo Hidratos</string>
+    <string name="careportal_newnstreatment_carbtime_label">Hora Hidratos</string>
    <string name="careportal_newnstreatment_duration_label">Duração</string>
    <string name="careportal_newnstreatment_notes_label">Notas</string>
    <string name="event_time_label">Hora do Evento</string>
@ -148,12 +147,12 @@
    <string name="configbuilder_nightscoutversion_label">Versão Nightscout:</string>
    <string name="missing_carbs">A faltar %1$d g</string>
    <string name="exported">Preferências exportadas</string>
-    <string name="export_to">Exportar configurações para</string>
-    <string name="import_from">Importar configurações de</string>
-    <string name="setting_imported">Configurações importadas</string>
+    <string name="export_to">Exportar definições para</string>
+    <string name="import_from">Importar definições de</string>
+    <string name="setting_imported">Definições importadas</string>
    <string name="filenotfound">Ficheiro não encontrado</string>
-    <string name="nav_export">Exportar configurações</string>
-    <string name="nav_import">Importar configurações</string>
+    <string name="nav_export">Exportar definições</string>
+    <string name="nav_import">Importar definições</string>
    <string name="openapsma_maxbasal_title">Max U/h em que uma Temp Basal pode ser definida</string>
    <string name="openapsma_maxbasal_summary">Este valor é chamado max basal no contexto do OpenAPS</string>
    <string name="openapsma_maxiob_title">Basal Máxima IOB que OpenAPS pode administrar [U]</string>
@ -175,12 +174,12 @@
    <string name="check_preferences_details_title">Detalhes de problemas de importação</string>
    <string name="check_preferences_import_btn">Importar</string>
    <string name="check_preferences_import_anyway_btn">Importar mesmo assim (PERIGOSO!)</string>
-    <string name="metadata_warning_different_flavour">As preferências foram criadas com uma variante diferente do AAPS (%1$s) enquanto tem: %2$s.\n\nAlgumas configurações podem estar ausentes ou inválidas - após a importação, por favor verifique e actualize suas preferências.</string>
+    <string name="metadata_warning_different_flavour">As preferências foram criadas com uma variante diferente do AAPS (%1$s) enquanto tem: %2$s.\n\nAlgumas definições podem estar ausentes ou inválidas - após a importação, por favor verifique e actualize suas preferências.</string>
    <string name="metadata_warning_different_device">Preferências foram criadas num dispositivo diferente. Não há problema se estiver a importar de telefone diferente/antigo, mas se certifique que as preferências importadas estão corretas!</string>
    <string name="metadata_warning_outdated_format">Está a usar formato ultrapassado herdado a partir de versões antigas do AAPS, o que não é seguro! Use-o apenas como um último recurso, se não tiver uma exportação no actual no formato JSON.</string>
    <string name="metadata_warning_old_export">Preferências importadas já são %1$s dias antigas! Talvez tenha preferências mais actualizadas ou escolheu o ficheiro errado? Lembre-se de exportar preferências regularmente!</string>
    <string name="metadata_warning_date_format">Formato de data-hora inválido!</string>
-    <string name="metadata_warning_different_version">Preferências de uma versão menor diferente de aplicação. Está OK se você está importando após o upgrade, mas verifique após a importação se as preferências ainda estão corretas!</string>
+    <string name="metadata_warning_different_version">Preferências de uma versão menor diferente de aplicação. Está OK se está a importar após o upgrade, mas verifique após a importação se as preferências ainda estão correctas!</string>
    <string name="metadata_urgent_different_version">Preferências de uma versão principal diferente de aplicação. As principais versões diferem significativamente e podem ter preferências incompatíveis! Certifique-se depois de importar que as preferências ainda estão corretas!</string>
    <string name="metadata_label_format">Formato do ficheiro</string>
    <string name="metadata_label_created_at">Criado em</string>
@ -193,23 +192,23 @@
    <string name="metadata_format_new">Novo formato de encriptação</string>
    <string name="metadata_format_debug">Novo formato de depuração (não encriptado)</string>
    <string name="metadata_format_other">Formato de exportação desconhecido</string>
-    <string name="prefdecrypt_settings_tampered">Ficheiro de configurações adulterado</string>
-    <string name="prefdecrypt_settings_secure">Ficheiro de configurações é seguro</string>
-    <string name="prefdecrypt_settings_unencrypted">A usar um formato de configurações não seguro e não encriptado</string>
+    <string name="prefdecrypt_settings_tampered">Ficheiro de definições adulterado</string>
+    <string name="prefdecrypt_settings_secure">Ficheiro de definições é seguro</string>
+    <string name="prefdecrypt_settings_unencrypted">A usar um formato de definições não seguro e não encriptado</string>
    <string name="prefdecrypt_wrong_json">Erro de formato JSON, campo necessário ausente (formato, conteúdo, metadados ou segurança)</string>
    <string name="prefdecrypt_wrong_password">Erro ao desencriptar, a senha inserida não pode desencriptar o ficheiro</string>
-    <string name="prefdecrypt_issue_missing_file_hash">Ficheiro de verificação (hash) em falta, não é possível verificar a autenticidade de configurações!</string>
+    <string name="prefdecrypt_issue_missing_file_hash">Ficheiro de verificação (hash) em falta, não é possível verificar a autenticidade das definições!</string>
    <string name="prefdecrypt_issue_modified">Ficheiro foi modificado após exportação!</string>
    <string name="prefdecrypt_issue_parsing">Erro Desencriptação, a análise de preferências falhou!</string>
    <string name="prefdecrypt_issue_wrong_pass">Erro de Desencriptação, a senha é inválida ou configurações de arquivo foram modificadas! Pode acontecer que o ficheiro importado foi exportado com uma Senha Mestra diferente.</string>
-    <string name="prefdecrypt_issue_wrong_format">Configuração de encriptação ausente, formato de configurações é inválido!</string>
+    <string name="prefdecrypt_issue_wrong_format">Configuração de encriptação ausente, formato de definições é inválido!</string>
    <string name="prefdecrypt_issue_wrong_algorithm">Algoritmo de encriptação não suportado ou não especificado!</string>
    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">exportado há %1$s</string>
    <string name="exported_at" comment="at placeholder we add export date">exportado às %1$s</string>
    <string name="exported_less_than_hour_ago">exportado há menos de uma hora</string>
    <string name="in_directory" comment="placeholder is for exported file path">no diretório: %1$s</string>
    <string name="end_user_license_agreement">Condições de Utilização</string>
-    <string name="end_user_license_agreement_text">NÃO DEVE SER USADO PARA FAZER DECISÕES MÉDICAS. NÃO HÁ NENHUMA GARANTIA PARA O PROGRAMA, NA EXTENSÃO PERMITIDA PELA LEGISLAÇÃO APLICÁVEL. EXCETO QUANDO DE OUTRA FORMA, POR ESCRITO, OS TITULARES DOS DIREITOS DE AUTOR E / OU OUTRAS PARTES FORNECEM O PROGRAMA “TAL COMO ESTÁ”, SEM GARANTIA DE QUALQUER TIPO, EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO SE LIMITANDO, ÀS GARANTIAS IMPLÍCITAS DE COMERCIALIZAÇÃO E ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. TODO O RISCO QUANTO À QUALIDADE E DESEMPENHO DO PROGRAMA É COM VOCÊ. CASO O PROGRAMA SEJA DEFEITUOSO, VOCÊ ASSUME O CUSTO DE TODOS OS SERVIÇOS, REPAROS OU CORREÇÕES NECESSÁRIOS.</string>
+    <string name="end_user_license_agreement_text">NÃO DEVE SER USADO PARA FAZER DECISÕES MÉDICAS. NÃO HÁ NENHUMA GARANTIA PARA O PROGRAMA, NA EXTENSÃO PERMITIDA PELA LEGISLAÇÃO APLICÁVEL. EXCEPTO QUANDO DE OUTRA FORMA, POR ESCRITO, OS TITULARES DOS DIREITOS DE AUTOR E / OU OUTRAS PARTES FORNECEM O PROGRAMA “TAL COMO ESTÁ”, SEM GARANTIA DE QUALQUER TIPO, EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO SE LIMITANDO, ÀS GARANTIAS IMPLÍCITAS DE COMERCIALIZAÇÃO E ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. TODO O RISCO QUANTO À QUALIDADE E DESEMPENHO DO PROGRAMA É CONSIGO. CASO O PROGRAMA SEJA DEFEITUOSO, ASSUME O CUSTO DE TODOS OS SERVIÇOS, REPAROS OU CORREÇÕES NECESSÁRIOS.</string>
    <string name="end_user_license_agreement_i_understand">EU ENTENDO E CONCORDO</string>
    <string name="save">Guardar</string>
    <string name="reloadprofile">Recarregar perfil</string>
@ -226,7 +225,7 @@
    <string name="smscommunicator_bolusfailed">Bólus falhado</string>
    <string name="smscommunicator_remotebolusmindistance_summary">Número mínimo de minutos que deve decorrer entre um bólus remoto e o próximo</string>
    <string name="smscommunicator_remotebolusmindistance">Quantos minutos deve decorrer, pelo menos, entre um bólus e o próximo</string>
-    <string name="smscommunicator_remotebolusmindistance_caveat">Para sua segurança, para editar esta preferência você precisa adicionar pelo menos 2 números de telefone.</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">Para sua segurança, para editar esta preferência precisa adicionar pelo menos 2 números de telefone.</string>
    <string name="bolusdelivered">Bólus %1$.2f U administrador com sucesso</string>
    <string name="bolusrequested">A ser administrado %1$.2f U</string>
    <string name="smscommunicator_bolusdelivered">Bólus %1$.2f U administrador com sucesso</string>
@ -245,7 +244,8 @@
    <string name="valueoutofrange">O valor %1$s está fora dos limites permitidos</string>
    <string name="smscommunicator_pumpconnectwithcode">Para ligar a bomba responda com o código %1$s</string>
    <string name="smscommunicator_pumpconnectfail">Ligação à bomba falhou</string>
-    <string name="smscommunicator_pumpdisconnected">Bomba desligada</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Para remover a bomba por %1$d minutos responda com o código %2$s</string>
+    <string name="smscommunicator_pumpdisconnected">Bomba removida</string>
    <string name="smscommunicator_reconnect">Bomba ligada novamente</string>
    <string name="smscommunicator_remotecommandnotallowed">O comando remoto não é permitido</string>
    <string name="smscommunicator_remotebolusnotallowed">O bólus remoto não está disponível. Tente novamente mais tarde.</string>
@ -283,7 +283,6 @@
    <string name="mealbolus">Refeição</string>
    <string name="correctionbous">Corr</string>
    <string name="actions">Acções</string>
-    <string name="ns_upload_only">Envio NS apenas (sincronização desactivada)</string>
    <string name="pumpNotInitialized">Bomba não inicializada!</string>
    <string name="primefill">Purgar/Preencher</string>
    <string name="fillwarning">Por favor certifique-se que o valor corresponde ao especificado para o seu conjunto de infusão!</string>
@ -338,7 +337,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Abreviar títulos dos separadores</string>
    <string name="always_use_shortavg">Usar sempre delta médio curto em vez de delta simples</string>
-    <string name="always_use_shortavg_summary">Útil quando há ruído nos dados de fontes sem filtro como o xDrip.</string>
    <string name="profile">Perfil</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Valor padrão: 3 Por segurança é o valor limite estabelecido por OpenAPS. O que faz é limitar a basal a x3 a basal mázima. Se necessário modificar este valor, por favor ter em conta que os dados apontam para que os limites de segurança sejam - 3 x max diario ou 4x valor actual (qual seja menor) como valores máximos.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Valor padrão: 4 Esta é a outra parte dos valores limites de segurança - 3 x max diário ou 4x valor actual - do OpenAPS. Isto define que não importa o valor da basal máxima definido na bomba, o valor máximo da basal temporária não pode ser maior que 4 x o valor da basal definida na bomba. O objectivo é evitar que sejam determinadas basais temporárias demasiado elevadas antes que se perceba como o algoritmo funciona. 4x é um valor que a maior parte das pessoas nunca necessitará de alterar pois o mais provável é necessitar de alterar outras definições para não necessitar de \"ultrapassar\" este limite de segurança.</string>
@ -352,9 +350,6 @@
    <string name="smscommunicator_invalidphonennumber">SMS número de telefone inválido</string>
    <string name="overview_calibration">Calibração</string>
    <string name="xdripnotinstalled">xDrip+ não está instalado</string>
-    <string name="calibrationsent">Calibração enviada para o xDrip</string>
-    <string name="smscommunicator_calibrationsent">Calibração enviada. Recepção têm de estar activada no xDrip.</string>
-    <string name="smscommunicator_calibrationfailed">O xDrip não esta a receber as calibrações</string>
    <string name="pumpsuspended">Bomba suspensa</string>
    <string name="executing">A Executar</string>
    <string name="virtualpump_settings">Definições da bomba virtual</string>
@ -380,7 +375,7 @@
    <string name="nowritepermission">ClienteNS sem permissões para alterar dados. Tem a senha API correta?</string>
    <string name="wear_settings">Definições Wear</string>
    <string name="wear_detailedIOB_title">Mostrar IOB detalhada</string>
-    <string name="wear_detailedIOB_summary">Dividir IOB entre IOB de bolus e de basal na face do relógio</string>
+    <string name="wear_detailedIOB_summary">Dividir IOB entre IOB de bolus e de basal mostrador</string>
    <string name="nosuccess">sem efeito - por favor verifique no telemóvel</string>
    <string name="notavailable">n/d</string>
    <string name="patientage">Tipo de Paciente</string>
@ -389,6 +384,7 @@
    <string name="adult">Adulto</string>
    <string name="resistantadult">Adulto resistente insulina</string>
    <string name="pregnant">Gravidez</string>
+    <string name="patientage_summary">Por favor seleccione o tipo de paciente para configurar limites de segurança</string>
    <string name="patient_name">Nome do Paciente</string>
    <string name="patient_name_summary">Por favor, forneça nome do paciente ou alcunha para diferenciar entre várias configurações</string>
    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Utilizador</string>
@ -402,11 +398,18 @@
    <string name="suspendloopfor3h">Suspender loop por 3h</string>
    <string name="suspendloopfor10h">Suspender loop por 10h</string>
    <string name="suspendloopforXmin">Suspender loop por %1$d min</string>
-    <string name="disconnectpumpfor15m">Desligar bomba por 15 min</string>
-    <string name="disconnectpumpfor30m">Desligar bomba por 30 min</string>
-    <string name="disconnectpumpfor1h">Desligar bomba por 1 h</string>
-    <string name="disconnectpumpfor2h">Desligar bomba por 2 h</string>
-    <string name="disconnectpumpfor3h">Desligar bomba por 3 h</string>
+    <string name="disconnectpump">Remover a bomba</string>
+    <string name="disconnectpumpfor15m">Remover bomba por 15 min</string>
+    <string name="disconnectpumpfor30m">Remover bomba por 30 min</string>
+    <string name="disconnectpumpfor1h">Remover bomba por 1 h</string>
+    <string name="disconnectpumpfor2h">Remover bomba por 2 h</string>
+    <string name="disconnectpumpfor3h">Remover bomba por 3 h</string>
+    <string name="duration15m">15 min.</string>
+    <string name="duration30m">30 min.</string>
+    <string name="duration1h">1 hora</string>
+    <string name="duration2h">2 horas</string>
+    <string name="duration3h">3 horas</string>
+    <string name="duration10h">10 horas</string>
    <string name="resume">Retomar</string>
    <string name="reconnect">Re-ligar a Bomba</string>
    <string name="smscommunicator_wrongduration">Duração errada</string>
@ -416,7 +419,7 @@
    <string name="treatments_wizard_cob_label">COB</string>
    <string name="superbolus">Superbólus</string>
    <string name="ns_logappstartedevent">Registar inicio da app no NS</string>
-    <string name="restartingapp">A sair da aplicação para aplicar as configurações.</string>
+    <string name="restartingapp">A sair da aplicação para aplicar as definições.</string>
    <string name="configbuilder_insulin_description">Qual o tipo de insulina que está a utilizar?</string>
    <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
    <string name="ultrafastactinginsulincomment">Fiasp</string>
@ -430,8 +433,14 @@
    <string name="statuslights_iage_critical">Limite crítico idade insulina [h]</string>
    <string name="statuslights_sage_warning">Limite aviso idade sensor [h]</string>
    <string name="statuslights_sage_critical">Limite crítico idade sensor [h]</string>
+    <string name="statuslights_sbat_warning">Limite de aviso do nível da bateria do sensor [%]</string>
+    <string name="statuslights_sbat_critical">Limite crítico do nível da bateria do sensor [%]</string>
+    <string name="statuslights_bage_warning">Limite de aviso de idade da bateria da bomba [h]</string>
+    <string name="statuslights_bage_critical">Limite crítico de idade da bateria da bomba [h]</string>
    <string name="statuslights_res_warning">Limite de aviso de nível de reservatório [U]</string>
    <string name="statuslights_res_critical">Limite crítico de nível de reservatório [U]</string>
+    <string name="statuslights_bat_warning">Limite de aviso do nível da bateria da bomba [%]</string>
+    <string name="statuslights_bat_critical">Limite crítico do nível da bateria da bomba [%]</string>
    <string name="prediction_shortname">PREV</string>
    <string name="iob">IOB</string>
    <string name="cob">COB</string>
@ -443,8 +452,6 @@
    <string name="nav_about">Acerca</string>
    <string name="smscommunicator_missingsmspermission">Falta de permissão SMS</string>
    <string name="smscommunicator_missingphonestatepermission">Falta permissão do estado do telefone</string>
-    <string name="xdripstatus_settings">Estado xDrip (relógio)</string>
-    <string name="xdripstatus">Linha estado xDrip (relógio)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">Mostrar BGI</string>
    <string name="wear_showbgi_summary">Adicionar BGI à linha de status</string>
@ -473,7 +480,7 @@
    <string name="sensitivity_shortname">SENS</string>
    <string name="sensitivityoref1">Sensibilidade Oref1</string>
    <string name="sensitivityaaps">Sensibilidade AAPS</string>
-    <string name="absorptionsettings_title">Configurações de absorção</string>
+    <string name="absorptionsettings_title">Definições de absorção</string>
    <string name="absorption_maxtime_title">Tempo máx. absorção refeição [h]</string>
    <string name="absorption_maxtime_summary">Tempo em horas, espectável para que todos os hidratos de carbono da refeição sejam absorvidos</string>
    <string name="openaps_short">OAPS</string>
@ -487,7 +494,6 @@
    <string name="mdtp_cancel">Cancelar</string>
    <string name="notloadedplugins">Nem todos perfis foram carregados!</string>
    <string name="valuesnotstored">Valores não guardados!</string>
-    <string name="ns_localbroadcasts">Activar transmissões para outras aplicações (como xDrip). Não habilite se tiver mais de uma instância de AAPS ou ClienteNS instalado!</string>
    <string name="ns_localbroadcasts_title">Activar partilha local.</string>
    <string name="careportal_newnstreatment_duration_min_label">Duração [min]</string>
    <string name="openapssmb">OpenAPS SMB</string>
@ -538,7 +544,7 @@
    <string name="info">INFO</string>
    <string name="eversense">Aplicação Eversense (com patch)</string>
    <string name="dexcomg5_nsupload_title">Enviar dados Glic. para NS</string>
-    <string name="bgsource_upload">Configurações de upload de Glic</string>
+    <string name="bgsource_upload">Definições de envio da Glic</string>
    <string name="wear_detailed_delta_title">Mostrar Delta detalho</string>
    <string name="wear_detailed_delta_summary">Mostrar delta com mais um ponto decimal</string>
    <string name="smbinterval_summary">Com que frequência em min os SMBs serão dados</string>
@ -631,7 +637,7 @@
    <string name="ns_create_announcements_from_carbs_req_title">Criar anúncios a partir dos alertas de hidratos necessários</string>
    <string name="ns_create_announcements_from_errors_summary">Criar um anúncio no Nightscout para caixas de diálogo de erro e alertas locais (também podem ser visualizados em Careportal sob tratamentos)</string>
    <string name="ns_create_announcements_from_carbs_req_summary">Criar anúncios Nightscout para alertas de hidratos necessários</string>
-    <string name="wear_predictions_summary">Mostrar a predições na face do relogio.</string>
+    <string name="wear_predictions_summary">Mostrar a predições mostrador.</string>
    <string name="wear_predictions_title">Previsão</string>
    <string name="data_choices">Escolha de Dados</string>
    <string name="fabric_upload">Envio Fabric</string>
@ -665,7 +671,8 @@
    <string name="combo_warning_pump_basal_rate_changed">O rácio da basal foi alterado na bomba e vai ser actualizado em breve</string>
    <string name="combo_error_failure_reading_changed_basal_rate">Rácio da basal foi alterado na bomba, mas a leitura falhou</string>
    <string name="combo_activity_checking_for_history_changes">A verificar se há alterações de histórico</string>
-    <string name="combo_error_multiple_boluses_with_identical_timestamp">Bólus múltiplos, com a mesma quantidade e no mesmo minuto acabaram de ser importados. Apenas um registo pôde ser adicionado aos tratamentos. Por favor confirma na bomba e adicione o registo de bólus manualmente, utilizando o separador do Careportal. Tenha em atenção que deve criar um bólus com um tempo em que nã oexistem outros registos de bólus.</string>
+    <string name="combo_error_multiple_boluses_with_identical_timestamp">Bólus múltiplos, com a mesma quantidade e no mesmo minuto acabaram de ser importados. Apenas um registo pode ser adicionado aos tratamentos. Por favor confirme na bomba e adicione o registo de bólus manualmente, utilizando o separador do Careportal. Tenha em atenção que deve criar um bólus com um tempo em que não existem outros registos de bólus.</string>
+    <string name="about_link_urls">\n\ndocumentação:\nhttps://androidaps.readthedocs.io\n\nfacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
    <string name="combo_check_date">O último bólus tem mais de 24 horas ou está no futuro. Por favor verifique se a data está definida correctamente na bomba.</string>
    <string name="combo_suspious_bolus_time">Hora/data da administração do bólus na bomba parece errado, IOB aparentemente está incorrecto. Verifique hora/data na bomba.</string>
    <string name="profileswitch_ismissing">TrocaPerfil em falta. Por favor faça uma troca de perfil ou pressione \"Activar Perfil\" em PerfilLocal.</string>
@ -734,8 +741,8 @@
    <string name="ns_autobackfill_title">Preenchimentoauto Glicemia</string>
    <string name="wear_wizard_settings">Definições do Assistente Rápido</string>
    <string name="wear_wizard_settings_summary">Resultado cálculos incluídos no Assistente:</string>
-    <string name="wear_display_settings">Configurações Ecrã</string>
-    <string name="wear_general_settings">Configurações Gerais</string>
+    <string name="wear_display_settings">Definições Ecrã</string>
+    <string name="wear_general_settings">Definições Gerais</string>
    <string name="enable_nsclient">Activar ClienteNS</string>
    <string name="welcometosetupwizard">Bem-vindo ao assistente de configuração. Vai guiá-lo(a) através do processo de instalação\n</string>
    <string name="readstatus">Ler estado</string>
@ -747,13 +754,15 @@
    <string name="nsclientinfotext">ClienteNS gere a ligação ao Nightscout. Pode saltar esta parte mas não será possível passar os objectivos até que o configure.</string>
    <string name="diawarning">Lembre-se: novos perfis de insulina requerem diâmetro de pelo menos 5h. DIA 5–6h no novo perfil é igual ao diâmetro 3h nos antigos perfis de insulina.</string>
    <string name="setupwizard_profile_description">Por favor seleccione a fonte do perfil. Se o paciente é uma criança deverá utilizar perfil NS. Se ninguém o está a seguir no Nightscout provavelmente preferirá um perfil Local. Lembre-se que apenas está a escolher a fonte de perfil. Para o utilizar terá que o activar executando \"Troca Perfil\"</string>
-    <string name="setupwizard_aps_description">Seleccione um dos algoritmos disponíveis. Eles são classificados do mais antigo para o mais recente. Algoritmo mais recente é geralmente mais forte e mais agressivo. Assim, se você é novo looper, poderá provavelmente começar com AMA e não com a versão mais recente. Não se esqueça de ler a documentação de OpenAPS e configurá-lo antes de usar.</string>
+    <string name="setupwizard_aps_description">Seleccione um dos algoritmos disponíveis. Eles são classificados do mais antigo para o mais recente. Algoritmo mais recente é geralmente mais forte e mais agressivo. Assim, se é novo looper, poderá provavelmente começar com AMA e não com a versão mais recente. Não se esqueça de ler a documentação de OpenAPS e configurá-lo antes de usar.</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Por favor, configure o seu RileyLink abaixo. Depois de seleccionar um RileyLink, será possível continuar a configuração quando o estado do RileyLink estiver \"Conectado\". Isso pode levar um minuto.\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>Nota:</b> Pode continuar confguração uma vez que a bomba foi configurada.\n</string>
    <string name="startobjective">Iniciar primeiro objectivo</string>
    <string name="permission">Permissão</string>
    <string name="askforpermission">Pedir permissão</string>
    <string name="needsystemwindowpermission">Aplicação precisa de permissão de janela do sistema para notificações</string>
    <string name="needlocationpermission">Aplicação necessita de permissão de localização para pesquisa Bluetooth e identificação Wi-Fi</string>
-    <string name="needstoragepermission">Aplicação precisa da permissão de armazenamento para poder armazenar ficheiros de registo e exportar configurações</string>
+    <string name="needstoragepermission">Aplicação precisa da permissão de armazenamento para poder armazenar ficheiros de registo e exportar definições</string>
    <string name="request">Pedido</string>
    <string name="exit">Sair</string>
    <string name="open_navigation">Abrir a navegação</string>
@ -775,12 +784,12 @@
    <string name="sensitivity_raises_target_summary">Quando a sensibilidade é detectada, aumenta o alvo glicose</string>
    <string name="combo_invalid_setup">Configuração da bomba inválida, verifique a documentação e se o menu de informações rápidas está nomeado de QUICK INFO utilizando o programa de configuração 360.</string>
    <string name="careportal_removestartedevents">Limpar AndroidAPS iniciado</string>
-    <string name="storedsettingsfound">Configurações encontradas</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, 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 da app tem os mesmos valores que estão na bomba. Em caso contrario pressione imediatamente cancelar e corrija antes de voltar a ligar à bomba.</string>
    <string name="error_adding_treatment_title">Dados tratamento incompletos</string>
-    <string name="maintenance_settings">Configurações de manutenção</string>
+    <string name="maintenance_settings">Definições de manutenção</string>
    <string name="maintenance_email">Email destinatário</string>
-    <string name="maintenance_encrypt_exported_prefs">Encriptar configurações exportadas</string>
+    <string name="maintenance_encrypt_exported_prefs">Encriptar definições exportadas</string>
    <string name="maintenance_amount">Nr. de registos a enviar</string>
    <string name="maintenance">Manutenção</string>
    <string name="maintenance_shortname">MANU</string>
@ -825,7 +834,7 @@
    <string name="disable_vibration_summary">Para bólus e bólus estendidos (só disponível com o firmware Insight 3.x)</string>
    <string name="disable_vibration_auto">Desactivar vibrações na entrega automática de bólus</string>
    <string name="disable_vibration_auto_summary">Para SMB e Basal Temp com emulação DBT (só disponível com firmware Insight 3.x)</string>
-    <string name="disconnect_delay">Atraso de desconexão [s]</string>
+    <string name="disconnect_delay">Atraso de remoção [s]</string>
    <string name="serial_number">Número de série</string>
    <string name="release_software_version">Lançar versão de software</string>
    <string name="ui_processor_software_version">Versão de software do processador de interface do utilizador</string>
@ -934,6 +943,7 @@
    <string name="storage">restrição de armazenamento interno</string>
    <string name="diskfull">Liberte pelo menos %1$d MB do armazenamento interno! Loop desativado!</string>
    <string name="wrongformat">Formato incorrecto</string>
+    <string name="wrongTbrDuration">A duração do DBT deve ser de um múltiplo de %1$d minutos e maior que 0.</string>
    <string name="sms_wrongcode">Código errado. Comando cancelado.</string>
    <string name="notconfigured">Não configurado</string>
    <string name="profileswitchcreated">Troca de perfil criada</string>
@ -950,7 +960,7 @@
    <string name="addnew">Adicionar novo</string>
    <string name="versionChecker">Verificador de Versão</string>
    <string name="signature_verifier">Verificador de assinatura</string>
-    <string name="running_invalid_version">Detectamos que está  a correr uma versão inválida. Loop desactivado!</string>
+    <string name="running_invalid_version">Detectamos que está a correr uma versão inválida. Loop desactivado!</string>
    <string name="old_version">versão antiga</string>
    <string name="very_old_version">versão muito antiga</string>
    <string name="new_version_warning">Nova versão para pelo menos %1$d dias disponíveis! Retorno a SGB após %2$d dias, o loop será desactivado após %3$d dias</string>
@ -960,6 +970,7 @@
    <string name="description_source_dexcom">Receber valores da Glicemia da app Dexcom (com patch).</string>
    <string name="notification">Notificação</string>
    <string name="notification_message">Notificação: %1$s</string>
+    <string name="alarm_message">Alarme: %1$s</string>
    <string name="message_short">Mnsg:</string>
    <string name="alarm_short">Alarme:</string>
    <string name="profilepercentage">Percentagem do Perfil</string>
@ -1052,7 +1063,7 @@
    <string name="id">ID:</string>
    <string name="submit">Enviar</string>
    <string name="mostcommonprofile">Perfil mais comum:</string>
-    <string name="survey_comment">Nota: Apenas os dados visíveis neste ecrã serão enviados anonimamente. O ID é atribuído a esta instalação do AndroidAPS. Você pode enviar dados novamente se o perfil principal for alterado, mas deixá-lo rodar pelo menos uma semana para tornar o resultado visível no intervalo de tempo. Sua ajuda é apreciada.</string>
+    <string name="survey_comment">Nota: Apenas os dados visíveis neste ecrã serão enviados anonimamente. O ID é atribuído a esta instalação do AndroidAPS. Pode enviar dados novamente se o perfil principal for alterado, mas deixá-lo rodar pelo menos uma semana para tornar o resultado visível no intervalo de tempo. Sua ajuda é apreciada.</string>
    <string name="invalidage">Entrada de idade inválida</string>
    <string name="invalidweight">Entrada de peso inválida</string>
    <string name="invalidpct">Entrada % inválida</string>
@ -1080,24 +1091,30 @@
    <string name="loop_tbrexecution_time_label">Hora de execução Basal Temp</string>
    <string name="insight_alert_notification_channel">Alertas Bomba Insight</string>
    <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">da app Authenticator para: %1$s seguido pelo PIN</string>
    <string name="smscommunicator_otp_enabled">Activar Autenticador</string>
-    <string name="smscommunicator_otp_enabled_summary">Autenticar comandos usando Uma-Senha-Única que sejam geradas pelo Google Authenticator ou app 2FA similar.</string>
+    <string name="smscommunicator_otp_enabled_summary">Autenticar comandos usando Uma-Senha-Única (OTP) que sejam geradas pelo Google Authenticator ou app 2FA similar.</string>
+    <string name="smscommunicator_otp_pin">PIN obrigatório adicional no token final</string>
    <string name="smscommunicator_otp_pin_summary">Dígitos adicionais que devem ser memorizados e colados no final de cada Uma-Senha-Única que seja gerada</string>
    <string name="smscomunicator_tab_otp_label">Configuração do Autenticador</string>
    <string name="smscommunicator_code_verify_label">Código para verificar:</string>
    <string name="smscommunicator_code_verify_hint">OTP + PIN</string>
+    <string name="smscommunicator_code_verify_info">O código de verificação consiste em 6 dígitos exibidos pela app Authenticator (conhecido como OTP) seguido de 3 ou mais dígitos de PIN obrigatório.</string>
    <string name="smscommunicator_otp_reset_btn">Repor Autenticadores</string>
    <string name="smscommunicator_otp_reset_title">Repor Chave Autenticador</string>
    <string name="smscommunicator_otp_reset_prompt">Tem certeza de redefinir chave Authenticador? Ele tornará todos os Authenticators configurados actualmente como inválidos, e precisará de os configurar novamente.</string>
    <string name="smscommunicator_otp_reset_successful">Nova Chave do Autenticador foi gerada! Por favor, use o QRCode actualizado para os autenticadores.</string>
+    <string name="smscommunicator_otp_export_title">A exportar segredo da OTP</string>
+    <string name="smscommunicator_otp_export_prompt">Tem a certeza de que deseja copiar o segredo da OTP para a área de transferêencia?\n\nSó pode precisar se a app do seu autenticador tiver problemas para digitalizar QRCode, deseja digitá-lo manualmente ou deseja configurar o token OTP de hardware usando app dedicada.</string>
+    <string name="smscommunicator_otp_export_successful">Segredo da OTP (em formato Base32) exportado e copiado na áreas de transferênca. Cole-o no autenticador ou no hardware OTP burner!</string>
    <string name="smscommunicator_otp_step1_install_header">1. Instalar Autenticador</string>
    <string name="smscommunicator_otp_step2_provisioning_header">2. Pesquise o código para configurar os códigos OTP do AndroidAPS</string>
-    <string name="smscommunicator_otp_step3_test_header">3. Testar Uma-Senha-Única</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Testar Uma-Senha-Única (OTP)</string>
    <string name="smscommunicator_otp_reset_header">Repor Autenticadores</string>
    <string name="smscommunicator_otp_install_info">Instalar uma app Autenticador que suporte Tokens RFC 6238 TOTP em cada telefone seguidor. Populares aplicativos gratuitos são:\n • Authy\n • o Google Authenticator\n • LastPass Autenticador\n • FreeOTP Autenticador</string>
    <string name="smscommunicator_otp_reset_warning">Ao repor o autenticador, torna inválidos todos os autenticadores já provisionados. Precisará de os configurar novamente!</string>
    <string name="onconnect">Ao ligar</string>
-    <string name="ondisconnect">Ao desligar</string>
+    <string name="ondisconnect">Ao remover</string>
    <string name="overview_show_predictions">Previsões</string>
    <string name="overview_show_deviationslope">Desvio de inclinação</string>
    <string name="authorizationfailed">Falha na autorização</string>
@ -1108,6 +1125,7 @@
    <string name="statuslights_copy_ns">Copiar definições do NS</string>
    <string name="copyexistingvalues">Copiar definições do NS (se existir)?</string>
    <string name="classic_description">Tema Gráfico Original</string>
+    <string name="lowres_description">Design de Baixa Resolução</string>
    <string name="buttonson_description">Os botões são sempre exibidos na parte inferior do ecrã</string>
    <string name="largedisplay_description">Mostrador Grande</string>
    <string name="skin">Tema gráfico</string>
@ -1124,21 +1142,49 @@
    <string name="dpvdefaultprofile">Perfil Padrão DPV</string>
    <string name="open_humans">Open Humans</string>
    <string name="finishing_open_humans_setup">A terminar configuração Open Humans...</string>
+    <string name="this_may_take_a_while">Pode demorar um pouco. Não desligue o telefone ou este plugin.</string>
    <string name="setup_finished">Configuração terminada</string>
+    <string name="your_phone_will_upload_data">Seu telefone fará o envio de dados para Open Humans em breve.</string>
+    <string name="your_phone_is_upload_data">Seu telefone está enviar dados para Open Humans agora.</string>
    <string name="setup_failed">Falha na configuração</string>
+    <string name="there_was_an_error">Houve um erro. Tente efetuar o login novamente a fim de prosseguir. Desculpe &amp; Obrigado!</string>
+    <string name="open_humans_terms">Esta é uma ferramenta de código aberto que vai copiar seus dados para Open Humans. Nós não retemos direitos de compartilhar seus dados com terceiros sem a sua autorização explícita. Os dados que o projecto e a app recebem são identificados através de um ID de usuário aleatório e só serão transmitidos de forma segura para uma conta Open Humans com a sua autorização desse processo. Pode parar de fazer o envio e excluir seus dados enviados a qualquer momento via www.openhumans.org.</string>
    <string name="i_understand_and_agree">Compreendo e concordo.</string>
    <string name="login">Login</string>
    <string name="logout">Terminar Sessão</string>
+    <string name="oh_logout_confirmation">Deseja realmente encerrar sessão e parar de doar dados para a ciência?</string>
+    <string name="project_member_id">ID Membro do Projecto: %s</string>
    <string name="queue_size">Tamanho da Fila: %d</string>
    <string name="terms_of_use">Termos de Utilização</string>
    <string name="not_logged_in">Não tem sessão iniciada</string>
+    <string name="you_need_to_accept_the_of_use_first">Tem de aceitar os Termos de Utilização.</string>
    <string name="successfully_logged_in">Login bem sucedido</string>
+    <string name="setup_will_continue_in_background">A configuração será concluída em segundo plano agora. Obrigado por fazer o envio dos seus dados.\n\nPor favor, mantenha este plugin e o telefone ligado por um curto tempo para que a configuração seja concluída.</string>
    <string name="completing_login">A completar o login…</string>
    <string name="donate_your_data_to_science">Doar seus dados para a ciência</string>
    <string name="open_humans_short">OH</string>
+    <string name="you_have_been_signed_out_of_open_humans">Sessão do Open Humans foi encerrada</string>
+    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Clique aqui para entrar novamente, se não era de propósito.</string>
    <string name="only_upload_if_connected_to_wifi">Apenas enviar se ligado ao Wi-Fi</string>
    <string name="only_upload_if_charging">Apenas enviar se estiver a carregar</string>
+    <string name="worker_state">Estado Trabalhador: %s</string>
    <string name="uploaded_data">Dados Enviados</string>
+    <string name="the_following_data_will_be_uploaded_to_your_open_humans_account">Os seguintes dados serão enviados para sua conta Open Humans: valores de Gliccose, bólus, hidratos, eventos do careportal (excepto notas), bólus estendidos, mudanças de perfil, doses diárias totais, basais temporárias, alvos temp, preferências, versão da aplicação, modelo de dispositivo e dimensões da tela. Informações secretas ou privadas como sua URL de Nightscout ou senha de API não serão enviadas.</string>
+    <string name="setupwizard_pump_riley_link_status">Estado RileyLink:</string>
    <string name="filter">Filtro</string>
+    <string name="copytolocalprofile_invalid">Não é possível criar perfil local. Perfil é inválido.</string>
+    <string name="cta_dont_kill_my_app_info">Não encerre minha app?</string>
    <string name="alarm">Alarme</string>
+    <string name="smscommunicator_report_pump_ureachable_summary">Enviar SMS se evento de bomba inacessível for accionado</string>
+    <string name="smscommunicator_pump_ureachable">Reportar bomba inacessível</string>
+    <string name="advisoralarm">Executar alarme quando for tempo de comer</string>
+    <string name="alarminxmin">Executar alarme em %1$d min</string>
+    <string name="bolusadvisor">Guia de Bólus</string>
+    <string name="bolusadvisormessage">Tem glicemia alta. Em vez de comer agora é recomendado esperar por uma melhor glicemia. Quer fazer um bólus de correção agora e lembrá-lo quando fôr hora de comer? Neste caso nenhum hidrato será registado e deve usar o assistente novamente quando for lembrado.</string>
+    <string name="enablebolusadvisor">Activar Guia de Bólus</string>
+    <string name="enablebolusadvisor_summary">Use lembrete para começar a comer mais tarde em vez di resultado do assistente durante a glicemia alta (\"pré-bolus\")</string>
+    <string name="time_to_eat">Hora de comer!\nExecutar assistente de Bólus e fazer cálculo novamente.</string>
+    <string name="timetoeat">Hora de comer</string>
+    <string name="fabric_upload_disabled">Envio de logs de erro desabilitado!</string>
+    <string name="graph_menu_divider_header">Gráfico</string>
 </resources>
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@ -42,7 +42,6 @@
    <string name="description_source_glimp">Primește valorile glicemiei din aplicația Glimp.</string>
    <string name="description_source_mm640g">Primește valorile glicemiei din aplicația 600SeriesAndroidUploader (Medtronic).</string>
    <string name="description_source_ns_client">Descarcă datele despre glicemii din Nightscout</string>
-    <string name="description_source_xdrip">Primește valorile glicemiei din xDrip.</string>
    <string name="description_treatments">Salvează toate tratamentele făcute</string>
    <string name="description_wear">Monitorizează și controlează aplicația AndroidAPS folosind smartwatchul WearOS.</string>
    <string name="description_xdrip_status_line">Afișează informații privind starea buclei pe watchface-ul xDrip+.</string>
@ -58,7 +57,7 @@
    <string name="tempbasals_netinsulin_label_string">Ins:</string>
    <string name="tempbasals_iob_label_string">IOB:</string>
    <string name="tempbasals_iobtotal_label_string">IOB totală:</string>
-    <string name="treatments_wizard_bg_label">Glicemie</string>
+    <string name="treatments_wizard_bg_label">Gl</string>
    <string name="treatments_wizard_tt_label">TT</string>
    <string name="treatments_wizard_carbs_label">Carbohidrați</string>
    <string name="treatments_wizard_correction_label">Corecție</string>
@ -119,7 +118,6 @@
    <string name="changeyourinput">Schimbați ceea ce ați introdus!</string>
    <string name="configbuilder_bgsource">Sursă glicemie</string>
    <string name="configbuilder_bgsource_description">De unde trebuie să primească AndroidAPS datele?</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">Mod APS</string>
    <string name="closedloop">Buclă închisă</string>
    <string name="openloop">Buclă deschisă</string>
@ -285,7 +283,6 @@
    <string name="mealbolus">Masă</string>
    <string name="correctionbous">Corecție</string>
    <string name="actions">Acțiuni</string>
-    <string name="ns_upload_only">Doar încărcare în NS (sincronizare dezactivată)</string>
    <string name="pumpNotInitialized">Pompa nu este inițializată!</string>
    <string name="primefill">Pregătire/umplere</string>
    <string name="fillwarning">Asigurați-vă că aveți cantitatea specificată de instrucțiunile setului de infuzie!</string>
@ -322,7 +319,7 @@
    <string name="openapsama_useautosens">Folosește opțiunea de autosensibilitate</string>
    <string name="refresheventsfromnightscout">Sincronizează cu NS</string>
    <string name="deletefuturetreatments">Ștergerea tratamentelor înregistrate în viitor</string>
-    <string name="eatingsoon">Masă în curând</string>
+    <string name="eatingsoon">Mănânc în curând</string>
    <string name="hypo">Hipo</string>
    <string name="activity">Activitate</string>
    <string name="removerecord">Șterge înregistrarea</string>
@ -340,7 +337,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Scurtează titlurile secțiunilor</string>
    <string name="always_use_shortavg">Folosește întotdeauna media scurtă a diferenței în locul diferenței simple</string>
-    <string name="always_use_shortavg_summary">Folositor când datele vin de la surse nefiltrate, ca atunci când xDrip are măsurători zgomotoase.</string>
    <string name="profile">Profil</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Valoare implicită: 3\nAceasta este o setare de critică de securitate a OpenAPS. Asta înseamnă că se limitează bazala lade 3x valoarea maximă a bazalelor tale.Cel mai probabil nu veți schimba această valoare, dar trebuie să țineți cont de ce se discută despre “3x max zilnic; 4x curent” ca valori de siguranță.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Valoare implicită: 4\nAceasta este cealaltă jumătate a cheii de siguranță a OpenAPS și cealaltă jumătate a \"3x max zilnic; 4x curent\" al setărilor de siguranță.Aceasta înseamnă că bazala dumneavoastră, indiferent de bazala maximă configurată în pompă, nu poate fi mai mare de acest număr înmulțit cu nivelul curent al bazalei active. Această limitare este impusă pentru a evita posibilitatea de a intra pe un teritoriu periculos prin setarea unei bazale maxime excesiv de mari înainte de a înțelege funcționarea algoritmului. Din nou, valoarea implictă este 4x; majoritatea oamenilor nu vor trebui să ajusteze această valoare și vor modifica, mai degrabă, alte valori dacă vor simți că această valoare le stă în cale.</string>
@ -354,9 +350,6 @@
    <string name="smscommunicator_invalidphonennumber">Număr de telefon SMS invalid</string>
    <string name="overview_calibration">Calibrare</string>
    <string name="xdripnotinstalled">xDrip+ nu este instalat.</string>
-    <string name="calibrationsent">Calibrare trimisă către xDrip</string>
-    <string name="smscommunicator_calibrationsent">Calibrare trimisă. Recepționarea trebuie să fie activată și în xDrip.</string>
-    <string name="smscommunicator_calibrationfailed">xDrip nu recepționează calibrări</string>
    <string name="pumpsuspended">Livrare de insulină suspendată</string>
    <string name="executing">Se execută</string>
    <string name="virtualpump_settings">Setări pompă virtuală</string>
@ -455,8 +448,6 @@
    <string name="nav_about">Despre</string>
    <string name="smscommunicator_missingsmspermission">Lipsesc permisiunile de SMS</string>
    <string name="smscommunicator_missingphonestatepermission">Nu este acordată permisiunea de citire a stării telefonului</string>
-    <string name="xdripstatus_settings">Status xDrip (ceas)</string>
-    <string name="xdripstatus">Linie de status xDrip (ceas)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">Arată BGI</string>
    <string name="wear_showbgi_summary">Adaugă BGI în linia de status</string>
@ -499,7 +490,6 @@
    <string name="mdtp_cancel">Renunță</string>
    <string name="notloadedplugins">Nu s-au încărcat toate profilurile!</string>
    <string name="valuesnotstored">Nu s-au salvat valorile!</string>
-    <string name="ns_localbroadcasts">Activează mesajele pentru alte aplicații (cum ar fi xDrip). Nu activați dacă aveți mai mult de o instanță de AAPS sau NSClient instalată!</string>
    <string name="ns_localbroadcasts_title">Permite anunțuri locale.</string>
    <string name="careportal_newnstreatment_duration_min_label">Durată [min]</string>
    <string name="openapssmb">OpenAPS SMB</string>
@ -519,8 +509,8 @@
    <string name="careportal_newnstreatment_percentage_label">Procentaj</string>
    <string name="careportal_newnstreatment_timeshift_label">Decalare</string>
    <string name="default_temptargets">Ținte-Temporare implicite</string>
-    <string name="eatingsoon_duration">durată se-mănâncă-în-curând</string>
-    <string name="eatingsoon_target">țintă se-mănâncă-în-curând</string>
+    <string name="eatingsoon_duration">durată mănânc-în-curând</string>
+    <string name="eatingsoon_target">țintă mănânc-în-curând</string>
    <string name="activity_duration">durată activitate</string>
    <string name="activity_target">țintă activitate</string>
    <string name="hypo_duration">durată țintă</string>
@ -624,7 +614,6 @@
    <string name="enablesmbwithhightemptarget">Activează SMB cu ținte temporare mari</string>
    <string name="enablesmbwithhightemptarget_summary">Activați SMB atunci când există o țintă temporară activă (exerciții fizice, peste 100mg/dl sau 5.5mmol/l)</string>
    <string name="overview_insulin_label">Insulină</string>
-    <string name="overview_carbs_label">Carbohidrați</string>
    <string name="overview_buttons_selection">Butoane</string>
    <string name="show_calibration_button_summary">Trimite calibrarea către xDrip+ sau deschide calibrarea pentru G5</string>
    <string name="show_cgm_button_summary">Deschide xDrip+, butonul de înapoi returnează la AAPS</string>
@ -809,7 +798,6 @@
    <string name="resettodefaults">Resetare la setările implicite</string>
    <string name="nsmalfunction">Funcționare incorectă a NSClient. Aveți în vedere un restart al NS și al NSClient.</string>
    <string name="versionavailable">Versiunea %1$s este disponibilă</string>
-    <string name="time_offset">Diferență de fus orar</string>
    <string name="setupwizard_preferred_aps_mode">Modul APS preferat</string>
    <string name="treatments_wizard_total_label">Total</string>
    <string name="calculation_short">Calc</string>
@ -1081,7 +1069,7 @@
    <string name="statistics">Statistici</string>
    <string name="randombg">Glicemie aleatoare</string>
    <string name="description_source_randombg">Generare glicemie aleator (doar mod Demo)</string>
-    <string name="randombg_short">Glicemie</string>
+    <string name="randombg_short">Gl</string>
    <string name="tools">Instrumente</string>
    <string name="show_calculation">Arată calculul</string>
    <string name="automation_event">Eveniment automatizare</string>
@ -1170,7 +1158,6 @@
    <string name="donate_your_data_to_science">Donează datele în scopuri științifice</string>
    <string name="open_humans_short">OH</string>
    <string name="you_have_been_signed_out_of_open_humans">Ai fost deconectat de la Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Dați click aici pentru a vă conecta din nou dacă nu a fost intenționat.</string>
    <string name="only_upload_if_connected_to_wifi">Încarcă numai pe conexiune WiFi</string>
    <string name="only_upload_if_charging">Încărca numai dacă telefonul este la încărcat</string>
    <string name="worker_state">Stare prelucrare: %s</string>
@ -1182,7 +1169,6 @@
    <string name="cta_dont_kill_my_app_info">Nu-mi opri aplicația?</string>
    <string name="alarm">Alarmă</string>
    <string name="smscommunicator_report_pump_ureachable_summary">Trimite SMS dacă este generata o alarma de eroare conexiune pompa</string>
-    <string name="smscommunicator_pump_ureachable">Raportează eroare conexiune pompa</string>
    <string name="advisoralarm">Rulează alarma când este timpul să mănânci</string>
    <string name="alarminxmin">Rulează alarma în %1$d min</string>
    <string name="bolusadvisor">Consilier bolus</string>
--- a/app/src/main/res/values-ru-rRU/exam.xml
+++ b/app/src/main/res/values-ru-rRU/exam.xml
@ -10,51 +10,136 @@
    <string name="hypott_label">Временная цель Гипо </string>
    <string name="hypott_whenhypott">Какова основная причина установки временной цели гипо?</string>
    <string name="hypott_wrongbasal">Для коррекции гипо, вызванных неверными настройками базальной скорости.</string>
+    <string name="hypott_preventoversmb">Чтобы не допустить чрезмерной коррекции ГК, вызванной быстрыми углеводами принятыми для устранения гипо.</string>
+    <string name="hypott_exercise">Чтобы исправить гипо вызванное нагрузкой.</string>
+    <string name="hypott_0basal">Чтобы предотвратить снижение уровня глюкозы в крови, если временная базальная скорость уже 0%.</string>
    <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
    <string name="offlineprofile_whatprofile">Какой профиль можно применить и настроить в автономном режиме?</string>
    <string name="offlineprofile_label">Тема: Автономный профиль</string>
    <string name="offlineprofile_nsprofile">Профилем NS можно пользоваться, но не настраивать.</string>
    <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
+    <string name="pumpdisconnect_label">Причины применения опции «Отсоединить помпу» в AndroidAPS</string>
    <string name="pumpdisconnect_whattodo">Что следует делать при отсоединении помпы?</string>
+    <string name="pumpdisconnect_unnecessary">This is unnecessary as insulin will not be delivered if the pump is physically disconnected.</string>
+    <string name="pumpdisconnect_missinginsulin">Это позволяет AndroidAPS не учитывать инсулин, который не был подан во время физического отключения помпы</string>
+    <string name="pumpdisconnect_notstop">Это не прекратит подачу инсулина если помпа остается подключенной.</string>
+    <string name="pumpdisconnect_openloop">Это переведет AndroidAPS в режим открытого цикла.</string>
    <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
+    <string name="objectives_label">Настройки AndroidAPS</string>
+    <string name="objectives2_label">Настройки AndroidAPS</string>
+    <string name="objectives_howtosave">Как эффективнее сохранять свои настройки?</string>
+    <string name="objectives_notesettings">Экспорт настроек не нужен, если они у вас где-то записаны.</string>
+    <string name="objectives_afterobjective">Экспортируйте настройки после прохождения цели.</string>
+    <string name="objectives_afterchange">Экспортируйте настройки после изменения любого параметра.</string>
+    <string name="objectives_afterinitialsetup">Экспортируйте настройки после окончания начальной настройки и установки параметров.</string>
+    <string name="objectives2_maintenance">Экспортируйте настройки локально используя меню Обслуживание.</string>
+    <string name="objectives2_internalstorage">Файл с вашими настройками сохраняется на телефоне во Внутреннем хранилище/AAPS/preferences.</string>
+    <string name="objectives2_cloud">Скопируйте файл с настройками в надежное место вне телефона (например, закинув в облако или на компьютер. либо отправив по E-mail и т.д.)</string>
+    <string name="objectives2_easyrestore">Если ваш телефон поврежден или утерян, существует легкий способ удаленно восстановить настройки без резервной копии.</string>
    <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
+    <string name="noisycgm_label">Зашумленные данные мониторинга</string>
    <string name="noisycgm_whattodo">Что следует делать, если данные мониторинга зашумлены?</string>
+    <string name="noisycgm_nothing">Ничего не делайте - AndroidAPS сам справится.</string>
+    <string name="noisycgm_pause">Отключите замкнутый цикл, чтоб избежать неверной дозировки.</string>
+    <string name="noisycgm_replacesensor">Заменить постоянно шумящий или неточный сенсор.</string>
+    <string name="noisycgm_checksmoothing">Убедитесь, что приложение мониторинга сглаживает данные ГК.</string>
    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
+    <string name="exerciseprofile_label">Нагрузка и Профили</string>
+    <string name="exerciseprofile_whattodo">Как использовать профили, чтоб помочь системе справиться с аэробными упражнениями?</string>
+    <string name="exerciseprofile_switchprofilebelow100">Задать профиль ниже 100%.</string>
+    <string name="exerciseprofile_switchprofileabove100">Задать профиль выше 100%.</string>
+    <string name="exerciseprofile_leaveat100">Оставить профиль на 100%.</string>
+    <string name="exerciseprofile_suspendloop">Приостановить цикл.</string>
    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="exercise_label">Физическая нагрузка и временные цели</string>
+    <string name="exercise_whattodo">Как использовать временные цели чтоб помочь системе справиться с аэробными упражнениями?</string>
+    <string name="exercise_settt">Установить временную цель \"Нагрузка\" заблаговременно перед началом упражнения.</string>
+    <string name="exercise_setfinished">Установить временную цель \"Нагрузка\" после окончания упражнения.</string>
+    <string name="exercise_setunchanged">Оставить временную цель без изменений.</string>
+    <string name="exercise_15g">Подождать пока глюкоза крови упадет ниже уровня цели \"Гипо\", а затем съесть 15г быстрых углеводов.</string>
    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="suspendloop_label">Отключенный/приостановленный цикл</string>
    <string name="suspendloop_doigetinsulin">Получаю ли я инсулин, когда цикл отключен/приостановлен?</string>
    <string name="suspendloop_yes">Да, базальный инсулин продолжает подаваться.</string>
    <string name="suspendloop_no">Нет, подача инсулина прекращается.</string>
+    <string name="basaltest_label">Проверка базы, чувствительности ISF и I:C</string>
+    <string name="basaltest_when">Когда следует проверять эти значения?</string>
+    <string name="basaltest_beforeloop">Перед началом использования петли.</string>
+    <string name="basaltest_havingregularhighlow">При частом высоком или низком уровне глюкозы в крови.</string>
+    <string name="basaltest_weekly">Хотя бы один раз в неделю.</string>
+    <string name="basaltest_fixed">После установки и проверки, эти значения не должны меняться со временем.</string>
    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
+    <string name="prerequisites_label">Предварительные требования</string>
+    <string name="prerequisites_what">Что необходимо для настройки и использования AndroidAPS?</string>
    <string name="prerequisites_determinedcorrectprofile">Проверенные данные профиля (базал, инс-углеводы IC, фактор чувствительности к инсулину ISF, длительность действия инсулина DIA).</string>
+    <string name="prerequisites_computer">Компьютер с установленной и настроенной Android Studio.</string>
    <string name="prerequisites_phone">Поддерживаемый телефон.</string>
+    <string name="prerequisites_pump">Совместимая инсулиновая помпа, если вы планируете использовать замкнутый цикл.</string>
+    <string name="prerequisites_nightscout">Nightscout, для записи всех данных и обзора настроек.</string>
    <string name="prerequisites_tidepoolaccount">Учетная запись Tidepool.</string>
    <string name="prerequisites_googleaccount">Учетная запись Google.</string>
    <string name="prerequisites_githubaccount">Учетная запись Github.</string>
+    <string name="prerequisites_beanandroiddeveloper">Опыт программирования или редактирования кода.</string>
    <string name="prerequisites_own670g">Помпа MiniMed 670G.</string>
    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
    <string name="prerequisites_smartwatch">Смарт часы.</string>
    <string name="prerequisites_supportedcgm">Поддерживаемый мониторинг.</string>
+    <string name="prerequisites2_label">Предварительные требования</string>
+    <string name="prerequisites2_what">Что необходимо для настройки и использования AndroidAPS?</string>
+    <string name="prerequisites2_profile">Проверенные настройки профиля (чувствительность ISF, I:C, скорость базала, продолжительность действия инсулина и т.д.).</string>
+    <string name="prerequisites2_device">Совместимое устройство на Android (мобильный телефон, планшет или часы на полноценном Android).</string>
+    <string name="prerequisites2_internet">AndroidAPS требует подключения к интернет чтоб работать в режиме закрытого цикла.</string>
+    <string name="prerequisites2_supportedcgm">Поддерживаемая система мониторинга и подходящее приложение для получения данных ГК на устройстве.</string>
    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="update_label">Обновление AndroidAPS</string>
    <string name="whatistrue">Отметьте все правильные ответы.</string>
+    <string name="update_git">На компьютере должен быть установлен и настроен Git.</string>
+    <string name="update_asap">При выходе новый версий AndroidAPS, старые версии могут быть удаленно ограничены после определенного периода времени.</string>
+    <string name="update_keys">Необходимо сохранить и запомнить расположение хранилища ключей и использовать тот же ключ подписи для обновлений, что и для предыдущей установки.</string>
    <string name="update_neverupdate">Никогда не обновлять, если система работает хорошо.</string>
+    <string name="update_askfriend">Если у вас возникли трудности с построением приложения, вы можете установить апк, который был построен другом.</string>
    <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
    <string name="troubleshooting_label">Устранение неполадок</string>
+    <string name="troubleshooting_wheretoask">Где искать помощь с AndroidAPS?</string>
+    <string name="troubleshooting_fb">Вы можете попросить совета в группе AndroidAPS Users Facebook.</string>
+    <string name="troubleshooting_wiki">Вам следует прочитать (и перечитать) документацию AndroidAPS.</string>
+    <string name="troubleshooting_gitter">Можно консультироваться и пересылать логи технических проблем и неполадок в чате Gitter по AndroidAPS.</string>
+    <string name="troubleshooting_yourendo">Вы должны спросить в диабетической клинике / у вашего врача-эндокринолога.</string>
    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
    <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
    <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS
 
 Context | Edit Context</string>
+    <string name="insulin_label">Модули для инсулинов</string>
+    <string name="insulin_ultrarapid">Какой инсулин следует использовать с модулем Сверхбыстрый Oref?</string>
    <string name="insulin_fiasp">Fiasp®</string>
+    <string name="insulin_novorapid">Novoapid ® /Novolog ®</string>
    <string name="insulin_humalog">Хумалог®</string>
+    <string name="insulin_actrapid">Actrapid ® /Humalin R ®/\"обычный\" человеческий инсулин.</string>
    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
+    <string name="sensitivity_label">Модули чувствительности</string>
    <string name="sensitivity_which">Отметьте все правильные ответы.</string>
+    <string name="sensitivity_adjust">Модули чувствительности позволяют AndroidAPS подстраиваться под временные или кратковременные изменения в чувствительности к инсулину (например, гормональные изменения или проблемы с поглощением в месте установки катетера).</string>
+    <string name="sensitivity_edit">Модули чувствительности предлагают пользователю изменения скорости базала, коэффициентов I:C и ISF, которые можно внести в профиль.</string>
+    <string name="sensitivity_cannula">Внесение записи о замене катетера вернет коэффициент Autosens к 100%.</string>
+    <string name="sensitivity_time">У некоторых опций модуля есть настраиваемые диапазоны времени, которые может задать пользователь.</string>
    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="wrongcarbs_label">Ошибки записи углеводов</string>
    <string name="wrongcarbs_whattodo">Что нужно делать, если сделан неправильный ввод углеводов?</string>
+    <string name="iob_negiob">Отрицательное значение IOB в течеие продолжительного периода времени при отсутствии физ. нагрузки означает, что ваш профиль слишком сильный и вам нужно убавить подачу инсулина в настройках.</string>
+    <string name="breadgrams_grams">Для оценки и записи потребляемых углеводов следует использовать только граммы.</string>
+    <string name="breadgrams_decay">AndroidAPS использует динамическую модель для оценки \"распада\" и расчета COB.</string>
+    <string name="breadgrams_calc">Если уровень глюкозы в крови находится вне допустимых значений (слишком низкое или слишком высокое), то калькулятор болюса может быть использован для внесения предложений по коррекции соотношения инсулин/углеводы.</string>
    <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
+    <string name="nsclient_fullcontrol">NS Client в режиме удаленки предоставляет как отслеживание, так и полное управление AndroidAPS.</string>
    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_label_exam">Фактор Чувствительности к Инсулину (ISF)</string>
+    <string name="isf_increasingvalue">Увеличения фактора чувствительности к инсулину ISF приведет к увеличению дозы инсулина на покрытие определенного числа углеводов.</string>
+    <string name="isf_decreasingvalue">Уменьшение фактора чувствительности к инсулину ISF приведет к увеличению дозы инсулина для корректировки ГК выше целевого уровня.</string>
+    <string name="isf_noeffect">Увеличение или уменьшение фактора чувствительности к инсулину ISF не влияет на дозировку инсулина когда уровень ГК ниже целевого.</string>
+    <string name="isf_preferences">Фактор чувствительности к инсулину ISF задается в параметрах AndroidAPS.</string>
    <string name="isf_profile">Изменение значения ISF в профиле достаточно для применения изменений.</string>
    <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
@ -62,6 +147,7 @@ Context | Edit Context</string>
    <string name="ic_different">Соотношение инсулин-углеводы IC изменится если принимать ХЕ за 10 или 12г.</string>
    <string name="ic_meaning">Смысл соотношения инсулин-углеводы IC таков: сколько хлебных единиц покрываются одной ед. инсулина.</string>
    <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
+    <string name="profileswitch_label">Cмена профиля</string>
    <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
    <string name="profileswitchtime_2">Выполнить переключение профиля со сдвигом времени 2</string>
    <string name="profileswitchtime__2">Выполнить переключение профиля со сдвигом времени -2</string>
--- a/app/src/main/res/values-ru-rRU/objectives.xml
+++ b/app/src/main/res/values-ru-rRU/objectives.xml
@ -21,6 +21,7 @@
    <string name="objectives_smb_objective">Активация таких доп функций для дневного времени как супер микро болюс SMB</string>
    <string name="objectives_auto_objective">Включение автоматизации</string>
    <string name="objectives_smb_gate">Прочтите wiki и увеличьте maxIOB чтобы супер микро болюс SMB заработал как положено! Хорошее начало – maxIOB = средний болюс на еду + троекратный максимальный суточный базал</string>
+    <string name="objectives_auto_gate">Прочтите документацию по автоматизации. Настройте свои первые простые правила. Вместо действия позвольте AAPS только выводить уведомления. Если вы уверены, что автоматизация инициируется в нужное время, замените уведомление реальными действиями. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
    <string name="objectives_bgavailableinns">гликемия доступна в NS</string>
    <string name="objectives_pumpstatusavailableinns">Статус помпы доступен в NS</string>
    <string name="objectives_manualenacts">Ввод вручную</string>
@ -35,9 +36,11 @@
    <string name="objectives_useloop">Просмотр содержимого модуля Цикл Loop</string>
    <string name="objectives_usescale">Применить функцию масштабирования по долгому нажатию на диаграмму ГК</string>
    <string name="objectives_button_enter">Ввод</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Если у вас есть хотя бы три месяца опыта работы с замкнутым циклом на других системах, то можно получить код пропуска. Подробности смотрите по адресу https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives.</string>
    <string name="codeaccepted">Код принят</string>
    <string name="codeinvalid">Неверный код</string>
    <string name="objectives_exam_objective">Подтвердите ваши знания</string>
+    <string name="objectives_exam_gate">Изучите вопросы. Вам дано четыре возможных ответа на каждый вопрос. Может быть более одного правильного ответа. Проверьте все правильные ответы и подтвердите выбор.</string>
    <string name="answerdisabledto">Ответы отключены до: %1$s</string>
    <string name="wronganswer">Неверный ответ!</string>
    <string name="unfinshed_button">Следующий незавершенный</string>
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@ -42,7 +42,6 @@
    <string name="description_source_glimp">Получать данные гликемии от Glimp.</string>
    <string name="description_source_mm640g">Получать данные гликемии от 600SeriesAndroidUploader.</string>
    <string name="description_source_ns_client">Получать данные гликемии с сайта Nightscout</string>
-    <string name="description_source_xdrip">Получать данные гликемии от xDrip.</string>
    <string name="description_treatments">Сохраняет все выполненные назначения</string>
    <string name="description_wear">Мониторить и контролировать AndroidAPS при помощи часов WearOS.</string>
    <string name="description_xdrip_status_line">Показать информацию о работе алгоритма ИПЖ на экране смарт-часов xDrip+.</string>
@ -119,7 +118,6 @@
    <string name="changeyourinput">измените введенные данные</string>
    <string name="configbuilder_bgsource">источник СК</string>
    <string name="configbuilder_bgsource_description">Откуда должен получать данные AndroidAPS?</string>
-    <string name="xdrip">xDrip +</string>
    <string name="apsmode_title">режим APS</string>
    <string name="closedloop">Замкнутый цикл</string>
    <string name="openloop">открытый цикл</string>
@ -285,7 +283,6 @@
    <string name="mealbolus">болюс на еду</string>
    <string name="correctionbous">коррекция</string>
    <string name="actions">действия</string>
-    <string name="ns_upload_only">только передача в NS (синхронизация отсутствует)</string>
    <string name="pumpNotInitialized">помпа не инициализирована</string>
    <string name="primefill">прайм/заполнение</string>
    <string name="fillwarning">убедитесь что количество соответствует характеристикам вашей инфузионной системы</string>
@ -340,7 +337,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">сокращенные имена табул</string>
    <string name="always_use_shortavg">всегда используйте укороченное среднее приращение вместо простого</string>
-    <string name="always_use_shortavg_summary">Полезно когда данные из нефильтрованных источников вроде xDrip+ начинают \"шуметь\".</string>
    <string name="profile">профиль</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">значение по умолчанию:3 Это ключевой ограничитель безопасности OpenAPS. Он ограничивает величину вашего базала максимум до 3x максимума. Вам вероятно не понадобится менять эту величину но вам следует понимать, что она входит в формулу дуэта \"максимум 3x ежедневное; 4x текущее\"</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">значение по умолчанию: 4 . Это вторая половина обеспечения безопасности OpenAPS из дуэта \"максимум 3x ежедневное; 4x текущее\" Означает что ваша база независимо от установок помпы не может быть выше чем это число умноженное на текущее значение базала. Ограничение для того, чтобы предотвратить вторжение в опасную зону из-за высокого уровня установленных значений базы без понимания алгоритма работы приложения. Большинству людей никогда не потребуется изменять это значение, скорее всего нужно поменять другие настройки если вы чувствуете, что вам мешает это ограничение.</string>
@ -354,9 +350,6 @@
    <string name="smscommunicator_invalidphonennumber">неверный номер телефона для смс</string>
    <string name="overview_calibration">калибровка</string>
    <string name="xdripnotinstalled">xdrip+ не установлен</string>
-    <string name="calibrationsent">калибровка передается на xdrip</string>
-    <string name="smscommunicator_calibrationsent">Калибровка отправлена. Активируйте прием в xDrip+.</string>
-    <string name="smscommunicator_calibrationfailed">xdrip не получает калибровок</string>
    <string name="pumpsuspended">Работа помпы остановлена</string>
    <string name="executing">выполнение</string>
    <string name="virtualpump_settings">настройки вирт помпы</string>
@ -405,11 +398,18 @@
    <string name="suspendloopfor3h">приостановить цикл на 3 часа</string>
    <string name="suspendloopfor10h">приостановить цикл на 10 часов</string>
    <string name="suspendloopforXmin">Приостановить цикл на %1$d мин</string>
+    <string name="disconnectpump">Отключить помпу</string>
    <string name="disconnectpumpfor15m">отсоединить помпу на 15 мин</string>
    <string name="disconnectpumpfor30m">отсоединить помпу на 30 мин</string>
    <string name="disconnectpumpfor1h">отсоединить помпу на 1 час</string>
    <string name="disconnectpumpfor2h">отсоединить помпу на 2 часа</string>
    <string name="disconnectpumpfor3h">отсоединить помпу на 3 часа</string>
+    <string name="duration15m">15 мин</string>
+    <string name="duration30m">30 мин</string>
+    <string name="duration1h">1 час</string>
+    <string name="duration2h">2 часа</string>
+    <string name="duration3h">3 часа</string>
+    <string name="duration10h">10 часов</string>
    <string name="resume">возобновить</string>
    <string name="reconnect">Возобновить соединение с помпой</string>
    <string name="smscommunicator_wrongduration">неверное значение длительности</string>
@ -435,8 +435,12 @@
    <string name="statuslights_sage_critical">Критический порог предупреждения о времени, отработанном сенсором [h]</string>
    <string name="statuslights_sbat_warning">Порог предупреждения о разрядке батареи [%]</string>
    <string name="statuslights_sbat_critical">Порог предупреждения о критическом уровне разрядки батареи [%]</string>
+    <string name="statuslights_bage_warning">Порог предупреждения о разрядке батареи [h]</string>
+    <string name="statuslights_bage_critical">Порог предупреждения о критическом уровне разрядки батареи [h]</string>
    <string name="statuslights_res_warning">Порог уровня наполненности резервуара для оповещения [ед.]</string>
    <string name="statuslights_res_critical">Порог критического уровня наполненности резервуара [U]</string>
+    <string name="statuslights_bat_warning">Порог предупреждения о разрядке батареи [%]</string>
+    <string name="statuslights_bat_critical">Порог предупреждения о критическом уровне разрядки батареи [%]</string>
    <string name="prediction_shortname">ОЖИД</string>
    <string name="iob">IOB акт инс</string>
    <string name="cob">акт углев</string>
@ -448,8 +452,6 @@
    <string name="nav_about">о приложении</string>
    <string name="smscommunicator_missingsmspermission">отсутствует смс подтверждение</string>
    <string name="smscommunicator_missingphonestatepermission">Отсутствует разрешение телефона</string>
-    <string name="xdripstatus_settings">состояние xdrip (часы)</string>
-    <string name="xdripstatus">строка состояния xdrip (часы)</string>
    <string name="xdripstatus_shortname">Статус xDrip</string>
    <string name="wear_showbgi_title">показать BGI</string>
    <string name="wear_showbgi_summary">добавить BGI в строку состояния</string>
@ -492,7 +494,6 @@
    <string name="mdtp_cancel">отмена</string>
    <string name="notloadedplugins">не все профили загружены!</string>
    <string name="valuesnotstored">Данные не сохранены!</string>
-    <string name="ns_localbroadcasts">Включить трансляцию для других приложений (например, xDrip). Не включайте, если установлено несколько экземпляров приложений AAPS или NSClient!</string>
    <string name="ns_localbroadcasts_title">Активировать локальную передачу</string>
    <string name="careportal_newnstreatment_duration_min_label">Длительность (мин)</string>
    <string name="openapssmb">Супер микро болюс OpenAPS</string>
@ -1178,4 +1179,13 @@ Context | Edit Context</string>
    <string name="alarm">Сигнал</string>
    <string name="smscommunicator_report_pump_ureachable_summary">Отправить SMS, если инициируется запись о недоступности помпы</string>
    <string name="smscommunicator_pump_ureachable">Сообщить о недоступности помпы</string>
+    <string name="advisoralarm">Напомнить о еде</string>
+    <string name="alarminxmin">Напомнить через %1$d мин</string>
+    <string name="bolusadvisor">Помощник болюса</string>
+    <string name="bolusadvisormessage">У вас высокая глюкоза крови. Лучше подождать, чем есть сейчас. Хотите сделать болюс на коррекцию и установить напоминание, когда будет пора есть? В этом случае углеводы не будут записаны и после напоминания надо будет снова воспользоваться помощником.</string>
+    <string name="enablebolusadvisor">Вкл помощник болюса</string>
+    <string name="enablebolusadvisor_summary">Используйте напоминание для того, чтобы начать есть позже, вместо того, чтобы воспользоваться помощником болюса на высоких значениях ГК (\"пре-болюс\")</string>
+    <string name="time_to_eat">Пора есть!\nЗапустите помощник болюса снова для подсчета.</string>
+    <string name="timetoeat">Пора есть</string>
+    <string name="fabric_upload_disabled">Загрузка журналов сбоя на сервер отключена!</string>
 </resources>
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@ -42,7 +42,6 @@
    <string name="description_source_glimp">Získavať hodnoty glykémií z aplikácie Glimp.</string>
    <string name="description_source_mm640g">Získavať hodnoty glykémií z 600SeriesAndroidUploader.</string>
    <string name="description_source_ns_client">Získavať hodnoty glykémií z Nightscoutu</string>
-    <string name="description_source_xdrip">Získavať hodnoty glykémií z xDripu.</string>
    <string name="description_treatments">Ukladá všetky ošetrenia do databázy</string>
    <string name="description_wear">Zobrazovanie stavu a riadenie AndroidAPS z hodiniek s WearOS.</string>
    <string name="description_xdrip_status_line">Zobraz informácie o uzavretom okruhu na xDrip+ watchface.</string>
@ -119,7 +118,6 @@
    <string name="changeyourinput">Zmeňte zadanie!</string>
    <string name="configbuilder_bgsource">Zdroj glykémie</string>
    <string name="configbuilder_bgsource_description">Odkiaľ má AndroidAPS získavať glykémie?</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">APS mód</string>
    <string name="closedloop">Uzavretý okruh</string>
    <string name="openloop">Otvorený okruh</string>
@ -285,7 +283,6 @@
    <string name="mealbolus">Bolus</string>
    <string name="correctionbous">Korekcia</string>
    <string name="actions">Akcie</string>
-    <string name="ns_upload_only">Iba nahrávanie do NS (synchronizácia deaktivovaná)</string>
    <string name="pumpNotInitialized">Pumpa nie je inicializovaná!</string>
    <string name="primefill">Plnenie/doplňovanie</string>
    <string name="fillwarning">Prosím uistite sa, že hodnota zodpovedá špecifikácií Vášho setu!</string>
@ -340,7 +337,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Krátke názvy modulov</string>
    <string name="always_use_shortavg">Vždy používať krátkodobý priemerný rozdiel glykémií, namiesto rozdielu posledných dvoch hodnôt</string>
-    <string name="always_use_shortavg_summary">Zmysluplné, pokiaľ dáta z xDripu obsahujú veľký šum.</string>
    <string name="profile">Profil</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Štandardná hodnota: 3 Toto je kľúčová hodnota zabezpečenia. Hovorí, že maximálny nastaviteľný bazál je trojnásobkom maximálneho denného bazálu. Spravidla to zrejme nebudete musieť meniť, prípadne si prečítate o téme \"3x max denný; 4x aktuálny\".</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Štandardná hodnota: 4 Toto je druhá kľúčová hodnota. Hovorí, že maximálna hodnota dočasného bazálu nikdy nebude väčšia, ako štvornásobok aktuálneho bazálu. Je to preto, aby se ľudia nedostali do nebezpečných hodnôt skôr, ako pochopia ako OpenAPS pracuje. Znovu, štandardná hodnota je 4 a väčšina ľudí ju nikdy nebude musieť meniť. Pokiaľ nestačí, obvykle je problém niekde inde.</string>
@ -354,9 +350,6 @@
    <string name="smscommunicator_invalidphonennumber">Chybné telefónne číslo</string>
    <string name="overview_calibration">Kalibrácia</string>
    <string name="xdripnotinstalled">xDrip+ nie je nainštalovaný</string>
-    <string name="calibrationsent">Kalibrácia odoslaná do xDripu</string>
-    <string name="smscommunicator_calibrationsent">Kalibrácia odoslaná. Príjem kalibrácií musí byť v xDripe povolený.</string>
-    <string name="smscommunicator_calibrationfailed">xDrip neprijíma kalibrácie</string>
    <string name="pumpsuspended">Pumpa pozastavená</string>
    <string name="executing">Vykonávam</string>
    <string name="virtualpump_settings">Nastavenie virtuálnej pumpy</string>
@ -455,8 +448,6 @@
    <string name="nav_about">O aplikácii</string>
    <string name="smscommunicator_missingsmspermission">Chýbajúce povolenie SMS príkazov</string>
    <string name="smscommunicator_missingphonestatepermission">Chýba oprávnenia pre zisťovanie stavu telefónu</string>
-    <string name="xdripstatus_settings">Stav z xDripu (hodinky)</string>
-    <string name="xdripstatus">Stavový riadok xDripu (hodinky)</string>
    <string name="xdripstatus_shortname">XDS</string>
    <string name="wear_showbgi_title">Zobrazovať BGI</string>
    <string name="wear_showbgi_summary">Pridať BGI do stavového riadku</string>
@ -499,7 +490,6 @@
    <string name="mdtp_cancel">Zrušiť</string>
    <string name="notloadedplugins">Nenačítané všetky profily!</string>
    <string name="valuesnotstored">Hodnoty nie sú uložené!</string>
-    <string name="ns_localbroadcasts">Povoliť vysielanie do iných aplikácií (napr. xDrip). Nepovoľujte, pokiaľ máte nainštalovanú viac ako jednu AAPS, alebo NSClient inštanciu!</string>
    <string name="ns_localbroadcasts_title">Povoliť lokálne vysielanie.</string>
    <string name="careportal_newnstreatment_duration_min_label">Trvanie [min]</string>
    <string name="openapssmb">OpenAPS SMB</string>
@ -1170,7 +1160,6 @@
    <string name="donate_your_data_to_science">Darujte svoje údaje vede</string>
    <string name="open_humans_short">OH</string>
    <string name="you_have_been_signed_out_of_open_humans">Boli ste odhlásený z Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Kliknite sem, ak sa chcete prihlásiť znova, v prípade, že sa to nestalo omylom.</string>
    <string name="only_upload_if_connected_to_wifi">Odoslať iba ak ste pripojený k Wi-Fi</string>
    <string name="only_upload_if_charging">Odoslať iba pri nabíjaní</string>
    <string name="worker_state">Stav procesu: %s</string>
@ -1182,7 +1171,6 @@
    <string name="cta_dont_kill_my_app_info">Nepotláčať moju aplikáciu?</string>
    <string name="alarm">Alarm</string>
    <string name="smscommunicator_report_pump_ureachable_summary">Odoslať SMS, pokiaľ pumpa nie je dostupná</string>
-    <string name="smscommunicator_pump_ureachable">Nahlásiť nedostupnú pumpu</string>
    <string name="advisoralarm">Spustiť výstrahu, keď je čas na jedlo</string>
    <string name="alarminxmin">Spustiť výstrahu za %1$d min</string>
    <string name="bolusadvisor">Bolusový poradca</string>
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@ -43,7 +43,6 @@ Eversense-appen.</string>
    <string name="description_source_glimp">Ta emot BG-data från Glimp</string>
    <string name="description_source_mm640g">Ta emot BG-data från 600SeriesAndroidUploader</string>
    <string name="description_source_ns_client">Ladda ner BG-data från Nightscout</string>
-    <string name="description_source_xdrip">Ta emot BG-data från xDrip</string>
    <string name="description_treatments">Spara alla behandlingar som gjorts</string>
    <string name="description_wear">Följ och kontrollera AndroidAPS med din Wear OS-klocka</string>
    <string name="description_xdrip_status_line">Visa AAPS-information på din xDrip-urtavla</string>
@ -120,7 +119,6 @@ Eversense-appen.</string>
    <string name="changeyourinput">Ändra inmatning</string>
    <string name="configbuilder_bgsource">BG-källa</string>
    <string name="configbuilder_bgsource_description">Var ska AndroidAPS få sitt data ifrån?</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">APS-läge</string>
    <string name="closedloop">Closed Loop</string>
    <string name="openloop">Open Loop</string>
@ -286,7 +284,6 @@ Eversense-appen.</string>
    <string name="mealbolus">Måltid</string>
    <string name="correctionbous">Korrektion</string>
    <string name="actions">Åtgärder</string>
-    <string name="ns_upload_only">Endast uppladdning till Nightscout</string>
    <string name="pumpNotInitialized">Pump inte initierad</string>
    <string name="primefill">Förfyllning</string>
    <string name="fillwarning">Försäkra dig om att mängden motsvarar det som är specificerat för just ditt infusionsset.</string>
@ -341,7 +338,6 @@ Eversense-appen.</string>
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Förkorta namnen på flikarna</string>
    <string name="always_use_shortavg">Använd alltid kort medeldelta istället för enkel delta</string>
-    <string name="always_use_shortavg_summary">Användbart när ofiltrerade källor som xDrip ger brusvärden</string>
    <string name="profile">Profil</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Standardvärde: 3 Detta är en grundsten i OpenAPS säkerhet. Detta begränsar dina temp basaler till maximalt 3x din största basaldos. Du behöver oftast inte ändra detta värde. Läs på och förstå skillnaden mellan 3x nuvarande och 3x daglig max som säkerhetsinställningar.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Standardvärde: 4 Detta är en grundsten i OpenAPS säkerhet. Detta begränsar dina tempbasaler till maximalt 4 gånger din nuvarande basaldos, oberoende av din maximala basaldos. Detta för att undvika att man av misstag gör farliga inställningar. Om man når taket i denna inställning så kanske ändringar i andra inställningar behövs. De flesta behöver inte ändra denna inställning.</string>
@ -355,9 +351,6 @@ Eversense-appen.</string>
    <string name="smscommunicator_invalidphonennumber">Ogiltigt telefonnummer för SMS</string>
    <string name="overview_calibration">Kalibrering</string>
    <string name="xdripnotinstalled">xDrip+ inte installerat</string>
-    <string name="calibrationsent">Kalibrering skickad till xDrip</string>
-    <string name="smscommunicator_calibrationsent">Kalibrering skickad. Observera att xDrip måste vara inställd att ta emot kalibreringar.</string>
-    <string name="smscommunicator_calibrationfailed">xDrip tar inte emot kalibreringar</string>
    <string name="pumpsuspended">Pump pausad</string>
    <string name="executing">Utför</string>
    <string name="virtualpump_settings">Inställningar för Virtuell pump</string>
@ -460,8 +453,6 @@ Eversense-appen.</string>
    <string name="nav_about">Om</string>
    <string name="smscommunicator_missingsmspermission">Saknar behörighet att skicka SMS</string>
    <string name="smscommunicator_missingphonestatepermission">Behörighet saknas</string>
-    <string name="xdripstatus_settings">xDrip Status (klocka)</string>
-    <string name="xdripstatus">xDrip Statusrad (klocka)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">Visa BGI</string>
    <string name="wear_showbgi_summary">Visa BGI i statusraden</string>
@ -504,7 +495,6 @@ Eversense-appen.</string>
    <string name="mdtp_cancel">Avbryt</string>
    <string name="notloadedplugins">Alla profiler laddades inte!</string>
    <string name="valuesnotstored">Alla värden sparades inte!</string>
-    <string name="ns_localbroadcasts">Aktivera sändning till andra appar (som xDrip). Aktivera inte detta om du har fler än en förekomst av AAPS eller NSClient installerad.</string>
    <string name="ns_localbroadcasts_title">Aktivera lokala broadcasts</string>
    <string name="careportal_newnstreatment_duration_min_label">Duration [min]</string>
    <string name="openapssmb">OpenAPS SMB</string>
@ -1175,7 +1165,6 @@ Eversense-appen.</string>
    <string name="donate_your_data_to_science">Donera dina data till vetenskapen</string>
    <string name="open_humans_short">OH</string>
    <string name="you_have_been_signed_out_of_open_humans">Du har loggats ut från Open Humans</string>
-    <string name="click_here_to_sign_in_again_if_this_wasnt_on_purpose">Klicka här om du vill logga in igen om det inte var meningen.</string>
    <string name="only_upload_if_connected_to_wifi">Ladda bara upp om ansluten till WiFi</string>
    <string name="only_upload_if_charging">Ladda bara upp vid laddning</string>
    <string name="worker_state">Jobbstatus: %s</string>
@ -1187,7 +1176,6 @@ Eversense-appen.</string>
    <string name="cta_dont_kill_my_app_info">Döda inte min app?</string>
    <string name="alarm">Larm</string>
    <string name="smscommunicator_report_pump_ureachable_summary">Skicka SMS om pumpen inte kan nås</string>
-    <string name="smscommunicator_pump_ureachable">Rapportera om pump inte kan nås</string>
    <string name="advisoralarm">Larma när det är dags att äta</string>
    <string name="alarminxmin">Larma om %1$d min</string>
    <string name="bolusadvisor">Bolusguide</string>
--- a/app/src/main/res/values-tr-rTR/insight_alert_descriptions.xml
+++ b/app/src/main/res/values-tr-rTR/insight_alert_descriptions.xml
@ -1,2 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="alert_r7_description"><![CDATA[Miktar: <b>%1$d%%</b>\nSüre: </b>%2$s st.</b>]]></string>
+    <string name="alert_w36_description"><![CDATA[Miktar: <b>%1$d%%</b><br/>Süre: <b>%2$s st.</b>]]></string>
+</resources>
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@ -36,7 +36,6 @@
    <string name="description_source_glimp">Glimp\'ten KŞ değerleri alır.</string>
    <string name="description_source_mm640g">600SeriesAndroidUploader\'dan KŞ değerleri alın.</string>
    <string name="description_source_ns_client">Nightscout\'tan KŞ verilerini yükler</string>
-    <string name="description_source_xdrip">XDrip+\'ten KŞ değerlerini alır.</string>
    <string name="description_treatments">Yapılan tüm tedavileri kaydet</string>
    <string name="description_wear">WearOS saatinizi kullanarak AndroidAPS\'yi izleyin ve kontrol edin.</string>
    <string name="description_xdrip_status_line">Döngü\'yle ilgili bilgileri xDrip+ watchface\'inizde gösterin.</string>
@ -112,7 +111,6 @@
    <string name="changeyourinput">Girişinizi değiştirin!</string>
    <string name="configbuilder_bgsource">KŞ kaynağı</string>
    <string name="configbuilder_bgsource_description">AndroidAPS verilerini nereden alsın?</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">APS modu</string>
    <string name="closedloop">Kapalı Döngü</string>
    <string name="openloop">Açık Döngü</string>
@ -183,7 +181,6 @@
    <string name="mealbolus">Ögün</string>
    <string name="correctionbous">Düzeltme</string>
    <string name="actions">Eylemler</string>
-    <string name="ns_upload_only">Sadece Nightscout\'a yükle (devre dışı senkronizasyon)</string>
    <string name="pumpNotInitialized">Pompa başlatılmamış!</string>
    <string name="primefill">Hazırla/doldur</string>
    <string name="fillwarning">Lütfen miktarın infüzyon setinizin özelliklerine uygun olduğundan emin olun!</string>
@ -232,7 +229,6 @@
    <string name="smscommunicator_shortname">SMS</string>
    <string name="short_tabtitles">Kısa tab başlıkları</string>
    <string name="always_use_shortavg">Her zaman basit delta yerine kısa ortalama delta kullan</string>
-    <string name="always_use_shortavg_summary">xDrip gibi filtre uygulanmamış kaynaklardan gelen veriler gürültülü olduğunda kullanışlıdır.</string>
    <string name="profile">Profil</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">Varsayılan değer: 3 Bu OpenAPS için önemli bir güvenlik ayarıdır. Maksimum bazal Iob\'u, en büyük bazal oranınızın üç katı (varsayılan olarak) ile sınırlar. Genel olarak, bu değeri değiştirmemelisiniz. Ama \"3x max günlük, 4x şuan\" ın bir güvenlik ayarı olarak ne anlama geldiğini bilmelisiniz.</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">Varsayılan ayar: 4 Bu, OpenAPS güvenlik ayarlarının diğer yarısı ve \"3x max günlük, 4x akım\" güvenlik korumasının diğer yarısıdır. Bu, başlangıç değerinizin, pompada ayarlanan taban maksimum değerinizden bağımsız olarak, mevcut bazal seviyenin bu sayısından daha yüksek olamayacağı anlamına gelir. Bu, insanların, algoritmanın nasıl çalıştığını anlamadan temel çizgiyi büyük ölçüde artırarak kendilerini tehlikeli durumlarda bulmalarını engellemektir. Varsayılan ayar 4x\'dir; Çoğu insan bu ayarları asla değiştirmek zorunda kalmayacak, ancak bu güvenlik sınırına yakınsa diğer terapi ayarlarını ayarlamalıdırlar.</string>
@ -245,9 +241,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
    <string name="smscommunicator_invalidphonennumber">Geçersiz SMS telefon numarası</string>
    <string name="overview_calibration">Kalibrasyon</string>
    <string name="xdripnotinstalled">xDrip+ uygulaması yüklenmemiş</string>
-    <string name="calibrationsent">Kalibrasyon xDrip+ a gönderildi</string>
-    <string name="smscommunicator_calibrationsent">Kalibrasyon gönderildi. Alma xDrip+\'ta etkinleştirilmelidir.</string>
-    <string name="smscommunicator_calibrationfailed">xDrip+ kalibrasyonları almıyor</string>
    <string name="pumpsuspended">Pompa durduldu</string>
    <string name="executing">Yürütülüyor</string>
    <string name="virtualpump_settings">Sanal pompa ayarları</string>
@ -313,8 +306,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
    <string name="nav_about">Hakkında</string>
    <string name="smscommunicator_missingsmspermission">SMS izni eksik</string>
    <string name="smscommunicator_missingphonestatepermission">Kayıp telefon durum yetkilendirmesi</string>
-    <string name="xdripstatus_settings">xDrip durumu (izle)</string>
-    <string name="xdripstatus">xDrip durumu çizgisi (izle)</string>
    <string name="xdripstatus_shortname">xds</string>
    <string name="wear_showbgi_title">BGI göster</string>
    <string name="wear_showbgi_summary">BGI\'yı durum satırına ekle</string>
--- a/app/src/main/res/values-zh-rCN/insight_alert_descriptions.xml
+++ b/app/src/main/res/values-zh-rCN/insight_alert_descriptions.xml
@ -1,2 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="alert_r7_description"><![CDATA[总数: <b>%1$d%%</b>\nDuration: <b>%2$s h</b>]]></string>
+    <string name="alert_w36_description"><![CDATA[总数: <b>%1$d%%</b><br/>Duration: <b>%2$s h</b>]]></string>
+</resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -37,7 +37,6 @@
    <string name="description_source_glimp">从 Glimp 接收血糖值。</string>
    <string name="description_source_mm640g">从美敦力600Series 的AndroidUploader 接收血糖值。</string>
    <string name="description_source_ns_client">从 Nightscout 下载 血糖数据</string>
-    <string name="description_source_xdrip">从 xDrip 接收血糖值。</string>
    <string name="description_treatments">保存所做的所有治疗</string>
    <string name="description_wear">使用您的 WearOS 手表监视和控制 AndroidAPS。</string>
    <string name="description_xdrip_status_line">在 xDrip + 表盘上显示有关闭环的信息。</string>
@ -113,7 +112,6 @@
    <string name="changeyourinput">更改您的输入!</string>
    <string name="configbuilder_bgsource">血糖来源</string>
    <string name="configbuilder_bgsource_description">AndroidAPS 从何处获取数据？</string>
-    <string name="xdrip">xDrip</string>
    <string name="apsmode_title">APS模式</string>
    <string name="closedloop">闭环</string>
    <string name="openloop">开环</string>
@ -196,7 +194,6 @@
    <string name="mealbolus">饮食</string>
    <string name="correctionbous">矫正</string>
    <string name="actions">手动操作</string>
-    <string name="ns_upload_only">只上传到NS服务器 (禁用同步)</string>
    <string name="pumpNotInitialized">泵未初始化!</string>
    <string name="primefill">充盈</string>
    <string name="fillwarning">请确保数量和输液器里的药量匹配</string>
@ -246,7 +243,6 @@
    <string name="smscommunicator_shortname">手机SMS</string>
    <string name="short_tabtitles">标题名称缩写</string>
    <string name="always_use_shortavg">总是使用短时间的平均增量代替简单增量</string>
-    <string name="always_use_shortavg_summary">当数据来自没有过滤的源头时，例如 xDrip 偶尔出现噪音数据.</string>
    <string name="profile">配置文件</string>
    <string name="openapsama_max_daily_safety_multiplier_summary">默认值: 3 这是一个关键的 OpenAPS 安全阀值。这是限制你的闭环可以最大扩张3倍的日最大基础率。你可能不需要改变这个值 但你应该这个值的含义。日最大基础率的3倍，当前基础率的4倍，这是建议的安全阀值</string>
    <string name="openapsama_current_basal_safety_multiplier_summary">默认值: 4 这是另一个的关键 OpenAPS 安全阀值, 日最大基础率的3倍，当前基础率的4倍，这是建议的安全阀值。这意味着你的基础率, 无论你的泵上的最大基础率设置的多少，也 不能超过你的当前基础率的4倍。这是为了防止人们在了解该算法的工作原理之前进入危险的领域 。同样, 默认值为 4倍; 大多数人将永远不需要调整, 而是更有可能需要调整其他设置,</string>
@ -259,9 +255,6 @@
    <string name="smscommunicator_invalidphonennumber">无效的SMS手机号码</string>
    <string name="overview_calibration">校准</string>
    <string name="xdripnotinstalled">没有安装xDrip+</string>
-    <string name="calibrationsent">校准发送到 xDrip</string>
-    <string name="smscommunicator_calibrationsent">校准值发送了，必须在xDrip开启允许通过其他app使用它的校准功能</string>
-    <string name="smscommunicator_calibrationfailed">xDrip 没有收到校准</string>
    <string name="pumpsuspended">泵暂停了</string>
    <string name="executing">正在执行</string>
    <string name="virtualpump_settings">虚拟泵设置</string>
@ -330,8 +323,6 @@
    <string name="nav_about">关于</string>
    <string name="smscommunicator_missingsmspermission">缺少 SMS 短信权限</string>
    <string name="smscommunicator_missingphonestatepermission">缺少手机状态权限</string>
-    <string name="xdripstatus_settings">xDrip 状态 (手表)</string>
-    <string name="xdripstatus">xDrip 状态线 (手表)</string>
    <string name="xdripstatus_shortname">xdrip</string>
    <string name="wear_showbgi_title">显示血糖线</string>
    <string name="wear_showbgi_summary">添加血糖线到状态线</string>
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@ -4,7 +4,7 @@
    <!--    General-->
    <string name="error">Chyba</string>
    <string name="not_set_short">Nenastaveno</string>
-    <string name="failedupdatebasalprofile">Chyba při nastavení bazálního pprofilu</string>
+    <string name="failedupdatebasalprofile">Chyba při nastavení bazálního profilu</string>
    <string name="profile_set_ok">Bazální profil aktualizován</string>
    <string name="invalidinput">Chybná vstupní data</string>
    <string name="tempbasaldeliveryerror">Chyba nastavování dočasného bazálu</string>
--- a/core/src/main/res/values-da-rDK/strings.xml
+++ b/core/src/main/res/values-da-rDK/strings.xml
@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    Keys-->
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Protection-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+    <!-- PumoCommon - Pump Abstract -->
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
+</resources>
--- a/core/src/main/res/values-iw-rIL/strings.xml
+++ b/core/src/main/res/values-iw-rIL/strings.xml
@ -24,7 +24,7 @@
    <string name="format_carbs">%1$d גר\'</string>
    <string name="reservoirvalue">%1$.0f / %2$d יח\'</string>
    <string name="pump_basebasalrate">%1$.2f יח\' לשעה</string>
-    <string name="format_hours">%1$.2f שע\'</string>
+    <string name="format_hours">%1$.2f ש\'</string>
    <string name="format_mins">%1$d דק\'</string>
    <string name="pumpbusy">המשאבה אינה פנויה</string>
    <string name="connectionerror">שגיאה בחיבור המשאבה</string>
@ -112,8 +112,8 @@
    <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>
-    <string name="profile_carbs_per_unit">גר\'\יח\'</string>
+    <string name="profile_ins_units_per_hour">יח\'\\שעה</string>
+    <string name="profile_carbs_per_unit">גר\'\\יח\'</string>
    <!--    ProfileFunction-->
    <string name="noprofileselected">לא נבחר פרופיל</string>
    <!--    PumpType-->
@ -191,7 +191,7 @@
    <string name="timedetection">זיהוי שעה</string>
    <string name="format_hour_minute">%1$d ש\' %2$d דק\'</string>
    <!-- PumoCommon - Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">הפעולה לא נתמכת ע\"י המשאבה ו\או מנהל התקן.</string>
+    <string name="pump_operation_not_supported_by_pump_driver">הפעולה לא נתמכת ע\"י המשאבה ו\\או מנהל התקן.</string>
    <string name="pump_operation_not_yet_supported_by_pump">הפעולה עוד לא נתמכת על ידי המשאבה.</string>
    <string name="common_resultok">אישור</string>
    <!-- PumoCommon - Pump Status -->
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@ -15,8 +15,8 @@
    <string name="handshaking">Cumprimento</string>
    <string name="connecting">A ligar</string>
    <string name="connected">Ligado</string>
-    <string name="disconnected">Desligado</string>
-    <string name="disconnecting">A desligar</string>
+    <string name="disconnected">Desconectada</string>
+    <string name="disconnecting">A desconectar</string>
    <string name="androidaps_start">AndroidAPS iniciado</string>
    <string name="formatinsulinunits1">%1$.1f U</string>
    <string name="formatinsulinunits">%1$.2f U</string>
@ -172,6 +172,7 @@
    <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">Dose diária acumulativa</string>
--- a/dana/src/main/res/values-da-rDK/strings.xml
+++ b/dana/src/main/res/values-da-rDK/strings.xml
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
--- a/dana/src/main/res/values-iw-rIL/strings.xml
+++ b/dana/src/main/res/values-iw-rIL/strings.xml
@ -14,7 +14,7 @@
    <string name="insulinlimitviolation">כמות אינסולין גבוהה מדי</string>
    <string name="boluserrorcode">התבקש: %1$.2f יח\' הוזרק: %2$.2f יח\' קוד שגיאה: %3$s</string>
    <string name="danar_valuenotsetproperly">ערך לא מוגדר כראוי</string>
-    <string name="danar_setbasalstep001">הגדר מינון באזלי ל-0.01 יח\'\שעה</string>
+    <string name="danar_setbasalstep001">הגדר מינון באזלי ל-0.01 יח\'\\שעה</string>
    <string name="resetpairing">לאפס את נתוני הצימוד?</string>
    <string name="dana_model">%1$s\nדגם: %2$02X\nפרוטוקול: %3$02X\nקוד: %4$02X</string>
    <string name="processinghistory">מעבד אירוע</string>
@ -98,8 +98,8 @@
    <string name="bolus_step">צעד במינון בולוס</string>
    <string name="virtualpump_firmware_label">קושחה</string>
    <string name="danar_pump_settings">הגדרות משאבת Dana</string>
-    <string name="timeformat12h">12 שע\'</string>
-    <string name="timeformat24h">24 שע\'</string>
+    <string name="timeformat12h">12 שעות</string>
+    <string name="timeformat24h">24 שעות</string>
    <string name="option_on">מופעל</string>
    <string name="option_off">כבוי</string>
    <string name="danar_bt_name_title">מכשיר בלוטות\' DanaR</string>
--- a/dana/src/main/res/values-nl-rNL/strings.xml
+++ b/dana/src/main/res/values-nl-rNL/strings.xml
@ -92,7 +92,7 @@
    <string name="danarv2pump">DanaRv2</string>
    <string name="danar_disableeasymode">EasyUI modus in pomp deactiveren</string>
    <string name="profile_set_failed">Instellen van basaal profiel mislukt</string>
-    <string name="danar_bluetooth_status">Bluetooh status</string>
+    <string name="danar_bluetooth_status">Bluetooth status</string>
    <string name="danar_iob_label">Pomp IOB</string>
    <string name="basal_step">Basaal Stap</string>
    <string name="bolus_step">Bolus Stap</string>
--- a/dana/src/main/res/values-pt-rPT/strings.xml
+++ b/dana/src/main/res/values-pt-rPT/strings.xml
@ -97,7 +97,7 @@
    <string name="basal_step">Incremento Basal</string>
    <string name="bolus_step">Incremento Bólus</string>
    <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="danar_pump_settings">Configurações da bomba Dana</string>
+    <string name="danar_pump_settings">Definições da bomba Dana</string>
    <string name="timeformat12h">12h</string>
    <string name="timeformat24h">24h</string>
    <string name="option_on">Ligado</string>
--- a/medtronic/src/main/res/values-da-rDK/strings.xml
+++ b/medtronic/src/main/res/values-da-rDK/strings.xml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <!-- MDT Configuration -->
+    <!-- MDT Errors -->
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+</resources>
--- a/omnipod/src/main/res/values-bg-rBG/strings.xml
+++ b/omnipod/src/main/res/values-bg-rBG/strings.xml
@ -3,6 +3,7 @@
    <!-- Omnipod - Keys -->
    <!-- Omnipod - Non translatable -->
    <!-- Omnipod - Preferences -->
+    <string name="omnipod_config_riley_link_configuration">Конфигурация на rileyLink</string>
    <string name="omnipod_config_bolus_beeps_enabled">Звук при болус активен</string>
    <string name="omnipod_config_basal_beeps_enabled">Звук при базал активен</string>
    <string name="omnipod_config_smb_beeps_enabled">Звук при SMB активен</string>
@ -10,7 +11,6 @@
    <string name="omnipod_config_suspend_delivery_button_enabled">Показвай спряна доставката в раздела Omnipod</string>
    <string name="omnipod_config_pulse_log_button_enabled">Показване на PULSE LOG в менюто на Pod Management</string>
    <string name="omnipod_config_rileylink_stats_button_enabled">Бутон Показване RileyLink Stats в меню Управление на Pod</string>
-    <string name="omnipod_config_use_riley_link_battery_level_summary">НЕ работи с оригиналната RileyLink. Може да не работи с други RileyLink алтернативи.</string>
    <string name="omnipod_config_time_change_enabled">Разрешено е Лятно часово време</string>
    <string name="omnipod_config_expiration_reminder_enabled">Напомняне за срок</string>
    <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Часове преди изключване</string>
@ -65,6 +65,7 @@
    <string name="omnipod_error_rileylink_address_invalid">Грешен RileyLink адрес.</string>
    <string name="omnipod_error_operation_not_possible_no_configuration">Забранено действие.\n\n Първо трябва да конфигурурате Omnipod , преди да използвате тази операция,.</string>
    <string name="omnipod_error_pod_not_attached">Няма активен под</string>
+    <string name="omnipod_error_time_out_of_sync">Времето на пода не е синхронизирано. Моля, актуализирайте времето в раздел Omnipod.</string>
    <string name="omnipod_error_unexpected_exception">Непредвидена грешка. Моля, докладвайте! (%1$s: %2$s).</string>
    <string name="omnipod_error_crc_mismatch">Неуспешна комуникация: проверката на цялостта на съобщението е неуспешна</string>
    <string name="omnipod_error_invalid_packet_type">Неуспешна комуникация: получиен невалиден пакет от под</string>
--- a/omnipod/src/main/res/values-es-rES/strings.xml
+++ b/omnipod/src/main/res/values-es-rES/strings.xml
@ -11,8 +11,6 @@
    <string name="omnipod_config_suspend_delivery_button_enabled">Mostrar el botón Suspender entrega en la pestaña Omnipod</string>
    <string name="omnipod_config_pulse_log_button_enabled">Mostrar botón de registro de pulso en el menú de gestión del pod</string>
    <string name="omnipod_config_rileylink_stats_button_enabled">Mostrar botón de estadísticas de RileyLink en el menú de gestión del pod</string>
-    <string name="omnipod_config_use_riley_link_battery_level">Usar el nivel de batería reportado por EmaLink/Orangelink</string>
-    <string name="omnipod_config_use_riley_link_battery_level_summary">NO funciona con el RileyLink original. Puede que no funcione con otras alternativas de RiyeyLink.</string>
    <string name="omnipod_config_time_change_enabled">Detección de zona DST/hora activada</string>
    <string name="omnipod_config_expiration_reminder_enabled">Recordatorio de expiración activado</string>
    <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Horas antes del apagado</string>
--- a/omnipod/src/main/res/values-fr-rFR/strings.xml
+++ b/omnipod/src/main/res/values-fr-rFR/strings.xml
@ -197,11 +197,11 @@
    <string name="omnipod_pod_deactivation_wizard_discard_pod">Supprimer Pod</string>
    <!-- Omnipod - Overview -->
    <string name="omnipod_overview_button_set_time">Définir l\'heure</string>
-    <string name="omnipod_overview_button_suspend_delivery">Arrêter</string>
+    <string name="omnipod_overview_button_suspend_delivery">Suspendre</string>
    <string name="omnipod_overview_button_refresh">Actualiser</string>
    <string name="omnipod_overview_button_resume_delivery">Reprendre l\'injection</string>
    <string name="omnipod_overview_button_pod_management">Gest. Pod</string>
-    <string name="omnipod_overview_button_acknowledge_active_alerts">Accepter les alertes</string>
+    <string name="omnipod_overview_button_acknowledge_active_alerts">Accepter alertes</string>
    <string name="omnipod_overview_pod_status">État du Pod</string>
    <string name="omnipod_overview_total_delivered">Total injecté</string>
    <string name="omnipod_overview_total_delivered_value">%1$.2f U</string>
@ -212,7 +212,7 @@
    <string name="omnipod_overview_temp_basal_rate">Débit de Basal Temp.</string>
    <string name="omnipod_overview_base_basal_rate">Débit de Basal</string>
    <string name="omnipod_overview_reservoir">Réservoir</string>
-    <string name="omnipod_overview_pod_active_alerts">Activer alertes Pod</string>
+    <string name="omnipod_overview_pod_active_alerts">Alertes Pod actives</string>
    <string name="omnipod_overview_firmware_version">Version du firmware</string>
    <string name="omnipod_overview_time_on_pod">Heure du Pod</string>
    <string name="omnipod_overview_temp_basal_value">%1$.2fU/h @%2$s (%3$d/%4$d minutes)</string>
--- a/omnipod/src/main/res/values-lt-rLT/strings.xml
+++ b/omnipod/src/main/res/values-lt-rLT/strings.xml
@ -11,8 +11,6 @@
    <string name="omnipod_config_suspend_delivery_button_enabled">Omnipod skirtuke rodyti mygtuką Sustabdyti tiekimą</string>
    <string name="omnipod_config_pulse_log_button_enabled">Pod valdymo meniu rodyti mygtuką Pulse log</string>
    <string name="omnipod_config_rileylink_stats_button_enabled">Pod valdymo meniu rodyti mygtuką RileyLink Stats</string>
-    <string name="omnipod_config_use_riley_link_battery_level">Naudoti baterijos įkrovimo lygį, gautą iš EmaLink/OrangeLink</string>
-    <string name="omnipod_config_use_riley_link_battery_level_summary">NEVEIKIA su originaliu RileyLink. Gali neveikti su kitomis RileyLink alternatyvomis.</string>
    <string name="omnipod_config_time_change_enabled">Vasaros laiko/Laiko juostos aptikimas įgalintas</string>
    <string name="omnipod_config_expiration_reminder_enabled">Galiojimo pabaigos priminimas</string>
    <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Valandos prieš išsijungimą</string>
--- a/omnipod/src/main/res/values-pt-rPT/strings.xml
+++ b/omnipod/src/main/res/values-pt-rPT/strings.xml
@ -3,22 +3,30 @@
    <!-- Omnipod - Keys -->
    <!-- Omnipod - Non translatable -->
    <!-- Omnipod - Preferences -->
+    <string name="omnipod_config_riley_link_configuration">Configuração RileyLink</string>
+    <string name="omnipod_config_time_change_enabled">Detecção de DST/Fuso Horário Activado</string>
    <string name="omnipod_config_low_reservoir_alert_units">No. Unidades</string>
    <string name="omnipod_preference_category_rileylink">RileyLink</string>
    <string name="omnipod_preference_category_other">Outro</string>
    <string name="omnipod_preference_category_alerts">Alertas</string>
    <string name="omnipod_preference_category_notifications">Notificações</string>
    <!-- Omnipod - Pod Status -->
+    <string name="omnipod_pod_status_no_active_pod">Nenhum Pod Activo</string>
    <string name="omnipod_pod_status_running">A correr</string>
    <string name="omnipod_pod_status_suspended">Suspenso</string>
+    <string name="omnipod_pod_status_pod_fault">Falha no Pod</string>
    <string name="omnipod_pod_status_inactive">Inactivo</string>
+    <string name="omnipod_pod_status_pod_fault_description">Falha no Pod: %1$03d %2$s</string>
    <!-- Omnipod - Alerts -->
    <string name="omnipod_alert_finish_pairing_reminder">Lembrete Concluir Emparelhamento</string>
    <string name="omnipod_alert_finish_setup_reminder_reminder">Lembrete Terminar Configuração</string>
    <string name="omnipod_alert_expiration">Pod vai expirar em breve</string>
    <string name="omnipod_alert_expiration_advisory">Pod vai expirar em breve</string>
    <string name="omnipod_alert_shutdown_imminent">Encerramento iminente</string>
+    <string name="omnipod_alert_low_reservoir">Reservatório Baixo</string>
+    <string name="omnipod_alert_unknown_alert">Alerta Desconhecido</string>
    <!-- Omnipod - History -->
+    <string name="omnipod_history_title">Histórico do Pod</string>
    <string name="omnipod_history_item_description">Descrição</string>
    <string name="omnipod_history_item_source">Fonte</string>
    <string name="omnipod_history_item_date">Data</string>
@ -27,12 +35,27 @@
    <string name="omnipod_history_bolus_value_with_carbs">%1$.2f U, HC=%2$.1f g</string>
    <string name="omnipod_history_tbr_value">Rácio: %1$.2f U, duração: %2$d minutes</string>
    <!-- Omnipod - Short status -->
+    <string name="omnipod_short_status_extended_bolus">Estendido: %1$s</string>
+    <string name="omnipod_short_status_reservoir">Reserv: %1$sU</string>
+    <string name="omnipod_short_status_rl_battery">RLBat: %1$d</string>
    <!-- Omnipod - Error -->
    <string name="omnipod_warning">Aviso</string>
    <string name="omnipod_error_rileylink_address_invalid">Endereço RileyLink inválido.</string>
    <string name="omnipod_error_operation_not_possible_no_configuration">A operação não é possível.\n\nPrecisa configurar o Omnipod primeiro, antes de pode usar esta operação.</string>
    <string name="omnipod_error_pod_not_attached">Nenhum Pod Activo</string>
+    <string name="omnipod_error_crc_mismatch">Falha na comunicação: mensagem de falha de verificação de integridade</string>
+    <string name="omnipod_error_invalid_packet_type">Falha na comunicação: recebeu um pacote inválido do Pod</string>
+    <string name="omnipod_error_invalid_progress_state">Falha na comunicação: o Pod está em um estado errado</string>
+    <string name="omnipod_error_invalid_response">Falha na comunicação: recebeu uma resposta inválida do Pod</string>
+    <string name="omnipod_error_invalid_message_sequence_number">Falha na comunicação: recebeu uma mensagem com número de sequência inválido do Pod</string>
+    <string name="omnipod_error_invalid_message_address">Falha na comunicação: recebeu uma mensagem com um endereço inválido do Pod</string>
+    <string name="omnipod_error_message_decoding_failed">Falha na comunicação: falha ao descodificar a mensagem do Pod</string>
+    <string name="omnipod_error_nonce_resync_failed">Falha na comunicação: nonce resync falhou</string>
+    <string name="omnipod_error_nonce_out_of_sync">Falha na comunicação: nonce fora de sincronização</string>
+    <string name="omnipod_error_not_enough_data">Falha na comunicação: não há dados suficientes recebidos do Pod</string>
+    <string name="omnipod_error_pod_returned_error_response">Falha na comunicação: o Pod devolveu uma resposta de erro</string>
    <string name="omnipod_error_communication_failed_no_response_from_riley_link">Sem resposta do RileyLink</string>
+    <string name="omnipod_error_communication_failed_riley_link_interrupted">RileyLink interrompido</string>
    <string name="omnipod_error_communication_failed_no_response_from_pod">Sem resposta do Pod</string>
    <string name="omnipod_error_set_basal_failed">A configuração do perfil basal falhou.</string>
    <string name="omnipod_error_unknown_custom_command">Comando personalizado desconhecido: %1$s</string>
@ -47,7 +70,9 @@
    <!-- Omnipod - Commands -->
    <string name="omnipod_cmd_deactivate_pod">Desactivar Pod</string>
    <string name="omnipod_cmd_discard_pod">Descartar Pod</string>
+    <string name="omnipod_cmd_set_bolus">Definir Bólus</string>
    <string name="omnipod_cmd_cancel_bolus">Cancelar Bólus</string>
+    <string name="omnipod_cmd_set_tbr">Definir Basal Temporária</string>
    <string name="omnipod_cmd_set_basal_schedule">Definir Programação Basal</string>
    <string name="omnipod_cmd_get_pod_status">Obter Status do Pod</string>
    <string name="omnipod_cmd_get_pod_info">Obter Pod Info</string>
@ -59,11 +84,13 @@
    <string name="omnipod_cmd_unknown_entry">Entrada Desconhecida</string>
    <string name="omnipod_cmd_initialize_pod">Inicializar Pod</string>
    <!-- Omnipod - Pod Management -->
+    <string name="omnipod_pod_management_title">Gestão Pod</string>
    <string name="omnipod_pod_management_heading_actions">Acções</string>
    <string name="omnipod_pod_management_heading_tools">Ferramentas</string>
    <string name="omnipod_pod_management_button_activate_pod">Activar Pod</string>
    <string name="omnipod_pod_management_button_deactivate_pod">Desactivar Pod</string>
    <string name="omnipod_pod_management_button_discard_pod">Descartar Pod</string>
+    <string name="omnipod_pod_management_button_pod_history">Histórico do Pod</string>
    <string name="omnipod_pod_management_button_reset_riley_link_config">Redefinir configuração RileyLink</string>
    <!-- Omnipod - Wizard common -->
    <string name="omnipod_wizard_button_cancel">Cancelar</string>
@ -84,8 +111,15 @@
    <string name="omnipod_overview_button_set_time">Definir hora</string>
    <string name="omnipod_overview_button_suspend_delivery">Suspender</string>
    <string name="omnipod_overview_button_refresh">Actualizar</string>
+    <string name="omnipod_overview_button_resume_delivery">Retomar Administração</string>
+    <string name="omnipod_overview_button_pod_management">Gestão Pod</string>
+    <string name="omnipod_overview_button_acknowledge_active_alerts">Reco Alertas</string>
+    <string name="omnipod_overview_pod_status">Estado do Pod</string>
    <string name="omnipod_overview_total_delivered_value">%1$.2f U</string>
+    <string name="omnipod_overview_pod_address">Endereço do Pod</string>
+    <string name="omnipod_overview_pod_expiry_date">Pod Expira</string>
    <string name="omnipod_overview_reservoir">Reservatório</string>
+    <string name="omnipod_overview_pod_active_alerts">Alertas Pod Activos</string>
    <string name="omnipod_overview_time_on_pod">Hora no Pod</string>
    <string name="omnipod_overview_temp_basal_value">%1$.2fU/h @%2$s (%3$d/%4$d minutos)</string>
    <string name="omnipod_overview_reservoir_value">%1$.2f U restante</string>
@ -117,4 +151,8 @@
        <item quantity="one">%1$d dia</item>
        <item quantity="other">%1$d dias</item>
    </plurals>
+    <plurals name="omnipod_pod_alerts">
+        <item quantity="one">Alerta Pod: %1$s</item>
+        <item quantity="other">Alertas Pod: %1$s</item>
+    </plurals>
 </resources>
--- a/omnipod/src/main/res/values-ru-rRU/strings.xml
+++ b/omnipod/src/main/res/values-ru-rRU/strings.xml
@ -11,8 +11,6 @@
    <string name="omnipod_config_suspend_delivery_button_enabled">Показывать кнопку Приостановить подачу на вкладке Omnipod</string>
    <string name="omnipod_config_pulse_log_button_enabled">Показывать кнопку Pulse Log в меню управления Pod</string>
    <string name="omnipod_config_rileylink_stats_button_enabled">Показывать кнопку статистики RileyLink в меню управления подом</string>
-    <string name="omnipod_config_use_riley_link_battery_level">Использовать уровень батареи, который передает OrangeLink/EmaLink</string>
-    <string name="omnipod_config_use_riley_link_battery_level_summary">Не работает с оригинальной RileyLink. Может не работать с другими альтернативами RileyLink.</string>
    <string name="omnipod_config_time_change_enabled">Включено обнаружение часового пояса</string>
    <string name="omnipod_config_expiration_reminder_enabled">Включено напоминание об истечении срока действия</string>
    <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Часов до выключения</string>
--- a/omnipod/src/main/res/values-sk-rSK/strings.xml
+++ b/omnipod/src/main/res/values-sk-rSK/strings.xml
@ -11,8 +11,6 @@
    <string name="omnipod_config_suspend_delivery_button_enabled">Zobraziť tlačítko \"Pozastaviť podávanie\" na záložke Omnipod</string>
    <string name="omnipod_config_pulse_log_button_enabled">Zobraziť tlačítko Pulzný Log v menu Správa Podu</string>
    <string name="omnipod_config_rileylink_stats_button_enabled">Zobraziť tlačítko Štatistika RileyLink v menu Správa Podu</string>
-    <string name="omnipod_config_use_riley_link_battery_level">Použiť úroveň batérie nahlásenú OrangeLinkom/Rileylinkom</string>
-    <string name="omnipod_config_use_riley_link_battery_level_summary">NEPRACUJE s pôvodným RileyLinkom. Nemusí pracovať s inými alternatívami RileyLinku.</string>
    <string name="omnipod_config_time_change_enabled">Letný čas / Detekcia časového pásma povolená</string>
    <string name="omnipod_config_expiration_reminder_enabled">Pripomenutie vypršania platnosti povolené</string>
    <string name="omnipod_config_expiration_reminder_hours_before_shutdown">Hodiny pred vypnutím</string>
--- a/rileylink/src/main/res/values-af-rZA/strings.xml
+++ b/rileylink/src/main/res/values-af-rZA/strings.xml
@ -27,5 +27,5 @@
    <string name="rileylink_error_pod_unreachable">Pod onbereikbaar</string>
    <!-- RileyLink - Common -->
    <string name="rileylink_target_device_medtronic">Medtronic Pomp</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <!-- RileyLink - Preferences -->
 </resources>
--- a/rileylink/src/main/res/values-bg-rBG/strings.xml
+++ b/rileylink/src/main/res/values-bg-rBG/strings.xml
@ -22,14 +22,10 @@
    <string name="medtronic_pump_status">Статус на помпата</string>
    <string name="title_activity_rileylink_settings">RileyLink настройки</string>
    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_riley_link_address">Адрес на RileyLink:</string>
-    <string name="rileylink_configured_riley_link_name">Име на RileyLink:</string>
-    <string name="rileylink_connected_device">Свързано устройство:</string>
    <string name="rileylink_connection_status">Състояние на връзката:</string>
    <string name="rileylink_connection_error">Грешка при свързване:</string>
    <string name="rileylink_device">Устройство</string>
    <string name="rileylink_device_type">Тип на устройството:</string>
-    <string name="rileylink_device_model">Модел:</string>
    <string name="rileylink_last_used_frequency">Последна честота:</string>
    <string name="rileylink_last_device_contact">Последно връзка:</string>
    <string name="rileylink_firmware_version">Firmware версия:</string>
@ -56,9 +52,9 @@
    <string name="rileylink_error_pod_unreachable">Pod е недостъпen</string>
    <!-- RileyLink - Common -->
    <string name="rileylink_target_device_medtronic">Medtronic помпа</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
    <string name="riley_link_common_yes">Да</string>
    <string name="riley_link_common_no">Не</string>
+    <!-- RileyLink - Preferences -->
    <plurals name="duration_days">
        <item quantity="one">%1$d ден</item>
        <item quantity="other">%1$d дни</item>
--- a/rileylink/src/main/res/values-da-rDK/strings.xml
+++ b/rileylink/src/main/res/values-da-rDK/strings.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL keys -->
+    <!-- RL BLE Config -->
+    <!-- RL Status Page -->
+    <!-- RL State -->
+    <!-- RL Errors -->
+    <!-- RileyLink - Common -->
+    <!-- RileyLink - Preferences -->
+</resources>
--- a/rileylink/src/main/res/values-es-rES/strings.xml
+++ b/rileylink/src/main/res/values-es-rES/strings.xml
@ -22,14 +22,10 @@
    <string name="medtronic_pump_status">Estado de Infusora</string>
    <string name="title_activity_rileylink_settings">Ajustes de RileyLink</string>
    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_riley_link_address">Dirección RileyLink configurada:</string>
-    <string name="rileylink_configured_riley_link_name">Nombre de RileyLink configurado:</string>
-    <string name="rileylink_connected_device">Dispositivo conectado:</string>
    <string name="rileylink_connection_status">Estado de conexión:</string>
    <string name="rileylink_connection_error">Error de conexión:</string>
    <string name="rileylink_device">Dispositivo</string>
    <string name="rileylink_device_type">Tipo de dispositivo:</string>
-    <string name="rileylink_device_model">Modelo del dispositivo:</string>
    <string name="rileylink_last_used_frequency">Última frecuencia usada:</string>
    <string name="rileylink_last_device_contact">Último contacto del dispositivo:</string>
    <string name="rileylink_firmware_version">Versión de Firmware:</string>
@ -56,9 +52,9 @@
    <string name="rileylink_error_pod_unreachable">Infusora no alcanzable</string>
    <!-- RileyLink - Common -->
    <string name="rileylink_target_device_medtronic">Infusora Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
    <string name="riley_link_common_yes">Sí</string>
    <string name="riley_link_common_no">No</string>
+    <!-- RileyLink - Preferences -->
    <plurals name="duration_days">
        <item quantity="one">%1$d día</item>
        <item quantity="other">%1$d días</item>
--- a/rileylink/src/main/res/values-hr-rHR/strings.xml
+++ b/rileylink/src/main/res/values-hr-rHR/strings.xml
@ -6,4 +6,5 @@
    <!-- RL State -->
    <!-- RL Errors -->
    <!-- RileyLink - Common -->
+    <!-- RileyLink - Preferences -->
 </resources>
--- a/rileylink/src/main/res/values-pt-rBR/strings.xml
+++ b/rileylink/src/main/res/values-pt-rBR/strings.xml
@ -29,5 +29,5 @@
    <string name="rileylink_error_pod_unreachable">Pod inacessível</string>
    <!-- RileyLink - Common -->
    <string name="rileylink_target_device_medtronic">Bomba Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <!-- RileyLink - Preferences -->
 </resources>
--- a/rileylink/src/main/res/values-pt-rPT/strings.xml
+++ b/rileylink/src/main/res/values-pt-rPT/strings.xml
@ -2,6 +2,15 @@
 <resources>
    <!-- RL keys -->
    <!-- RL BLE Config -->
+    <string name="riley_link_ble_config_button_scan_start">Procurar</string>
+    <string name="riley_link_ble_config_scan_stop">Parar</string>
+    <string name="riley_link_ble_config_scan_selected">Seleccionado</string>
+    <string name="riley_link_ble_config_scan_title">Procura RileyLink</string>
+    <string name="riley_link_ble_config_scan_scanning">A procurar</string>
+    <string name="riley_link_ble_config_scan_finished">Procura terminada</string>
+    <string name="riley_link_ble_config_scan_error">Erro de Procura: %1$d</string>
+    <string name="riley_link_ble_config_connected_never">Nunca</string>
+    <string name="riley_link_ble_config_remove_riley_link">Remover</string>
    <!-- RL Status Page -->
    <string name="rileylink_settings_tab1">Definições</string>
    <string name="rileylink_settings_tab2">Histórico</string>
@ -9,7 +18,14 @@
    <string name="medtronic_pump_status">Estado da Bomba</string>
    <string name="title_activity_rileylink_settings">Definições do RileyLink</string>
    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_connection_status">Estado de Ligação:</string>
+    <string name="rileylink_connection_error">Erro de Ligação:</string>
    <string name="rileylink_device">Dispositivo</string>
+    <string name="rileylink_device_type">Tipo de dispositivo:</string>
+    <string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
+    <string name="rileylink_pump_serial_number">Número de série da Bomba:</string>
+    <string name="rileylink_pump_frequency">Frequência da Bomba:</string>
+    <string name="rileylink_pump_frequency_value">%1$.2f MHz</string>
    <!-- RL State -->
    <string name="rileylink_state_bt_init">A iniciar o Bluetooth...</string>
    <string name="rileylink_state_bt_error">Erro de Bluetooth</string>
@ -31,7 +47,10 @@
    <string name="rileylink_error_pod_unreachable">Pod inacessível</string>
    <!-- RileyLink - Common -->
    <string name="rileylink_target_device_medtronic">Bomba Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="rileylink_target_device_omnipod">Omnipod (Eros)</string>
+    <string name="riley_link_common_yes">Sim</string>
+    <string name="riley_link_common_no">Não</string>
+    <!-- RileyLink - Preferences -->
    <plurals name="duration_days">
        <item quantity="one">%1$d dia</item>
        <item quantity="other">%1$d dias</item>
--- a/rileylink/src/main/res/values-ru-rRU/strings.xml
+++ b/rileylink/src/main/res/values-ru-rRU/strings.xml
@ -22,14 +22,10 @@
    <string name="medtronic_pump_status">Статус помпы</string>
    <string name="title_activity_rileylink_settings">Настройки RileyLink</string>
    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_riley_link_address">Адрес RileyLink настроен:</string>
-    <string name="rileylink_configured_riley_link_name">Имя подключенного RileyLink:</string>
-    <string name="rileylink_connected_device">Подключенное устройство:</string>
    <string name="rileylink_connection_status">Статус подключения:</string>
    <string name="rileylink_connection_error">Ошибка подключения:</string>
    <string name="rileylink_device">Устройство</string>
    <string name="rileylink_device_type">Тип устройства:</string>
-    <string name="rileylink_device_model">Модель устройства:</string>
    <string name="rileylink_last_used_frequency">Последняя использованная частота:</string>
    <string name="rileylink_last_device_contact">Контакт последнего устройства:</string>
    <string name="rileylink_firmware_version">Версия прошивки:</string>
@ -56,9 +52,9 @@
    <string name="rileylink_error_pod_unreachable">POD недоступен</string>
    <!-- RileyLink - Common -->
    <string name="rileylink_target_device_medtronic">Помпа Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
    <string name="riley_link_common_yes">Да</string>
    <string name="riley_link_common_no">Нет</string>
+    <!-- RileyLink - Preferences -->
    <plurals name="duration_days">
        <item quantity="one">%1$d день</item>
        <item quantity="few">%1$d дня</item>
--- a/rileylink/src/main/res/values-sk-rSK/strings.xml
+++ b/rileylink/src/main/res/values-sk-rSK/strings.xml
@ -22,14 +22,10 @@
    <string name="medtronic_pump_status">Stav pumpy</string>
    <string name="title_activity_rileylink_settings">Nastavenie RileyLink</string>
    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_riley_link_address">Adresa nakonfigurovaného RileyLinku:</string>
-    <string name="rileylink_configured_riley_link_name">Názov nakonfigurovaného RileyLinku:</string>
-    <string name="rileylink_connected_device">Pripojené zariadenie:</string>
    <string name="rileylink_connection_status">Stav pripojenia:</string>
    <string name="rileylink_connection_error">Chyba pripojenia:</string>
    <string name="rileylink_device">Zariadenie</string>
    <string name="rileylink_device_type">Typ zariadenia:</string>
-    <string name="rileylink_device_model">Model zariadenia:</string>
    <string name="rileylink_last_used_frequency">Posledná použitá frekvencia:</string>
    <string name="rileylink_last_device_contact">Posledné spojenie zo zariadením:</string>
    <string name="rileylink_firmware_version">Verzia firmvéru:</string>
@ -56,9 +52,9 @@
    <string name="rileylink_error_pod_unreachable">Pod nedostupný</string>
    <!-- RileyLink - Common -->
    <string name="rileylink_target_device_medtronic">Pumpa Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
    <string name="riley_link_common_yes">Áno</string>
    <string name="riley_link_common_no">Nie</string>
+    <!-- RileyLink - Preferences -->
    <plurals name="duration_days">
        <item quantity="one">%1$d deň</item>
        <item quantity="few">%1$d dní</item>
--- a/rileylink/src/main/res/values-sl-rSI/strings.xml
+++ b/rileylink/src/main/res/values-sl-rSI/strings.xml
@ -6,4 +6,5 @@
    <!-- RL State -->
    <!-- RL Errors -->
    <!-- RileyLink - Common -->
+    <!-- RileyLink - Preferences -->
 </resources>
--- a/rileylink/src/main/res/values-tr-rTR/strings.xml
+++ b/rileylink/src/main/res/values-tr-rTR/strings.xml
@ -6,4 +6,5 @@
    <!-- RL State -->
    <!-- RL Errors -->
    <!-- RileyLink - Common -->
+    <!-- RileyLink - Preferences -->
 </resources>
--- a/rileylink/src/main/res/values-zh-rCN/strings.xml
+++ b/rileylink/src/main/res/values-zh-rCN/strings.xml
@ -28,5 +28,5 @@
    <string name="rileylink_error_pod_unreachable">无法连接主机</string>
    <!-- RileyLink - Common -->
    <string name="rileylink_target_device_medtronic">美敦力泵</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <!-- RileyLink - Preferences -->
 </resources>
--- a/wear/src/main/res/values-cs-rCZ/strings.xml
+++ b/wear/src/main/res/values-cs-rCZ/strings.xml
@ -69,6 +69,7 @@
    <string name="menu_ecarb">eCarbs</string>
    <string name="menu_settings">Nastavení</string>
    <string name="menu_status">Stav</string>
+    <string name="menu_resync">Re-Sync</string>
    <string name="menu_prime_fill">Plnění/doplňování</string>
    <string name="menu_none">Nic</string>
    <string name="menu_default">Výchozí</string>
--- a/wear/src/main/res/values-da-rDK/strings.xml
+++ b/wear/src/main/res/values-da-rDK/strings.xml
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
--- a/wear/src/main/res/values-de-rDE/strings.xml
+++ b/wear/src/main/res/values-de-rDE/strings.xml
@ -69,6 +69,7 @@
    <string name="menu_ecarb">eCarb</string>
    <string name="menu_settings">Einstellung</string>
    <string name="menu_status">Status</string>
+    <string name="menu_resync">Erneut synchronisieren</string>
    <string name="menu_prime_fill">(Vor-)Füllen</string>
    <string name="menu_none">Kein(e)</string>
    <string name="menu_default">Standard</string>
--- a/wear/src/main/res/values-iw-rIL/strings.xml
+++ b/wear/src/main/res/values-iw-rIL/strings.xml
@ -69,7 +69,8 @@
    <string name="menu_ecarb">פחמימות ממושכות</string>
    <string name="menu_settings">הגדרות</string>
    <string name="menu_status">סטטוס</string>
-    <string name="menu_prime_fill">תיחול\מילוי</string>
+    <string name="menu_resync">סנכרן מחדש </string>
+    <string name="menu_prime_fill">תיחול\\מילוי</string>
    <string name="menu_none">ללא</string>
    <string name="menu_default">ברירת מחדל</string>
    <string name="menu_menu">תפריט</string>
--- a/wear/src/main/res/values-nl-rNL/strings.xml
+++ b/wear/src/main/res/values-nl-rNL/strings.xml
@ -69,6 +69,7 @@
    <string name="menu_ecarb">eCarb</string>
    <string name="menu_settings">Instellingen</string>
    <string name="menu_status">Status</string>
+    <string name="menu_resync">Opnieuw synchroniseren</string>
    <string name="menu_prime_fill">Ontlucht/vul</string>
    <string name="menu_none">Geen</string>
    <string name="menu_default">Standaard</string>
--- a/wear/src/main/res/values-no-rNO/strings.xml
+++ b/wear/src/main/res/values-no-rNO/strings.xml
@ -69,6 +69,7 @@
    <string name="menu_ecarb">eKarbo</string>
    <string name="menu_settings">Innstillinger</string>
    <string name="menu_status">Status</string>
+    <string name="menu_resync">Re-synk</string>
    <string name="menu_prime_fill">Prime/fylling</string>
    <string name="menu_none">Ingen</string>
    <string name="menu_default">Standard</string>
--- a/wear/src/main/res/values-pt-rPT/strings.xml
+++ b/wear/src/main/res/values-pt-rPT/strings.xml
@ -61,6 +61,8 @@
    <string name="pref_complication_tap_action">Complicação de Toque</string>
    <string name="pref_unicode_in_complications">Unicode em Complicações</string>
    <string name="pref_version">Versão:</string>
+    <string name="pref_moreWatchfaceSettings">mais definições do Mostrador</string>
+    <string name="pref_lookInYourWatchfaceConfiguration">Verifique a configuração do mostrador, por favor.</string>
    <string name="menu_tempt">AlvoT</string>
    <string name="menu_wizard">Assistente</string>
    <string name="menu_bolus">Bólus</string>