New Crowdin translations (#2584)

* New translations protection.xml (Czech) * New translations protection.xml (German) * New translations validator.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (German) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese) * New translations protection.xml (Portuguese) * New translations validator.xml (Portuguese) * New translations strings.xml (Portuguese, Brazilian) * New translations protection.xml (Portuguese, Brazilian) * New translations validator.xml (Portuguese, Brazilian) * New translations validator.xml (Portuguese, Brazilian) * New translations validator.xml (Portuguese) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Portuguese) * New translations protection.xml (Portuguese) * New translations strings.xml (Portuguese, Brazilian) * New translations protection.xml (Portuguese, Brazilian) * New translations strings.xml (German) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Slovak) * New translations protection.xml (Slovak) * New translations strings.xml (Slovak) * New translations validator.xml (Slovak) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations protection.xml (Russian) * New translations validator.xml (Russian) * New translations objectives.xml (Portuguese) * New translations objectives.xml (Portuguese, Brazilian) * New translations objectives.xml (German) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Russian) * New translations objectives.xml (Russian) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese, Brazilian) * New translations objectives.xml (Portuguese) * New translations objectives.xml (Portuguese, Brazilian) * New translations objectives.xml (Russian) * New translations objectives.xml (German) * New translations strings.xml (German) * New translations objectives.xml (German) * New translations objectives.xml (Czech) * New translations objectives.xml (Russian) * New translations objectives.xml (Lithuanian) * New translations strings.xml (Lithuanian) * New translations strings.xml (Romanian) * New translations exam.xml (Lithuanian) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Turkish) * New translations validator.xml (Swedish) * New translations protection.xml (Swedish) * New translations objectives.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Slovak) * New translations strings.xml (Russian) * New translations strings.xml (Portuguese) * New translations strings.xml (Polish) * New translations strings.xml (Dutch) * New translations strings.xml (Lithuanian) * New translations strings.xml (French) * New translations strings.xml (Korean) * New translations strings.xml (Italian) * New translations strings.xml (Greek) * New translations strings.xml (German) * New translations strings.xml (Czech) * New translations strings.xml (Bulgarian) * New translations strings.xml (Afrikaans) * New translations strings.xml (Spanish) * New translations strings.xml (Slovak) * New translations strings.xml (Czech) * New translations objectives.xml (Portuguese) * New translations validator.xml (Italian) * New translations objectives.xml (Italian) * New translations objectives.xml (Bulgarian) * New translations strings.xml (Slovak) * New translations strings.xml (Czech) * New translations strings.xml (Italian) * New translations objectives.xml (Italian) * New translations protection.xml (Italian) * New translations validator.xml (Italian) * New translations strings.xml (Italian) * New translations strings.xml (German) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations strings.xml (Italian) * New translations strings.xml (Polish) * New translations strings.xml (Slovak) * New translations objectives.xml (Slovak) * New translations objectives.xml (Polish) * New translations protection.xml (Polish) * New translations strings.xml (Russian) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations strings.xml (Italian) * New translations strings.xml (Slovak) * New translations strings.xml (French) * New translations strings.xml (Portuguese) * New translations strings.xml (Russian) * New translations protection.xml (French) * New translations objectives.xml (French) * New translations validator.xml (French)
2020-04-28 09:43:12 +02:00 · 2020-04-28 09:43:12 +02:00 · 0aa8a4b270
commit 0aa8a4b270
parent a2ebcb5ff0
51 changed files with 1303 additions and 127 deletions
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@ -103,7 +103,6 @@
    <string name="sms_delta">Delta:</string>
    <string name="configbuilder">Konfigurasie bouer</string>
    <string name="objectives">Doelstellings</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Oorsig</string>
    <string name="nsprofile">Ns Profiel</string>
    <string name="simpleprofile">Maklike profiel</string>
--- a/app/src/main/res/values-bg-rBG/objectives.xml
+++ b/app/src/main/res/values-bg-rBG/objectives.xml
@ -46,6 +46,9 @@
    <string name="requestcode">Код (request code): %1$s</string>
    <string name="objectives_hint">(отбележете всички правилни отговори)</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>
+    <string name="usescale_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#the-homescreen</string>
    <string name="notconnected">Няма връзка с Интернет!</string>
    <string name="failedretrievetime">Не може да се вземе времето</string>
    <string name="requirementnotmet">Задачите не са изпълнени</string>
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@ -43,6 +43,7 @@
    <string name="description_pump_mdi">Писалки - За хората, които правят множество ежедневни инжекции ( интензифицирано лечение с писалки)</string>
    <string name="description_pump_virtual">За помпи, който все още не работят с AndroidAPS(Open Loop)</string>
    <string name="description_sensitivity_aaps">Чувствителността се изчислява по същия начин като в Oref0, но можете да зададете времева рамка. Минимална въглехидрати абсорбция се изчислява от Макс време за усвояване на въглехидратите в опциите.</string>
+    <string name="description_sensitivity_oref1">Чувствителността се изчислява за 8 или 24 назад в миналото, а въглехидрати (ако не са се абсорбирали) изчезват след изтичане на срока от настройките. Това е необходимо за изчисление на необявени хранения (UAM).</string>
    <string name="description_sensitivity_weighted_average">Чувствителността се изчислява като среднопретеглена стойност от отклоненията. По-новите отклонения имат по-високо тегло. Минималната абсорбция на въглехидрати се изчислява от Време за макс усвояване на въглехидрати от опциите. Този алгоритъм е най-бързият при проследяването на промени в чувствителността.</string>
    <string name="description_source_eversense">Получава данни за КЗ от модифицираното приложение на Eversense.</string>
    <string name="description_source_glimp">Получава данни за КЗ от Glimp.</string>
@ -105,7 +106,6 @@
    <string name="sms_delta">Изменение (делта):</string>
    <string name="configbuilder">Конфигурация</string>
    <string name="objectives">Цели</string>
-    <string name="openapsma">OpenAPS МА</string>
    <string name="overview">Общ</string>
    <string name="nsprofile">NS Профил</string>
    <string name="simpleprofile">Обикновен профил</string>
@ -543,8 +543,6 @@
    <string name="enablesuperbolus">Разреши използването на Суперболус</string>
    <string name="enablesuperbolus_summary">Разреши функцията суперболус в съветника. Не я разрешавайте докато не научите какво наистина прави. ТОВА МОЖЕ ДА СЪЗДАДЕ ОПАСНОСТ ОТ ПРЕДОЗИРАНЕ С ИНСУЛИН.</string>
    <string name="show_statuslights">Покажи статус светлини на началния екран</string>
-    <string name="show_statuslights_extended">Покажи статус светлини с подробности на началния екран</string>
-    <string name="show_statuslights_extended_summary">Показвай подробни статус светлини за канула, инсулин, сензор, резервоар и батерията на началния екран.</string>
    <string name="statuslights_res_warning">Ниво за аларма за останал инсулин в резервоара [Е]</string>
    <string name="statuslights_res_critical">Критично ниво на останал инсулин в резервоар [Е]</string>
    <string name="statuslights_bat_warning">Аларма при заряд на батерия под [%]</string>
@ -979,6 +977,7 @@
    <string name="allow_hardware_pump_text">Внимание: Ако активирате и свържете с хардуерна помпа, AndroidAPS ще копира основните настройки от профила в помпата, като презапише съществуващата базова скорост, съхранявана на помпата. Уверете се, че имате правилните основни настройки в AndroidAPS. Ако не сте сигурни или не искате да презапишете основните настройки на помпата, натиснете Cancel и повторете превключването към помпата по-късно.</string>
    <string name="error_adding_treatment_title">Данните за лечението не са пълни</string>
    <string name="maintenance_settings">Настройки за поддръжка</string>
+    <string name="maintenance_email">Имейл</string>
    <string name="maintenance_amount">Брой логове за изпращане</string>
    <string name="maintenance">Поддръжка</string>
    <string name="maintenance_shortname">ПОДДР</string>
--- a/app/src/main/res/values-cs-rCZ/objectives.xml
+++ b/app/src/main/res/values-cs-rCZ/objectives.xml
@ -20,7 +20,9 @@
    <string name="objectives_autosens_gate">Jeden týden úspěšného používání s běžným příjmem sacharidů</string>
    <string name="objectives_ama_objective">Povolení doplňkový funkcí pro každodenní použití, jako např. pokročilý jídelní asistent (AMA)</string>
    <string name="objectives_smb_objective">Povolit další funkce pro běžné používání jako SMB</string>
+    <string name="objectives_auto_objective">Povolení automatizace</string>
    <string name="objectives_smb_gate">Přečíst si dokumentaci a zvýšit maximální IOB, aby mohlo SMB fungovat. Pro začátek se dá použít velikost běžného bolusu + 3x maximální denní bazál</string>
+    <string name="objectives_auto_gate">Přečtěte si na wiki, jak automatizace funguje. Nejdříve nastavte pouze jednoduchá pravidla. Namísto provádění akcí nechte AAPS zobrazovat pouze oznámení. Pokud jste si jistí, že je automatizace je spuštěna v pravý čas, můžete oznámení nahradit prováděním akce. (https://androidaps.readdocs.io/en/latest/CROWDIN/cs/Usage/Automation.html)</string>
    <string name="objectives_bgavailableinns">Glykémie dostupná v NS</string>
    <string name="objectives_pumpstatusavailableinns">Stav pumpy dostupný v NS</string>
    <string name="objectives_manualenacts">Ručně spuštěno</string>
--- a/app/src/main/res/values-cs-rCZ/protection.xml
+++ b/app/src/main/res/values-cs-rCZ/protection.xml
@ -4,4 +4,20 @@
    <string name="biometric_description">Položte prst na čtečku otisků prstů pro ověření vaší totožnosti</string>
    <string name="settings_protection">Ochrana nastavení</string>
    <string name="application_protection">Ochrana aplikace</string>
+    <string name="bolus_protection">Ochrana bolusu</string>
+    <string name="master_password">Hlavní heslo</string>
+    <string name="settings_password">Heslo pro nastavení</string>
+    <string name="application_password">Heslo aplikace</string>
+    <string name="bolus_password">Heslo pro bolus</string>
+    <string name="unlock_settings">Odemknout nastavení</string>
+    <string name="biometric">Biometrie</string>
+    <string name="custom_password">Vlastní heslo</string>
+    <string name="noprotection">Bez ochrany</string>
+    <string name="protection">Ochrana</string>
+    <string name="master_password_missing">Hlavní heslo není nastaveno!\n\nProsím nastavte své hlavní heslo v Preferencích (%1$s &#8594; %2$s)</string>
+    <string name="password_set">Heslo nastaveno!</string>
+    <string name="password_not_set">Heslo není nastavené</string>
+    <string name="password_not_changed">Heslo nezměněno</string>
+    <string name="password_cleared">Heslo vymazáno!</string>
+    <string name="password_hint">Zadejte heslo</string>
 </resources>
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@ -106,7 +106,6 @@
    <string name="sms_delta">Rozdíl:</string>
    <string name="configbuilder">Konfigurace</string>
    <string name="objectives">Cíle</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Přehled</string>
    <string name="nsprofile">NS profil</string>
    <string name="simpleprofile">Jednoduchý profil</string>
@ -585,8 +584,14 @@
    <string name="enablesuperbolus">Povolit superbolus</string>
    <string name="enablesuperbolus_summary">Povolení superbolusu v kalkulátoru. Nepovolujte, dokud se nenaučíte, co to opravdu dělá. MŮŽE ZPŮSOBIT PŘEDÁVKOVÁNÍ INZULÍNEM PŘI NESPRÁVNÉM POUŽITÍ!</string>
    <string name="show_statuslights">Zobrazit stavové indikátory na domovské obrazovce</string>
-    <string name="show_statuslights_extended">Zobrazit rozšířené stavové indikátory na domovské obrazovce</string>
-    <string name="show_statuslights_extended_summary">Povolí rozšířené stavové indikátory pro stáří kanyly, inzulínu, senzoru, zásobníku a baterie na domovské obrazovce.</string>
+    <string name="statuslights_cage_warning">Úroveň varování stáří kanyly [h]</string>
+    <string name="statuslights_cage_critical">Úroveň kritického stáří kanyly [h]</string>
+    <string name="statuslights_iage_warning">Úroveň varování stáří inzulínu [h]</string>
+    <string name="statuslights_iage_critical">Úroveň kritického stáří inzulínu [h]</string>
+    <string name="statuslights_sage_warning">Úroveň varování stáří senzoru [h]</string>
+    <string name="statuslights_sage_critical">Úroveň kritického stáří senzoru [h]</string>
+    <string name="statuslights_bage_warning">Úroveň varování stáří baterie [h]</string>
+    <string name="statuslights_bage_critical">Úroveň kritického varování stáří baterie [h]</string>
    <string name="statuslights_res_warning">Úroveň varování stavu zásobníku [U]</string>
    <string name="statuslights_res_critical">Úroveň kritického varování stavu zásobníku [U]</string>
    <string name="statuslights_bat_warning">Úroveň varování stavu baterie [%]</string>
@ -1523,4 +1528,12 @@
    <string name="ondisconnect">Při odpojení</string>
    <string name="overview_show_predictions">Predikce</string>
    <string name="overview_show_deviationslope">Odchylka sklonu</string>
+    <string name="authorizationfailed">Autorizace selhala</string>
+    <string name="overview_show_absinsulin">Absolutní inzulin</string>
+    <string name="master_password_summary">Hlavní heslo se používá pro šifrování zálohy a pro \"přebití\" zabezpečení v aplikaci. Dobře si ho zapamatujte nebo uložte na bezpečném místě.</string>
+    <string name="passwords_dont_match">Hesla se neshodují</string>
+    <string name="current_master_password">Aktuální hlavní heslo</string>
+    <string name="statuslights">Stavové indikátory</string>
+    <string name="statuslights_copy_ns">Zkopírovat nastavení z NS</string>
+    <string name="copyexistingvalues">Zkopírovat nastavení NS (existuje-li)?</string>
 </resources>
--- a/app/src/main/res/values-de-rDE/objectives.xml
+++ b/app/src/main/res/values-de-rDE/objectives.xml
@ -20,8 +20,10 @@
    <string name="objectives_autosens_gate">Loope eine Woche tagsüber mit regelmäßiger Kohlenhydrat-Eingabe</string>
    <string name="objectives_ama_objective">Aktiviere zusätzliche Funktionen für die Nutzung tagsüber wie z. B. den erweiterten Mahlzeitenassistenten (AMA)</string>
    <string name="objectives_smb_objective">Aktiviere zusätzliche Funktionen für die Nutzung tagsüber wie z. B. SMB</string>
+    <string name="objectives_auto_objective">Automatisierung aktivieren</string>
    <string name="objectives_smb_gate">Lies das Wiki und erhöhe maxIOB, damit der SMB gut funktioniert. Ein guter Anfang ist
 die Formel maxIOB = durchschnittlicher Essensbolus + 3 x höchste Basalrate</string>
+    <string name="objectives_auto_gate">Lies in den Docs wie Automatisierung funktioniert und erstelle dann eine erste einfache Regel. Verwende eine Benachrichtigung statt der tatsächlichen Aktion. Wenn die Automatisierung zum richtigen Zeitpunkt auslöst, ersetze die Benachrichtigung durch die gewünschte Aktion. (https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Usage/Automation.html)</string>
    <string name="objectives_bgavailableinns">BZ in Nightscout verfügbar</string>
    <string name="objectives_pumpstatusavailableinns">Pumpen-Status in Nightscout verfügbar</string>
    <string name="objectives_manualenacts">Manuelle Aktionen</string>
--- a/app/src/main/res/values-de-rDE/protection.xml
+++ b/app/src/main/res/values-de-rDE/protection.xml
@ -1,2 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="biometric_title">Authentifizierung erforderlich</string>
+    <string name="biometric_description">Legen Deinen Finger auf den Fingerabdrucksensors, um Deine Identität zu bestätigen.</string>
+    <string name="settings_protection">Schutz der Einstellungen</string>
+    <string name="application_protection">Schutz der App</string>
+    <string name="bolus_protection">Bolus-Schutz</string>
+    <string name="master_password">Master-Passwort</string>
+    <string name="settings_password">Passwort für Einstellungen</string>
+    <string name="application_password">Anwendungspasswort</string>
+    <string name="bolus_password">Passwort für Boli</string>
+    <string name="unlock_settings">Einstellungen freischalten</string>
+    <string name="biometric">Biometrisch</string>
+    <string name="custom_password">Benutzerdefiniertes Passwort</string>
+    <string name="noprotection">Kein Schutz</string>
+    <string name="protection">Schutz</string>
+    <string name="master_password_missing">Das Master-Passwort ist nicht festgelegt!\n\nLege Dein Master-Passwort bitte in en Einstellungen fest (%1$s &#8594; %2$s)</string>
+    <string name="password_set">Passwort festgelegt!</string>
+    <string name="password_not_set">Passwort nicht festgelegt</string>
+    <string name="password_not_changed">Passwort nicht geändert</string>
+    <string name="password_cleared">Passwort gelöscht!</string>
+    <string name="password_hint">Passwort hier eingeben</string>
+</resources>
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@ -43,6 +43,7 @@
    <string name="description_pump_mdi">Pumpen-Integration für Personen, die täglich mehrere Injektionen für ihre Diabetestherapie vornehmen</string>
    <string name="description_pump_virtual">Pumpen-Integration für Pumpen, die noch nicht über einen Treiber verfügen (Open Loop)</string>
    <string name="description_sensitivity_aaps">Die Sensitivität wird genauso wie bei Oref0 berechnet, aber Du kannst dafür ein Zeitfenster bestimmen. Die minimale Kohlenhydrat-Absorptionsrate wird aus der maximalen Absorptionsdauer aus den Einstellungen abgeleitet.</string>
+    <string name="description_sensitivity_oref1">Die Sensitivität wird aus den Daten der letzten 8 Stunden berechnet und Kohlenhydrate (falls nicht bereits absorbiert) werden nach der in den Einstellungen angegebenen Zeit als absorbiert betrachtet. Das Plugin bezieht Zeiträume, in denen UAM annimmt, dass Kohlenhydrate aktiv waren, nicht mit in die Berechnung ein.</string>
    <string name="description_sensitivity_weighted_average">Die Sensitivität wird aus den Abweichungen errechnet. Dabei werden neuere Abweichungen stärker gewichtet als ältere. Die minimale Kohlenhydrat-Aufnahme wird aus der in den Präferenzen angegebenen maximalen Kohlenhydrat-Resorptionszeit abgeleitet. Dieser Algorithmus reagiert am schnellsten auf Änderungen der Empfindlichkeit.</string>
    <string name="description_source_eversense">Empfange BZ-Werte von der gepatchten Eversense App.</string>
    <string name="description_source_glimp">Empfange Blutzucker-Werte von Glimp.</string>
@ -105,7 +106,6 @@
    <string name="sms_delta">Delta:</string>
    <string name="configbuilder">Konfiguration</string>
    <string name="objectives">Zielsetzungen</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Übersicht</string>
    <string name="nsprofile">Nightscout-Profil</string>
    <string name="simpleprofile">Einfaches Profil</string>
@ -218,6 +218,44 @@
    <string name="openapsma_maxiob_title">Maximales Basal-IOB, das OpenAPS abgeben darf [IE]</string>
    <string name="openapsma_maxiob_summary">Maximale Menge von nicht Bolus-IOB, die OpenAPs abgeben kann.</string>
    <string name="dismiss">VERWERFEN</string>
+    <string name="password_preferences_encrypt_prompt">Du wirst nach dem Master-Passwort gefragt. Mit diesem werden die exportierten Einstellungen verschlüsselt.</string>
+    <string name="password_preferences_decrypt_prompt">Du wirst nach dem Master-Passwort gefragt. Mit diesem werden die importierten Einstellungen entschlüsselt.</string>
+    <string name="preferences_export_canceled">Export abgebrochen! Einstellungen wurden NICHT exportiert!</string>
+    <string name="preferences_import_canceled">Import abgebrochen! Einstellungen wurden NICHT importiert!</string>
+    <string name="check_preferences_before_import">Überprüfe die Einstellungen vor dem Import:</string>
+    <string name="check_preferences_cannot_import">Einstellungen können nicht importiert werden!</string>
+    <string name="check_preferences_dangerous_import">Einstellungen sollten nicht importiert werden!</string>
+    <string name="check_preferences_details_btn">Beschreibe die Import-Probleme...</string>
+    <string name="check_preferences_details_title">Details zu den Import-Problemen</string>
+    <string name="check_preferences_import_btn">Importieren</string>
+    <string name="check_preferences_import_anyway_btn">Trotzdem importieren (GEFÄHRLICH!)</string>
+    <string name="metadata_warning_different_flavour">Einstellungen wurden mit einer anderen Variante von AAPS erstellt (%1$s). Du nutzt: %2$s.\n\nEinige Einstellungen können fehlen oder ungültig sein - überprüfe und aktualisiere Deine Einstellungen nach dem Import .</string>
+    <string name="metadata_warning_different_device">Einstellungen wurden auf einem anderen Gerät erstellt. Das ist OK, wenn Du von einem älteren/anderen Handy importierst. Stelle aber sicher, dass die importierten Einstellungen korrekt sind!</string>
+    <string name="metadata_warning_outdated_format">Du verwendest das veraltete Format einer alten AAPS-Version das nicht sicher ist! Verwende dieses nur als letzte Möglichkeit, wenn Du keinen Export im aktuellen JSON-Format hast.</string>
+    <string name="metadata_warning_old_export">Die importierten Einstellungen sind bereits %1$s Tage alt! Hast Du aktuellere Einstellungen oder evtl. die falsche Datei gewählt? Denke daran, die Einstellungen regelmäßig zu exportieren.</string>
+    <string name="metadata_warning_date_format">Ungültiges Datums-/Zeitformat!</string>
+    <string name="metadata_label_format">Dateiformat</string>
+    <string name="metadata_label_created_at">Erstellt am</string>
+    <string name="metadata_label_aaps_version">AAPS-Version</string>
+    <string name="metadata_label_aaps_flavour">Build-Variante</string>
+    <string name="metadata_label_device_name">Patientenname des exportierenden Geräts</string>
+    <string name="metadata_label_device_model">Modell des exportierenden Geräts</string>
+    <string name="metadata_label_encryption">Dateiverschlüsselung</string>
+    <string name="metadata_format_old">Altes Exportformat</string>
+    <string name="metadata_format_new">Neues verschlüsseltes Format</string>
+    <string name="metadata_format_debug">Neues Debugformat (unverschlüsselt)</string>
+    <string name="metadata_format_other">Unbekanntes Export-Format</string>
+    <string name="prefdecrypt_settings_tampered">Einstellungen-Datei wurde manipuliert.</string>
+    <string name="prefdecrypt_settings_secure">Einstellungsdatei ist sicher.</string>
+    <string name="prefdecrypt_settings_unencrypted">Nicht sicheres, unverschlüsseltes Einstellungsformat verwenden</string>
+    <string name="prefdecrypt_wrong_json">Fehler im JSON-Format, fehlendes erforderliches Feld (Format, Inhalt, Metadaten oder Sicherheit)</string>
+    <string name="prefdecrypt_wrong_password">Entschlüsselungsfehler. Das angegebene Passwort kann die Datei nicht entschlüsseln.</string>
+    <string name="prefdecrypt_issue_missing_file_hash">Datei-Prüfsumme (hash) fehlt. Einstellungen können nicht auf Echtheit überprüft werden!</string>
+    <string name="prefdecrypt_issue_modified">Datei wurde nach dem Export verändert!</string>
+    <string name="prefdecrypt_issue_parsing">Entschlüsselungsfehler, Analyse der Einstellungen fehlgeschlagen!</string>
+    <string name="prefdecrypt_issue_wrong_pass">Entschlüsselungsfehler. Das angegebene Passwort ist ungültig oder die Einstellungsdatei wurde verändert! Evtl. wurde die importierte Datei mit einem anderen Master-Passwort exportiert.</string>
+    <string name="prefdecrypt_issue_wrong_format">Fehlende Verschlüsselungskonfiguration, Einstellungsformat ist ungültig!</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">Nicht unterstützter oder nicht angegebener Verschlüsselungsalgorithmus!</string>
    <string name="danarpump">DanaR</string>
    <string name="connecting">Verbinden</string>
    <string name="connected">Verbunden</string>
@ -507,6 +545,9 @@
    <string name="adult">Erwachsener</string>
    <string name="resistantadult">Insulinresistenter Erwachsener</string>
    <string name="patientage_summary">Bitte wähle das Patientenalter, um die Sicherheits-Limits festzulegen</string>
+    <string name="patient_name">Name des Patienten</string>
+    <string name="patient_name_summary">Gib den Namen des Patienten oder einen Spitznamen für die Unterscheidung zwischen mehreren Setups an.</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Nutzer</string>
    <string name="Glimp">Glimp</string>
    <string name="needwhitelisting">%1$s benötigt eine deaktivierte Akku-Leistungsoptimierung, um korrekt arbeiten zu können.</string>
    <string name="loopsuspended">Loop pausiert</string>
@ -543,8 +584,14 @@
    <string name="enablesuperbolus">Aktiviere Superbolus im Wizard</string>
    <string name="enablesuperbolus_summary">Aktiviere die SuperBolus-Funktion im Wizard. Nicht aktivieren, wenn Du nicht weißt, welche Auswirkungen dieser Bolus hat! ES KANN ZU EINER ÜBERDOSIERUNG AN INSULIN KOMMEN!</string>
    <string name="show_statuslights">Statusanzeige auf Homescreen</string>
-    <string name="show_statuslights_extended">Erweiterte Statusanzeige auf Homescreen</string>
-    <string name="show_statuslights_extended_summary">Erweiterte Statusanzeige für CAGE, IAGE, SAGE, Reservoir- und Batteriestand auf dem Homescreen.</string>
+    <string name="statuslights_cage_warning">Warnschwelle Kanülenalter [h]</string>
+    <string name="statuslights_cage_critical">Warnschwelle kritisches Kanülenalter [h]</string>
+    <string name="statuslights_iage_warning">Warnschwelle Insulinalter [h]</string>
+    <string name="statuslights_iage_critical">Warnschwelle kritisches Insulinalter [h]</string>
+    <string name="statuslights_sage_warning">Warnschwelle Sensoralter [h]</string>
+    <string name="statuslights_sage_critical">Warnschwelle kritisches Sensoralter [h]</string>
+    <string name="statuslights_bage_warning">Warnschwelle Batteriealter [h]</string>
+    <string name="statuslights_bage_critical">Warnschwelle kritisches Batteriealter [h]</string>
    <string name="statuslights_res_warning">Warnschwelle Reservoirstand [IE]</string>
    <string name="statuslights_res_critical">Warnschwelle kritischer Reservoirstand [IE]</string>
    <string name="statuslights_bat_warning">Warnschwelle Batteriestand [%]</string>
@ -704,8 +751,12 @@
    <string name="bgsource_upload">BZ Upload Einstellungen</string>
    <string name="wear_detailed_delta_title">Zeige detailliertes Delta</string>
    <string name="wear_detailed_delta_summary">Delta wird mit Dezimalstelle angezeigt.</string>
+    <string name="smbinterval_summary">Wie häufig SMBs angegeben werden (in Min.)</string>
    <string name="smbmaxminutes">SMB max. Minuten</string>
    <string name="smbmaxminutes_summary">SMB Basal-Limit in Minuten</string>
+    <string name="uamsmbmaxminutes">UAM SMB max minutes</string>
+    <string name="uamsmbmaxminutes_summary">SMB Basal-Limit in Minuten für UAM</string>
+    <string name="carbsReqThreshold">Schwellenwert für KH-Empfehlung</string>
    <string name="unsupportedfirmware">Nicht unterstützte Pumpen-Firmware</string>
    <string name="dexcomg5_xdripupload_title">Sende BZ-Werte zu xDrip+</string>
    <string name="dexcomg5_xdripupload_summary">Wähle in xDrip+ 640g/Eversense als Daten-Quelle.</string>
@ -772,6 +823,7 @@
    <string name="ago">her</string>
    <string name="format_hours">%1$.2f h</string>
    <string name="format_mins">%1$d mins</string>
+    <string name="format_mins_short">%1$dm</string>
    <string name="enablesmbalways">SMB immer aktivieren</string>
    <string name="enablesmbalways_summary">Aktiviere SMB immer, unabhängig von Boli. Dies ist nur möglich, wenn eine BZ-Quelle genutzt wird, die die Daten besonders gut filtert wie z. B. G5.</string>
    <string name="enablesmbaftercarbs">Aktiviere SMB nach Mahlzeiten.</string>
@ -970,6 +1022,10 @@
    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Erhöhe die Sensitivität für temporäre Ziele >= 100.]]></string>
    <string name="low_temptarget_lowers_sensitivity_title">Niedrige temporäre Ziele senken die Sensitivität</string>
    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Senke die Sensitivität für temporäre Ziele < 100.]]></string>
+    <string name="resistance_lowers_target_title">Resistenz senkt Zielwert</string>
+    <string name="resistance_lowers_target_summary">Wenn Resistenz festgestellt wird, senke den Glukose-Zielwert</string>
+    <string name="sensitivity_raises_target_title">Empfindlichkeit erhöht den Zielwert</string>
+    <string name="sensitivity_raises_target_summary">Wenn eine höhere Empfindlichkeit festgestellt wird, wird der Glukose-Zielwert erhöht.</string>
    <string name="combo_invalid_setup">Ungültige Pumpen-Einstellungen. Lies das Wiki und stelle mit der 360° Konfigurations-Software sicher, dass das Quick-Info-Menü \"QUICK INFO\" heißt.</string>
    <string name="custom">Benutzerdefiniert</string>
    <string name="largetimedifftitle">Große Zeitdifferenz</string>
@ -979,6 +1035,8 @@
    <string name="allow_hardware_pump_text">WARNUNG: Wenn Du eine echte Pumpe aktivierst und anschließt, kopiert AndroidAPS die Basaleinstellungen vom aktiven Profil zur Pumpe (und behält sie bei). Die Einstellungen in der Pumpe werden hierbei überschrieben. Wenn Du Dir nicht sicher bist oder die Basaleinstellungen in der Pumpe nicht überschreiben möchten, drücke \"Abbrechen\" und vollziehe den Wechsel zur Pumpe später.</string>
    <string name="error_adding_treatment_title">Behandlungsdaten unvollständig</string>
    <string name="maintenance_settings">Wartungseinstellungen</string>
+    <string name="maintenance_email">E-Mail</string>
+    <string name="maintenance_encrypt_exported_prefs">Exportierte Einstellungen verschlüsseln</string>
    <string name="maintenance_amount">Anzahl der zu sendenden Logs</string>
    <string name="maintenance">Wartung</string>
    <string name="maintenance_shortname">WRTNG</string>
@ -1187,6 +1245,8 @@ Unerwartetes Verhalten.</string>
    <string name="exists">existiert</string>
    <string name="notexists">existiert nicht</string>
    <string name="temptargetcompared">Temporäres Ziel %1$s</string>
+    <string name="btdevicecompared">Bluetooth-Verbindung mit Gerät %1$s %2$s</string>
+    <string name="btdevice">Mit Bluetooth-Gerät verbinden</string>
    <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
    <string name="autosenscompared">Autosens %1$s %2$s %%</string>
    <string name="autosenslabel">Autosens %</string>
@ -1241,6 +1301,7 @@ Unerwartetes Verhalten.</string>
    <string name="medtronic_pump_battery_alkaline">Alkaline Batterie (erweiterte Ansicht)</string>
    <string name="medtronic_pump_battery_lithium">Lithium Batterie (erweiterte Ansicht)</string>
    <string name="medtronic_pump_battery_nizn">Nickel-Zink-Akku (erweiterte Ansicht)</string>
+    <string name="medtronic_pump_battery_nimh">Nickel-Zink-Akku (erweiterte Ansicht)</string>
    <string name="medtronic_bolus_debugging">Fehlersuche Bolus/Behandlungen</string>
    <!-- RL BLE Scanning -->
    <string name="rileylink_scanner_scan_scan">SCANNEN</string>
@ -1256,6 +1317,7 @@ Unerwartetes Verhalten.</string>
    <string name="rileylink_scanner_scanning">Scannt</string>
    <string name="rileylink_scanner_scanning_finished">Scannen abgeschlossen</string>
    <string name="rileylink_scanner_scanning_error">Scanfehler: %1$d</string>
+    <string name="common_never">Nie</string>
    <!-- RL Status Page -->
    <string name="rileylink_settings_tab1">Einstellungen</string>
    <string name="rileylink_settings_tab2">Verlauf</string>
@ -1389,6 +1451,7 @@ Unerwartetes Verhalten.</string>
    <string name="objectives_button_unstart">Ziel neu starten</string>
    <string name="timedetection">Zeiterkennung</string>
    <string name="doyouwantresetstart">Möchtest Du den Start der Ziele zurücksetzen? Du verlierst Deine Fortschritte.</string>
+    <string name="time_or_timezone_change">Zeit- und/oder Zeitzonenänderung an der Pumpe</string>
    <string name="nopumpselected">Keine Pumpe ausgewählt</string>
    <string name="setupwizard_units_prompt">Wähle die Einheit, in der die Werte angezeigt werden sollen.</string>
    <string name="ns_ploadlocalprofile">Lade die Änderungen des lokalen Profils zu NS hoch.</string>
@ -1445,4 +1508,34 @@ Unerwartetes Verhalten.</string>
    <string name="loop_tbrexecution_time_label">Temp. BR Ausführungszeit</string>
    <string name="insight_alert_notification_channel">Insight Pumpenalarme</string>
    <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">von der Authentifizierungs-App für: %1$s</string>
+    <string name="smscommunicator_otp_enabled">Authentifizierung einschalten</string>
+    <string name="smscommunicator_otp_enabled_summary">Authentifiziere Befehle mit Einmal-Passwörtern, die von Google Authenticator oder ähnlichen Apps zur 2-Faktor-Authentifizierung generiert wurden.</string>
+    <string name="smscommunicator_otp_pin">Zusätzliche PIN am Ende des Tokens</string>
+    <string name="smscommunicator_otp_pin_summary">Zusätzliche Ziffern, die auswendig gelernt und am Ende jedes generierten Einmal-Passworts angehängt werden sollten.</string>
+    <string name="smscomunicator_tab_otp_label">Konfiguration des Authentifikators</string>
+    <string name="smscommunicator_otp_verify_label">Zu überprüfendes OTP:</string>
+    <string name="smscommunicator_otp_reset_btn">Authentifikators zurücksetzen</string>
+    <string name="smscommunicator_otp_reset_title">Authentifikatorschlüssel zurücksetzen</string>
+    <string name="smscommunicator_otp_reset_prompt">Willst Du wirklich den Authentifikatorschlüssel zurücksetzen? Dies wird alle momentan genutzten Authentifikatoren ungültig machen und Du musst sie neu einrichten.</string>
+    <string name="smscommunicator_otp_reset_successful">Neuer Authentifizierungsschlüssel generiert! Bitte verwende den aktualisierten QR-Code für die Bereitstellung von Authentifikatoren.</string>
+    <string name="smscommunicator_otp_step1_install_header">1. Authentifikator installieren</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. Scanne den Code zum Einrichten von AndroidAPS OTP-Codes</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Teste das Einmal-Passwort</string>
+    <string name="smscommunicator_otp_reset_header">Authentifikators zurücksetzen</string>
+    <string name="smscommunicator_otp_install_info">Installiere auf jedem Folloer-Phone eine Authenticator-App, die RFC 6238 TOTP-Token unterstützt. Beliebte kostenlose Apps sind:\n Authy\n Google Authenticator\n LastPass Authenticator\n FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_provisioning_warning">Diesen Code NICHT ONLINE TEILEN!\nVerwende ihn nur zur Einrichtung der Authenticator App auf den Follower-Phones.</string>
+    <string name="smscommunicator_otp_reset_warning">Wenn Du den Authentifikator zurücksetzt werden alle bestehenden Authentifikatoren ungültig. Du musst sie dann neu einrichten!</string>
+    <string name="onconnect">Beim Verbinden</string>
+    <string name="ondisconnect">Beim Trennen</string>
+    <string name="overview_show_predictions">Predictions (Vorhersagen)</string>
+    <string name="overview_show_deviationslope">Steigung der Abweichung</string>
+    <string name="authorizationfailed">Autorisierung fehlgeschlagen</string>
+    <string name="overview_show_absinsulin">Gesamtinsulin</string>
+    <string name="master_password_summary">Das Master-Passwort wird für die Backup-Verschlüsselung und zur Außerkraftsetzung der Sicherheit in der Anwendung verwendet. Merke es Dir oder bewahre es an einem sicheren Ort auf.</string>
+    <string name="passwords_dont_match">Die Passwörter stimmen nicht überein.</string>
+    <string name="current_master_password">Aktuelles Master-Passwort</string>
+    <string name="statuslights">Statusanzeige</string>
+    <string name="statuslights_copy_ns">Einstellung aus NS kopieren</string>
+    <string name="copyexistingvalues">NS-Einstellungen kopieren (falls vorhanden)?</string>
 </resources>
--- a/app/src/main/res/values-de-rDE/validator.xml
+++ b/app/src/main/res/values-de-rDE/validator.xml
@ -1,2 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Nur numerische Ziffern zulässig.</string>
+    <string name="error_only_numeric_digits_range_allowed">Bitte verwende nur Ziffern von %1$s - %2$s.</string>
+    <string name="error_this_field_cannot_contain_special_character">Dieses Feld darf kein Sonderzeichen enthalten.</string>
+    <string name="error_only_standard_letters_are_allowed">Nur Standard-Buchstaben sind erlaubt</string>
+    <string name="error_field_must_not_be_empty">Das Feld darf nicht leer sein.</string>
+    <string name="error_email_address_not_valid">E-Mail Adresse ungültig</string>
+    <string name="error_creditcard_number_not_valid">Kreditkartennummer ist ungültig.</string>
+    <string name="error_phone_not_valid">Telefonnummer ist nicht gültig</string>
+    <string name="error_domain_not_valid">Domain-Name nicht gültig</string>
+    <string name="error_ip_not_valid">IP-Adresse nicht gültig</string>
+    <string name="error_url_not_valid">Web-Adresse (URL) ungültig</string>
+    <string name="error_notvalid_personname">Kein gültiger Vor- oder Nachname</string>
+    <string name="error_notvalid_personfullname">Kein gültiger vollständiger Name.</string>
+    <string name="error_date_not_valid">Ungültig Format</string>
+    <string name="error_mustbe4digitnumber">Bitte 4-stellige Zahl verwenden</string>
+    <string name="error_mustbe6digitnumber">Bitte 6-stellige Zahl verwenden</string>
+    <string name="error_not_a_minimum_length">Mindestlänge nicht erreicht</string>
+    <string name="error_pin_not_valid">Pin sollte 3- bis 6-stellig sein, unterschiedliche und nicht aufeinanderfolgende Zahlen enthalten.</string>
+</resources>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@ -105,7 +105,6 @@
    <string name="sms_delta">Διαφορά:</string>
    <string name="configbuilder">Διαμόρφωση</string>
    <string name="objectives">Βήματα</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Επισκόπηση</string>
    <string name="nsprofile">Προφίλ NS</string>
    <string name="simpleprofile">Απλό Προφίλ</string>
@ -518,8 +517,6 @@
    <string name="enablesuperbolus">Ενεργοποίηση superbolus στον σύντομο οδηγό</string>
    <string name="enablesuperbolus_summary">Ενεργοποιήστε την λειτουργία superbolus στον σύντομο οδηγό. Μην το κάνετε μέχρι να μάθετε τι ακριβώς κάνει. ΜΠΟΡΕΙ ΝΑ ΕΓΧΥΣΕΙ ΠΑΡΑΠΑΝΩ ΔΟΣΕΙΣ ΙΝΣΟΥΛΙΝΗΣ ΑΝ ΧΡΗΣΙΜΟΠΟΙΗΘΕΙ ΛΑΝΘΑΣΜΕΝΑ!</string>
    <string name="show_statuslights">Εμφάνιση του φωτισμού κατάστασης στην αρχική οθόνη</string>
-    <string name="show_statuslights_extended">Εμφάνιση του φωτισμού κατάστασης στην αρχική οθόνη</string>
-    <string name="show_statuslights_extended_summary">Ενεργοποίηση του φωτισμού κατάστασης για cage, iage, sage, reservoir και επίπεδο μπαταρίας στην αρχική οθόνη.</string>
    <string name="statuslights_res_warning">Όριο προειδοποίησης χαμηλής αμπούλας [U]</string>
    <string name="statuslights_res_critical">Όριο προειδοποίησης πολύ χαμηλής αμπούλας [U]</string>
    <string name="statuslights_bat_warning">Όριο προειδοποίησης χαμηλής μπαταρίας [%]</string>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -105,7 +105,6 @@
    <string name="sms_delta">Variación:</string>
    <string name="configbuilder">Tabla de configuraciones</string>
    <string name="objectives">Objetivos</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Inicio</string>
    <string name="nsprofile">Perfil NS</string>
    <string name="simpleprofile">Perfil simple</string>
@ -218,6 +217,36 @@
    <string name="openapsma_maxiob_title">Max IOB basal que OpenAPs puede emitir [U]</string>
    <string name="openapsma_maxiob_summary">Este valor es llamado Max Iob en el OpenAPS\nEsta es la máxima insulina en [U] que APS puede entregar a la vez.</string>
    <string name="dismiss">DESCARTAR</string>
+    <string name="password_preferences_encrypt_prompt">Se le solicitará la contraseña maestra, que se utilizará para cifrar las preferencias exportadas.</string>
+    <string name="password_preferences_decrypt_prompt">Se le solicitará la contraseña maestra, que es necesaria para descifrar las preferencias importadas.</string>
+    <string name="preferences_export_canceled">¡Exportación cancelada! ¡Las preferencias NO se han exportado!</string>
+    <string name="preferences_import_canceled">¡Importación cancelada! ¡Las preferencias NO se han importado!</string>
+    <string name="check_preferences_before_import">Por favor, compruebe las preferencias antes de importar:</string>
+    <string name="check_preferences_cannot_import">¡Las preferencias no se pueden importar!</string>
+    <string name="check_preferences_dangerous_import">¡Las preferencias no se deben importar!</string>
+    <string name="check_preferences_details_btn">Explicar problemas de importación…</string>
+    <string name="check_preferences_import_btn">Importar</string>
+    <string name="check_preferences_import_anyway_btn">Importar de todos modos (¡PELIGROSO!)</string>
+    <string name="metadata_warning_different_device">Las preferencias se han creado en un dispositivo distinto. Está bien si va a importar desde un teléfono más antiguo/diferente, pero ¡asegúrese de que las preferencias importadas son correctas!</string>
+    <string name="metadata_warning_outdated_format">¡Estás usando el obsoleto formato heredado de versiones antiguas de AAPS, que no es seguro! Únicamente utilizarlo como último recurso, si no tiene una exportación en formato JSON actual.</string>
+    <string name="metadata_warning_old_export">Las preferencias importadas ya tienen %1$s días! ¿Tal vez tengas preferencias más actualizadas o eligiste el archivo equivocado? ¡Recuerda exportar las preferencias regularmente!</string>
+    <string name="metadata_warning_date_format">¡Formato de fecha no válido!</string>
+    <string name="metadata_label_format">Formato del archivo</string>
+    <string name="metadata_label_created_at">Creado el</string>
+    <string name="metadata_label_aaps_version">Versión de AAPS</string>
+    <string name="metadata_label_device_name">Exportar el nombre del paciente del dispositivo</string>
+    <string name="metadata_label_device_model">Exportar modelo de dispositivo</string>
+    <string name="metadata_label_encryption">Encriptación de archivos</string>
+    <string name="metadata_format_old">Formato de exportación antiguo</string>
+    <string name="metadata_format_new">Nuevo formato cifrado</string>
+    <string name="metadata_format_debug">Nuevo formato de depuración (sin cifrar)</string>
+    <string name="metadata_format_other">Formato de exportación desconocido</string>
+    <string name="prefdecrypt_settings_tampered">Archivo de configuración alterado</string>
+    <string name="prefdecrypt_settings_secure">El archivo de configuración es seguro</string>
+    <string name="prefdecrypt_wrong_password">Error de descifrado, la contraseña proporcionada no puede descifrar el archivo</string>
+    <string name="prefdecrypt_issue_modified">¡El archivo se ha modificado tras la exportación!</string>
+    <string name="prefdecrypt_issue_parsing">Error de descifrado, ¡el análisis de las preferencias ha fallado!</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">¡Algoritmo de cifrado no soportado o no especificado!</string>
    <string name="danarpump">DanaR</string>
    <string name="connecting">Conectando</string>
    <string name="connected">Conectado</string>
@ -507,6 +536,9 @@
    <string name="adult">Adulto</string>
    <string name="resistantadult">Adulto resistente a la insulina</string>
    <string name="patientage_summary">Por favor elige la edad del paciente para ajustar los límites de seguridad</string>
+    <string name="patient_name">Nombre del paciente</string>
+    <string name="patient_name_summary">Proporcione el nombre de paciente o el apodo para diferenciar entre varias configuraciones</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Usuario</string>
    <string name="Glimp">Glimp</string>
    <string name="needwhitelisting">%1$s necesita una optimización de la batería para funcionar óptimamente</string>
    <string name="loopsuspended">Loop desactivado</string>
@ -543,8 +575,6 @@
    <string name="enablesuperbolus">Activar superbolo en asistente</string>
    <string name="enablesuperbolus_summary">Activar función superbolo en asistente. No lo actives hasta que hayas aprendido lo que realmente hace. ¡PUEDE CAUSAR SOBREDOSIS DE INSULINA usándolo sin precaución!</string>
    <string name="show_statuslights">Mostrar luces de estado en la pantalla de inicio</string>
-    <string name="show_statuslights_extended">Mostrar luces de estado extendidas en pantalla de inicio</string>
-    <string name="show_statuslights_extended_summary">Habilita luces de estado extendidas para tiempo de cánula, tiempo de insulina, tiempo del sensor, reservorio y nivel de batería en pantalla de inicio.</string>
    <string name="statuslights_res_warning">Umbral de advertencia de nivel de reservorio [U]</string>
    <string name="statuslights_res_critical">Umbral crítico de nivel de reservorio [U]</string>
    <string name="statuslights_bat_warning">Umbral de advertencia de nivel de pila [%]</string>
@ -704,8 +734,12 @@
    <string name="bgsource_upload">Ajuste de subida de datos de glucosa</string>
    <string name="wear_detailed_delta_title">Mostrar detalles delta</string>
    <string name="wear_detailed_delta_summary">Mostrar delta con un decimal mas</string>
+    <string name="smbinterval_summary">Con qué frecuencia se administrarán los SMB en min</string>
    <string name="smbmaxminutes">Minutos máximos SMB</string>
    <string name="smbmaxminutes_summary">Minutos máximos de basal para limitar SMB</string>
+    <string name="uamsmbmaxminutes">Minutos máximos de UAM SMB</string>
+    <string name="uamsmbmaxminutes_summary">Minutos máximos de basal para limitar SMB para UAM</string>
+    <string name="carbsReqThreshold">Umbral de sugerencia de Carbohidratos</string>
    <string name="unsupportedfirmware">Firmware de la bomba no soportado</string>
    <string name="dexcomg5_xdripupload_title">Mandar datos BG a xDrip+</string>
    <string name="dexcomg5_xdripupload_summary">En xDrip+ elige 640g/Eversense como fuente de datos</string>
@ -969,6 +1003,7 @@
    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Aumentar la sensibilidad para objetivos temporales >= 100]]></string>
    <string name="low_temptarget_lowers_sensitivity_title">Objetivo temporal bajo reduce sensibilidad</string>
    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Reduce la sensibilidad para objetivos temporales < 100]]></string>
+    <string name="sensitivity_raises_target_title">Sensibilidad aumenta objetivo</string>
    <string name="combo_invalid_setup">Configuración de la bomba incorrecta, leer la documentación y comprobar que el menú de Quick Info se llama QUICK INFO usando el software de configuración 360.</string>
    <string name="custom">Personalizado</string>
    <string name="largetimedifftitle">Diferencia de tiempo grande</string>
@ -978,6 +1013,8 @@
    <string name="allow_hardware_pump_text">Atención: si activas y conectas al hardware de la bomba, AndroidAPS copiará los ajustes basales del perfil de la bomba, sobrescribiendo el actual perfil basal de la bomba. Comprueba que tengas el perfil basal correcto en AndroidAPS. Si no estás seguro o no quieres sobrescribir los ajustes basales en la bomba, presiona cancelar y repite cambio de la bomba más tarde.</string>
    <string name="error_adding_treatment_title">Datos de tratamiento incompletos</string>
    <string name="maintenance_settings">Ajustes de mantenimiento</string>
+    <string name="maintenance_email">Email</string>
+    <string name="maintenance_encrypt_exported_prefs">Cifrar valores exportados</string>
    <string name="maintenance_amount">Ningún registro para enviar</string>
    <string name="maintenance">Mantenimiento</string>
    <string name="maintenance_shortname">MANT</string>
@ -1185,6 +1222,8 @@
    <string name="exists">existe</string>
    <string name="notexists">no existe</string>
    <string name="temptargetcompared">Objetivo temporal %1$s</string>
+    <string name="btdevicecompared">Conexión Bluetooth con el dispositivo %1$s %2$s</string>
+    <string name="btdevice">Conectar con dispositivo Bluetooth </string>
    <string name="wifissidcompared">SSID WiFi %1$s %2$s</string>
    <string name="autosenscompared">Autosens %1$s %2$s %%</string>
    <string name="autosenslabel">Autosens %</string>
@ -1239,6 +1278,7 @@
    <string name="medtronic_pump_battery_alkaline">Alcalina (vista extendida)</string>
    <string name="medtronic_pump_battery_lithium">Litio (vista extendida)</string>
    <string name="medtronic_pump_battery_nizn">NiZn (vista ampliada)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (vista extendida)</string>
    <string name="medtronic_bolus_debugging">Bolos/Depuración de Tratamientos</string>
    <!-- RL BLE Scanning -->
    <string name="rileylink_scanner_scan_scan">ESCANEAR</string>
@ -1439,4 +1479,14 @@
    <string name="loop_smbrequest_time_label">Tiempo requerido de SMB</string>
    <string name="loop_smbexecution_time_label">Tiempo de ejecución de SMB</string>
    <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_otp_enabled">Habilitar autentificador</string>
+    <string name="smscomunicator_tab_otp_label">Configuración de autentificación</string>
+    <string name="smscommunicator_otp_reset_prompt">¿Está seguro de que desea restablecer la clave del autenticador? Los autenticadores configurados actualmente no seran válidos, y tendrá que volver a configurarlos.</string>
+    <string name="smscommunicator_otp_reset_successful">¡Se ha generado una clave de autenticador nueva! Utilice QRCode actualizado para suministrar autenticadores.</string>
+    <string name="smscommunicator_otp_step1_install_header">1. Instalar autenticador</string>
+    <string name="smscommunicator_otp_reset_header">Restablecer autentificadores</string>
+    <string name="smscommunicator_otp_reset_warning">Al resetear el autenticador haces que todos los autenticadores ya provistos no sean válidos. ¡Necesitarás configurarlos de nuevo!</string>
+    <string name="onconnect">Al conectar</string>
+    <string name="ondisconnect">Al desconectar</string>
+    <string name="overview_show_predictions">Predicciones</string>
 </resources>
--- a/app/src/main/res/values-fr-rFR/objectives.xml
+++ b/app/src/main/res/values-fr-rFR/objectives.xml
@ -20,7 +20,9 @@
    <string name="objectives_autosens_gate">1 semaine de Boucle Fermée en journée en saisissant régulièrement les glucides</string>
    <string name="objectives_ama_objective">Activation de fonctionnalités supplémentaires en journée, comme l\'Aide au Repas Améliorée ARA (AMA)</string>
    <string name="objectives_smb_objective">Activation de fonctionnalités supplémentaires pour l\'utilisation en journée, telles que la fonction SMB</string>
+    <string name="objectives_auto_objective">Activation de l\'automatisation</string>
    <string name="objectives_smb_gate">Lisez le wiki et augmentez le maxIA pour que les SMBs fonctionnent correctement ! Un bon début est maxIA = moyenne des Bolus Repas + 3 x maximum débit Basal quotidien</string>
+    <string name="objectives_auto_gate">Lisez la documentation comment l\'automatisation fonctionne. Configurez vos premières règles simples. Au lieu de mettre une action, configurez une notification. Quand vous êtes sûr que l\'automatisation est déclenchée au bon moment, remplacez la notification par une action réelle. (https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Usage/Automation.html)</string>
    <string name="objectives_bgavailableinns">Glycémie disponible sur NS</string>
    <string name="objectives_pumpstatusavailableinns">Statut de la pompe disponible sur NS</string>
    <string name="objectives_manualenacts">Activation manuelle</string>
--- a/app/src/main/res/values-fr-rFR/protection.xml
+++ b/app/src/main/res/values-fr-rFR/protection.xml
@ -1,2 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="biometric_title">Authentification requise</string>
+    <string name="biometric_description">Placez votre doigt sur le lecteur d\'empreintes digitales pour vérifier votre identité</string>
+    <string name="settings_protection">Protection des paramètres</string>
+    <string name="application_protection">Protection de l\'Application</string>
+    <string name="bolus_protection">Protection des bolus</string>
+    <string name="master_password">Mot de passe principal</string>
+    <string name="settings_password">Mot de passe des paramètres</string>
+    <string name="application_password">Mot de passe de l\'application</string>
+    <string name="bolus_password">Mot de passe des bolus</string>
+    <string name="unlock_settings">Déverrouiller les paramètres</string>
+    <string name="biometric">Biométrique</string>
+    <string name="custom_password">Mot de passe personnalisé</string>
+    <string name="noprotection">Pas de Protection</string>
+    <string name="protection">Protection</string>
+    <string name="master_password_missing">Le mot de passe principal n\'est pas défini !\n\nVeuillez définir votre mot de passe principal dans les préférences (%1$s &#8594; %2$s)</string>
+    <string name="password_set">Mot de passe défini !</string>
+    <string name="password_not_set">Mot de passe non défini</string>
+    <string name="password_not_changed">Mot de passe non modifié</string>
+    <string name="password_cleared">Mot de passe supprimé !</string>
+    <string name="password_hint">Entrez le mot de passe ici</string>
+</resources>
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@ -43,6 +43,7 @@
    <string name="description_pump_mdi">Intégration pompe pour les personnes qui font des injections quotidiennes multiples pour le traitement de leur diabète</string>
    <string name="description_pump_virtual">Intégration pour les pompes qui n’ont pas encore de pilote (Boucle Ouverte)</string>
    <string name="description_sensitivity_aaps">La sensibilité est calculée de la même manière que Oref0, mais vous pouvez spécifier la période concernée. L\'absorption minimale des glucides est calculée à partir des temps d’absorption max des glucides du menu préférences.</string>
+    <string name="description_sensitivity_oref1">La sensibilité est calculée à partir des données des dernières 8 heures et les glucides (si non absorbés) ne sont plus pris en compte après le temps spécifié dans les préférences. Le plugin calcule également les RNS (UAM).</string>
    <string name="description_sensitivity_weighted_average">La sensibilité est calculée comme une moyenne pondérée des écarts. Les écarts les plus récents ont un poids plus élevé. L\'absorption minimale des glucides est calculée à partir des temps d’absorption des glucides max du menu préférences. Cet algorithme est le plus rapide pour s\'adapter aux changements de sensibilité.</string>
    <string name="description_source_eversense">Recevoir les valeurs de glycémie de l’app Eversense patchée.</string>
    <string name="description_source_glimp">Recevoir les glycémies depuis Glimp.</string>
@ -105,7 +106,6 @@
    <string name="sms_delta">Delta:</string>
    <string name="configbuilder">Générateur de configuration</string>
    <string name="objectives">Objectifs</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Aperçu</string>
    <string name="nsprofile">Profil NS</string>
    <string name="simpleprofile">Profil simple</string>
@ -218,6 +218,44 @@
    <string name="openapsma_maxiob_title">IA basale max que OpenAPS pourra délivrer [U]</string>
    <string name="openapsma_maxiob_summary">Cette valeur est appelée Max IA (Insuline Active) dans le contexte OpenAPS\nC\'estlle maximum d\'insuline en [U] que APS peut délivrer en une seule fois.</string>
    <string name="dismiss">FERMER</string>
+    <string name="password_preferences_encrypt_prompt">Le mot de passe principal vous sera demandé pour crypter les préférences exportées.</string>
+    <string name="password_preferences_decrypt_prompt">Le mot de passe principal vous sera demandé pour décrypter les préférences exportées.</string>
+    <string name="preferences_export_canceled">Export annulé ! Les préférences n\'ont PAS été exportées !</string>
+    <string name="preferences_import_canceled">Import annulé ! Les préférences n\'ont PAS été importées !</string>
+    <string name="check_preferences_before_import">Vérifiez les préférences avant d\'importer :</string>
+    <string name="check_preferences_cannot_import">Les préférences ne peuvent pas être importées !</string>
+    <string name="check_preferences_dangerous_import">Les préférences ne doivent pas être importées !</string>
+    <string name="check_preferences_details_btn">Explication des problèmes d\'importation…</string>
+    <string name="check_preferences_details_title">Détails des problèmes d\'importation</string>
+    <string name="check_preferences_import_btn">Import</string>
+    <string name="check_preferences_import_anyway_btn">Importer quand même (DANGEREUX !)</string>
+    <string name="metadata_warning_different_flavour">Des préférences ont été créées avec des variantes différentes d\'AAPS (%1$s) quand vous avez : %2$s.\n\nCertains paramètres peuvent manquer ou ou ne pas être valides après l\'import, vérifiez et mettez à jour vos préférences.</string>
+    <string name="metadata_warning_different_device">Les préférences ont été créées sur un autre périphérique. C\'est OK si vous importez à partir d\'un téléphone ancien/différent, mais vérifiez les préférences importées sont correctes !</string>
+    <string name="metadata_warning_outdated_format">Vous utilisez le format obsolète des anciennes versions d\'APPS qui n\'est pas sécurisé ! Utilisez-le uniquement en dernier recours, si vous n\'avez pas d\'export au format JSON actuel.</string>
+    <string name="metadata_warning_old_export">Les préférences importées ont déjà %1$s jours ! Vous avez peut-être des préférences plus récentes ou vous avez sélectionné un mauvais fichier ? N\'oubliez pas d\'exporter vos préférences régulièrement !</string>
+    <string name="metadata_warning_date_format">Format de date invalide !</string>
+    <string name="metadata_label_format">Format de fichier</string>
+    <string name="metadata_label_created_at">Créé le</string>
+    <string name="metadata_label_aaps_version">Version d\'AAPS</string>
+    <string name="metadata_label_aaps_flavour">Variante de Build</string>
+    <string name="metadata_label_device_name">Export du nom du patient de l\'appareil</string>
+    <string name="metadata_label_device_model">Export du modèle de l\'appareil</string>
+    <string name="metadata_label_encryption">Cryptage du fichier</string>
+    <string name="metadata_format_old">Ancien format d\'export</string>
+    <string name="metadata_format_new">Nouveau format crypté</string>
+    <string name="metadata_format_debug">Nouveau format de débug (non crypté)</string>
+    <string name="metadata_format_other">Format d\'export inconnu</string>
+    <string name="prefdecrypt_settings_tampered">Fichier paramètres altérés</string>
+    <string name="prefdecrypt_settings_secure">Fichier paramètres sécurisé</string>
+    <string name="prefdecrypt_settings_unencrypted">Utilisation non sécurisée, fichier paramètres non crypté</string>
+    <string name="prefdecrypt_wrong_json">Erreur de format JSON, zone obligatoire manquante (format, contenu, métadonnées ou sécurité)</string>
+    <string name="prefdecrypt_wrong_password">Erreur de décryptage, le mot de passe indiqué ne permet pas le décryptage du fichier</string>
+    <string name="prefdecrypt_issue_missing_file_hash">Checksum du fichier manquant, vérification de l\'authenticité des pararamètres impossible !</string>
+    <string name="prefdecrypt_issue_modified">Le fichier a été modifié après l\'export !</string>
+    <string name="prefdecrypt_issue_parsing">Erreur de décryptage, échec de l\'import des préférences !</string>
+    <string name="prefdecrypt_issue_wrong_pass">Erreur de décryptage, le mot de passe fourni est invalide ou le fichier de paramètres à été modifié ! Cela peut arriver si le fichier a été exporté avec un mot de passe principal différent.</string>
+    <string name="prefdecrypt_issue_wrong_format">Configuration du cryptage manquant, format des paramètres invalide !</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">Algorithme de cryptage non pris en charge ou non spécifié !</string>
    <string name="danarpump">DanaR</string>
    <string name="connecting">Connection en cours</string>
    <string name="connected">Connectée</string>
@ -253,8 +291,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="smscommunicator_mealbolusreplywithcode">Pour injecter le bolus repas de %1$.2fU renvoyer le code %2$s</string>
    <string name="smscommunicator_temptargetwithcode">Pour définir la Cible Temp %1$s renvoyer le code %2$s</string>
    <string name="smscommunicator_temptargetcancel">Pour annuler la Cible Temp renvoyer le code %1$s</string>
-    <string name="smscommunicator_stopsmswithcode">Pour désactiver les commandes à distance SMS renvoyer le code %1$s.\n\nGardez à l\'esprit que vous ne pourrez le réactiver que directement à partir de l\'application AAPS du smartphone maitre.</string>
-    <string name="smscommunicator_stoppedsms">Service de commande à distance SMS arrêté. Pour le réactiver, utilisez AAPS sur le smartphone maitre.</string>
+    <string name="smscommunicator_stopsmswithcode">Pour désactiver les commandes à distance SMS renvoyer le code %1$s.\n\nGardez à l\'esprit que vous ne pourrez le réactiver que directement à partir de l\'application AAPS du smartphone maître.</string>
+    <string name="smscommunicator_stoppedsms">Service de commande à distance SMS arrêté. Pour le réactiver, utilisez AAPS sur le smartphone maître.</string>
    <string name="smscommunicator_calibrationreplywithcode">Renvoyer le code %2$s pour envoyer la calibration %1$.2f</string>
    <string name="smscommunicator_bolusfailed">Échec du Bolus</string>
    <string name="smscommunicator_remotebolusmindistance_summary">Nombre minimum de minutes qu\'il doit y avoir entre un bolus distant et le suivant</string>
@ -508,6 +546,9 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="adult">Adulte</string>
    <string name="resistantadult">Adulte résistant à l\'insuline</string>
    <string name="patientage_summary">Veuillez svp sélectionner l’âge du patient pour définir les limites de sécurité</string>
+    <string name="patient_name">Nom du patient</string>
+    <string name="patient_name_summary">Veuillez indiquer un nom ou pseudo du patient pour différencier plusieurs configurations</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Patient</string>
    <string name="Glimp">Glimp</string>
    <string name="needwhitelisting">%1$s a besoin d\'optimisation de la batterie (whitelisting) pour une performance correcte</string>
    <string name="loopsuspended">La Boucle est suspendue</string>
@ -544,8 +585,14 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="enablesuperbolus">Activer les Superbolus dans l’Assistant</string>
    <string name="enablesuperbolus_summary">Activer la fonctionnalité SuperBolus dans l’Assistant. Ne pas l’activer avant de bien comprendre comment cela fonctionne réellement. IL PEUT PROVOQUER UNE OVERDOSE D’INSULINE SI UTILISÉ AVEUGLÉMENT !</string>
    <string name="show_statuslights">Afficher les voyants d\'état sur l\'écran d\'accueil</string>
-    <string name="show_statuslights_extended">Afficher les voyants d\'état prolongés sur l\'écran d\'accueil</string>
-    <string name="show_statuslights_extended_summary">Activer les voyants d\'état prolongés pour AgeC, AgeI, AgeS, niveaux du réservoir et de batterie sur l\'écran d\'accueil.</string>
+    <string name="statuslights_cage_warning">Seuil d\'alerte âge canule [h]</string>
+    <string name="statuslights_cage_critical">Seuil critique âge canule [h]</string>
+    <string name="statuslights_iage_warning">Seuil d\'alerte âge insuline [h]</string>
+    <string name="statuslights_iage_critical">Seuil critique âge insuline [h]</string>
+    <string name="statuslights_sage_warning">Seuil d\'alerte âge capteur [h]</string>
+    <string name="statuslights_sage_critical">Seuil critique âge capteur [h]</string>
+    <string name="statuslights_bage_warning">Seuil d\'alerte niveau pile [h]</string>
+    <string name="statuslights_bage_critical">Seuil critique niveau pile [h]</string>
    <string name="statuslights_res_warning">Seuil d\'avertissement de niveau du réservoir [U]</string>
    <string name="statuslights_res_critical">Seuil critique de niveau du réservoir [U]</string>
    <string name="statuslights_bat_warning">Seuil d’avertissement du niveau de batterie [%]</string>
@ -705,8 +752,13 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="bgsource_upload">Paramètres de téléchargement des glycémies</string>
    <string name="wear_detailed_delta_title">Afficher le delta détaillé</string>
    <string name="wear_detailed_delta_summary">Afficher delta avec une décimale supplémentaire</string>
+    <string name="smbinterval_summary">Fréquence des SMB en min</string>
    <string name="smbmaxminutes">SMB minutes max</string>
    <string name="smbmaxminutes_summary">Max. minutes de basal pour limiter le SMB</string>
+    <string name="uamsmbmaxminutes">SMB RNS minutes max</string>
+    <string name="uamsmbmaxminutes_summary">Minutes de basal max pour limiter les SMB des RNS</string>
+    <string name="carbsReqThreshold">Seuil de suggestionde glucides</string>
+    <string name="carbsReqThreshold_summary">Quantité de glucides à partir de laquelle une notification est envoyée</string>
    <string name="unsupportedfirmware">Firmware pompe incompatible </string>
    <string name="dexcomg5_xdripupload_title">Transmettre les Gly vers xDrip+</string>
    <string name="dexcomg5_xdripupload_summary">Dans xDrip+ veuillez séléctionner 640g/Eversense comme source de données</string>
@ -773,6 +825,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="ago">passé(e)s</string>
    <string name="format_hours">%1$.2f h</string>
    <string name="format_mins">%1$d min</string>
+    <string name="format_mins_short">%1$dm</string>
    <string name="enablesmbalways">Activer en permanence les SMB</string>
    <string name="enablesmbalways_summary">Activer toujours SMB de manière autonome pour les bolus. Ceci est possible uniquement avec une source de glycémie ayant un très bon filtrage de données comme le G5</string>
    <string name="enablesmbaftercarbs">Activer SMB après ingestion de glucides</string>
@ -971,6 +1024,10 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Augmente la Sensibilité pour les cibles temporaires >= 100]]></string>
    <string name="low_temptarget_lowers_sensitivity_title">Cible temp. basse abaisse la sensibilité</string>
    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Diminue la Sensibilité pour les cibles temporaires < 100]]></string>
+    <string name="resistance_lowers_target_title">La résistance diminue la cible</string>
+    <string name="resistance_lowers_target_summary">Quand une résistance est détectée, baisse de la glycémie cible</string>
+    <string name="sensitivity_raises_target_title">Sensibilité augmente la cible</string>
+    <string name="sensitivity_raises_target_summary">Quand une sensibilité est détectée, augmentation de la glycémie cible</string>
    <string name="combo_invalid_setup">Paramétrage de la pompe invalide. Vérifiez la documentation et le menu QUICK INFO en utilisant le logiciel de configuration 360.</string>
    <string name="custom">Personnalisé</string>
    <string name="largetimedifftitle">Différence horaire importante</string>
@ -980,6 +1037,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="allow_hardware_pump_text">ATTENTION : Si vous activez et connectez à une vraie pompe, AndroidAPS copiera les paramètres Basals du profil vers la pompe, écrasant le taux basal existant stocké sur la pompe. Assurez-vous d\'avoir correctement saisi et réglé les paramètres Basal dans AndroidAPS. Si vous ne savez pas ou si ne voulez pas écraser les paramètres Basal sur votre pompe, appuyez sur Annuler et reporter le passage à la pompe à une date ultérieure.</string>
    <string name="error_adding_treatment_title">Données de traitement incomplètes</string>
    <string name="maintenance_settings">Paramètres de maintenance</string>
+    <string name="maintenance_email">E-mail</string>
+    <string name="maintenance_encrypt_exported_prefs">Crypter les paramètres exportés</string>
    <string name="maintenance_amount">Nombre de journaux (Logs) à envoyer</string>
    <string name="maintenance">Maintenance</string>
    <string name="maintenance_shortname">MAINT</string>
@ -1187,6 +1246,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="exists">existe</string>
    <string name="notexists">n\'existe pas</string>
    <string name="temptargetcompared">Cible Temp. %1$s</string>
+    <string name="btdevicecompared">Connexion Bluetooth à l\'appareil %1$s %2$s</string>
+    <string name="btdevice">Connecter à un appareil Bluetooth </string>
    <string name="wifissidcompared">SSID WiFi %1$s %2$s</string>
    <string name="autosenscompared">Autosens %1$s %2$s %%</string>
    <string name="autosenslabel">Autosens %</string>
@ -1241,6 +1302,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="medtronic_pump_battery_alkaline">Alcaline (vue étendue)</string>
    <string name="medtronic_pump_battery_lithium">Lithium (vue étendue)</string>
    <string name="medtronic_pump_battery_nizn">NiZn (vue étendue)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (vue Étendue)</string>
    <string name="medtronic_bolus_debugging">Débogage de Bolus/Traitements</string>
    <!-- RL BLE Scanning -->
    <string name="rileylink_scanner_scan_scan">SCANNER</string>
@ -1256,6 +1318,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="rileylink_scanner_scanning">Recherche en cours</string>
    <string name="rileylink_scanner_scanning_finished">Recherche finie</string>
    <string name="rileylink_scanner_scanning_error">Erreur de recherche : %1$d</string>
+    <string name="common_never">Jamais</string>
    <!-- RL Status Page -->
    <string name="rileylink_settings_tab1">Paramètres</string>
    <string name="rileylink_settings_tab2">Historique</string>
@ -1389,6 +1452,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="objectives_button_unstart">Suppression démarrée</string>
    <string name="timedetection">Détection de temps</string>
    <string name="doyouwantresetstart">Voulez-vous réinitialiser le début de l\'objectif ? Vous risquez de perdre vos progrès.</string>
+    <string name="time_or_timezone_change">Heure et/ou fuseau horaire changé sur la pompe</string>
    <string name="nopumpselected">Aucune pompe sélectionnée</string>
    <string name="setupwizard_units_prompt">Sélectionnez les unités dans lesquelles vous souhaitez afficher les valeurs</string>
    <string name="ns_ploadlocalprofile">Remonter les modifications de profil local dans NS</string>
@ -1445,4 +1509,34 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
    <string name="loop_tbrexecution_time_label">Heure d\'exécution basal temp</string>
    <string name="insight_alert_notification_channel">Alertes Pompe Insight</string>
    <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">depuis l\'appli. Authenticateur pour : %1$s</string>
+    <string name="smscommunicator_otp_enabled">Activer l\'Authentificateur</string>
+    <string name="smscommunicator_otp_enabled_summary">Authentifier les commandes à l\'aide des mots de passe uniques (OTP) générés par Google Authenticator ou des applications 2FA similaires.</string>
+    <string name="smscommunicator_otp_pin">Code PIN supplémentaire à la fin de l\'OTP</string>
+    <string name="smscommunicator_otp_pin_summary">Chiffres supplémentaires qui doivent être mémorisés et collés à la fin de chaque OTP généré</string>
+    <string name="smscomunicator_tab_otp_label">Configuration de l\'Authentificateur</string>
+    <string name="smscommunicator_otp_verify_label">OTP à vérifier :</string>
+    <string name="smscommunicator_otp_reset_btn">Réinitialiser les authentificateurs</string>
+    <string name="smscommunicator_otp_reset_title">Réinitialiser la clé de l\'Authentificateur</string>
+    <string name="smscommunicator_otp_reset_prompt">Voulez-vous réinitialiser la clé de l\'Authenticateur ? Cela rendra tous authentificateurs configurés invalides, et vous devrez les configurer à nouveau.</string>
+    <string name="smscommunicator_otp_reset_successful">Nouvelle clé de l\'Authenticateur générée ! Veuillez utiliser le QRCode mis à jour pour les authentificateurs.</string>
+    <string name="smscommunicator_otp_step1_install_header">1. Installation l\'Authentificateur</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. Scan du code pour configurer les codes OTP AndroidAPS</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Test Mot-de-Passe-Unique (OTP)</string>
+    <string name="smscommunicator_otp_reset_header">Réinitialiser les authentificateurs</string>
+    <string name="smscommunicator_otp_install_info">Sur chaque téléphone suiveur, installez une appli. Authentificateur qui prend en charge les jetons RFC 6238 TOTP. Les applications libres populaires sont:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_provisioning_warning">NE PAS PARTAGER ce code en ligne !\nUtilisez-le uniquement pour configurer l\'appli. Authenticateur sur les téléphones suiveurs.</string>
+    <string name="smscommunicator_otp_reset_warning">En réinitialisant l\'Authentificateur, vous invalidez tous les authentificateurs déjà initialisés. Vous devrez les reconfigurer !</string>
+    <string name="onconnect">À la connexion</string>
+    <string name="ondisconnect">À la déconnexion</string>
+    <string name="overview_show_predictions">Prédictions</string>
+    <string name="overview_show_deviationslope">Pente de déviations</string>
+    <string name="authorizationfailed">Echec de l\'authentification</string>
+    <string name="overview_show_absinsulin">Insuline absolue</string>
+    <string name="master_password_summary">Le mot de passe principal est utilisé pour crypter les sauvegardes et superviser la sécurité de l\'application. Rappelez-vous en ou stockez le en lieu sûr.</string>
+    <string name="passwords_dont_match">Les mots de passe ne correspondent pas</string>
+    <string name="current_master_password">Mot de passe principal actuel</string>
+    <string name="statuslights">Voyants d\'état</string>
+    <string name="statuslights_copy_ns">Copier les paramètres depuis NS</string>
+    <string name="copyexistingvalues">Copier les paramètres NS (s\'ils existent)?</string>
 </resources>
--- a/app/src/main/res/values-fr-rFR/validator.xml
+++ b/app/src/main/res/values-fr-rFR/validator.xml
@ -1,2 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Seuls les chiffres sont autorisés</string>
+    <string name="error_only_numeric_digits_range_allowed">Seuls les chiffres entre %1$s et %2$s sont autorisés</string>
+    <string name="error_this_field_cannot_contain_special_character">Ce champ ne doit pas contenir de caractères spéciaux</string>
+    <string name="error_only_standard_letters_are_allowed">Seules les lettres standard sont autorisées</string>
+    <string name="error_field_must_not_be_empty">Le champ ne doit pas être vide</string>
+    <string name="error_email_address_not_valid">Adresse email non valide</string>
+    <string name="error_creditcard_number_not_valid">Numéro de carte de crédit non valide</string>
+    <string name="error_phone_not_valid">Téléphone non valide</string>
+    <string name="error_domain_not_valid">Nom de domaine non valide</string>
+    <string name="error_ip_not_valid">Adresse IP non valide</string>
+    <string name="error_url_not_valid">Url Web non valide.</string>
+    <string name="error_notvalid_personname">Prénom ou Nom non valide</string>
+    <string name="error_notvalid_personfullname">Nom complet non valide</string>
+    <string name="error_date_not_valid">Format non valide</string>
+    <string name="error_mustbe4digitnumber">Doit être 4 chiffres</string>
+    <string name="error_mustbe6digitnumber">Doit être 6 chiffres</string>
+    <string name="error_not_a_minimum_length">Longueur minimale non respectée</string>
+    <string name="error_pin_not_valid">le PIN doit être entre 3 et 6 chiffres différents et non en série</string>
+</resources>
--- a/app/src/main/res/values-it-rIT/objectives.xml
+++ b/app/src/main/res/values-it-rIT/objectives.xml
@ -20,7 +20,10 @@
    <string name="objectives_autosens_gate">1 settimana di looping diurno con inserimento regolare dei carboidrati, eseguito con successo</string>
    <string name="objectives_ama_objective">Abilitazione funzioni aggiuntive per l\'uso diurno, ad esempio AMA (advanced meal assist - assistenza avanzata del pasto)</string>
    <string name="objectives_smb_objective">Abilitazione funzioni aggiuntive per l\'uso diurno, come SMB</string>
+    <string name="objectives_auto_objective">Abilitazione automazione</string>
    <string name="objectives_smb_gate">È necessario leggere il wiki e aumentare maxIOB affinché le azioni di SMB funzionino adeguatamente! Un buon inizio è maxIOB = media bolo posto + 3 x max basale giornaliera</string>
+    <string name="objectives_auto_gate">Leggi la documentazione su come funziona l\'automazione. Configura le tue prime semplici regole. Consenti ad AAPS solo di visualizzare una notifica, non di eseguire un\'azione. Quando sei sicuro che l\'automazione viene attivata al momento giusto, sostituisci la notifica con un\'azione reale.
+(https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
    <string name="objectives_bgavailableinns">Glicemia disponibile in NS</string>
    <string name="objectives_pumpstatusavailableinns">Stato micro disponibile in NS</string>
    <string name="objectives_manualenacts">Attivazioni manuali</string>
--- a/app/src/main/res/values-it-rIT/protection.xml
+++ b/app/src/main/res/values-it-rIT/protection.xml
@ -1,2 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="biometric_title">Autenticazione richiesta</string>
+    <string name="biometric_description">Posiziona il tuo dito sul lettore di impronte digitali per verificare la tua identità</string>
+    <string name="settings_protection">Protezione impostazioni</string>
+    <string name="application_protection">Protezione applicazione</string>
+    <string name="bolus_protection">Protezione bolo</string>
+    <string name="master_password">Password Master</string>
+    <string name="settings_password">Password impostazioni</string>
+    <string name="application_password">Password applicazione</string>
+    <string name="bolus_password">Password bolo</string>
+    <string name="unlock_settings">Impostazioni sblocco</string>
+    <string name="biometric">Biometrico</string>
+    <string name="custom_password">Password personalizzata</string>
+    <string name="noprotection">Nessuna protezione</string>
+    <string name="protection">Protezione</string>
+    <string name="master_password_missing">La password master non è impostata!\n\nImposta la tua password Master in Preferenze (%1$s &#8594; %2$s)</string>
+    <string name="password_set">Password impostata!</string>
+    <string name="password_not_set">Password non impostata</string>
+    <string name="password_not_changed">Password non modificata</string>
+    <string name="password_cleared">Password cancellata!</string>
+    <string name="password_hint">Inserisci qui la password</string>
+</resources>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@ -106,7 +106,6 @@
    <string name="sms_delta">Delta:</string>
    <string name="configbuilder">Configuratore strutturale</string>
    <string name="objectives">Obiettivi</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Panoramica</string>
    <string name="nsprofile">Profilo NS</string>
    <string name="simpleprofile">Profilo semplice</string>
@ -220,8 +219,43 @@
    <string name="openapsma_maxiob_summary">Questo valore è chiamato Max IOB nel contesto OpenAPS\nIndica l\'insulina massima in [U] che APS può erogare in contemporanea.</string>
    <string name="dismiss">RIMUOVI</string>
    <string name="password_preferences_encrypt_prompt">Ti verrà richiesta la password principale, che verrà utilizzata per crittografare le preferenze esportate.</string>
+    <string name="password_preferences_decrypt_prompt">Ti verrà chiesta la password master, che è necessaria per decrittare le preferenze importate.</string>
+    <string name="preferences_export_canceled">Esportazione annullata! Le preferenze NON sono state esportate!</string>
+    <string name="preferences_import_canceled">Importazione annullata! Le preferenze NON sono state importate!</string>
+    <string name="check_preferences_before_import">Verifica le preferenze prima dell\'importazione:</string>
    <string name="check_preferences_cannot_import">Le preferenze non possono essere importate!</string>
    <string name="check_preferences_dangerous_import">Le preferenze non dovrebbero essere importate!</string>
+    <string name="check_preferences_details_btn">Descrivi i problemi importazione…</string>
+    <string name="check_preferences_details_title">Dettagli dei problemi di importazione</string>
+    <string name="check_preferences_import_btn">Importa</string>
+    <string name="check_preferences_import_anyway_btn">Importa comunque (PERICOLOSO!)</string>
+    <string name="metadata_warning_different_flavour">Le preferenze sono state create con una differente versione di AAPS (%1$s) mentre invece tu hai: %2$s.\n\nAlcune impostazioni potrebbero mancare o non essere valide - dopo l\'importazione controlla e aggiornare le tue preferenze.</string>
+    <string name="metadata_warning_different_device">Le preferenze sono state create su un dispositivo diverso. Va bene importarle da un vecchio/diverso telefono, ma assicurati che le preferenze importate siano corrette!</string>
+    <string name="metadata_warning_outdated_format">Stai utilizzando il formato precedente (obsoleto) delle vecchie versioni di APPS, che non è sicuro! Utilizzalo solo come ultima risorsa, se non hai un\'esportazione nel corrente formato JSON.</string>
+    <string name="metadata_warning_old_export">Le preferenze importate hanno già %1$s giorni! Forse hai preferenze più aggiornate. Hai scelto il file sbagliato? Ricorda di esportare le preferenze regolarmente!</string>
+    <string name="metadata_warning_date_format">Formato data-ora non valido!</string>
+    <string name="metadata_label_format">Formato file</string>
+    <string name="metadata_label_created_at">Creato:</string>
+    <string name="metadata_label_aaps_version">Versione AAPS</string>
+    <string name="metadata_label_aaps_flavour">Variante build</string>
+    <string name="metadata_label_device_name">Nome paziente del dispositivo esportatore</string>
+    <string name="metadata_label_device_model">Modello dispositivo esportatore</string>
+    <string name="metadata_label_encryption">Crittografia file</string>
+    <string name="metadata_format_old">Vecchio formato esportazione</string>
+    <string name="metadata_format_new">Nuovo formato crittografato</string>
+    <string name="metadata_format_debug">Nuovo formato di debug (non crittografato)</string>
+    <string name="metadata_format_other">Formato esportazione sconosciuto</string>
+    <string name="prefdecrypt_settings_tampered">File delle impostazioni manomesso</string>
+    <string name="prefdecrypt_settings_secure">Il file delle impostazioni è sicuro</string>
+    <string name="prefdecrypt_settings_unencrypted">Utilizzo non sicuro, formato impostazioni non crittografato</string>
+    <string name="prefdecrypt_wrong_json">Errore formato JSON, campo obbligatorio mancante (formato, contenuto, metadati o sicurezza)</string>
+    <string name="prefdecrypt_wrong_password">Errore decrittazione, la password data non può decrittare il file</string>
+    <string name="prefdecrypt_issue_missing_file_hash">File checksum (hash) mancante, impossibile verificare l\'autenticità delle impostazioni!</string>
+    <string name="prefdecrypt_issue_modified">Il file è stato modificato dopo l\'esportazione!</string>
+    <string name="prefdecrypt_issue_parsing">Errore decrittazione, analisi preferenze fallita!</string>
+    <string name="prefdecrypt_issue_wrong_pass">Errore decrittazione, la password fornita è errata o il file delle impostazioni è stato modificato! È possibile che il file importato sia stato esportato con una diversa password master.</string>
+    <string name="prefdecrypt_issue_wrong_format">Configurazione crittografia mancante, il formato delle impostazioni non è valido!</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">Algoritmo di crittografia non supportato o non specificato!</string>
    <string name="danarpump">DanaR</string>
    <string name="connecting">Connessione</string>
    <string name="connected">Connesso</string>
@ -511,6 +545,9 @@
    <string name="adult">Adulto</string>
    <string name="resistantadult">Adulto insulino-resistente</string>
    <string name="patientage_summary">Seleziona l\'età del paziente per impostare i limiti di sicurezza</string>
+    <string name="patient_name">Nome paziente</string>
+    <string name="patient_name_summary">Fornisci il nome del paziente o il nickname per distinguere questa configurazione tra altre</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Utente</string>
    <string name="Glimp">Glimp</string>
    <string name="needwhitelisting">Per un buon funzionamento, %1$s ha bisogno di essere nella whitelist della funzione \"ottimizzazione batteria\" di Android</string>
    <string name="loopsuspended">Loop sospeso</string>
@ -547,8 +584,14 @@
    <string name="enablesuperbolus">Abilita superbolo nel calcolatore</string>
    <string name="enablesuperbolus_summary">Abilita la funzionalità superbolo nel calcolatore. Non abilitare fino a quando non impari ciò che realmente fa. PUÒ CAUSARE SOVRADOSAGGIO DI INSULINA SE USATO IMPROPRIAMENTE!</string>
    <string name="show_statuslights">Mostra indicatori di stato sulla home</string>
-    <string name="show_statuslights_extended">Mostra indicatori estesi sulla home</string>
-    <string name="show_statuslights_extended_summary">Abilita indicatori di stato estesi per \"età\" cannula, insulina, sensore, serbatoio e livello batteria sulla schermata iniziale.</string>
+    <string name="statuslights_cage_warning">Soglia di avviso età cannula [h]</string>
+    <string name="statuslights_cage_critical">Soglia età cannula critica [h]</string>
+    <string name="statuslights_iage_warning">Soglia di avviso età insulina [h]</string>
+    <string name="statuslights_iage_critical">Soglia età insulina critica [h]</string>
+    <string name="statuslights_sage_warning">Soglia di avviso età sensore [h]</string>
+    <string name="statuslights_sage_critical">Soglia età sensore critica [h]</string>
+    <string name="statuslights_bage_warning">Soglia di avviso età batteria [h]</string>
+    <string name="statuslights_bage_critical">Soglia età batteria critica [h]</string>
    <string name="statuslights_res_warning">Soglia di avviso livello serbatoio [U]</string>
    <string name="statuslights_res_critical">Soglia livello serbatoio critico [U]</string>
    <string name="statuslights_bat_warning">Soglia di avviso livello batteria [%]</string>
@ -708,8 +751,13 @@
    <string name="bgsource_upload">Impostazioni caricamento BG</string>
    <string name="wear_detailed_delta_title">Mostra delta dettagliato</string>
    <string name="wear_detailed_delta_summary">Mostra delta con una cifra decimale in più</string>
+    <string name="smbinterval_summary">Frequenza di erogazione SMB (min)</string>
    <string name="smbmaxminutes">Max minuti SMB</string>
    <string name="smbmaxminutes_summary">Max minuti di basale a cui limitare SMB</string>
+    <string name="uamsmbmaxminutes">SMB UAM max minuti</string>
+    <string name="uamsmbmaxminutes_summary">Max minuti di basale a cui limitare SMB per UAM</string>
+    <string name="carbsReqThreshold">Soglia proposta CHO</string>
+    <string name="carbsReqThreshold_summary">Quando vengono proposti carboidrati, la quantità minima per la quale verrà mostrata una notifica</string>
    <string name="unsupportedfirmware">Firmware del micro non supportato</string>
    <string name="dexcomg5_xdripupload_title">Invia dati BG a xDrip+</string>
    <string name="dexcomg5_xdripupload_summary">In xDrip+ seleziona origine dati 640g/Eversense</string>
@ -776,6 +824,7 @@
    <string name="ago">fa</string>
    <string name="format_hours">%1$.2f h</string>
    <string name="format_mins">%1$d min</string>
+    <string name="format_mins_short">%1$dm</string>
    <string name="enablesmbalways">Abilita SMB sempre</string>
    <string name="enablesmbalways_summary">Abilita SMB sempre, indipendentemente dai boli. Possibile solo con sorgente glicemia con un buon filtraggio dei dati, come G5</string>
    <string name="enablesmbaftercarbs">Abilita SMB dopo i CHO</string>
@ -926,7 +975,7 @@
    <string name="readstatus">Lettura stato</string>
    <string name="adjustprofileinns">Le modifiche devono essere fatte in NS</string>
    <string name="exitwizard">Salta configurazione guidata</string>
-    <string name="setupwizard_loop_description">Premi il tasto in basso per permettere ad AndroidAPS di suggerire/fare modifiche alla basale</string>
+    <string name="setupwizard_loop_description">Premi il tasto in basso per permettere ad AndroidAPS di proporre/fare modifiche alla basale</string>
    <string name="apssetup">Configura il plugin APS</string>
    <string name="sensitivitysetup">Configura il plugin di Sensibilità</string>
    <string name="setupwizard_sensitivity_description">Il plugin di Sensibilità è utilizzato per il rilevamento della sensibilità all\'insulina e il calcolo di COB. Per ulteriori informazioni visita:</string>
@ -974,6 +1023,10 @@
    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Aumenta la sensibilità per temp-target >= 100]]></string>
    <string name="low_temptarget_lowers_sensitivity_title">Temp-Target \"basso\" riduce la sensibilità</string>
    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Riduci la sensibilità per temp-target < 100]]></string>
+    <string name="resistance_lowers_target_title">La resistenza abbassa il target</string>
+    <string name="resistance_lowers_target_summary">Quando viene rilevata resistenza, ridurre la glicemia target</string>
+    <string name="sensitivity_raises_target_title">La sensibilità aumenta il target</string>
+    <string name="sensitivity_raises_target_summary">Quando viene rilevata sensibilità, aumentare la glicemia target</string>
    <string name="combo_invalid_setup">Configurazione micro non valida, controlla la documentazione e verifica che il menu Quick Info sia denominato QUICK INFO utilizzando \"360 configuration software\".</string>
    <string name="custom">Personalizzato</string>
    <string name="largetimedifftitle">Grande differenza oraria</string>
@ -983,6 +1036,8 @@
    <string name="allow_hardware_pump_text">Attenzione: se attivi e connetti un micro, AndroidAPS copierà le impostazioni della basale dal profilo al micro, sovrascrivendo la velocità basale esistente memorizzata sul micro. Assicurati di avere la giusta impostazione della basale in AndroidAPS. Se non sei sicuro o non vuoi sovrascrivere le impostazioni della basale sul micro, premi annulla e ripeti il processo in un altro momento.</string>
    <string name="error_adding_treatment_title">Dati trattamento incompleti</string>
    <string name="maintenance_settings">Impostazioni manutenzione</string>
+    <string name="maintenance_email">Destinatario email</string>
+    <string name="maintenance_encrypt_exported_prefs">Crittografa impostazioni esportate</string>
    <string name="maintenance_amount">Numero di log da inviare</string>
    <string name="maintenance">Manutenzione</string>
    <string name="maintenance_shortname">MANUT</string>
@ -1190,6 +1245,8 @@
    <string name="exists">esiste</string>
    <string name="notexists">non esiste</string>
    <string name="temptargetcompared">Temp-Target %1$s</string>
+    <string name="btdevicecompared">Connessione Bluetooth a dispositivo %1$s %2$s</string>
+    <string name="btdevice">Connessione a dispositivo Bluetooth </string>
    <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
    <string name="autosenscompared">Autosens %1$s %2$s %%</string>
    <string name="autosenslabel">Autosens %</string>
@ -1244,6 +1301,7 @@
    <string name="medtronic_pump_battery_alkaline">Alcalina (Extended view)</string>
    <string name="medtronic_pump_battery_lithium">Litio (Extended view)</string>
    <string name="medtronic_pump_battery_nizn">NiZn (Extended view)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (Extended view)</string>
    <string name="medtronic_bolus_debugging">Debug Bolo/Trattamenti</string>
    <!-- RL BLE Scanning -->
    <string name="rileylink_scanner_scan_scan">SCAN</string>
@ -1259,6 +1317,7 @@
    <string name="rileylink_scanner_scanning">Scansione</string>
    <string name="rileylink_scanner_scanning_finished">Scansione terminata</string>
    <string name="rileylink_scanner_scanning_error">Errore scansione: %1$d</string>
+    <string name="common_never">Mai</string>
    <!-- RL Status Page -->
    <string name="rileylink_settings_tab1">Impostazioni</string>
    <string name="rileylink_settings_tab2">Storico</string>
@ -1392,6 +1451,7 @@
    <string name="objectives_button_unstart">Cancella avvio</string>
    <string name="timedetection">Rilevazione tempo</string>
    <string name="doyouwantresetstart">Vuoi resettare l\'avvio dell\'obiettivo? Potresti perdere i tuoi progressi.</string>
+    <string name="time_or_timezone_change">Cambio di ora e/o fuso orario sul micro</string>
    <string name="nopumpselected">Nessun micro selezionato</string>
    <string name="setupwizard_units_prompt">Seleziona le unità in cui vuoi visualizzare i valori</string>
    <string name="ns_ploadlocalprofile">Carica modifiche al profilo locale in NS</string>
@ -1448,4 +1508,34 @@
    <string name="loop_tbrexecution_time_label">Esecuzione basale temporanea (momento)</string>
    <string name="insight_alert_notification_channel">Avvisi micro 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 Autenticatore per: %1$s</string>
+    <string name="smscommunicator_otp_enabled">Abilita Autenticatore</string>
+    <string name="smscommunicator_otp_enabled_summary">Autentica i comandi utilizzando OTP (One Time Password) generate da Google Authenticator o app 2FA simili.</string>
+    <string name="smscommunicator_otp_pin">PIN aggiuntivo a fine token</string>
+    <string name="smscommunicator_otp_pin_summary">Cifre aggiuntive che devono essere memorizzate e incollate alla fine di ogni OTP generata</string>
+    <string name="smscomunicator_tab_otp_label">Configurazione Autenticatore</string>
+    <string name="smscommunicator_otp_verify_label">OTP per verifica:</string>
+    <string name="smscommunicator_otp_reset_btn">Resetta Autenticatori</string>
+    <string name="smscommunicator_otp_reset_title">Resetta Chiave Autenticatore</string>
+    <string name="smscommunicator_otp_reset_prompt">Sei sicuro di resettare la chiave Autenticatore? Renderà non validi tutti gli Autenticatori attualmente configurati e sarà necessario configurarli nuovamente.</string>
+    <string name="smscommunicator_otp_reset_successful">La nuova Chiave Autenticatore è stata generata! Utilizza il QRCode aggiornato per fornire gli autenticatori.</string>
+    <string name="smscommunicator_otp_step1_install_header">1. Installa l\'Autenticatore</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. Scansione il codice per configurare i codici OTP di AndroidAPS</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Testa OTP</string>
+    <string name="smscommunicator_otp_reset_header">Resetta Autenticatori</string>
+    <string name="smscommunicator_otp_install_info">Su ogni telefono follower installa una app Autenticatore che supporta i token RFC 6238 TOTP. App gratuite popolari sono:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_provisioning_warning">NON CONDIVIDERE questo codice online!\nUtilizzalo solo per configurare l\'app Autenticatore sui telefoni follower.</string>
+    <string name="smscommunicator_otp_reset_warning">Resettando l\'autenticatore rendi non validi tutti gli autenticatori già forniti. Dovrai configurarli di nuovo!</string>
+    <string name="onconnect">Alla connessione</string>
+    <string name="ondisconnect">Alla disconnessione</string>
+    <string name="overview_show_predictions">Predizioni</string>
+    <string name="overview_show_deviationslope">Pendenza deviazione</string>
+    <string name="authorizationfailed">Autorizzazione fallita</string>
+    <string name="overview_show_absinsulin">Insulina assoluta</string>
+    <string name="master_password_summary">La password master viene utilizzata per la crittografia del backup e per gestire la sicurezza nell\'applicazione. Ricordala o conservala in un luogo sicuro.</string>
+    <string name="passwords_dont_match">Le password non coincidono</string>
+    <string name="current_master_password">Password Master corrente</string>
+    <string name="statuslights">Indicatori di stato</string>
+    <string name="statuslights_copy_ns">Copia impostazioni da NS</string>
+    <string name="copyexistingvalues">Copiare impostazioni NS (se esiste)?</string>
 </resources>
--- a/app/src/main/res/values-it-rIT/validator.xml
+++ b/app/src/main/res/values-it-rIT/validator.xml
@ -1,2 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Sono consentite solo cifre numeriche.</string>
+    <string name="error_only_numeric_digits_range_allowed">Sono consentite solo cifre numeriche nel range %1$s - %2$s.</string>
+    <string name="error_this_field_cannot_contain_special_character">Questo campo non può contenere alcun carattere speciale</string>
+    <string name="error_only_standard_letters_are_allowed">Sono consentite solo lettere standard</string>
+    <string name="error_field_must_not_be_empty">Il campo non deve essere vuoto</string>
+    <string name="error_email_address_not_valid">Indirizzo email non valido</string>
+    <string name="error_creditcard_number_not_valid">Il numero della carta di credito non è valido</string>
+    <string name="error_phone_not_valid">Numero di telefono non valido</string>
+    <string name="error_domain_not_valid">Nome dominio non valido</string>
+    <string name="error_ip_not_valid">Indirizzo IP non valido</string>
+    <string name="error_url_not_valid">L\'URL non è valido</string>
+    <string name="error_notvalid_personname">Nome o Cognome non valido.</string>
+    <string name="error_notvalid_personfullname">Nome completo non valido.</string>
+    <string name="error_date_not_valid">Formato non valido</string>
+    <string name="error_mustbe4digitnumber">Deve essere un numero di 4 cifre</string>
+    <string name="error_mustbe6digitnumber">Deve essere un numero di 6 cifre</string>
+    <string name="error_not_a_minimum_length">Lunghezza minima non soddisfatta</string>
+    <string name="error_pin_not_valid">Il PIN deve contenere da 3 a 6 cifre, non uguali o in serie</string>
+</resources>
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@ -105,7 +105,6 @@
    <string name="sms_delta">Delta:</string>
    <string name="configbuilder">구성 관리자</string>
    <string name="objectives">목표</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">홈</string>
    <string name="nsprofile">NS 프로파일</string>
    <string name="simpleprofile">Simple 프로파일</string>
@ -543,8 +542,6 @@
    <string name="enablesuperbolus">마법사에서 Superbolus 활성화하기</string>
    <string name="enablesuperbolus_summary">마법사에서 Superbolus 기능을 활성화합니다. 어떤 기능인지 확실히 알기전까지 활성화 하지 마세요. 제대로 알지 못하고 사용하면 일슐린이 과다 주입될 수 있습니다!</string>
    <string name="show_statuslights">홈화면에 상태 표시등 보여주기</string>
-    <string name="show_statuslights_extended">홈화면에 확장 상태등 표시하기</string>
-    <string name="show_statuslights_extended_summary">홈화면에 캐뉼라 사용기간(cage), 인슐린 사용기간(iage), 센서 사용기간(sage), 펌프용 주사기(reservoir)와 배터리(battery) 남은 양에 대한 확장 표시등을 활성화합니다.</string>
    <string name="statuslights_res_warning">주사기량 경고 기준값[U]</string>
    <string name="statuslights_res_critical">주사기량 위험 기준값[U]</string>
    <string name="statuslights_bat_warning">배터리 잔량 경고값 [%]</string>
--- a/app/src/main/res/values-lt-rLT/exam.xml
+++ b/app/src/main/res/values-lt-rLT/exam.xml
@ -6,7 +6,7 @@
    <string name="dia_minimumis5h">Mažiausia reikšmė - 5 valandos.</string>
    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
    <string name="dia_meaningisequaltodiapump">Jis yra lygus IVT parametrui, kuris naudojamas pompoje.</string>
-    <string name="dia_valuemustbedetermined">Jūs turite nustatyti jūsų individualias vertes (bet ne mažiau kaip 5 valandas).</string>
+    <string name="dia_valuemustbedetermined">Jūs turite nustatyti savo individualią reikšmę (bet ne mažiau kaip 5 val.).</string>
    <string name="hypott_label">Tema: Hipo Laikinas tikslas</string>
    <string name="hypott_whenhypott">Kokia yra pagrindinė priežastis nustatyti hipo laikiną tikslą?</string>
    <string name="hypott_goinglow">Užkirsti kelią kristi gliukozės kiekiui kraujyje, kai jau veikia nulinė laikina bazė.</string>
--- a/app/src/main/res/values-lt-rLT/objectives.xml
+++ b/app/src/main/res/values-lt-rLT/objectives.xml
@ -35,6 +35,7 @@
    <string name="objectives_useloop">Parodyti Ciklo įskiepio turinį</string>
    <string name="objectives_usescale">Panaudokite vaizdo dydžio keitimo funkciją ilgai spaudžiant ant glikemijos kreivės</string>
    <string name="objectives_button_enter">Įeiti</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Jei turite bent 3 mėnesių uždaro ciklo patirties kitose sistemose, galite gauti kodą, leidžiantį praleisti tikslus. Visą informaciją galite rasti čia: https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives.</string>
    <string name="codeaccepted">Kodas priimtas</string>
    <string name="codeinvalid">Neteisingas kodas</string>
    <string name="objectives_exam_objective">Patvirtinkite savo žinias</string>
@ -52,21 +53,21 @@
    <string name="failedretrievetime">Nepavyko nuskaityti laiko</string>
    <string name="requirementnotmet">Tikslo reikalavimai neįvykdyti</string>
    <plurals name="objective_days">
-        <item quantity="one">%1$d diena</item>
-        <item quantity="few">%1$d dienos(-ų)</item>
-        <item quantity="many">%1$d dienos(-ų)</item>
-        <item quantity="other">%1$d dienos(-ų)</item>
+        <item quantity="one">%1$d d.</item>
+        <item quantity="few">%1$d d.</item>
+        <item quantity="many">%1$d d.</item>
+        <item quantity="other">%1$d d.</item>
    </plurals>
    <plurals name="objective_hours">
-        <item quantity="one">%1$d valanda</item>
-        <item quantity="few">%1$d valandos(-ų)</item>
-        <item quantity="many">%1$d valandos(-ų)</item>
-        <item quantity="other">%1$d valandos(-ų)</item>
+        <item quantity="one">%1$d val.</item>
+        <item quantity="few">%1$d val.</item>
+        <item quantity="many">%1$d val.</item>
+        <item quantity="other">%1$d val.</item>
    </plurals>
    <plurals name="objective_minutes">
-        <item quantity="one">%1$d minutė</item>
-        <item quantity="few">%1$d minutės(-čių)</item>
-        <item quantity="many">%1$d minutės(-čių)</item>
-        <item quantity="other">%1$d minutės(-čių)</item>
+        <item quantity="one">%1$d min.</item>
+        <item quantity="few">%1$d min.</item>
+        <item quantity="many">%1$d min.</item>
+        <item quantity="other">%1$d min.</item>
    </plurals>
 </resources>
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@ -43,6 +43,7 @@
    <string name="description_pump_mdi">Integracija žmonėms, naudojantiems insulino injektorius</string>
    <string name="description_pump_virtual">Integracija pompoms, kurios dar neturi reikalingo valdiklio (Atviras Ciklas)</string>
    <string name="description_sensitivity_aaps">Jautrumas insulinui apskaičiuojamas taip pat kaip ir Oref0, tačiau jūs galite nustatyti, koks praeities laikotarpis bus naudojamas. Minimalus angliavandenių įsisavinimo greitis apskaičiuojamas remiantis maksimaliu angliavandenių įsisavinimo greičiu, kuris įvestas Nustatymuose.</string>
+    <string name="description_sensitivity_oref1">Jautrumas insulinui apskaičiuojamas remiantis praėjusių 8 val. duomenimis, o (neįsisavinti) angliavandeniai neįtraukiami į skaičiavimus praėjus Nustatymuose nurodytam laikui. Įskiepis taip pat įskaičiuoja NDM (nedeklaruotą maistą).</string>
    <string name="description_sensitivity_weighted_average">Jautrumas insulinui apskaičiuojamas kaip nuokrypių svertinis vidurkis. Naujausių nuokrypių svoris yra didesnis. Minimalus angliavandenių įsisavinimo greitis apskaičiuojamas iš maksimalaus angliavandenių įsisavinimo greičio, kuris nurodytas Nustatymuose. Šis algoritmas greičiausiai aptinka pasikeitusį jautrumą insulinui.</string>
    <string name="description_source_eversense">Gauti kraujo gliukozės vertes iš modifikuotos Eversense programėlės.</string>
    <string name="description_source_glimp">Gauti kraujo gliukozės vertes iš Glimp.</string>
@ -54,9 +55,9 @@
    <string name="description_xdrip_status_line">Rodyti Ciklo informaciją laikrodyje, xDrip+ pradžios ekrane.</string>
    <string name="description_sms_communicator">Nuotolinis AndroidAPS valdymas naudojant SMS komandas.</string>
    <string name="nsprofileview_units_label">Vienetai</string>
-    <string name="nsprofileview_dia_label">IVT (Insulino Veikimo Trukmė)</string>
-    <string name="nsprofileview_ic_label">IA (insulino/angliavandenių santykis)</string>
-    <string name="nsprofileview_isf_label">JIF (jautrumo insulinui faktorius)</string>
+    <string name="nsprofileview_dia_label">IVT</string>
+    <string name="nsprofileview_ic_label">IA</string>
+    <string name="nsprofileview_isf_label">JIF</string>
    <string name="nsprofileview_basal_label">Valandinė bazė</string>
    <string name="nsprofileview_target_label">Tikslas</string>
    <string name="noprofileset">Nenustatytas profilis</string>
@ -75,7 +76,7 @@
    <string name="treatments_wizard_tt_label">LT</string>
    <string name="treatments_wizard_carbs_label">AV</string>
    <string name="treatments_wizard_correction_label">Korekcija</string>
-    <string name="insulin_unit_shortname">vv</string>
+    <string name="insulin_unit_shortname">V</string>
    <string name="treatments_wizard_bolusiob_label">Bolusų AIO</string>
    <string name="openapsma_run">Paleisti dabar</string>
    <string name="vitualpump_label">Virtuali pompa</string>
@ -105,7 +106,6 @@
    <string name="sms_delta">Pokytis:</string>
    <string name="configbuilder">Konfigūracija</string>
    <string name="objectives">Tikslai</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Apžvalga</string>
    <string name="nsprofile">NS profilis</string>
    <string name="simpleprofile">Paprastas profilis</string>
@ -123,7 +123,7 @@
    <string name="configbuilder_general">Bendrieji</string>
    <string name="configbuilder_general_description">Bendrieji įskiepiai, kurie gali praversti.</string>
    <string name="configbuilder_constraints_description">Kokie apribojimai taikomi?</string>
-    <string name="days">dienos(-ų)</string>
+    <string name="days">d.</string>
    <string name="constraints">Apribojimai</string>
    <string name="loop">Ciklas</string>
    <string name="configbuilder_loop">Ciklas</string>
@ -152,7 +152,7 @@
    <string name="sms_basal">Valandinė bazė:</string>
    <string name="carbs">AV</string>
    <string name="changeyourinput">Pakeiskite įvestus duomenis!</string>
-    <string name="configbuilder_bgsource">KG šaltinis</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>
@ -166,16 +166,16 @@
    <string name="loopdisabled">CIKLAS NEAKTYVUS DĖL APRIBOJIMŲ</string>
    <string name="treatments_wizard_basaliob_label">Bazės AIO</string>
    <string name="bolusconstraintapplied">Pritaikytas boluso apribojimas</string>
-    <string name="carbsconstraintapplied">Pritaikytas angliavandenių apribojimas</string>
+    <string name="carbsconstraintapplied">Pritaikytas AV apribojimas</string>
    <string name="careportal_bgcheck">KG testas</string>
    <string name="careportal_announcement">Pranešimas</string>
    <string name="careportal_note">Pastaba</string>
    <string name="careportal_question">Klausimas</string>
    <string name="careportal_exercise">Fizinis aktyvumas</string>
    <string name="careportal_pumpsitechange">Kateterio keitimas</string>
-    <string name="careportal_cgmsensorinsert">NGJ sensoriaus įvedimas</string>
-    <string name="careportal_cgmsensorstart">NGJ sensoriaus paleidimas</string>
-    <string name="careportal_insulincartridgechange">Insulino rezervuaro keitimas</string>
+    <string name="careportal_cgmsensorinsert">NGJ įvedimas</string>
+    <string name="careportal_cgmsensorstart">NGJ paleidimas</string>
+    <string name="careportal_insulincartridgechange">Rezervuaro keitimas</string>
    <string name="careportal_profileswitch">Profilio keitimas</string>
    <string name="careportal_snackbolus">Bolusas užkandžiui</string>
    <string name="careportal_mealbolus">Bolusas valgiui</string>
@ -183,13 +183,13 @@
    <string name="careportal_combobolus">Kombinuotas bolusas</string>
    <string name="careportal_tempbasalstart">Pradėta laikina bazė</string>
    <string name="careportal_tempbasalend">Užbaigta laikina bazė</string>
-    <string name="careportal_carbscorrection">Angliavandeniai korekcijai</string>
+    <string name="careportal_carbscorrection">AV korekcijai</string>
    <string name="careportal_openapsoffline">OpenAPS neprisijungus</string>
    <string name="careportal_newnstreatment_eventtype">Įvykio tipas</string>
    <string name="careportal_newnstreatment_other">Kiti</string>
    <string name="careportal_newnstreatment_meter">Matuoklis</string>
    <string name="careportal_newnstreatment_sensor">Sensorius</string>
-    <string name="careportal_newnstreatment_carbs_label">Angliavandeniai</string>
+    <string name="careportal_newnstreatment_carbs_label">AV</string>
    <string name="careportal_newnstreatment_insulin_label">Insulinas</string>
    <string name="careportal_newnstreatment_carbtime_label">AV laikas</string>
    <string name="careportal_newnstreatment_split_label">Išskaidyti</string>
@ -218,6 +218,44 @@
    <string name="openapsma_maxiob_title">Didžiausias valandinės bazės insulino kiekis, kurį gali suleisti OpenAPS [U]</string>
    <string name="openapsma_maxiob_summary">Ši vertė OpenAPS kontekste vadinama Maks AIO\nTai maksimalus insulino vienetų [U] skaičius, kurį DKS gali suleisti vienu metu.</string>
    <string name="dismiss">ATMESTI</string>
+    <string name="password_preferences_encrypt_prompt">Jūsų paprašys nustatyti slaptažodį, kuris bus naudojamas užšifruojant eksportuojamus nustatymus.</string>
+    <string name="password_preferences_decrypt_prompt">Jūsų paprašys nustatyti slaptažodį, kuris bus naudojamas atšifruojant importuotus nustatymus.</string>
+    <string name="preferences_export_canceled">Eksportas nutrauktas! Nustatymai NE eksportuoti!</string>
+    <string name="preferences_import_canceled">Importas nutrauktas! Nustatymai NE importuoti!</string>
+    <string name="check_preferences_before_import">Prašom patikrinti nustatymus prieš importuojant:</string>
+    <string name="check_preferences_cannot_import">Nustatymai negali būti importuoti!</string>
+    <string name="check_preferences_dangerous_import">Nustatymai neturėtų būti importuoti!</string>
+    <string name="check_preferences_details_btn">Importo sutrikimų paaiškinimas…</string>
+    <string name="check_preferences_details_title">Importo sutrikimų detalės</string>
+    <string name="check_preferences_import_btn">Importas</string>
+    <string name="check_preferences_import_anyway_btn">Importuoti vistiek (PAVOJINGA!)</string>
+    <string name="metadata_warning_different_flavour">Nustatymai sukurti naudojant skirtingą AAPS versiją (%1$s), jūsų turima: %2$s.\n\nKai kurių nustatymų gali trūkti arba jie gali būti neteisingi - po importavimo patikrinkite ir atnaujinkite nustatymus.</string>
+    <string name="metadata_warning_different_device">Nustatymai buvo sukurti naudojant kitą prietaisą. Viskas gerai, jei importuojante iš senesnio/kito telefono, tačiau įsitikinkite, kad visi importuoti nustatymai yra teisingi!</string>
+    <string name="metadata_warning_outdated_format">Jūs naudojate pasenusį formatą iš senos AAPS versijos, kuris nėra saugus! Naudokite tik kraštutiniu atveju, jei neturite nustatymų failo dabartiniu, JSON formatu.</string>
+    <string name="metadata_warning_old_export">Importuoti nustatymai yra %1$s d. senumo! Patikrinkite, gal pasirinkote neteisingą failą ir turite naujesnius? Nepamirškite reguliariai eksportuoti nustatymų!</string>
+    <string name="metadata_warning_date_format">Neteisingas datos ir laiko formatas!</string>
+    <string name="metadata_label_format">Failo formatas</string>
+    <string name="metadata_label_created_at">Sukurta</string>
+    <string name="metadata_label_aaps_version">AAPS versija</string>
+    <string name="metadata_label_aaps_flavour">Versijos variantas</string>
+    <string name="metadata_label_device_name">Eksportuojamas paciento vardas</string>
+    <string name="metadata_label_device_model">Eksportuojamas prietaiso modelis</string>
+    <string name="metadata_label_encryption">Failo šifravimas</string>
+    <string name="metadata_format_old">Senas eksporto formatas</string>
+    <string name="metadata_format_new">Naujas šifruotas formatas</string>
+    <string name="metadata_format_debug">Naujas derinimo formatas (nešifruotas)</string>
+    <string name="metadata_format_other">Nežinomas eksporto formatas</string>
+    <string name="prefdecrypt_settings_tampered">Nustatymų failas sugadintas</string>
+    <string name="prefdecrypt_settings_secure">Nustatymų failas yra saugus</string>
+    <string name="prefdecrypt_settings_unencrypted">Naudojamas nesaugus, nešifruotas nustatymų formatas</string>
+    <string name="prefdecrypt_wrong_json">JSON formato klaida, neužpildyti reikalingi laukai (formatas, turinys, metaduomenys arba saugumas)</string>
+    <string name="prefdecrypt_wrong_password">Iššifravimo klaida, netinkamas slaptažodis</string>
+    <string name="prefdecrypt_issue_missing_file_hash">Trūksta failo kontrolinės žymės, neįmanoma patikrinti autentiškumo!</string>
+    <string name="prefdecrypt_issue_modified">Failas pakeistas po eksportavimo!</string>
+    <string name="prefdecrypt_issue_parsing">Iššifravimo klaida, nustatymų analizė neįvyko!</string>
+    <string name="prefdecrypt_issue_wrong_pass">Iššifravimas klaida, slaptažodis yra neteisingas arba nustatymų failas buvo pakeistas! Taip nutinka, jei importuotas failas buvo eksportuotas su kitu slaptažodžiu.</string>
+    <string name="prefdecrypt_issue_wrong_format">Trūksta šifravimo sąrankos parametrų, nustatymų formatas yra neteisingas!</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">Nepalaikomas arba nepatikslintas šifravimo algoritmas!</string>
    <string name="danarpump">DanaR</string>
    <string name="connecting">Jungiamasi</string>
    <string name="connected">Prisijungta</string>
@ -233,7 +271,7 @@
    <string name="danar_iob_label">Pompos AIO</string>
    <string name="danar_dailyunits">Paros insulinas</string>
    <string name="pump_lastbolus_label">Paskutinis bolusas</string>
-    <string name="hoursago">Prieš %1$.1f valandų</string>
+    <string name="hoursago">Prieš %1$.1f val.</string>
    <string name="danar_invalidinput">Neteisingai įvesti duomenys</string>
    <string name="danar_valuenotsetproperly">Vertė nėra tinkamai nustatyta</string>
    <string name="reloadprofile">Atnaujinti profilį</string>
@ -263,8 +301,8 @@
    <string name="bolusrequested">Bus suleista %1$.2fvv</string>
    <string name="smscommunicator_bolusdelivered">%1$.2fvv bolusas sėkmingai suleistas</string>
    <string name="smscommunicator_mealbolusdelivered">Bolusas %1$.2fvv sėkmingai suleistas</string>
-    <string name="smscommunicator_mealbolusdelivered_tt">Tikslas %1$s %2$d minutėms</string>
-    <string name="smscommunicator_tt_set">Tikslas %1$s %2$d minutėms nustatytas sėkmingai</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">Tikslas %1$s %2$d min.</string>
+    <string name="smscommunicator_tt_set">Tikslas %1$s %2$d min. nustatytas sėkmingai</string>
    <string name="smscommunicator_tt_canceled">Laikinas tikslas atšauktas sėkmingai</string>
    <string name="bolusdelivering">Leidžiama %1$.2fvv</string>
    <string name="smscommunicator_remotecommandsallowed">Leisti nuotolines komandas SMS žinutėmis</string>
@ -286,14 +324,14 @@
    <string name="danar_refill">užpildymas</string>
    <string name="danar_basalhour">valandinė bazė</string>
    <string name="danar_glucose">gliukozė</string>
-    <string name="danar_carbohydrate">angliavandeniai</string>
+    <string name="danar_carbohydrate">AV</string>
    <string name="danar_alarm">aliarmas</string>
    <string name="danar_totaluploaded">Įkelta %1$d įrašų</string>
    <string name="danar_sbolus">Paprastas bolusas</string>
    <string name="danar_history_alarm">Aliarmai</string>
    <string name="danar_history_basalhours">Valandinė bazė</string>
    <string name="danar_history_bolus">Bolusai</string>
-    <string name="danar_history_carbohydrates">Angliavandeniai</string>
+    <string name="danar_history_carbohydrates">AV</string>
    <string name="danar_history_dailyinsulin">Paros insulinas</string>
    <string name="danar_history_errors">Klaidos</string>
    <string name="danar_history_glucose">Gliukozė</string>
@ -369,7 +407,7 @@
    <string name="units">Vienetai</string>
    <string name="mgdl">mg/dl</string>
    <string name="mmol">mmol/l</string>
-    <string name="dia">IVT (Insulino Veikimo Trukmė)</string>
+    <string name="dia">IVT</string>
    <string name="target_range">Tikslinis diapazonas:</string>
    <string name="prefs_range_title">Vizualizacijos diapazonas</string>
    <string name="prefs_range_summary">Aukštoji ir žemoji riba Apžvalgos grafikuose bei išmaniuosiuose laikrodžiuose</string>
@ -420,7 +458,7 @@
    <string name="danar_stats_tdd">BPD</string>
    <string name="danar_stats_date">Data</string>
    <string name="danar_stats_ratio">Koeficientas</string>
-    <string name="danar_stats_amount_days"># dienų</string>
+    <string name="danar_stats_amount_days"># d.</string>
    <string name="danar_stats_weight">Svoris</string>
    <string name="danar_stats_warning_Message">Duomenys netikslūs, jei bolusai naudojami kateterių užpildymui!</string>
    <string name="danar_stats_olddata_Message">Duomenys seni, spauskite \"ATNAUJINTI\"</string>
@ -507,6 +545,9 @@
    <string name="adult">Suaugęs</string>
    <string name="resistantadult">Insulinui rezistentiškas suaugęs</string>
    <string name="patientage_summary">Pasirinkite paciento amžių saugumo riboms nustatyti</string>
+    <string name="patient_name">Paciento vardas</string>
+    <string name="patient_name_summary">Pateikite paciento vardą arba slapyvardį, kad galima būtų atskirti tarp skirtingų konfigūracijų.</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Vartotojas</string>
    <string name="Glimp">Glimp</string>
    <string name="needwhitelisting">%1$s įtraukite į baterijos optimizavimo baltąjį sąrašą tinkamam veikimui užtikrinti</string>
    <string name="loopsuspended">Ciklas sustabdytas</string>
@ -543,8 +584,6 @@
    <string name="enablesuperbolus">Įgalinti superbolusus skaičiuoklėje</string>
    <string name="enablesuperbolus_summary">Įgalina superbolusų naudojimą insulino skaičiuoklėje. Nenaudokite, kol nesuprantate, ką superbolus funkcija atlieka. NAUDODAMI AKLAI GALITE PERDOZUOTI INSULINO!</string>
    <string name="show_statuslights">Pradžios ekrane rodyti spalvotus indikatorius</string>
-    <string name="show_statuslights_extended">Pradžios ekrane rodyti papildomus šviesos indikatorius</string>
-    <string name="show_statuslights_extended_summary">Pradžios ekrane rodyti papildomus šviesos indikatorius kateterio, insulino, sensoriaus naudojimo trukmei bei baterijos įkrovimo lygiui.</string>
    <string name="statuslights_res_warning">Įspėjimo apie žemą rezervuaro lygį riba [U]</string>
    <string name="statuslights_res_critical">Įspėjimo apie kritiškai žemą rezervuaro lygį riba [U]</string>
    <string name="statuslights_bat_warning">Įspėjimo apie žemą baterijos įkrovimo lygį riba [%]</string>
@ -570,11 +609,11 @@
    <string name="careportal_sensorage_label">Sensorius</string>
    <string name="careportal_canulaage_label">Kateteris</string>
    <string name="careportal_insulinage_label">Insulinas</string>
-    <string name="hours">valandos</string>
+    <string name="hours">val.</string>
    <string name="invalidprofile">Netinkamas profilis!!!</string>
    <string name="doprofileswitch">Profilio keitimas</string>
-    <string name="careportal_pbage_label">Pompos baterija</string>
-    <string name="careportal_pumpbatterychange">Pompos baterijos keitimas</string>
+    <string name="careportal_pbage_label">Baterija</string>
+    <string name="careportal_pumpbatterychange">Baterijos keitimas</string>
    <string name="ns_alarmoptions">Aliarmų nustatymai</string>
    <string name="nsalarm_urgenthigh">Kritiškai aukštas</string>
    <string name="nsalarm_high">Aukštas</string>
@ -673,7 +712,7 @@
    <string name="connectiontimedout">Prijungimo laikas baigėsi</string>
    <string name="food">Maistas</string>
    <string name="shortgramm">g</string>
-    <string name="shortminute">min</string>
+    <string name="shortminute">min.</string>
    <string name="shorthour">val</string>
    <string name="shortday">d</string>
    <string name="none"><![CDATA[<none>]]></string>
@ -704,8 +743,13 @@
    <string name="bgsource_upload">KG duomenų perdavimo nustatymai</string>
    <string name="wear_detailed_delta_title">Rodyti gliukozės pokyčio detales</string>
    <string name="wear_detailed_delta_summary">Rodyti pokytį su reikšme po kablelio</string>
-    <string name="smbmaxminutes">SMB max minutės</string>
+    <string name="smbinterval_summary">Kaip dažnai SMB bus leidžiami, min.</string>
+    <string name="smbmaxminutes">SMB maks. minutės</string>
    <string name="smbmaxminutes_summary">SMB atitinka valandinės bazės insulino kiekį, kuris gaunamas ne daugiau, kaip per</string>
+    <string name="uamsmbmaxminutes">NDM SMB maks. min.</string>
+    <string name="uamsmbmaxminutes_summary">NDM SMB atitinka valandinės bazės insulino kiekį, kuris gaunamas ne daugiau, kaip per</string>
+    <string name="carbsReqThreshold">Angliavandenių pasiūlymo riba</string>
+    <string name="carbsReqThreshold_summary">Kai angliavandeniai yra siūlomi, kaip gramų angliavandenių aktyvuos pranešimą</string>
    <string name="unsupportedfirmware">Pompos programinės įrangos versija nepalaikoma</string>
    <string name="dexcomg5_xdripupload_title">Siųsti KG duomenis į xDrip+</string>
    <string name="dexcomg5_xdripupload_summary">Xdrip+ pasirinkite 640g/Eversense duomenų šaltinį</string>
@ -771,7 +815,8 @@
    <string name="insightpump_shortname">Sight</string>
    <string name="ago">prieš</string>
    <string name="format_hours">%1$.2f h</string>
-    <string name="format_mins">%1$d minutės</string>
+    <string name="format_mins">%1$d min.</string>
+    <string name="format_mins_short">%1$dm</string>
    <string name="enablesmbalways">Leisti SMB visada</string>
    <string name="enablesmbalways_summary">Leisti SMB visada, nepriklausomai nuo bolusų. Įmanoma tik naudojant patikimų, filtruotų KG duomenų šaltinį, pvz.: Dexcom G5</string>
    <string name="enablesmbaftercarbs">Leisti SMB po angliavandenių įvedimo</string>
@ -819,7 +864,7 @@
    <string name="overview_show_deviations">Nuokrypiai</string>
    <string name="overview_show_cob">Aktyvūs angliavandeniai</string>
    <string name="overview_show_iob">Aktyvus insulinas organizme</string>
-    <string name="overview_show_basals">Valandinės bazės</string>
+    <string name="overview_show_basals">Bazė</string>
    <string name="no_action_selected">Veiksmas nepasirinktas, nieko neįvyks</string>
    <string name="start_hypo_tt">Pradėti \"Hipo\" LT</string>
    <string name="closed_loop_disabled_on_dev_branch">Naudojama neužbaigta versija. Uždaras ciklas neaktyvus.</string>
@ -853,7 +898,7 @@
    <string name="itmustbepositivevalue">reikšmė turi būti teigiama</string>
    <string name="maxbasalmultiplier">maksimalus bazės daugiklis</string>
    <string name="maxdailybasalmultiplier">maksimalus paros bazės daugiklis</string>
-    <string name="smb_frequency_exceeded">Bolusas buvo suleistas per paskutines 3 minutes, praleidžiant SMB</string>
+    <string name="smb_frequency_exceeded">Bolusas buvo suleistas per paskutines 3 minutes, SMB praleidžiamas</string>
    <string name="basal_set_correctly">Bazė nustatyta teisingai</string>
    <string name="limitingpercentrate">Ribojamas maks procentų kiekis %1$d%%, nes %2$s</string>
    <string name="limitingbolus">Bolusas ribojamas iki %1$.1f vv dėl %2$s</string>
@ -935,6 +980,7 @@
    <string name="startobjective">Pradėti jūsų pirmąjį tikslą</string>
    <string name="permission">Leidimas</string>
    <string name="askforpermission">Prašyti leidimo</string>
+    <string name="needsystemwindowpermission">Norint gauti pranešimus, programai reikalingas sisteminio lango leidimas</string>
    <string name="needlocationpermission">Aplikacijai reikia vietos nustatymo leidimo BT skenavimui atlikti</string>
    <string name="needstoragepermission">Aplikacijai reikia leidimo prieigai prie saugyklos, kad galėtų išsaugoti žurnalo įrašus</string>
    <string name="request">Užklausa</string>
@ -969,6 +1015,9 @@
    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Padidinti jautrumą laikiniems tikslams >= 100]]></string>
    <string name="low_temptarget_lowers_sensitivity_title">Pasyvus laikinas tikslas mažina jautrumą</string>
    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Žemas jautrumas laikiniem tikslams < 100]]></string>
+    <string name="resistance_lowers_target_title">Rezistencija mažina tikslą</string>
+    <string name="resistance_lowers_target_summary">Kai nustatoma rezistencija, tikslinė gliukozės vertė sumažinama</string>
+    <string name="sensitivity_raises_target_title">Jautrumas didina tikslą</string>
    <string name="combo_invalid_setup">Netinkami pompos nustatymai, patikrinkite dokumentaciją ir įsitikinkite, kad Quick info meniu yra pavadintas QUICK INFO, naudojant 360 configuration software.</string>
    <string name="custom">Pasirinktinis</string>
    <string name="largetimedifftitle">Didelis laiko neatitikimas</string>
@ -978,6 +1027,7 @@
    <string name="allow_hardware_pump_text">Dėmesio: jei aktyvuosite ir prijungsite prie aparatinės pompos, AndroidAPS nukopijuos bazės nustatymus iš profilio į pompą, pakeisdamas esančius nustatymus pompoje. Įsitikinkite, kad turimi bazės nustatymai AndroidAPS yra teisingi. Jei nesate tikri arba nenorite iš naujo keisti bazės nustatymų jūsų pompoje, paspauskite atšaukti ir pakartokite prijungimą prie pompos kitą kartą.</string>
    <string name="error_adding_treatment_title">Terapijos duomenys nepilni</string>
    <string name="maintenance_settings">Serviso nustatymai</string>
+    <string name="maintenance_email">Gavėjo el. paštas</string>
    <string name="maintenance_amount">Siunčiamų įrašų skaičius</string>
    <string name="maintenance">Servisas</string>
    <string name="maintenance_shortname">Serv</string>
@ -1120,14 +1170,14 @@
    <string name="tomato">Tomato (MiaoMiao)</string>
    <string name="tomato_short">Tomato</string>
    <string name="unit_second">sekundė</string>
-    <string name="unit_minute">minutė</string>
-    <string name="unit_hour">valanda</string>
-    <string name="unit_day">diena</string>
+    <string name="unit_minute">min.</string>
+    <string name="unit_hour">val.</string>
+    <string name="unit_day">d.</string>
    <string name="unit_week">savaitė</string>
    <string name="unit_seconds">sekundės</string>
-    <string name="unit_minutes">minutės</string>
-    <string name="unit_hours">valandos</string>
-    <string name="unit_days">dienų</string>
+    <string name="unit_minutes"> min.</string>
+    <string name="unit_hours">val.</string>
+    <string name="unit_days">d.</string>
    <string name="unit_weeks">savaičių</string>
    <string name="summary_tidepool_username">Jūsų Tidepool vartotojo vardas, įprastai jūsų el. pašto adresas</string>
    <string name="title_tidepool_username">Vartotojo vardas</string>
@ -1169,7 +1219,7 @@
    <string name="running_invalid_version">Nustatyta, kad naudojate neteisingą versiją. Ciklas išjungtas!</string>
    <string name="old_version">sena versija</string>
    <string name="very_old_version">labai sena versija</string>
-    <string name="new_version_warning">Nauja versija pasiekiama mažiausiai %1$d dienų! Po %2$d grįšite prie stabdymo prie žemo, po %3$d ciklas bus išjungtas</string>
+    <string name="new_version_warning">Nauja versija pasiekiama mažiausiai %1$d d.! Po %2$d grįšite prie stabdymo prie žemo, po %3$d ciklas bus išjungtas</string>
    <string name="twohours">2 val</string>
    <string name="formatinsulinunits">%1$.2fV</string>
    <string name="dexcom_app_patched">Dexcom programėlė (modifikuota)</string>
@ -1234,7 +1284,7 @@
    <string name="medtronic_custom_action_wake_and_tune">Pažadinti ir nustatyti</string>
    <string name="medtronic_custom_action_clear_bolus_block">Išvalyti Boluso bloką</string>
    <string name="medtronic_custom_action_reset_rileylink">Išvalyti RileyLink nustatymus</string>
-    <string name="medtronic_pump_battery_select">Baterijos tipas (galios vaizdas)</string>
+    <string name="medtronic_pump_battery_select">Baterijos tipas (pagal galią)</string>
    <string name="medtronic_pump_battery_no">Nepasirinkta (paprastas vaizdas)</string>
    <string name="medtronic_pump_battery_alkaline">Šarminė (išplėstinis vaizdas)</string>
    <string name="medtronic_pump_battery_lithium">Ličio (išplėstinis vaizdas)</string>
@ -1311,7 +1361,7 @@
    <string name="medtronic_error_operation_not_possible_no_configuration">Operacija negalima. \n\n Pirmiausia turite sukonfigūruoti Medronic pompą prieš atliekant šią operaciją.</string>
    <string name="medtronic_error_pump_24h_time_change_requested">Laiko pokytis didesnis nei 24 val.</string>
    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Valandinės bazės</string>
+    <string name="medtronic_history_group_basal">Bazė</string>
    <string name="medtronic_history_group_configuration">Nustatymai</string>
    <string name="medtronic_history_group_notification">Pranešimai</string>
    <string name="medtronic_history_group_statistic">Statistika</string>
@ -1328,7 +1378,7 @@
    <string name="medtronic_pump_status_active">Aktyvi</string>
    <string name="medtronic_pump_status_sleeping">Užmigusi</string>
    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Atšaukėte Bolusą, kuris jau buvo nustatytas pompoje. Medronic pompa nepalaiko šio atšaukimo, todėl turite jį atšaukti rankiniu būdu. Sustabdykite pompą ir vėl ją paleiskite (jei vis dar norite atšaukti Bolusą). Aplikacija perims pokyčius su kitu atnaujinimu (per mažiau nei 5 minutes).</string>
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Atšaukėte bolusą, kuris jau buvo nustatytas pompoje. Medronic pompa nepalaiko šio atšaukimo, todėl turite jį atšaukti rankiniu būdu. Sustabdykite pompą ir vėl ją paleiskite (jei vis dar norite atšaukti bolusą). Aplikacija perims pokyčius su kitu atnaujinimu (per mažiau nei 5 minutes).</string>
    <string name="medtronic_cmd_cant_read_tbr">Negalima sužinoti dabartinės laikinos bazės.</string>
    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Negalima atšaukti dabartinės laikinos bazės. Operacija stabdoma.</string>
    <string name="medtronic_cmd_set_profile_pattern_overflow">Profilio nustatymas nepavyko dėl per didelės nustatytos bazės: %1$s</string>
@ -1390,9 +1440,9 @@
    <string name="nopumpselected">Pompa nepasirinkta</string>
    <string name="setupwizard_units_prompt">Pasirinkite vienetus, kurių vertes norite parodyti</string>
    <string name="ns_ploadlocalprofile">Įkelti vietinio profilio pakeitimus į NS</string>
-    <string name="dia_short">IVT (Insulino Veikimo Trukmė)</string>
-    <string name="ic_short">IA (insulino/angliavandenių santykis)</string>
-    <string name="isf_short">JIF (jautrumo insulinui faktorius)</string>
+    <string name="dia_short">IVT</string>
+    <string name="ic_short">IA</string>
+    <string name="isf_short">JIF</string>
    <string name="target_short">TIKSLAS</string>
    <string name="clone_label">Klonuoti</string>
    <string name="saveorresetchangesfirst">Pirmiausia išsaugoti arba anuliuoti dabartinius pokyčius</string>
@ -1434,5 +1484,13 @@
    <string name="ebstopsloop">Ištęsto boluso funkcija sustabdys uždaro ciklo režimą ištęsto boluso veikimo metu. Ar tikrai norite patvirtinti savo pasirinkimą?</string>
    <string name="closed_loop_disabled_with_eb">Uždara ciklas išjungtas dėl ištęsto boluso veikimo</string>
    <string name="extended_bolus_short">IB (Ištęstas bolusas)</string>
+    <string name="phonechecker">\"PhoneChecker\"</string>
+    <string name="chartmenu">Grafiko meniu</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">SMB užklausos laikas</string>
+    <string name="loop_smbexecution_time_label">SMB įvykdymo laikas</string>
+    <string name="loop_tbrrequest_time_label">Laikinos bazės užklausos laikas</string>
+    <string name="loop_tbrexecution_time_label">Laikinos bazės įvykdymo laikas</string>
+    <string name="insight_alert_notification_channel">Insight pompos aliarmai</string>
    <!-- SMS Communicator & OTP Authenticator -->
 </resources>
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@ -105,7 +105,6 @@
    <string name="sms_delta">Verschil:</string>
    <string name="configbuilder">Configurator</string>
    <string name="objectives">Doelen</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Overzicht</string>
    <string name="nsprofile">NS Profiel</string>
    <string name="simpleprofile">Eenvoudig profiel</string>
@ -543,8 +542,6 @@
    <string name="enablesuperbolus">Activeer superbolus in de wizard</string>
    <string name="enablesuperbolus_summary">Activeer de superbolus functie in de wizard. Activeer deze niet tot je begrijpt wat dit doet. OVERDOSIS IS MOGELIJK BIJ BLINDELINGS GEBRUIK!</string>
    <string name="show_statuslights">Toon statusindicatoren op startscherm</string>
-    <string name="show_statuslights_extended">Toon uitgebreide statusindicatoren op overzicht scherm</string>
-    <string name="show_statuslights_extended_summary">Statusindicatoren inschakelen voor cage, iage, sage, reservoir en batterijniveau op het overzicht scherm.</string>
    <string name="statuslights_res_warning">Drempel waarschuwing reservoir niveau [E]</string>
    <string name="statuslights_res_critical">Drempel alarm reservoir niveau [E]</string>
    <string name="statuslights_bat_warning">Drempel waarschuwing batterij niveau [%]</string>
--- a/app/src/main/res/values-pl-rPL/objectives.xml
+++ b/app/src/main/res/values-pl-rPL/objectives.xml
@ -20,7 +20,9 @@
    <string name="objectives_autosens_gate">1 tydzień sukcesu w działaniu pętli w ciągu dnia z regularnym wprowadzaniem spożywanych węglowodanów</string>
    <string name="objectives_ama_objective">Włączanie dodatkowych funkcji do użytku, jak AMA</string>
    <string name="objectives_smb_objective">Włączanie dodatkowych funkcji do użytku, jak SMB (Super Mikro Bolusy)</string>
+    <string name="objectives_auto_objective">Włączanie automatyzacji</string>
    <string name="objectives_smb_gate">Musisz przeczytać wiki i zwiększyć maxIOB, aby SMB działało dobrze! Dobrym początkiem jest maxIOB = średni bolus + 3 x maks. dzienna dawka bazowa</string>
+    <string name="objectives_auto_gate">Przeczytaj dokumenty jak działa automatyzacja. Skonfiguruj swoje pierwsze proste zasady. Na początku zamiast działań pozwól AAPS wyświetlać powiadomienia. Gdy jesteś pewien, że automatyzacja jest uruchamiana we właściwym czasie, zastąp powiadomienie prawdziwymi działaniami. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
    <string name="objectives_bgavailableinns">BG dostępne w NS</string>
    <string name="objectives_pumpstatusavailableinns">Status pompy dostępny w NS</string>
    <string name="objectives_manualenacts">Ręczne zarządzanie</string>
@ -35,6 +37,7 @@
    <string name="objectives_useloop">Wyświetl zawartość wtyczki Pętla (Loop)</string>
    <string name="objectives_usescale">Użyj funkcji skalowania przez dłuższe przytrzymanie wykresu glikemii</string>
    <string name="objectives_button_enter">Wprowadź</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Jeśli masz co najmniej 3 miesiące doświadczenia w zamkniętej pętli z innymi systemami, możesz zakwalifikować się do otrzymania kodu do pominięcia etapu nauki. Zobacz https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-targets.</string>
    <string name="codeaccepted">Kod został zaakceptowany</string>
    <string name="codeinvalid">Niepoprawny kod</string>
    <string name="objectives_exam_objective">Potwierdź swoje umiejętności</string>
--- a/app/src/main/res/values-pl-rPL/protection.xml
+++ b/app/src/main/res/values-pl-rPL/protection.xml
@ -1,2 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="biometric_title">Wymagane uwierzytelnienie</string>
+    <string name="biometric_description">Umieść palec na czytniku linii papilarnych, aby zweryfikować swoją tożsamość</string>
+    <string name="settings_protection">Ochrona ustawień</string>
+    <string name="application_protection">Ochrona aplikacji</string>
+    <string name="bolus_protection">Ochrona Bolusa</string>
+    <string name="master_password">Hasło główne</string>
+    <string name="settings_password">Hasło ustawień</string>
+    <string name="application_password">Hasło aplikacji</string>
+    <string name="bolus_password">Hasło bolusa</string>
+    <string name="unlock_settings">Odblokuj ustawienia</string>
+    <string name="biometric">Biometryczne</string>
+    <string name="custom_password">Hasło użytkownika</string>
+    <string name="noprotection">Bez ochrony</string>
+    <string name="protection">Z ochroną</string>
+    <string name="master_password_missing">Hasło główne nie jest ustawione!\n\nProszę ustawić swoje hasło główne w preferencjach (%1$s &#8594; %2$s)</string>
+    <string name="password_set">Hasło ustawione!</string>
+    <string name="password_not_set">Hasło nie ustawione</string>
+    <string name="password_not_changed">Hasło nie zostało zmienione</string>
+    <string name="password_cleared">Hasło usunięte!</string>
+    <string name="password_hint">Wpisz hasło tutaj</string>
+</resources>
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@ -105,7 +105,6 @@
    <string name="sms_delta">Delta:</string>
    <string name="configbuilder">Konfiguracja</string>
    <string name="objectives">Zadania</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Przegląd</string>
    <string name="nsprofile">Profil Nightscout</string>
    <string name="simpleprofile">Prosty profil</string>
@ -543,8 +542,14 @@
    <string name="enablesuperbolus">Zezwalaj na superbolus w kalkulatorze</string>
    <string name="enablesuperbolus_summary">Włącz funkcję Superbolus w kalkulatorze. Nie uruchamiaj, dopóki nie nauczysz się jak ta funkcja działa. MOŻESZ DOPROWADZIĆ DO PRZEDAWKOWANIA INSULINY JEŻELI UŻYJESZ TEJ FUNKCJI NIE POSIADAJĄC ODPOWIEDNIEJ WIEDZY!</string>
    <string name="show_statuslights">Pokaż diody stanu na ekranie głównym</string>
-    <string name="show_statuslights_extended">Pokaż diody stanu na ekranie głównym</string>
-    <string name="show_statuslights_extended_summary">Włącz diody stanu dla cage, iage, sage, rezerwuar i poziom baterii na ekranie głównym.</string>
+    <string name="statuslights_cage_warning">Ostrzeżenie o czasie wkłucia [h]</string>
+    <string name="statuslights_cage_critical">Krytyczny czas wkłucia [h]</string>
+    <string name="statuslights_iage_warning">Ostrzeżenie o czasie insuliny [h]</string>
+    <string name="statuslights_iage_critical">Krytyczny czas insuliny [h]</string>
+    <string name="statuslights_sage_warning">Ostrzeżenie o czasie sensora CGM [h]</string>
+    <string name="statuslights_sage_critical">Krytyczny czas sensora CGM [h]</string>
+    <string name="statuslights_bage_warning">Ostrzeżenie o czasie baterii [h]</string>
+    <string name="statuslights_bage_critical">Krytyczny czas baterii [h]</string>
    <string name="statuslights_res_warning">Próg ostrzeżenia o poziomie zbiornika [U]</string>
    <string name="statuslights_res_critical">Próg ostrzeżenia o krytycznym poziomie zbiornika [U]</string>
    <string name="statuslights_bat_warning">Próg ostrzeżenia o poziomie baterii [%]</string>
@ -1433,4 +1438,6 @@
    <string name="message">Wiadomość</string>
    <string name="clearqueueconfirm">Wyczyścić kolejkę? Wszystkie dane w kolejce zostaną utracone!</string>
    <!-- SMS Communicator & OTP Authenticator -->
+    <string name="statuslights">Wskaźniki stanu</string>
+    <string name="statuslights_copy_ns">Kopiowanie ustawień z NS</string>
 </resources>
--- a/app/src/main/res/values-pt-rBR/objectives.xml
+++ b/app/src/main/res/values-pt-rBR/objectives.xml
@ -20,6 +20,7 @@
    <string name="objectives_autosens_gate">1 semana de looping durante o dia com sucesso com entrada regular de hidratos de carbono</string>
    <string name="objectives_ama_objective">A activar recursos adicionais para uso durante o dia, como assistente avançado de refeição</string>
    <string name="objectives_smb_objective">Activando recursos adicionais para uso durante o dia, como SMB</string>
+    <string name="objectives_auto_objective">A activar a automação</string>
    <string name="objectives_smb_gate">Deverá ler a wiki e aumentar a IOB máx para que os SMBs funcionem devidamente! Inicialmente poderá considerar maxIOB=média dos bólus + 3 x a basal máxima</string>
    <string name="objectives_bgavailableinns">Glic disponível no NS</string>
    <string name="objectives_pumpstatusavailableinns">Estado da Bomba disponível no NS</string>
--- a/app/src/main/res/values-pt-rBR/protection.xml
+++ b/app/src/main/res/values-pt-rBR/protection.xml
@ -1,2 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="biometric_title">Autenticação necessária</string>
+    <string name="biometric_description">Coloque o dedo sobre o leitor de impressões digitais para verificar a sua identidade</string>
+    <string name="settings_protection">Definições Protecção</string>
+    <string name="application_protection">Protecção Aplicação</string>
+    <string name="bolus_protection">Protecção Bólus</string>
+    <string name="master_password">Password Mestre</string>
+    <string name="settings_password">Definições Password</string>
+    <string name="application_password">Password Aplicação</string>
+    <string name="bolus_password">Password Bólus</string>
+    <string name="unlock_settings">Definições Desbloqueio</string>
+    <string name="biometric">Biométrico</string>
+    <string name="custom_password">Password Personalizada</string>
+    <string name="noprotection">Sem Protecção</string>
+    <string name="protection">Protecção</string>
+    <string name="master_password_missing">A Password Mestre não está definida!\n\nPor favor, configure Password Mestre em Preferências (%1$s &#8594; %2$s)</string>
+    <string name="password_set">Password foi definida!</string>
+    <string name="password_not_set">Password não foi definida</string>
+    <string name="password_not_changed">Password não foi alterada</string>
+    <string name="password_cleared">Password apagada!</string>
+    <string name="password_hint">Insira a password aqui</string>
+</resources>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -43,6 +43,7 @@
    <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_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 BG do Glimp.</string>
@ -105,7 +106,6 @@
    <string name="sms_delta">Delta:</string>
    <string name="configbuilder">Configurador</string>
    <string name="objectives">Objetivos</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Visão geral</string>
    <string name="nsprofile">Perfil NS</string>
    <string name="simpleprofile">Perfil simples</string>
@ -218,17 +218,44 @@
    <string name="openapsma_maxiob_title">Basal Máxima IOB que OpenAPS pode dar [U]</string>
    <string name="openapsma_maxiob_summary">Este valor é denominado Max IOB em contexto OpenAPS \nEste é o valor máximo de insulina em [U] que APS pode dar de uma vez.</string>
    <string name="dismiss">Dispensar</string>
+    <string name="password_preferences_encrypt_prompt">Será perguntado pela password mestre, que será usada para encriptar preferências exportadas.</string>
+    <string name="password_preferences_decrypt_prompt">Será perguntado pela password mestre, que será necessária para desencriptar preferências importadas.</string>
+    <string name="preferences_export_canceled">Exportação cancelada! Preferências NÃO foram exportadas!</string>
+    <string name="preferences_import_canceled">Importação cancelada! Preferências NÃO foram importadas!</string>
+    <string name="check_preferences_before_import">Por favor, verifique as preferências antes da importação:</string>
+    <string name="check_preferences_cannot_import">Preferências não podem ser importadas!</string>
+    <string name="check_preferences_dangerous_import">As preferências não devem ser importadas!</string>
    <string name="check_preferences_details_btn">Explicar problemas de importação…</string>
    <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_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_label_format">Formato do ficheiro</string>
    <string name="metadata_label_created_at">Criado em</string>
    <string name="metadata_label_aaps_version">Versão AAPS</string>
    <string name="metadata_label_aaps_flavour">Variante de Compilação</string>
+    <string name="metadata_label_device_name">A exportar nome do paciente do dispositivo</string>
+    <string name="metadata_label_device_model">A exportar modelo do dispositivo</string>
    <string name="metadata_label_encryption">Encriptação do Ficheiro</string>
    <string name="metadata_format_old">Antigo Formato de Exportação</string>
    <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_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 password 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_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 password é inválida ou configurações de arquivo foram modificadas! Pode acontecer que o ficheiro importado foi exportado com uma Password Mestre 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_algorithm">Algoritmo de encriptação não suportado ou não especificado!</string>
    <string name="danarpump">DanaR</string>
    <string name="connecting">Conectando</string>
    <string name="connected">Conectado</string>
@ -518,6 +545,8 @@
    <string name="adult">Adulto</string>
    <string name="resistantadult">Adulto resistente insulina</string>
    <string name="patientage_summary">Por favor seleccione a idade do diabético para definir os 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>
    <string name="Glimp">Glimp</string>
    <string name="needwhitelisting">%1$s necessita de autorizar a não optimização da bateria para assegurar a performance necessária</string>
@ -555,8 +584,6 @@
    <string name="enablesuperbolus">Activar superbólus no assistente</string>
    <string name="enablesuperbolus_summary">Habilite a funcionalidade de superbolus no assistente. Não habilite até que aprenda o funcionamento. PODE CAUSAR OVERDOSE DE INSULINA SE USAR INDISCRIMINADAMENTE!</string>
    <string name="show_statuslights">Mostrar luzes de estado no ecrã principal</string>
-    <string name="show_statuslights_extended">Mostrar luzes de estado estendido no ecrã principal</string>
-    <string name="show_statuslights_extended_summary">Ativar as luzes de status estendida para idade da cânula, insulina, sensor, reservatório e bateria no ecrã inicial.</string>
    <string name="statuslights_res_warning">Limite de aviso de nível de reservatório [U]</string>
    <string name="statuslights_res_critical">Limite crítico de nível de reservatório [U]</string>
    <string name="statuslights_bat_warning">Limite de aviso de nível de bateria [%]</string>
@ -716,8 +743,13 @@
    <string name="bgsource_upload">Configurações de upload de BG</string>
    <string name="wear_detailed_delta_title">Mostrar Delta detalho</string>
    <string name="wear_detailed_delta_summary">Mostrar delta com mais um ponto decimal</string>
+    <string name="smbinterval_summary">Com que frequência em min os SMBs serão dados</string>
    <string name="smbmaxminutes">SMB máx. minutos</string>
    <string name="smbmaxminutes_summary">Limite de minutos de basal para SMB</string>
+    <string name="uamsmbmaxminutes">UAM SMB máx minutos</string>
+    <string name="uamsmbmaxminutes_summary">Max minutos de basal para limitar SMB para UAM</string>
+    <string name="carbsReqThreshold">Limite Sugestão de Hidratos</string>
+    <string name="carbsReqThreshold_summary">Quando Hidratos são sugeridos, quantos hidratos irá solicitar uma notificação</string>
    <string name="unsupportedfirmware">Firmware bomba não suportado</string>
    <string name="dexcomg5_xdripupload_title">Enviar dados Glic. para xDrip+</string>
    <string name="dexcomg5_xdripupload_summary">Seleccionar 640g/Eversense como fonte no xDrip+</string>
@ -983,6 +1015,10 @@
    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Aumentar sensibilidade para alvostemp >= 100]]></string>
    <string name="low_temptarget_lowers_sensitivity_title">Baixo alvotemp baixa sensibilidade</string>
    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Baixar sensibilidade para alvostemp < 100]]></string>
+    <string name="resistance_lowers_target_title">Resistência reduz alvo</string>
+    <string name="resistance_lowers_target_summary">Quando a resistência for detectada, diminui o alvo de glicose</string>
+    <string name="sensitivity_raises_target_title">Sensibilidade aumenta o alvo</string>
+    <string name="sensitivity_raises_target_summary">Quando a sensibilidade é detectada, aumenta o alvo glicose</string>
    <string name="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="custom">Personalizado</string>
    <string name="largetimedifftitle">Grande diferença Horária</string>
@ -992,6 +1028,8 @@
    <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_email">Email destinatário</string>
+    <string name="maintenance_encrypt_exported_prefs">Encriptar configuraçõ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>
@ -1199,6 +1237,8 @@
    <string name="exists">existe</string>
    <string name="notexists">não existe</string>
    <string name="temptargetcompared">Alvo Temp %1$s</string>
+    <string name="btdevicecompared">Ligação Bluetooth com o dispositivo %1$s %2$s</string>
+    <string name="btdevice">Ligação ao dispositivo Bluetooth </string>
    <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
    <string name="autosenscompared">Autosens %1$s %2$s %%</string>
    <string name="autosenslabel">Autosens %</string>
@ -1458,7 +1498,31 @@
    <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">a partir da app Autenticador para: %1$s</string>
+    <string name="smscommunicator_otp_enabled">Activar Autenticador</string>
+    <string name="smscommunicator_otp_enabled_summary">Autenticar comandos usando Uma-Password-Única que sejam geradas pelo Google Authenticator ou app 2FA similar.</string>
+    <string name="smscommunicator_otp_pin">PIN 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-Password-Única que seja gerada</string>
+    <string name="smscomunicator_tab_otp_label">Configuração do Autenticador</string>
+    <string name="smscommunicator_otp_verify_label">OTP para verificar:</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_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. Teste Uma-Password-Única</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_provisioning_warning">NÃO PARTILHE este código online!\nUse-o apenas para a instalação da app Autenticador nos telefones seguidores.</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="overview_show_predictions">Previsões</string>
+    <string name="overview_show_deviationslope">Desvio de inclinação</string>
+    <string name="authorizationfailed">Falha na autorização</string>
+    <string name="overview_show_absinsulin">Insulina absoluta</string>
+    <string name="master_password_summary">Password Mestre é usada para encriptação da cópia de segurança e substituir segurança na aplicação. Lembre-se dela ou guarde-a em um lugar seguro.</string>
+    <string name="passwords_dont_match">As passwords não coincidem</string>
+    <string name="current_master_password">Password Mestre actual</string>
 </resources>
--- a/app/src/main/res/values-pt-rBR/validator.xml
+++ b/app/src/main/res/values-pt-rBR/validator.xml
@ -1,2 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Apenas dígitos numéricos são permitidos.</string>
+    <string name="error_only_numeric_digits_range_allowed">Apenas dígitos numéricos dentro de um intervalo de %1$s - %2$s são permitidos.</string>
+    <string name="error_this_field_cannot_contain_special_character">Este campo não pode conter qualquer carácter especial</string>
+    <string name="error_only_standard_letters_are_allowed">Apenas letras padrão são permitidas</string>
+    <string name="error_field_must_not_be_empty">Este campo não deve estar vazio</string>
+    <string name="error_email_address_not_valid">Endereço de e-mail inválido</string>
+    <string name="error_creditcard_number_not_valid">Número de cartão de crédito inválido</string>
+    <string name="error_phone_not_valid">Número de telefone inválido</string>
+    <string name="error_domain_not_valid">Nome de domínio inválido</string>
+    <string name="error_ip_not_valid">Endereço IP inválido</string>
+    <string name="error_url_not_valid">Url do site não é válido</string>
+    <string name="error_notvalid_personname">Não é um nome ou sobrenome válido.</string>
+    <string name="error_notvalid_personfullname">Nome completo inválido.</string>
+    <string name="error_date_not_valid">Formato inválido</string>
+    <string name="error_mustbe4digitnumber">Deve ser número de 4 dígitos</string>
+    <string name="error_mustbe6digitnumber">Deve ser número de 6 dígitos</string>
+    <string name="error_not_a_minimum_length">Não um comprimento mínimo</string>
+    <string name="error_pin_not_valid">Pin deve ser de 3 a 6 dígitos, não o mesmo ou em série</string>
+</resources>
--- a/app/src/main/res/values-pt-rPT/objectives.xml
+++ b/app/src/main/res/values-pt-rPT/objectives.xml
@ -20,7 +20,9 @@
    <string name="objectives_autosens_gate">1 semana de looping durante o dia com sucesso com entrada regular de hidratos de carbono</string>
    <string name="objectives_ama_objective">A activar recursos adicionais para uso durante o dia, como assistente avançado de refeição</string>
    <string name="objectives_smb_objective">Activando recursos adicionais para uso durante o dia, como SMB</string>
+    <string name="objectives_auto_objective">A activar a automação</string>
    <string name="objectives_smb_gate">Deverá ler a wiki e aumentar a IOB máx para que os SMBs funcionem devidamente! Inicialmente poderá considerar maxIOB=média dos bólus + 3 x a basal máxima</string>
+    <string name="objectives_auto_gate">Leia os documentos de como a automação funciona. Configure primeiro regras simples. Em vez de acção deixe AAPS apresentar apenas a notificação. Quando tem certeza de automação é accionada no momento certo substitua a notificação por acção real. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
    <string name="objectives_bgavailableinns">Glic disponível no NS</string>
    <string name="objectives_pumpstatusavailableinns">Estado da Bomba disponível no NS</string>
    <string name="objectives_manualenacts">Execução manual</string>
--- a/app/src/main/res/values-pt-rPT/protection.xml
+++ b/app/src/main/res/values-pt-rPT/protection.xml
@ -1,2 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="biometric_title">Autenticação necessária</string>
+    <string name="biometric_description">Coloque o dedo sobre o leitor de impressões digitais para verificar a sua identidade</string>
+    <string name="settings_protection">Definições Protecção</string>
+    <string name="application_protection">Protecção Aplicação</string>
+    <string name="bolus_protection">Protecção Bólus</string>
+    <string name="master_password">Password Mestre</string>
+    <string name="settings_password">Definições Password</string>
+    <string name="application_password">Password Aplicação</string>
+    <string name="bolus_password">Password Bólus</string>
+    <string name="unlock_settings">Definições Desbloqueio</string>
+    <string name="biometric">Biométrico</string>
+    <string name="custom_password">Password Personalizada</string>
+    <string name="noprotection">Sem Protecção</string>
+    <string name="protection">Protecção</string>
+    <string name="master_password_missing">A Password Mestre não está definida!\n\nPor favor, configure Password Mestre em Preferências (%1$s &#8594; %2$s)</string>
+    <string name="password_set">Password foi definida!</string>
+    <string name="password_not_set">Password não foi definida</string>
+    <string name="password_not_changed">Password não foi alterada</string>
+    <string name="password_cleared">Password apagada!</string>
+    <string name="password_hint">Insira a password aqui</string>
+</resources>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -43,6 +43,7 @@
    <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_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>
@ -105,7 +106,6 @@
    <string name="sms_delta">Delta:</string>
    <string name="configbuilder">Configurador</string>
    <string name="objectives">Objetivos</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Visão geral</string>
    <string name="nsprofile">Perfil NS</string>
    <string name="simpleprofile">Perfil simples</string>
@ -218,17 +218,44 @@
    <string name="openapsma_maxiob_title">Basal Máxima IOB que OpenAPS pode dar [U]</string>
    <string name="openapsma_maxiob_summary">Este valor é denominado Max IOB em contexto OpenAPS \nEste é o valor máximo de insulina em [U] que APS pode dar de uma vez.</string>
    <string name="dismiss">Dispensar</string>
+    <string name="password_preferences_encrypt_prompt">Será perguntado pela password mestre, que será usada para encriptar preferências exportadas.</string>
+    <string name="password_preferences_decrypt_prompt">Será perguntado pela password mestre, que será necessária para desencriptar preferências importadas.</string>
+    <string name="preferences_export_canceled">Exportação cancelada! Preferências NÃO foram exportadas!</string>
+    <string name="preferences_import_canceled">Importação cancelada! Preferências NÃO foram importadas!</string>
+    <string name="check_preferences_before_import">Por favor, verifique as preferências antes da importação:</string>
+    <string name="check_preferences_cannot_import">Preferências não podem ser importadas!</string>
+    <string name="check_preferences_dangerous_import">As preferências não devem ser importadas!</string>
    <string name="check_preferences_details_btn">Explicar problemas de importação…</string>
    <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_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_label_format">Formato do ficheiro</string>
    <string name="metadata_label_created_at">Criado em</string>
    <string name="metadata_label_aaps_version">Versão AAPS</string>
    <string name="metadata_label_aaps_flavour">Variante de Compilação</string>
+    <string name="metadata_label_device_name">A exportar nome do paciente do dispositivo</string>
+    <string name="metadata_label_device_model">A exportar modelo do dispositivo</string>
    <string name="metadata_label_encryption">Encriptação do Ficheiro</string>
    <string name="metadata_format_old">Antigo Formato de Exportação</string>
    <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_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 password 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_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 password é inválida ou configurações de arquivo foram modificadas! Pode acontecer que o ficheiro importado foi exportado com uma Password Mestre 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_algorithm">Algoritmo de encriptação não suportado ou não especificado!</string>
    <string name="danarpump">DanaR</string>
    <string name="connecting">A ligar</string>
    <string name="connected">Ligado</string>
@ -518,6 +545,8 @@
    <string name="adult">Adulto</string>
    <string name="resistantadult">Adulto resistente insulina</string>
    <string name="patientage_summary">Por favor seleccione a idade do diabético para definir os 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>
    <string name="Glimp">Glimp</string>
    <string name="needwhitelisting">%1$s necessita de autorizar a não optimização da bateria para assegurar a performance necessária</string>
@ -555,8 +584,14 @@
    <string name="enablesuperbolus">Activar superbólus no assistente</string>
    <string name="enablesuperbolus_summary">Habilite a funcionalidade de superbolus no assistente. Não habilite até que aprenda o funcionamento. PODE CAUSAR OVERDOSE DE INSULINA SE USAR INDISCRIMINADAMENTE!</string>
    <string name="show_statuslights">Mostrar luzes de estado no ecrã principal</string>
-    <string name="show_statuslights_extended">Mostrar luzes de estado no ecrã principal</string>
-    <string name="show_statuslights_extended_summary">Activar as luzes de estado para idade da cânula, idade da insulina, idade do sensor, reservatório e bateria no ecrã inicial.</string>
+    <string name="statuslights_cage_warning">Limite aviso idade canula [h]</string>
+    <string name="statuslights_cage_critical">Limite Crítico Idade Canula [h]</string>
+    <string name="statuslights_iage_warning">Limite aviso idade insulina [h]</string>
+    <string name="statuslights_iage_critical">Limite crítico idade insulina [h]</string>
+    <string name="statuslights_sage_warning">Limite aviso idade sensor [h]</string>
+    <string name="statuslights_sage_critical">Limite crítico idade sensor [h]</string>
+    <string name="statuslights_bage_warning">Limite de aviso de nível de bateria [h]</string>
+    <string name="statuslights_bage_critical">Limite crítico de nível de bateria [h]</string>
    <string name="statuslights_res_warning">Limite de aviso de nível de reservatório [U]</string>
    <string name="statuslights_res_critical">Limite crítico de nível de reservatório [U]</string>
    <string name="statuslights_bat_warning">Limite de aviso de nível de bateria [%]</string>
@ -716,8 +751,13 @@
    <string name="bgsource_upload">Configurações de upload de BG</string>
    <string name="wear_detailed_delta_title">Mostrar Delta detalho</string>
    <string name="wear_detailed_delta_summary">Mostrar delta com mais um ponto decimal</string>
+    <string name="smbinterval_summary">Com que frequência em min os SMBs serão dados</string>
    <string name="smbmaxminutes">SMB máx. minutos</string>
    <string name="smbmaxminutes_summary">Limite de minutos de basal para SMB</string>
+    <string name="uamsmbmaxminutes">UAM SMB máx minutos</string>
+    <string name="uamsmbmaxminutes_summary">Max minutos de basal para limitar SMB para UAM</string>
+    <string name="carbsReqThreshold">Limite Sugestão de Hidratos</string>
+    <string name="carbsReqThreshold_summary">Quando Hidratos são sugeridos, quantos hidratos irá solicitar uma notificação</string>
    <string name="unsupportedfirmware">Firmware bomba não suportado</string>
    <string name="dexcomg5_xdripupload_title">Enviar dados Glic. para xDrip+</string>
    <string name="dexcomg5_xdripupload_summary">Seleccionar 640g/Eversense como fonte no xDrip+</string>
@ -983,6 +1023,10 @@
    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Aumentar sensibilidade para alvostemp >= 100]]></string>
    <string name="low_temptarget_lowers_sensitivity_title">Baixo alvotemp baixa sensibilidade</string>
    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Baixar sensibilidade para alvostemp < 100]]></string>
+    <string name="resistance_lowers_target_title">Resistência reduz alvo</string>
+    <string name="resistance_lowers_target_summary">Quando a resistência for detectada, diminui o alvo de glicose</string>
+    <string name="sensitivity_raises_target_title">Sensibilidade aumenta o alvo</string>
+    <string name="sensitivity_raises_target_summary">Quando a sensibilidade é detectada, aumenta o alvo glicose</string>
    <string name="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="custom">Personalizado</string>
    <string name="largetimedifftitle">Grande diferença Horária</string>
@ -992,6 +1036,8 @@
    <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_email">Email destinatário</string>
+    <string name="maintenance_encrypt_exported_prefs">Encriptar configuraçõ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>
@ -1199,6 +1245,8 @@
    <string name="exists">existe</string>
    <string name="notexists">não existe</string>
    <string name="temptargetcompared">Alvo Temp %1$s</string>
+    <string name="btdevicecompared">Ligação Bluetooth com o dispositivo %1$s %2$s</string>
+    <string name="btdevice">Ligação ao dispositivo Bluetooth </string>
    <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
    <string name="autosenscompared">Autosens %1$s %2$s %%</string>
    <string name="autosenslabel">Autosens %</string>
@ -1458,7 +1506,31 @@
    <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">a partir da app Autenticador para: %1$s</string>
+    <string name="smscommunicator_otp_enabled">Activar Autenticador</string>
+    <string name="smscommunicator_otp_enabled_summary">Autenticar comandos usando Uma-Password-Única que sejam geradas pelo Google Authenticator ou app 2FA similar.</string>
+    <string name="smscommunicator_otp_pin">PIN 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-Password-Única que seja gerada</string>
+    <string name="smscomunicator_tab_otp_label">Configuração do Autenticador</string>
+    <string name="smscommunicator_otp_verify_label">OTP para verificar:</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_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. Teste Uma-Password-Única</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_provisioning_warning">NÃO PARTILHE este código online!\nUse-o apenas para a instalação da app Autenticador nos telefones seguidores.</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="overview_show_predictions">Previsões</string>
+    <string name="overview_show_deviationslope">Desvio de inclinação</string>
+    <string name="authorizationfailed">Falha na autorização</string>
+    <string name="overview_show_absinsulin">Insulina absoluta</string>
+    <string name="master_password_summary">Password Mestre é usada para encriptação da cópia de segurança e substituir segurança na aplicação. Lembre-se dela ou guarde-a em um lugar seguro.</string>
+    <string name="passwords_dont_match">As passwords não coincidem</string>
+    <string name="current_master_password">Password Mestre actual</string>
 </resources>
--- a/app/src/main/res/values-pt-rPT/validator.xml
+++ b/app/src/main/res/values-pt-rPT/validator.xml
@ -1,2 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Apenas dígitos numéricos são permitidos.</string>
+    <string name="error_only_numeric_digits_range_allowed">Apenas dígitos numéricos dentro de um intervalo de %1$s - %2$s são permitidos.</string>
+    <string name="error_this_field_cannot_contain_special_character">Este campo não pode conter qualquer carácter especial</string>
+    <string name="error_only_standard_letters_are_allowed">Apenas letras padrão são permitidas</string>
+    <string name="error_field_must_not_be_empty">Este campo não deve estar vazio</string>
+    <string name="error_email_address_not_valid">Endereço de e-mail inválido</string>
+    <string name="error_creditcard_number_not_valid">Número de cartão de crédito inválido</string>
+    <string name="error_phone_not_valid">Número de telefone inválido</string>
+    <string name="error_domain_not_valid">Nome de domínio inválido</string>
+    <string name="error_ip_not_valid">Endereço IP inválido</string>
+    <string name="error_url_not_valid">Url do site não é válido</string>
+    <string name="error_notvalid_personname">Não é um nome ou sobrenome válido.</string>
+    <string name="error_notvalid_personfullname">Nome completo inválido.</string>
+    <string name="error_date_not_valid">Formato inválido</string>
+    <string name="error_mustbe4digitnumber">Deve ser número de 4 dígitos</string>
+    <string name="error_mustbe6digitnumber">Deve ser número de 6 dígitos</string>
+    <string name="error_not_a_minimum_length">Não um comprimento mínimo</string>
+    <string name="error_pin_not_valid">Pin deve ser de 3 a 6 dígitos, não o mesmo ou em série</string>
+</resources>
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@ -104,7 +104,6 @@
    <string name="sms_delta">Diferență:</string>
    <string name="configbuilder">Configurator</string>
    <string name="objectives">Obiective</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Privire de ansamblu</string>
    <string name="nsprofile">Profil NS</string>
    <string name="simpleprofile">Profil simplu</string>
@ -517,8 +516,6 @@
    <string name="enablesuperbolus">Activează superbolus în asistent</string>
    <string name="enablesuperbolus_summary">Activează funcționalitatea de superbolus în asistentul de buclă. Nu activați până nu înțelegeți ce face cu adevărat. DACĂ ESTE FOLOSIT ÎN NECUNOȘTINȚĂ DE CAUZĂ POATE DUCE LA SUPRADOZĂ DE INSULINĂ!</string>
    <string name="show_statuslights">Afișați indicatorii luminoși ai pompei pe ecranul de start</string>
-    <string name="show_statuslights_extended">Afișați indicatorii luminoși referitori la starea detaliată a pompei pe ecranul principal</string>
-    <string name="show_statuslights_extended_summary">Activați indicatori pentru CAGE, IAGE, SAGE, nivel baterie și rezervor pe ecranul principal.</string>
    <string name="statuslights_res_warning">Pragul de avertisment pentru insulina din rezervor [U]</string>
    <string name="statuslights_res_critical">Pragul critic al nivelului insulinei în rezervor [U]</string>
    <string name="iob">IOB</string>
--- a/app/src/main/res/values-ru-rRU/objectives.xml
+++ b/app/src/main/res/values-ru-rRU/objectives.xml
@ -20,7 +20,9 @@
    <string name="objectives_autosens_gate">1 неделя успешной дневной работы с регулярным введением углеводов</string>
    <string name="objectives_ama_objective">Активация таких доп функций для дневного времени как расширенный калькулятор болюса advanced meal assist</string>
    <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 только выводить уведомления. Если вы уверены, что автоматизация инициируется в нужное время, замените уведомление реальным действием.</string>
    <string name="objectives_bgavailableinns">гликемия доступна в NS</string>
    <string name="objectives_pumpstatusavailableinns">Статус помпы доступен в NS</string>
    <string name="objectives_manualenacts">Ввод вручную</string>
--- a/app/src/main/res/values-ru-rRU/protection.xml
+++ b/app/src/main/res/values-ru-rRU/protection.xml
@ -1,2 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="biometric_title">Требуется авторизация</string>
+    <string name="biometric_description">Поместите палец на устройство считывания отпечатков, чтобы подтвердить свою идентичность</string>
+    <string name="settings_protection">Защита настроек</string>
+    <string name="application_protection">Защита приложения</string>
+    <string name="bolus_protection">Защита болюсов</string>
+    <string name="master_password">Главный пароль</string>
+    <string name="settings_password">Пароль параметров</string>
+    <string name="application_password">Пароль приложения</string>
+    <string name="bolus_password">Пароль болюсов</string>
+    <string name="unlock_settings">Разблокировать настройки</string>
+    <string name="biometric">Биометрия</string>
+    <string name="custom_password">Настраиваемый пароль</string>
+    <string name="noprotection">Без защиты</string>
+    <string name="protection">Защита</string>
+    <string name="master_password_missing">Не задан главный пароль!\n\nЗадайте главный пароль в настройках (%1$s &#8594; %2$s)</string>
+    <string name="password_set">Пароль задан!</string>
+    <string name="password_not_set">Пароль не задан</string>
+    <string name="password_not_changed">Пароль не был изменён</string>
+    <string name="password_cleared">Пароль сброшен!</string>
+    <string name="password_hint">Введите пароль здесь</string>
+</resources>
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@ -43,6 +43,7 @@
    <string name="description_pump_mdi">Интеграция с помпой для тех, кто делает многочисленные подколки для компенсации диабета</string>
    <string name="description_pump_virtual">Интеграция с помпами, еще не имеющими драйвера (незамкнутый цикл)</string>
    <string name="description_sensitivity_aaps">Чувствительность вычисляется аналогично алгоритму oref0, но можно включить период прошлого. Минимальное усвоение углеводов вычисляется на основе макс усвоения из настроек.</string>
+    <string name="description_sensitivity_oref1">Чувствительность рассчитывается на основе данных за прошедшие 8 часов и (неусвоенные) углеводы не учитываются после времени указанного в настройках. Плагин также вычисляет UAM.</string>
    <string name="description_sensitivity_weighted_average">Чувствительность рассчитывается как средневзвешенное от отклонений (deviations). Более поздние отклонения имеют больший вес. Минимальное усвоение углеводов рассчитывается на основе макс времени усвоения углеводов в настройках. Этот алгоритм быстрее всего отслеживает изменения чувствительности.</string>
    <string name="description_source_eversense">Получать данные гликемии от пропатченного приложения Eversense.</string>
    <string name="description_source_glimp">Получать данные гликемии от Glimp.</string>
@ -105,7 +106,6 @@
    <string name="sms_delta">дельта:</string>
    <string name="configbuilder">конфигуратор</string>
    <string name="objectives">Цели</string>
-    <string name="openapsma">Помощник болюса OpenAPS MA</string>
    <string name="overview">начало</string>
    <string name="nsprofile">профиль NS</string>
    <string name="simpleprofile">простой профиль</string>
@ -218,6 +218,44 @@
    <string name="openapsma_maxiob_title">макс базал активн инс подаваемый с OpenAPS (ед)</string>
    <string name="openapsma_maxiob_summary">Эта величина называется Max IOB (макс активн инс) в OpenAPS\n. Это макс кол-во инсулина в ед. [U] которое APS может подать единовременно.</string>
    <string name="dismiss">отклонить</string>
+    <string name="password_preferences_encrypt_prompt">Будет предложено ввести главный пароль, который будет использоваться для шифрования экспортированных параметров.</string>
+    <string name="password_preferences_decrypt_prompt">Вам будет предложено ввести главный пароль, необходимый для расшифровки импортированных настроек.</string>
+    <string name="preferences_export_canceled">Экспорт отменен! Настройки НЕ экспортированы!</string>
+    <string name="preferences_import_canceled">Импорт отменен! Настройки не импортированы!</string>
+    <string name="check_preferences_before_import">Проверьте настройки перед импортом:</string>
+    <string name="check_preferences_cannot_import">Не удается импортировать настройки!</string>
+    <string name="check_preferences_dangerous_import">Не следует импортировать настройки!</string>
+    <string name="check_preferences_details_btn">Объяснить проблемы импорта…</string>
+    <string name="check_preferences_details_title">Сведения о проблемах импорта</string>
+    <string name="check_preferences_import_btn">Импортировать</string>
+    <string name="check_preferences_import_anyway_btn">Импортировать в любом случае (ОПАСНО!)</string>
+    <string name="metadata_warning_different_flavour">Параметры были созданы с другим вариантом AAPS (%1$s) в то время как у вас: %2$s.\n\nНекоторые параметры могут отсутствать или быть недопустимы-после импорта проверьте и обновите параметры.</string>
+    <string name="metadata_warning_different_device">Параметры созданы на другом устройстве. Это нормально, если вы импортируете из старого/другого телефона, но убедитесь, что импортированные параметры - верные!</string>
+    <string name="metadata_warning_outdated_format">Вы используете устаревший формат из старых версий AAPS, который не безопасен! Используйте его только в крайнем случае, если у вас нет экспорта в текущем формате JSON.</string>
+    <string name="metadata_warning_old_export">Импортируемым параметрам уже %1$s дней! Может быть у вас есть более актуальные параметры или вы выбрали неправильный файл? Не забудьте регулярно экспортировать параметры!</string>
+    <string name="metadata_warning_date_format">Недопустимый формат даты и времени!</string>
+    <string name="metadata_label_format">Формат файла</string>
+    <string name="metadata_label_created_at">Дата создания</string>
+    <string name="metadata_label_aaps_version">Версия AAPS</string>
+    <string name="metadata_label_aaps_flavour">Версия сборки</string>
+    <string name="metadata_label_device_name">Имя пациента экспортируемого устройства</string>
+    <string name="metadata_label_device_model">Модель экспортируемого устройства</string>
+    <string name="metadata_label_encryption">Шифрование файла</string>
+    <string name="metadata_format_old">Старый формат экспорта</string>
+    <string name="metadata_format_new">Новый зашифрованный формат</string>
+    <string name="metadata_format_debug">Новый формат отладки (незашифрованный)</string>
+    <string name="metadata_format_other">Неизвестный формат экспорта</string>
+    <string name="prefdecrypt_settings_tampered">Файл параметров несанкционированно изменен</string>
+    <string name="prefdecrypt_settings_secure">Файл настроек безопасен</string>
+    <string name="prefdecrypt_settings_unencrypted">Применяется незащищенный, незашифрованный формат параметров</string>
+    <string name="prefdecrypt_wrong_json">Ошибка формата JSON, отсутствует обязательное поле (формат, содержимое, метаданные или защита)</string>
+    <string name="prefdecrypt_wrong_password">Ошибка расшифровки, указанный пароль не может расшифровать файл</string>
+    <string name="prefdecrypt_issue_missing_file_hash">Отсутствует контрольная сумма файла (хэш), не удалось проверить подлинность параметров!</string>
+    <string name="prefdecrypt_issue_modified">Файл был изменен после экспорта!</string>
+    <string name="prefdecrypt_issue_parsing">Ошибка расшифровки, не удалось проанализировать настройки!</string>
+    <string name="prefdecrypt_issue_wrong_pass">Ошибка расшифровки, указан недопустимый пароль или файл параметров изменен! Возможно, импортированный файл был экспортирован с использованием другого главного пароля.</string>
+    <string name="prefdecrypt_issue_wrong_format">Отсутствует конфигурация шифрования, формат параметров недопустим!</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">Неподдерживаемый или не прописанный алгоритм шифрования!</string>
    <string name="danarpump">DanaR</string>
    <string name="connecting">соединение устанавливается</string>
    <string name="connected">соединение установлено</string>
@ -507,6 +545,9 @@
    <string name="adult">взрослый</string>
    <string name="resistantadult">Инсулинорезистентный взрослый</string>
    <string name="patientage_summary">выберите возраст пациента для определения ограничителей безопасности</string>
+    <string name="patient_name">Имя пациента</string>
+    <string name="patient_name_summary">Укажите имя или псевдоним пациента, чтобы распознавать разные настройки</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Пользователь</string>
    <string name="Glimp">Glimp</string>
    <string name="needwhitelisting">%1$s необходимо включить в белый список оптимизации батареи для корректной работы</string>
    <string name="loopsuspended">ЗЦ остановлен</string>
@ -543,8 +584,14 @@
    <string name="enablesuperbolus">активировать суперболюс</string>
    <string name="enablesuperbolus_summary">активировать возможность суперболюса в мастере. не активируйте если не знаете что это. МОЖЕТ ВЫЗВАТЬ ПЕРЕДОЗИРОВКУ ИНСУЛИНА ЕСЛИ ИСПОЛЬЗУЕТСЯ ВСЛЕПУЮ</string>
    <string name="show_statuslights">Показать индикаторы состояния на главном экране</string>
-    <string name="show_statuslights_extended">Показывать подробные индикаторы состояния на главном экране</string>
-    <string name="show_statuslights_extended_summary">Включить на главном экране подробные индикаторы отработанного времени для канюли помпы, инсулина, сенсора, резервуара, а также уровня заряда батареи.</string>
+    <string name="statuslights_cage_warning">Порог предупреждения о времени, отработанном катетером [h]</string>
+    <string name="statuslights_cage_critical">Критический порог предупреждения о времени, отработанном катетером [h]</string>
+    <string name="statuslights_iage_warning">Порог предупреждения о времени, отработанном инсулином [h]</string>
+    <string name="statuslights_iage_critical">Критический порог предупреждения о времени, отработанном инсулином [h]</string>
+    <string name="statuslights_sage_warning">Порог предупреждения о времени, отработанном сенсором [h]</string>
+    <string name="statuslights_sage_critical">Критический порог предупреждения о времени, отработанном сенсором [h]</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>
@ -704,8 +751,13 @@
    <string name="bgsource_upload">Параметры загрузки СК</string>
    <string name="wear_detailed_delta_title">Показать подробно дельту</string>
    <string name="wear_detailed_delta_summary">Показать дельту еще с одним десятичным знаком</string>
+    <string name="smbinterval_summary">Как часто SMB будут подаваться в минутах</string>
    <string name="smbmaxminutes">Максимум минут микроболюса SMB</string>
    <string name="smbmaxminutes_summary">Верхний лимит минут базала на SMB</string>
+    <string name="uamsmbmaxminutes">Максимум минут микроболюса SMB для непредвиденного приема пищи UAM</string>
+    <string name="uamsmbmaxminutes_summary">Максимум минут базала ограничивающего микроболюсы SMB на непредвиденный прием пищи UAM</string>
+    <string name="carbsReqThreshold">Порог предлагаемых углеводов</string>
+    <string name="carbsReqThreshold_summary">Когда предлагаются углеводы, какое количество инициирует уведомление</string>
    <string name="unsupportedfirmware">Неподдерживаемая версия прошивки помпы</string>
    <string name="dexcomg5_xdripupload_title">Отправить данные СК на xDrip+</string>
    <string name="dexcomg5_xdripupload_summary">В xDrip + выберите источник данных 640g/Eversense</string>
@ -772,6 +824,7 @@
    <string name="ago">тому назад</string>
    <string name="format_hours">%1$.2f ч</string>
    <string name="format_mins">%1$d мин</string>
+    <string name="format_mins_short">%1$dm</string>
    <string name="enablesmbalways">Всегда включать супер микро болюс SMB</string>
    <string name="enablesmbalways_summary">Всегда включать супер микро болюс SMB независимо от болюсов. Возможно только для источников СК с хорошей фильтрацией данных вроде G5</string>
    <string name="enablesmbaftercarbs">Активировать супер микро болюс SMB после углеводов</string>
@ -972,6 +1025,10 @@ Context | Edit Context</string>
    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Повысить чувствительность для temptargets > = 100]]></string>
    <string name="low_temptarget_lowers_sensitivity_title">Низкая временная цель temptarget снижает чувствительность</string>
    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Понизить чувствительность для temptargets > = 100]]></string>
+    <string name="resistance_lowers_target_title">Сопротивляемость понижает цель</string>
+    <string name="resistance_lowers_target_summary">При обнаружении сопротивляемости целевой уровень гликемии понижается</string>
+    <string name="sensitivity_raises_target_title">Чувствительность поднимает цель</string>
+    <string name="sensitivity_raises_target_summary">При обнаружении чувствительности целевой уровень глюкозы повышается</string>
    <string name="combo_invalid_setup">Недопустимые установки помпы, проверьте документацию и убедитесь, что меню Quick Info называется QUICK INFO, используя приложение 360 для конфигурации помпы.</string>
    <string name="custom">Пользовательские</string>
    <string name="largetimedifftitle">Большая разница во времени</string>
@ -981,6 +1038,8 @@ Context | Edit Context</string>
    <string name="allow_hardware_pump_text">Внимание: Если вы активируете подключение к невиртуальной помпе, AndroidAPS скопирует настройки базала в профиль помпы, перезаписывая существующие настройки, хранящиеся в ней. Убедитесь, что настройки базала в AndroidAPS корректны. Если вы не уверены или не хотите перезаписать настройки базала на помпу, нажмите отменить и повторите подключение в другое время.</string>
    <string name="error_adding_treatment_title">Данные терапии неполные</string>
    <string name="maintenance_settings">Параметры обслуживания</string>
+    <string name="maintenance_email">Адрес электронной почты</string>
+    <string name="maintenance_encrypt_exported_prefs">Зашифровать экспортируемые параметры</string>
    <string name="maintenance_amount">Количество логов для отправки</string>
    <string name="maintenance">Обслуживание</string>
    <string name="maintenance_shortname">ОБСЛУЖ</string>
@ -1188,6 +1247,8 @@ Context | Edit Context</string>
    <string name="exists">существует</string>
    <string name="notexists">не существует</string>
    <string name="temptargetcompared">Врем цель %1$s</string>
+    <string name="btdevicecompared">Подключение Bluetooth к устройству %1$s %2$s</string>
+    <string name="btdevice">Соединение с устройством Bluetooth </string>
    <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
    <string name="autosenscompared">Автосенс %1$s %2$s %%</string>
    <string name="autosenslabel">Автосенс %</string>
@ -1242,6 +1303,7 @@ Context | Edit Context</string>
    <string name="medtronic_pump_battery_alkaline">Щелочная (Подробный вид)</string>
    <string name="medtronic_pump_battery_lithium">Литиевая (Подробный вид)</string>
    <string name="medtronic_pump_battery_nizn">NiZn (Подробный вид)</string>
+    <string name="medtronic_pump_battery_nimh">Никель-металлогидридная (подробно)</string>
    <string name="medtronic_bolus_debugging">Отладка Болюс/Назначения</string>
    <!-- RL BLE Scanning -->
    <string name="rileylink_scanner_scan_scan">СКАН</string>
@ -1257,6 +1319,7 @@ Context | Edit Context</string>
    <string name="rileylink_scanner_scanning">Сканирование</string>
    <string name="rileylink_scanner_scanning_finished">Сканирование завершено</string>
    <string name="rileylink_scanner_scanning_error">Ошибка сканирования: %1$d</string>
+    <string name="common_never">Никогда</string>
    <!-- RL Status Page -->
    <string name="rileylink_settings_tab1">Настройки</string>
    <string name="rileylink_settings_tab2">История</string>
@ -1390,6 +1453,7 @@ Context | Edit Context</string>
    <string name="objectives_button_unstart">Очистить начатые</string>
    <string name="timedetection">Определение времени</string>
    <string name="doyouwantresetstart">Хотите сбросить начатую цель? Можете потерять уже достигнутое.</string>
+    <string name="time_or_timezone_change">Изменение времени и/или часового пояса на помпе</string>
    <string name="nopumpselected">Помпа не выбрана</string>
    <string name="setupwizard_units_prompt">Выберите единицы, в которых вы хотите отображать значения</string>
    <string name="ns_ploadlocalprofile">Перенести изменения локального профиля в NS</string>
@ -1446,4 +1510,34 @@ Context | Edit Context</string>
    <string name="loop_tbrexecution_time_label">Время выполнения временной базальной скорости</string>
    <string name="insight_alert_notification_channel">Оповещения помпы Insight</string>
    <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">из приложения Authenticator на: %1$s</string>
+    <string name="smscommunicator_otp_enabled">Включить аутентификатор</string>
+    <string name="smscommunicator_otp_enabled_summary">Аутентифицировать команды с помощью одноразовых паролей, сгенерированных Google Authenticator или похожими приложениями 2FA.</string>
+    <string name="smscommunicator_otp_pin">Дополнительный PIN-код в конце маркера</string>
+    <string name="smscommunicator_otp_pin_summary">Дополнительные цифры, которые должны быть запомнены и добавлены в конце каждого сгенерированного одноразового пароля</string>
+    <string name="smscomunicator_tab_otp_label">Настройка аутентификации</string>
+    <string name="smscommunicator_otp_verify_label">OTP для проверки:</string>
+    <string name="smscommunicator_otp_reset_btn">Сбросить аутентификаторы</string>
+    <string name="smscommunicator_otp_reset_title">Сбросить ключ идентификации</string>
+    <string name="smscommunicator_otp_reset_prompt">Вы действительно хотите сбросить ключ аутентификации? Все сконфигурированные в настоящее время ключи станут недопустимы, и придется их настроить заново.</string>
+    <string name="smscommunicator_otp_reset_successful">Создан новый ключ аутентификации! Для идентификации используйте обновленный QRCode.</string>
+    <string name="smscommunicator_otp_step1_install_header">1. Установить Аутентификатор</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. Код сканирования для настройки кодов OTP AndroidAPS</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Одноразовый Пароль</string>
+    <string name="smscommunicator_otp_reset_header">Сбросить аутентификаторы</string>
+    <string name="smscommunicator_otp_install_info">В каждом отслеживающем телефоне установите приложение Authenticator, поддерживающее маркеры TOTP RFC 6238. Популярные бесплатные приложения: \n Authy\n Google Authenticator\n LastPass Authenticator\n FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_provisioning_warning">Не переправляйте этот код через интернет!\nИспользуйте его только для настройки приложения Authenticator на отслеживающих телефонах.</string>
+    <string name="smscommunicator_otp_reset_warning">После сброса аутентификатора вы делаете все созданные идентификаторы недействительными. Вам нужно будет снова создать их!</string>
+    <string name="onconnect">При подключении</string>
+    <string name="ondisconnect">При отключении</string>
+    <string name="overview_show_predictions">Прогнозирование</string>
+    <string name="overview_show_deviationslope">Линия отклонения</string>
+    <string name="authorizationfailed">Ошибка авторизации</string>
+    <string name="overview_show_absinsulin">Абсолютный инсулин</string>
+    <string name="master_password_summary">Главный пароль используется для шифрования резервных копий и для переопределения защиты в приложении. Запомните его или храните в безопасном месте.</string>
+    <string name="passwords_dont_match">Пароли не совпадают</string>
+    <string name="current_master_password">Текущий главный пароль</string>
+    <string name="statuslights">Индикаторы состояния</string>
+    <string name="statuslights_copy_ns">Копировать параметры из NS</string>
+    <string name="copyexistingvalues">Копировать настройки NS (если есть)?</string>
 </resources>
--- a/app/src/main/res/values-ru-rRU/validator.xml
+++ b/app/src/main/res/values-ru-rRU/validator.xml
@ -1,2 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Можно вводить только цифры.</string>
+    <string name="error_only_numeric_digits_range_allowed">Разрешены только цифровые значения в диапазоне %1$s - %2$s.</string>
+    <string name="error_this_field_cannot_contain_special_character">Это поле не может содержать специальные символы</string>
+    <string name="error_only_standard_letters_are_allowed">Разрешены только стандартные буквы</string>
+    <string name="error_field_must_not_be_empty">Поле не может быть пустым</string>
+    <string name="error_email_address_not_valid">Недопустимый адрес электронной почты</string>
+    <string name="error_creditcard_number_not_valid">Недопустимый номер кредитной карты</string>
+    <string name="error_phone_not_valid">Некорректный номер телефона</string>
+    <string name="error_domain_not_valid">Недопустимое имя домена</string>
+    <string name="error_ip_not_valid">Недопустимый IP</string>
+    <string name="error_url_not_valid">Недопустимый Url-адрес</string>
+    <string name="error_notvalid_personname">Недопустимое имя или фамилия.</string>
+    <string name="error_notvalid_personfullname">Недопустимое полное имя.</string>
+    <string name="error_date_not_valid">Недопустимый формат</string>
+    <string name="error_mustbe4digitnumber">Должен быть 4-значным числом</string>
+    <string name="error_mustbe6digitnumber">Должен быть 6-значным числом</string>
+    <string name="error_not_a_minimum_length">Не минимальной длины</string>
+    <string name="error_pin_not_valid">Пин-код должен состоять из 3-6 цифр, не одинаковых или идущих подряд</string>
+</resources>
--- a/app/src/main/res/values-sk-rSK/objectives.xml
+++ b/app/src/main/res/values-sk-rSK/objectives.xml
@ -20,7 +20,9 @@
    <string name="objectives_autosens_gate">Jeden týždeň úspešného používania s bežným príjmom sacharidov</string>
    <string name="objectives_ama_objective">Povolenie doplnkových funkcií pre každodenné použitie, ako napr. pokročilý asistent jedál (AMA)</string>
    <string name="objectives_smb_objective">Povoliť ďalšie funkcie pre bežné používanie ako SMB</string>
+    <string name="objectives_auto_objective">Povolenie automatiky</string>
    <string name="objectives_smb_gate">Prečítať si dokumentáciu a zvýšiť maximálne IOB, aby mohlo správne fungovať SMB! Pre začiatok sa dá použiť veľkosť bežného bolusu + 3x maximálny denný bazál</string>
+    <string name="objectives_auto_gate">Prečítajte si dokumentáciu na wiki, ako automatika funguje. Najskôr nastavte iba jednoduché pravidlá. Namiesto vykonávania akcií nechajte AAPS zobrazovať iba oznámenia. Pokiaľ ste si istý, že automatika je spustená v správnom čase, môžete oznámenie nahradiť vykonaním akcie.(https://androidaps.readdocs.io/en/latest/CROWDIN/cs/Usage/Automation.html)</string>
    <string name="objectives_bgavailableinns">Glykémia dostupná v NS</string>
    <string name="objectives_pumpstatusavailableinns">Stav pumpy dostupný v NS</string>
    <string name="objectives_manualenacts">Spustené manuálne</string>
--- a/app/src/main/res/values-sk-rSK/protection.xml
+++ b/app/src/main/res/values-sk-rSK/protection.xml
@ -1,2 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="biometric_title">Vyžaduje sa autentifikácia</string>
+    <string name="biometric_description">Priložte prst na čítačku odtlačkov prstov pre overenie vašej totožnosti</string>
+    <string name="settings_protection">Ochrana nastavení</string>
+    <string name="application_protection">Ochrana aplikácie</string>
+    <string name="bolus_protection">Ochrana bolusu</string>
+    <string name="master_password">Hlavné heslo</string>
+    <string name="settings_password">Heslo pre nastavenia</string>
+    <string name="application_password">Heslo aplikácie</string>
+    <string name="bolus_password">Heslo pre bolus</string>
+    <string name="unlock_settings">Odomknúť nastavenia</string>
+    <string name="biometric">Biometria</string>
+    <string name="custom_password">Vlastné heslo</string>
+    <string name="noprotection">Bez ochrany</string>
+    <string name="protection">Ochrana</string>
+    <string name="master_password_missing">Hlavné heslo nie je nastavené!\n\nProsím nastavte svoje hlavné heslo v nastaveniach (%1$s &#8594; %2$s)</string>
+    <string name="password_set">Heslo nastavené!</string>
+    <string name="password_not_set">Heslo nie je nastavené</string>
+    <string name="password_not_changed">Heslo nezmenené</string>
+    <string name="password_cleared">Heslo vymazané!</string>
+    <string name="password_hint">Zadajte heslo</string>
+</resources>
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@ -43,6 +43,7 @@
    <string name="description_pump_mdi">Ovládač pumpy pre užívateľov používajúcich k liečbe diabetu inzulínové perá</string>
    <string name="description_pump_virtual">Ovládač pumpy pre užívateľov bez podporovanej pumpy (Otvorený okruh)</string>
    <string name="description_sensitivity_aaps">Citlivosť je počítaná tým istým spôsobom ako v Oref0, ale je možné špecifikovať časové okno do minulosti. Minimálne vstrebávanie sacharidov je počítané dynamicky z maximálnej doby vstrebávania, definovanej v nastaveniach.</string>
+    <string name="description_sensitivity_oref1">Citlivosť je počítaná za posledných 8h, alebo 24h (použiť to, ktoré je citlivejšie) a sacharidy (pokiaľ nie sú vstrebané), sú orezané po čase definovanom v nastaveniach. Modul tiež počíta s UAM (neoznámené jedlo).</string>
    <string name="description_sensitivity_weighted_average">Citlivosť je počítaná ako vážený priemer z odchýlok. Novšie majú vyššiu prioritu. Minimálna vstrebateľnosť sacharidov je počítaná dynamicky z maximálnej doby vstrebateľnosti definovanej v nastaveniach. Tento algoritmus je najrýchlejší v sledovaní zmien citlivosti.</string>
    <string name="description_source_eversense">Získavať glykémie z upravenej Eversense aplikácie.</string>
    <string name="description_source_glimp">Získavať hodnoty glykémií z aplikácie Glimp.</string>
@ -105,7 +106,6 @@
    <string name="sms_delta">Rozdiel:</string>
    <string name="configbuilder">Konfigurácia</string>
    <string name="objectives">Ciele</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Prehľad</string>
    <string name="nsprofile">NS Profil</string>
    <string name="simpleprofile">Jednoduchý profil</string>
@ -218,6 +218,44 @@
    <string name="openapsma_maxiob_title">Maximálny bazálny IOB, ktorý OpenAPS môže podať [JI]</string>
    <string name="openapsma_maxiob_summary">Táto hodnota je nazývaná v kontexte OpenAPS ako max IOB, je to maximálne množstvo inzulínu v [JI], ktoré APS môže naraz podať.</string>
    <string name="dismiss">POTVRDIŤ</string>
+    <string name="password_preferences_encrypt_prompt">Budete vyzvaný na zadanie hlavného hesla, ktoré bude použité na dešifrovanie exportovaných nastavení.</string>
+    <string name="password_preferences_decrypt_prompt">Budete vyzvaný na zadanie hlavného hesla, ktoré bude použité na dešifrovanie importovaných nastavení.</string>
+    <string name="preferences_export_canceled">Export zrušený! Nastavenia neboli exportované!</string>
+    <string name="preferences_import_canceled">Import zrušený! Nastavenia neboli importované!</string>
+    <string name="check_preferences_before_import">Prosím skontrolujte nastavenia predtým, ako importujete:</string>
+    <string name="check_preferences_cannot_import">Nastavenia nemôžu byť importované!</string>
+    <string name="check_preferences_dangerous_import">Nastavenia by nemali byť importované!</string>
+    <string name="check_preferences_details_btn">Vysvetli chyby pri importe...</string>
+    <string name="check_preferences_details_title">Podrobnosti chýb pri importe</string>
+    <string name="check_preferences_import_btn">Importovať</string>
+    <string name="check_preferences_import_anyway_btn">Importovať rovnako (NEBEZPEČNÉ!)</string>
+    <string name="metadata_warning_different_flavour">Nastavenia boli vytvorené inou verziou AAPS (%1$s) pretože máte: %2$s.\n\nNiektoré nastavenia môžu chýbať, alebo byť poškodené - po importovaní prosím skontrolujte a upravte nastavenia.</string>
+    <string name="metadata_warning_different_device">Nastavenia boli vytvorené na inom zariadení. Je to v poriadku, keď importujete zo staršieho/iného telefónu, ale skontrolujte, že importované nastavenia sú správne!</string>
+    <string name="metadata_warning_outdated_format">Používate zastaralý formát zo staršej verzie AAPS, čo nie je bezpečné! Používajte len ako poslednú možnosť, ak nemáte export v aktuálnom, JSON formáte.</string>
+    <string name="metadata_warning_old_export">Importované nastavenia sú už %1$s dní staré! Možno máte viacero novších nastavení, alebo ste zvolili nesprávny súbor? Nezabúdajte pravidelne exportovať nastavenia!</string>
+    <string name="metadata_warning_date_format">Nesprávny formát dátumu a času!</string>
+    <string name="metadata_label_format">Formát súboru</string>
+    <string name="metadata_label_created_at">Vytvorené</string>
+    <string name="metadata_label_aaps_version">Verzia AAPS</string>
+    <string name="metadata_label_aaps_flavour">Verzia zostavy</string>
+    <string name="metadata_label_device_name">Meno pacienta použité pri exporte</string>
+    <string name="metadata_label_device_model">Model zariadenia použitý pri exporte</string>
+    <string name="metadata_label_encryption">Šifrovanie súborov</string>
+    <string name="metadata_format_old">Zastaralý formát exportu</string>
+    <string name="metadata_format_new">Nový šifrovaný formát</string>
+    <string name="metadata_format_debug">Nový formát pre ladenie (nešifrovaný)</string>
+    <string name="metadata_format_other">Neznámy formát exportu</string>
+    <string name="prefdecrypt_settings_tampered">Súbor s nastaveniami poškodený</string>
+    <string name="prefdecrypt_settings_secure">Súbor s nastaveniami je zabezpečený</string>
+    <string name="prefdecrypt_settings_unencrypted">Použitie nezabezpečeného, nešifrovaného formátu nastavení</string>
+    <string name="prefdecrypt_wrong_json">Chyba formátu JSON, chýba povinné pole (formát, obsah, metadáta, alebo zabezpečenie)</string>
+    <string name="prefdecrypt_wrong_password">Chyba dešifrovania, dané heslo nemôže dešifrovať súbor</string>
+    <string name="prefdecrypt_issue_missing_file_hash">Chýba kontrolný súčet súboru (hash), nedá sa overiť pravosť nastavení!</string>
+    <string name="prefdecrypt_issue_modified">Súbor bol po exporte zmenený!</string>
+    <string name="prefdecrypt_issue_parsing">Chyba dešifrovania, analýza nastavení zlyhala!</string>
+    <string name="prefdecrypt_issue_wrong_pass">Chyba dešifrovania, zadané heslo je neplatné, alebo bol súbor nastavení zmenený! Môže sa stať, že importovaný súbor bol exportovaný s iným hlavným heslom.</string>
+    <string name="prefdecrypt_issue_wrong_format">Chýba konfigurácia šifrovania, formát nastavení je neplatný!</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">Nepodporovaný alebo neurčený šifrovací algoritmus!</string>
    <string name="danarpump">DanaR</string>
    <string name="connecting">Pripájanie</string>
    <string name="connected">Pripojené</string>
@ -507,6 +545,9 @@
    <string name="adult">Dospelý</string>
    <string name="resistantadult">Dospelý s nízkou citlivosťou</string>
    <string name="patientage_summary">Vyberte vek pacienta pre nastavenie bezpečnostných limitov</string>
+    <string name="patient_name">Meno pacienta</string>
+    <string name="patient_name_summary">Zadajte meno pacienta, alebo prezývku pre rozlíšenie medzi viacerými nastaveniami</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Používateľ</string>
    <string name="Glimp">Glimp</string>
    <string name="needwhitelisting">%1$s potrebuje vypnúť optimalizáciu batérie pre optimálny výkon</string>
    <string name="loopsuspended">Uzavretý okruh pozastavený</string>
@ -543,8 +584,14 @@
    <string name="enablesuperbolus">Povoliť superbolus</string>
    <string name="enablesuperbolus_summary">Povolenie superbolusu v kalkulátore. Nepovoľujte, pokiaľ se nenaučíte, čo to v skutočnosti robí. MÔŽE SPÔSOBIŤ PREDÁVKOVANIE INZULÍNOM PRI NESPRÁVNOM POUŽITÍ!</string>
    <string name="show_statuslights">Zobraziť indikátory stavu na domovskej obrazovke</string>
-    <string name="show_statuslights_extended">Zobraziť rozšírené indikátory stavu na domovskej obrazovke</string>
-    <string name="show_statuslights_extended_summary">Povoliť rozšírené indikátory stavu pre CAGE, IAGE, SAGE, Reservoir a Battery Level na domovskej obrazovke.</string>
+    <string name="statuslights_cage_warning">Prah upozornenia na vek kanyly [h]</string>
+    <string name="statuslights_cage_critical">Prah kritického veku kanyly [h]</string>
+    <string name="statuslights_iage_warning">Prah upozornenia na vek inzulínu [h]</string>
+    <string name="statuslights_iage_critical">Prah kritického veku inzulínu [h]</string>
+    <string name="statuslights_sage_warning">Prah upozornenia na vek senzora [h]</string>
+    <string name="statuslights_sage_critical">Prah kritického veku senzora [h]</string>
+    <string name="statuslights_bage_warning">Prah upozornenia na úroveň batérie [h]</string>
+    <string name="statuslights_bage_critical">Prah kritickej úrovne batérie [h]</string>
    <string name="statuslights_res_warning">Prah upozornenia na úroveň hladiny zásobníka [JI]</string>
    <string name="statuslights_res_critical">Prah kritickej úrovne hladiny zásobníka [JI]</string>
    <string name="statuslights_bat_warning">Prah upozornenia na úroveň batérie [%]</string>
@ -704,8 +751,13 @@
    <string name="bgsource_upload">Nastavenie nahrávania glykémie</string>
    <string name="wear_detailed_delta_title">Zobrazovať detailné zmeny</string>
    <string name="wear_detailed_delta_summary">Zobrazovať rozdiel s jedným desatinným miestom naviac</string>
+    <string name="smbinterval_summary">Ako často budú SMB podávané (v minutách)</string>
    <string name="smbmaxminutes">SMB max. minút</string>
    <string name="smbmaxminutes_summary">Maximálny počet minút bazálu, ku ktorým se limituje SMB</string>
+    <string name="uamsmbmaxminutes">UAM SMB max. minút</string>
+    <string name="uamsmbmaxminutes_summary">Maximální počet minút bazálu, ku ktorým sa limituje SMB pre UAM</string>
+    <string name="carbsReqThreshold">Prahová hodnota doporučenia sacharidov</string>
+    <string name="carbsReqThreshold_summary">Po navrhnutí sacharidov, aké množstvo sacharidov vyvolá upozornenie</string>
    <string name="unsupportedfirmware">Nepodporovaný firmware v pumpe</string>
    <string name="dexcomg5_xdripupload_title">Odosielať glykémie do xDrip+</string>
    <string name="dexcomg5_xdripupload_summary">V xDrip+ vyberte zdroj dát 640g/Eversense</string>
@ -772,6 +824,7 @@
    <string name="ago">pred</string>
    <string name="format_hours">%1$.2f h</string>
    <string name="format_mins">%1$d min</string>
+    <string name="format_mins_short">%1$dm</string>
    <string name="enablesmbalways">Vždy povoliť SMB</string>
    <string name="enablesmbalways_summary">Povoliť SMB nezávisle na bolusoch. Možno iba zo zdrojom glykémií s dobrým filtrovaním dát, ako napr. G5</string>
    <string name="enablesmbaftercarbs">Povoliť SMB po jedle</string>
@ -970,6 +1023,10 @@
    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Zvýšenie citlivosti pre dočasné ciele >= 5.5]]></string>
    <string name="low_temptarget_lowers_sensitivity_title">Nízky dočasný cieľ zníži citlivosť</string>
    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Nižšia citlivosť pre dočasné ciele < 5.5]]></string>
+    <string name="resistance_lowers_target_title">Rezistancia znižuje cieľ</string>
+    <string name="resistance_lowers_target_summary">Ak je zistená rezistancia, znížiť cieľovú hladinu glykémie</string>
+    <string name="sensitivity_raises_target_title">Citlivosť zvyšuje cieľ</string>
+    <string name="sensitivity_raises_target_summary">Ak je zistená vyššia citlivosť, zvýši cieľovú hladinu glykémie</string>
    <string name="combo_invalid_setup">Chybné nastavenie pumpy. Prejdite si dokumentáciu a presvedčte sa, že menu Quick Info se nazýva QUICK INFO, s použitím 360° Configuration Software.</string>
    <string name="custom">Voliteľný</string>
    <string name="largetimedifftitle">Veľký rozdiel v čase</string>
@ -979,6 +1036,8 @@
    <string name="allow_hardware_pump_text">POZOR: Pokiaľ aktivujete a pripojíte skutočnú pumpu, AndroidAPS nakopíruje (a bude udržiavať) nastavenie bazálu z aktívneho profilu do pumpy. Nastavenie bazálu v pumpe bude prepísané. Pokiaľ si nieste istí, alebo nechcete prepísať bazály v pumpe, stlačte Zrušiť a opakujte prepnutie na inú pumpu neskôr.</string>
    <string name="error_adding_treatment_title">Dáta ošetrení neúplné</string>
    <string name="maintenance_settings">Nastavenie údržby</string>
+    <string name="maintenance_email">E-Mail</string>
+    <string name="maintenance_encrypt_exported_prefs">Šifrovať exportované nastavenia</string>
    <string name="maintenance_amount">Počet protokolov na odoslanie</string>
    <string name="maintenance">Údržba</string>
    <string name="maintenance_shortname">Údržba</string>
@ -1186,6 +1245,8 @@
    <string name="exists">existuje</string>
    <string name="notexists">neexistuje</string>
    <string name="temptargetcompared">Dočasný cieľ %1$s</string>
+    <string name="btdevicecompared">Pripojenie Bluetooth k zariadeniu %1$s %2$s</string>
+    <string name="btdevice">Pripojenie k zariadeniu Bluetooth </string>
    <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
    <string name="autosenscompared">Autosens %1$s %2$s %%</string>
    <string name="autosenslabel">Autosens %</string>
@ -1240,6 +1301,7 @@
    <string name="medtronic_pump_battery_alkaline">Alkalické (rozšírené zobrazenie)</string>
    <string name="medtronic_pump_battery_lithium">Líthiové (rozšírené zobrazenie)</string>
    <string name="medtronic_pump_battery_nizn">NiZn (Rozšírené)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (Rozšírené zobrazenie)</string>
    <string name="medtronic_bolus_debugging">Bolus/Ošetrenia ladenie</string>
    <!-- RL BLE Scanning -->
    <string name="rileylink_scanner_scan_scan">VYHĽADAŤ</string>
@ -1255,6 +1317,7 @@
    <string name="rileylink_scanner_scanning">Vyhľadávanie</string>
    <string name="rileylink_scanner_scanning_finished">Vyhľadávanie dokončené</string>
    <string name="rileylink_scanner_scanning_error">Chyba vyhľadávania: %1$d</string>
+    <string name="common_never">Nikdy</string>
    <!-- RL Status Page -->
    <string name="rileylink_settings_tab1">Nastavenia</string>
    <string name="rileylink_settings_tab2">História</string>
@ -1388,6 +1451,7 @@
    <string name="objectives_button_unstart">Vymazanie začaté</string>
    <string name="timedetection">Detekcia času</string>
    <string name="doyouwantresetstart">Chcete resetovať začiatok cieľa? Môžete prísť o svoj pokrok.</string>
+    <string name="time_or_timezone_change">Zmena času a/alebo časovej zóny na pumpe</string>
    <string name="nopumpselected">Nie je vybraná žiadna pumpa</string>
    <string name="setupwizard_units_prompt">Vyberte jednotky, v ktorých chcete zobraziť hodnoty</string>
    <string name="ns_ploadlocalprofile">Odoslať zmeny lokálneho profilu do NS</string>
@ -1444,4 +1508,34 @@
    <string name="loop_tbrexecution_time_label">Čas spustenia dočasného bazálu</string>
    <string name="insight_alert_notification_channel">Výstrahy pumpy Insight</string>
    <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">z aplikácie Authenticator pre: %1$s</string>
+    <string name="smscommunicator_otp_enabled">Povoliť Autentifikátor</string>
+    <string name="smscommunicator_otp_enabled_summary">Autentifikačné príkazy používajú jednorázové heslá generované Google Authenticator, alebo podobnými 2FA aplikáciami.</string>
+    <string name="smscommunicator_otp_pin">Ďalší PIN na konci tokenu</string>
+    <string name="smscommunicator_otp_pin_summary">Ďalšie číslice, ktoré by mali byť zapamätané a pridané na koniec každého vygenerovaného jednorázového hesla</string>
+    <string name="smscomunicator_tab_otp_label">Nastavenie autentifikátora</string>
+    <string name="smscommunicator_otp_verify_label">OTP pre kontrolu:</string>
+    <string name="smscommunicator_otp_reset_btn">Resetovať autentifikátory</string>
+    <string name="smscommunicator_otp_reset_title">Resetovať autentifikačný kľúč</string>
+    <string name="smscommunicator_otp_reset_prompt">Ste si istý, že chcete obnoviť autentifikačný kľúč? Vyresetujete tým všetky aktuálne nakonfigurované autentikátory a budete ich musieť znovu nastaviť.</string>
+    <string name="smscommunicator_otp_reset_successful">Bol vygenerovaný nový autentifikačný kľúč! Prosím, použite aktualizovaný QR kód pre nastavenie autentifikátorov.</string>
+    <string name="smscommunicator_otp_step1_install_header">1. Nainštalujte Autentifikátor</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. Naskenujte kód pre nastavenie AndroidAPS OTP kódov</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Odtestujte jednorázové heslo</string>
+    <string name="smscommunicator_otp_reset_header">Resetovať autentifikátory</string>
+    <string name="smscommunicator_otp_install_info">Na každom sledovacom telefóne nainštalujte Autentifikátor, ktorý podporuje tokeny TOTP RFC 6238. Najobľúbenejšie bezplatné aplikácie sú:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_provisioning_warning">NEZDIEĽAJTE tento kód on-line!\nPoužiť iba na nastavenie Autentifikátora na sledujúcich telefónoch.</string>
+    <string name="smscommunicator_otp_reset_warning">Resetovaním autentifikátora budú všetky už poskytnuté autentifikátory neplatné. Budete ich musieť znovu nastaviť!</string>
+    <string name="onconnect">Pri pripojení</string>
+    <string name="ondisconnect">Pri odpojení</string>
+    <string name="overview_show_predictions">Predikcie</string>
+    <string name="overview_show_deviationslope">Odchýlka sklonu</string>
+    <string name="authorizationfailed">Autorizácia zlyhala</string>
+    <string name="overview_show_absinsulin">Celkový inzulín</string>
+    <string name="master_password_summary">Hlavné heslo sa používa na šifrovanie zálohy a na \"prebitie\" zabezpečenia v aplikácii. Dobre si ho zapamätajte, alebo uložte na bezpečnom mieste.</string>
+    <string name="passwords_dont_match">Heslá sa nezhodujú</string>
+    <string name="current_master_password">Aktuálne hlavné heslo</string>
+    <string name="statuslights">Indikátory stavu</string>
+    <string name="statuslights_copy_ns">Kopírovať nastavenia z NS</string>
+    <string name="copyexistingvalues">Skopírovať nastavenia NS (ak existujú)?</string>
 </resources>
--- a/app/src/main/res/values-sk-rSK/validator.xml
+++ b/app/src/main/res/values-sk-rSK/validator.xml
@ -1,2 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Povolené sú iba číslice.</string>
+    <string name="error_only_numeric_digits_range_allowed">Povolené iba čísla v rozsahu %1$s - %2$s.</string>
+    <string name="error_this_field_cannot_contain_special_character">Toto pole nemôže obsahovať žiadne špeciálne znaky</string>
+    <string name="error_only_standard_letters_are_allowed">Sú povolené iba štandardné písmená</string>
+    <string name="error_field_must_not_be_empty">Toto pole nesmie byť prázdne</string>
+    <string name="error_email_address_not_valid">E-mailová adresa je neplatná</string>
+    <string name="error_creditcard_number_not_valid">Číslo kreditnej karty je neplatné</string>
+    <string name="error_phone_not_valid">Neplatné telefónne čislo</string>
+    <string name="error_domain_not_valid">Názov domény je neplatný</string>
+    <string name="error_ip_not_valid">IP Adresa je neplatná</string>
+    <string name="error_url_not_valid">Webová adresa je neplatná</string>
+    <string name="error_notvalid_personname">Neplatné krstné meno, alebo priezvisko.</string>
+    <string name="error_notvalid_personfullname">Nie je platné celé meno.</string>
+    <string name="error_date_not_valid">Formát nie je platný</string>
+    <string name="error_mustbe4digitnumber">Musí byť 4-miestne číslo</string>
+    <string name="error_mustbe6digitnumber">Musí byť 6-miestne číslo</string>
+    <string name="error_not_a_minimum_length">Nie je splnená minimálna dĺžka</string>
+    <string name="error_pin_not_valid">PIN by mal byť z 3 až 6 číslic, nie rovnakých, alebo za sebou nasledujúcich číslic</string>
+</resources>
--- a/app/src/main/res/values-sv-rSE/objectives.xml
+++ b/app/src/main/res/values-sv-rSE/objectives.xml
@ -20,7 +20,9 @@
    <string name="objectives_autosens_gate">1 veckas lyckad looping dagtid, där alla måltider lagts in</string>
    <string name="objectives_ama_objective">Aktiverar extra funktioner som kan användas dagtid, såsom avancerad måltidsassistans, AMA</string>
    <string name="objectives_smb_objective">Aktiverar ytterligare funktioner för användning dagtid, t ex SMB</string>
+    <string name="objectives_auto_objective">Aktivera automatisering</string>
    <string name="objectives_smb_gate">Du måste läsa på wikin och öka max IOB för att få SMB att fungera bra. En bra start är att sätta max IOB till din genomsnittliga måltidsbolus plus 3 gånger den högsta basalen du har under ett dygn</string>
+    <string name="objectives_auto_gate">Läs dokumentationen hur automatisering fungerar. Konfigurera dina första enkla regler. I stället för att ange en åtgärd, låt bara AAPS visa en avisering. När du är säker på att automatisering utlöses vid rätt tidpunkt ersätt aviseringen med verklig åtgärd. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
    <string name="objectives_bgavailableinns">BG är tillängligt i Nightscout</string>
    <string name="objectives_pumpstatusavailableinns">Pumpstatus tillgängligt i Nightscout</string>
    <string name="objectives_manualenacts">Manuella justeringar</string>
--- a/app/src/main/res/values-sv-rSE/protection.xml
+++ b/app/src/main/res/values-sv-rSE/protection.xml
@ -1,2 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="biometric_title">Autentisering krävs</string>
+    <string name="biometric_description">Placera fingret på fingeravtrycksläsaren för att verifiera din identitet</string>
+    <string name="settings_protection">Skydd för inställningar</string>
+    <string name="application_protection">Skydd för app</string>
+    <string name="bolus_protection">Bolusskydd</string>
+    <string name="master_password">Huvudlösenord</string>
+    <string name="settings_password">Lösenord för inställningar</string>
+    <string name="application_password">Lösenord för app</string>
+    <string name="bolus_password">Lösenord för bolus</string>
+    <string name="unlock_settings">Lås upp inställningar</string>
+    <string name="biometric">Biometri</string>
+    <string name="custom_password">Eget lösenord</string>
+    <string name="noprotection">Inget skydd</string>
+    <string name="protection">Skydd</string>
+    <string name="master_password_missing">Huvudlösenord har inte angetts.\n\nAnge huvudlösenord i Inställningar (%1$s &#8594; %2$s)</string>
+    <string name="password_set">Lösenord sparat!</string>
+    <string name="password_not_set">Lösenord inte inställt</string>
+    <string name="password_not_changed">Lösenordet har inte ändrats</string>
+    <string name="password_cleared">Lösenordet togs bort!</string>
+    <string name="password_hint">Ange lösenord här</string>
+</resources>
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@ -43,6 +43,7 @@
    <string name="description_pump_mdi">Integration för de som endast använder insulinpennor</string>
    <string name="description_pump_virtual">Integration för pumpar som ännu inte stöds av AndroidAPS (Open loop)</string>
    <string name="description_sensitivity_aaps">Känsligheten beräknas på samma sätt som i Oref0, men du kan specificera hur mycket av historiken som ska tas med i beräkningen. Minimalt upptag av kolhydrater beräknas utifrån maximal upptagstid för kolhydrater som angetts i Inställningar.</string>
+    <string name="description_sensitivity_oref1">Känsligheten beräknas både från 8 och 24 timmars data från historiken och väljer det resultat som har högst insulinkänslighet. Kolhydrater som ännu inte räknats av ignoreras efter tiden som ställts in i inställningarna. Insticksprogrammet beräknar också icke inmatade måltider, UAM.</string>
    <string name="description_sensitivity_weighted_average">Känsligheten beräknas som ett viktat medelvärde av avvikelserna. Senare avvikelser får en högre vikt. Minimal upptagning av kolhydrater beräknas utifrån maximal upptagstid för kolhydrater som angetts i inställningarna. Den här algoritmen är den snabbaste att justera förändringar i känsligheten.</string>
    <string name="description_source_eversense">Ta emot BG-data från den modifierade
 Eversense-appen.</string>
@ -106,7 +107,6 @@ Eversense-appen.</string>
    <string name="sms_delta">Delta:</string>
    <string name="configbuilder">Konfigurationsverktyg</string>
    <string name="objectives">Mål</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Översikt</string>
    <string name="nsprofile">NS-profil</string>
    <string name="simpleprofile">Enkel profil</string>
@ -219,6 +219,44 @@ Eversense-appen.</string>
    <string name="openapsma_maxiob_title">Maximal basal IOB som OpenAPS kan ge [E]</string>
    <string name="openapsma_maxiob_summary">Detta värde kallas Max IOB i OpenAPS. Det är ställt till noll från start. Efter flera dagar till veckor, beroende på hur du känner, kan du välja att justera denna.</string>
    <string name="dismiss">TA BORT</string>
+    <string name="password_preferences_encrypt_prompt">Du kommer att bli tillfrågad om huvudlösenordet som sedan kommer att användas för att kryptera exporterade inställningar.</string>
+    <string name="password_preferences_decrypt_prompt">Du kommer att bli tillfrågad om huvudlösenordet som sedan kommer att användas för att avkryptera importerade inställningar.</string>
+    <string name="preferences_export_canceled">Exporten avbröts. Inställningarna har INTE exporterats!</string>
+    <string name="preferences_import_canceled">Importen avbröts. Inställningarna har inte importerats!</string>
+    <string name="check_preferences_before_import">Vänligen kontrollera inställningarna innan du importerar:</string>
+    <string name="check_preferences_cannot_import">Inställningarna kan inte importeras!</string>
+    <string name="check_preferences_dangerous_import">Inställningar bör inte importeras!</string>
+    <string name="check_preferences_details_btn">Förklara importproblem…</string>
+    <string name="check_preferences_details_title">Detaljer kring importproblem</string>
+    <string name="check_preferences_import_btn">Importera</string>
+    <string name="check_preferences_import_anyway_btn">Importera ändå (FARLIGT!)</string>
+    <string name="metadata_warning_different_flavour">Inställningar skapades med en annan variant av AAPS (%1$s). Du kör nu: %2$s.\n\nVissa inställningar kan saknas eller är ogiltiga. Efter att du importerat bör du kontrollera och uppdatera inställningarna.</string>
+    <string name="metadata_warning_different_device">Inställningar skapades på en annan enhet. Det är OK om du importerar från en äldre eller en annan telefon, men se till att importerade inställningar är korrekta!</string>
+    <string name="metadata_warning_outdated_format">Du använder det gamla formatet (från äldre versioner av AAPS) som inte är säkert. Använd det bara som en sista utväg om du inte har någon export i aktuellt format, JSON.</string>
+    <string name="metadata_warning_old_export">Importerade inställningar är %1$s dagar gamla. Du kanske har mer aktuella inställningar eller väljer du fel fil? Kom ihåg att exportera dina inställningar regelbundet!</string>
+    <string name="metadata_warning_date_format">Ogiltigt datumformat!</string>
+    <string name="metadata_label_format">Filformat</string>
+    <string name="metadata_label_created_at">Skapad</string>
+    <string name="metadata_label_aaps_version">AAPS-version</string>
+    <string name="metadata_label_aaps_flavour">Build-variant</string>
+    <string name="metadata_label_device_name">Exporterar patientens namn</string>
+    <string name="metadata_label_device_model">Exporterar enhetsmodell</string>
+    <string name="metadata_label_encryption">· Filkryptering</string>
+    <string name="metadata_format_old">Gammalt exportformat</string>
+    <string name="metadata_format_new">Nytt krypterat format</string>
+    <string name="metadata_format_debug">Nytt debug-format (okrypterat)</string>
+    <string name="metadata_format_other">Okänt exportformat</string>
+    <string name="prefdecrypt_settings_tampered">Inställningsfil manipulerad</string>
+    <string name="prefdecrypt_settings_secure">Inställningsfilen är intakt</string>
+    <string name="prefdecrypt_settings_unencrypted">Använder icke säkrat, okrypterat format</string>
+    <string name="prefdecrypt_wrong_json">JSON-formatfel, saknar obligatoriskt fält (format, innehåll, metadata eller säkerhet)</string>
+    <string name="prefdecrypt_wrong_password">Dekrypteringsfel. Det angivna lösenordet kan inte dekryptera filen</string>
+    <string name="prefdecrypt_issue_missing_file_hash">Filen checksumma (hash) saknas. Det går inte att verifiera inställningarna!</string>
+    <string name="prefdecrypt_issue_modified">Filen har ändrats efter export!</string>
+    <string name="prefdecrypt_issue_parsing">Dekrypteringsfel. Det gick inte att tolka inställningarna.</string>
+    <string name="prefdecrypt_issue_wrong_pass">Dekrypteringsfel. Det angivna lösenordet är ogiltigt eller så har inställningsfilen ändrats. Filen verkar ha exporterats med ett annat lösenord.</string>
+    <string name="prefdecrypt_issue_wrong_format">Krypteringskonfigurationen saknas. Inställningsformatet är ogiltigt!</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">Ej stödd eller ej angiven krypteringsalgoritm!</string>
    <string name="danarpump">Dana R</string>
    <string name="connecting">Ansluter</string>
    <string name="connected">Ansluten</string>
@ -508,6 +546,9 @@ Eversense-appen.</string>
    <string name="adult">Vuxen</string>
    <string name="resistantadult">Insulinresistent vuxen</string>
    <string name="patientage_summary">Vg ange personens ålder för inställningar av gränser</string>
+    <string name="patient_name">Patientens namn</string>
+    <string name="patient_name_summary">Vänligen ange patientens namn eller smeknamn för att kunna skilja mellan flera uppsättningar av inställningar</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Ditt namn</string>
    <string name="Glimp">Glimp</string>
    <string name="needwhitelisting">%1$s behöver kunna kringgå batterisparfunktionerna för att fungera korrekt</string>
    <string name="loopsuspended">Loop pausad</string>
@ -544,8 +585,6 @@ Eversense-appen.</string>
    <string name="enablesuperbolus">Aktivera superbolus i kalkylatorn</string>
    <string name="enablesuperbolus_summary">Aktiverar superbolusfunktionen i kalkylatorn. Aktivera inte innan du förstått hur den fungerar. DEN KAN ORSAKA ÖVERDOSERING AV INSULIN OM INSIKT SAKNAS OM FUNKTIONEN!</string>
    <string name="show_statuslights">Visa \"statuslampor\" på hemskärmen</string>
-    <string name="show_statuslights_extended">Visa utökade statusindikatorer</string>
-    <string name="show_statuslights_extended_summary">Aktivera statusindikatorerna för cage, iage, sage, reservoar och batterinivå på hemskärmen.</string>
    <string name="statuslights_res_warning">Varningsnivå för reservoar [U]</string>
    <string name="statuslights_res_critical">Akut varningsnivå för reservoar [U]</string>
    <string name="statuslights_bat_warning">Varningsnivå för batteri [%]</string>
@ -705,8 +744,13 @@ Eversense-appen.</string>
    <string name="bgsource_upload">Uppladdningsinställningar för BG</string>
    <string name="wear_detailed_delta_title">Visa detaljerad delta</string>
    <string name="wear_detailed_delta_summary">Visa delta med en extra decimal</string>
+    <string name="smbinterval_summary">Minsta antal minuter mellan SMB</string>
    <string name="smbmaxminutes">SMB max minuter</string>
    <string name="smbmaxminutes_summary">Max antal minuter som kan bli SMB</string>
+    <string name="uamsmbmaxminutes">UAM SMB max minuter</string>
+    <string name="uamsmbmaxminutes_summary">Max antal minuter basal som kan bli SMB vid UAM</string>
+    <string name="carbsReqThreshold">Min föreslagen mängd kolhydrater</string>
+    <string name="carbsReqThreshold_summary">När kolhydrater rekommenderas som korrektion, ange minsta mängd KH som ger notifiering</string>
    <string name="unsupportedfirmware">Pumpens firmware stöds inte</string>
    <string name="dexcomg5_xdripupload_title">Skicka BG-data till xDrip+</string>
    <string name="dexcomg5_xdripupload_summary">Välj \"640G/Eversense\" som datakälla i xDrip+</string>
@ -773,6 +817,7 @@ Eversense-appen.</string>
    <string name="ago">sedan</string>
    <string name="format_hours">%1$.2f h</string>
    <string name="format_mins">%1$d min</string>
+    <string name="format_mins_short">%1$dm</string>
    <string name="enablesmbalways">Använd alltid SMB</string>
    <string name="enablesmbalways_summary">Använd alltid SMB oberoende av bolus. Endast möjligt med en bra filtrerad BG-källa, t ex Dexcom G5.</string>
    <string name="enablesmbaftercarbs">Använd SMB efter kolhydrater</string>
@ -971,6 +1016,10 @@ Eversense-appen.</string>
    <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Höj känsligheten om temp målvärde är 100 mg/dl (5.5 mmol/l) eller högre]]></string>
    <string name="low_temptarget_lowers_sensitivity_title">Lågt målvärde sänker känsligheten</string>
    <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Sänk känsligheten om temp målvärde är mindre än 100 mg/dl (5.5 mmol/l)]]></string>
+    <string name="resistance_lowers_target_title">Insulinresistens sänker mål-BG</string>
+    <string name="resistance_lowers_target_summary">Om systemet upptäcker tillfällig insulinresistens, sänk mål-BG för att på så sätt tillåta mer insulin</string>
+    <string name="sensitivity_raises_target_title">Insulinkänslighet höjer mål-BG</string>
+    <string name="sensitivity_raises_target_summary">Om systemet upptäcker tillfällig insulinkänslighet, höj mål-BG för att på så sätt minska insulindoseringen</string>
    <string name="combo_invalid_setup">Felaktig pumpinstallation. Kontrollera dokumentationen och verifiera att Snabbmenyn heter QUICK INFO med hjälp av 360-mjukvaran.</string>
    <string name="custom">Anpassad</string>
    <string name="largetimedifftitle">Stor tidsskillnad</string>
@ -980,6 +1029,8 @@ Eversense-appen.</string>
    <string name="allow_hardware_pump_text">Varning: Om du aktiverar och ansluter en pump, kommer AndroidAPS skriva över pumpens basalprofil med den aktiva profilen i AndroidAPS. Se till att ha rätt inställningar i appen innan du ansluter. Om du är osäker, tryck på Avbryt och anslut pumpen på nytt vid ett senare tillfälle.</string>
    <string name="error_adding_treatment_title">Behandlingsdata ofullständigt</string>
    <string name="maintenance_settings">Underhållsinställningar</string>
+    <string name="maintenance_email">e-postmottagare</string>
+    <string name="maintenance_encrypt_exported_prefs">Kryptera exporterade inställningar</string>
    <string name="maintenance_amount">Antal loggar att skicka</string>
    <string name="maintenance">Underhåll</string>
    <string name="maintenance_shortname">UH</string>
@ -1187,6 +1238,8 @@ Eversense-appen.</string>
    <string name="exists">finns</string>
    <string name="notexists">finns inte</string>
    <string name="temptargetcompared">Temp mål %1$s</string>
+    <string name="btdevicecompared">Bluetooth-anslutning till enhet %1$s %2$s</string>
+    <string name="btdevice">Anslutning till Bluetooth-enhet </string>
    <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
    <string name="autosenscompared">Autosens %1$s %2$s %%</string>
    <string name="autosenslabel">Autosens %</string>
@ -1241,6 +1294,7 @@ Eversense-appen.</string>
    <string name="medtronic_pump_battery_alkaline">Alkaliskt</string>
    <string name="medtronic_pump_battery_lithium">Litium</string>
    <string name="medtronic_pump_battery_nizn">NiZn (utökad vy)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (utökad vy)</string>
    <string name="medtronic_bolus_debugging">Avlusning av Bolus/Behandlingar</string>
    <!-- RL BLE Scanning -->
    <string name="rileylink_scanner_scan_scan">SÖK</string>
@ -1445,4 +1499,31 @@ Eversense-appen.</string>
    <string name="loop_tbrexecution_time_label">Basalförändring utförd</string>
    <string name="insight_alert_notification_channel">Pumpvarningar Insight</string>
    <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">från autentiseringsapp för: %1$s</string>
+    <string name="smscommunicator_otp_enabled">Aktivera autentiseraren</string>
+    <string name="smscommunicator_otp_enabled_summary">Autentisera kommandon med hjälp av engångslösenord som genererats av Google Authenticator eller liknande appar för tvåfaktorsautentisering.</string>
+    <string name="smscommunicator_otp_pin">Extra PIN-kod</string>
+    <string name="smscommunicator_otp_pin_summary">Ytterligare siffror som ska memoreras och läggas till i slutet av varje genererat engångslösenord</string>
+    <string name="smscomunicator_tab_otp_label">Konfiguration av tvåfaktorsautentisering</string>
+    <string name="smscommunicator_otp_verify_label">Engångslösenord att kontrollera:</string>
+    <string name="smscommunicator_otp_reset_btn">Återställ autentiserare</string>
+    <string name="smscommunicator_otp_reset_title">Återställ autentiseringsnyckel</string>
+    <string name="smscommunicator_otp_reset_prompt">Är du säker på att återställa autentiseringsnyckeln? Det gör alla konfigurerade autentiseringsappar ogiltiga och du kommer behöva ställa in dem igen.</string>
+    <string name="smscommunicator_otp_reset_successful">Ny autentiseringsnyckel genererades! Använd uppdaterad QR-kod till att aktivera autentiserare.</string>
+    <string name="smscommunicator_otp_step1_install_header">1. Installera autentiseringsapp</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. Scanna koden för att ställa in engångslösenord för AndroidAPS</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Testa engångslösenord</string>
+    <string name="smscommunicator_otp_reset_header">Återställ autentiserare</string>
+    <string name="smscommunicator_otp_install_info">På varje följartelefon behöver man installera en autentiseringsapp som stöder RFC 6238 TOTP tokens. Populära gratisappar är:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_provisioning_warning">DELA INTE denna kod online!\nAnvänd den endast för att installera autentiseringsappen på följartelefoner.</string>
+    <string name="smscommunicator_otp_reset_warning">Genom att återställa autentiseringsfunktionen kommer alla redan driftsatta autentiserare bli ogiltiga. Du kommer behöva sätta upp dem igen!</string>
+    <string name="onconnect">Vid anslutning</string>
+    <string name="ondisconnect">Vid frånkoppling</string>
+    <string name="overview_show_predictions">Beräknade resultat</string>
+    <string name="overview_show_deviationslope">Avvikelsekurva</string>
+    <string name="authorizationfailed">Behörighetskontroll misslyckades</string>
+    <string name="overview_show_absinsulin">Absolut insulinmängd</string>
+    <string name="master_password_summary">Huvudlösenordet används för att kryptera backuper och för att åsidosätta vissa säkerhetsfunktioner i applikationen. Kom ihåg det eller förvara det på ett säkert ställe.</string>
+    <string name="passwords_dont_match">Lösenorden stämmer inte överens</string>
+    <string name="current_master_password">Nuvarande huvudlösenord</string>
 </resources>
--- a/app/src/main/res/values-sv-rSE/validator.xml
+++ b/app/src/main/res/values-sv-rSE/validator.xml
@ -1,2 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Endast siffror tillåtna.</string>
+    <string name="error_only_numeric_digits_range_allowed">Endast siffror mellan %1$s - %2$s är tillåtna.</string>
+    <string name="error_this_field_cannot_contain_special_character">Det här fältet får inte innehålla något specialtecken</string>
+    <string name="error_only_standard_letters_are_allowed">Endast vanliga bokstäver är tillåtna</string>
+    <string name="error_field_must_not_be_empty">Detta fält får inte vara tomt</string>
+    <string name="error_email_address_not_valid">Ogiltig e-postadress</string>
+    <string name="error_creditcard_number_not_valid">Ogiltigt kreditkortsnummer</string>
+    <string name="error_phone_not_valid">Ogiltigt telefonnummer</string>
+    <string name="error_domain_not_valid">Ogiltigt domännamn</string>
+    <string name="error_ip_not_valid">Ogiltig IP-adress</string>
+    <string name="error_url_not_valid">Ogiltig URL</string>
+    <string name="error_notvalid_personname">Ogiltigt för- eller efternamn.</string>
+    <string name="error_notvalid_personfullname">Ogiltigt namn</string>
+    <string name="error_date_not_valid">Ogiltigt format</string>
+    <string name="error_mustbe4digitnumber">Måste vara fyra siffror</string>
+    <string name="error_mustbe6digitnumber">Måste vara sex siffror</string>
+    <string name="error_not_a_minimum_length">För kort</string>
+    <string name="error_pin_not_valid">Pin ska vara 3-6 siffror, inte samma eller efter varandra</string>
+</resources>
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@ -100,7 +100,6 @@
    <string name="sms_delta">Delta:</string>
    <string name="configbuilder">Konfigurasyon oluştur</string>
    <string name="objectives">Hedefler</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">Genel Bakış</string>
    <string name="nsprofile">Nightscout Profil</string>
    <string name="simpleprofile">Basit Profil</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -102,7 +102,6 @@
    <string name="sms_delta">增量:</string>
    <string name="configbuilder">配置生成器</string>
    <string name="objectives">目标</string>
-    <string name="openapsma">OpenAPS MA</string>
    <string name="overview">首页概览</string>
    <string name="nsprofile">NS 配置文件</string>
    <string name="simpleprofile">简单配置文件</string>