diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 5a9ff0129f..0d8a78f482 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -645,7 +645,6 @@
     <string name="needsystemwindowpermission">Pro oznámení vyžaduje aplikace oprávnění systémového okna</string>
     <string name="needlocationpermission">Aplikace potřebuje oprávnění k přístupu k poloze kvůli skenování BT a WiFi identifikaci</string>
     <string name="needstoragepermission">Aby bylo možné nahrávat logy a exportovat nastavení, je nutné pro aplikaci povolit oprávnění přístupu k úložišti</string>
-    <string name="needconnectpermission">Aplikace potřebuje oprávnění bluetooth</string>
     <string name="request">Požadavek</string>
     <string name="open_navigation">Otevřít menu</string>
     <string name="close_navigation">Zavřít menu</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 0f64e595f1..b21dfe69b3 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -636,7 +636,6 @@
     <string name="needsystemwindowpermission">Applikationen mangler system vindues tilladelse til notifikationer</string>
     <string name="needlocationpermission">Applikationen mangler lokations tilladelse til BT scanning og WIFI identifikation</string>
     <string name="needstoragepermission">Applikationen mangler lagerstyrings tilladelse for at gemme logfiler og exporteringsindstillinger</string>
-    <string name="needconnectpermission">Applikationen kræver tilladelse til bluetooth</string>
     <string name="request">Anmod</string>
     <string name="open_navigation">Åbn navigation</string>
     <string name="close_navigation">Luk navigation</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 0ccb861169..43c2f5b311 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -633,7 +633,6 @@
     <string name="needsystemwindowpermission">Die App benötigt die Systemberechtigung für App-Benachrichtigungen</string>
     <string name="needlocationpermission">Die App benötigt die Berechtigung für den Standort, um Bluetooth und WLAN nutzen zu können</string>
     <string name="needstoragepermission">Die App benötigt Zugriffsrechte für den Speicher um Log-Dateien zu sichern und die Einstellungen zu exportieren.</string>
-    <string name="needconnectpermission">App benötigt Bluetooth-Berechtigung</string>
     <string name="request">Anfordern</string>
     <string name="open_navigation">Menü öffnen</string>
     <string name="close_navigation">Menü schließen</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index d8e5d59e56..7f18165931 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -645,7 +645,6 @@
     <string name="needsystemwindowpermission">La aplicación necesita permisos del sistema para poder mostrarse sobre otras aplicaciones, para las notificaciones</string>
     <string name="needlocationpermission">La aplicación necesita permiso de ubicación para poder buscar dispositivos Bluetooth y redes WiFi</string>
     <string name="needstoragepermission">La aplicación necesita permiso de almacenamiento para poder almacenar archivos de registro y valores de exportación</string>
-    <string name="needconnectpermission">La aplicación necesita permiso de bluetooth</string>
     <string name="request">Solicitar</string>
     <string name="open_navigation">Abrir navegación</string>
     <string name="close_navigation">Cerrar navegación</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 5988390a0d..fd5d099938 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -646,7 +646,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="needsystemwindowpermission">L\'application a besoin de l\'autorisation d\'accès à la fenêtre système pour les notifications</string>
     <string name="needlocationpermission">L\'application a besoin de l\'autorisation de localisation pour l\'analyse BT et l\'identification WiFi</string>
     <string name="needstoragepermission">L\'application a besoin d\'une autorisation de stockage pour pouvoir stocker les fichiers journaux et les paramètres d\'exportation</string>
-    <string name="needconnectpermission">L\'application a besoin de l\'autorisation Bluetooth</string>
     <string name="request">Demande</string>
     <string name="open_navigation">Ouvrir navigation</string>
     <string name="close_navigation">Fermer navigation</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 699936420f..191d76f1b6 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -645,7 +645,6 @@
     <string name="needsystemwindowpermission">L\'applicazione richiede l\'autorizzazione \"finestra di sistema\" per le notifiche</string>
     <string name="needlocationpermission">L\'applicazione richiede l\'accesso alla posizione per la scansione bluetooth e l\'identificazione WiFi</string>
     <string name="needstoragepermission">L\'applicazione richiede l\'accesso alla memoria per memorizzare i file di log ed esportare le impostazioni</string>
-    <string name="needconnectpermission">L\'applicazione richiede l\'autorizzazione bluetooth</string>
     <string name="request">Richiesta</string>
     <string name="open_navigation">Apri navigazione</string>
     <string name="close_navigation">Chiudi navigazione</string>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index a51a33dfee..536056923b 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -645,7 +645,6 @@
     <string name="needsystemwindowpermission">האפליקציה צריכה הרשאת מערכת של חלונות לצורך התראות</string>
     <string name="needlocationpermission">דרושה הרשאת מיקום עבור סריקת בלוטות\' וזיהוי WiFi</string>
     <string name="needstoragepermission">דרושה הרשאת אחסון כדי שתוכלו לאחסן קובצי יומן והגדרות יצוא.</string>
-    <string name="needconnectpermission">האפליקציה צריכה הרשאה לבלוטות\'</string>
     <string name="request">בקשה</string>
     <string name="open_navigation">פתח ניווט</string>
     <string name="close_navigation">סגור ניווט</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 211286d69f..dcf41407e5 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -631,7 +631,6 @@
     <string name="needsystemwindowpermission">Norint gauti pranešimus, programai reikalingas sisteminio lango leidimas</string>
     <string name="needlocationpermission">Programai reikia vietos nustatymo leidimo, kad būtų galima naudoti Bluetooth ir WiFi</string>
     <string name="needstoragepermission">Aplikacijai reikia leidimo prieigai prie saugyklos, kad galėtų išsaugoti žurnalo įrašus ir eksportavimo nustatymus</string>
-    <string name="needconnectpermission">Programai reikalinga Bluetooth prieigos teisė</string>
     <string name="request">Užklausa</string>
     <string name="open_navigation">Atidaryti meniu</string>
     <string name="close_navigation">Uždaryti meniu</string>
@@ -894,6 +893,7 @@
     <string name="not_available_full">Negalimas</string>
     <!-- Theme switcher dark and light mode-->
     <!-- WEAR OS-->
+    <string name="sort_label">Rūšiuoti</string>
     <string name="login">Prisijungti</string>
     <!-- Aidex Cgms -->
 </resources>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index b1beae35b7..d9a282aaf0 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -645,7 +645,6 @@
     <string name="needsystemwindowpermission">Toepassing vereist systeemvenstermachtiging voor meldingen</string>
     <string name="needlocationpermission">App heeft locatie toestemming nodig voor Bluetooth scan en WiFi identificatie</string>
     <string name="needstoragepermission">Applicatie heeft toestemming nodig om log bestanden op te slaan en instellingen te exporteren</string>
-    <string name="needconnectpermission">Applicatie heeft Bluetooth toestemming nodig</string>
     <string name="request">Verzoek</string>
     <string name="open_navigation">Open navigatie</string>
     <string name="close_navigation">Sluit navigatie</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 21dbe2cb6a..b485585ece 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -645,7 +645,6 @@
     <string name="needsystemwindowpermission">App trenger tillatelse til å bruke Varslinger for å vise meldinger</string>
     <string name="needlocationpermission">App trenger tilgang til Posisjon for å søke etter Bluetooth og Wifi enheter</string>
     <string name="needstoragepermission">App trenger tilgang til Lagring for lagre logg filer og eksportere innstillinger</string>
-    <string name="needconnectpermission">Appen trenger bluetooth tillatelse</string>
     <string name="request">Forespørsel</string>
     <string name="open_navigation">Åpne meny</string>
     <string name="close_navigation">Lukk meny</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 716f005083..f91047c74f 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -244,6 +244,7 @@
     <string name="wear">Oprogramowanie Wear (Smartwatch)</string>
     <string name="resend_all_data">Prześlij ponownie wszystkie dane</string>
     <string name="open_settings_on_wear">Otwórz ustawienia dla Wear</string>
+    <string name="basal_rate">Dawka bazowa</string>
     <string name="basalvaluebelowminimum">Wartość bazy poniżej minimum. Nie ustawiono profilu!</string>
     <string name="sms_actualbg">BG:</string>
     <string name="sms_lastbg">Ostatnia BG:</string>
@@ -631,7 +632,6 @@
     <string name="needsystemwindowpermission">Aplikacja wymaga uprawnienia systemowego okna dla powiadomień</string>
     <string name="needlocationpermission">Aplikacja wymaga dostępu do lokalizacji dla zarządzania bluetoothem i identyfikacją Wi-Fi</string>
     <string name="needstoragepermission">Aplikacja wymaga zgody na zapis do pamięci, aby móc przechować pliki logów i eksportować ustawienia</string>
-    <string name="needconnectpermission">Aplikacja wymaga uprawnienia Bluetooth</string>
     <string name="request">Żądanie</string>
     <string name="open_navigation">Otwórz menu</string>
     <string name="close_navigation">Zamknij menu</string>
@@ -667,6 +667,7 @@
     <string name="error_adding_treatment_message">Leczenie (insulina: %1$.2f, węglowodany: %2$d, czas:%3$s) nie mogą być dodane. Sprawdź i dodaj ręcznie rekord w razie potrzeby.</string>
     <string name="generated_ecarbs_note">eWęgle: %1$d g (%2$d h), Opóźnienie: %3$d m</string>
     <string name="openaps_noasdata">Brak dostępnych danych autosens</string>
+    <string name="log_files">Log files</string>
     <string name="nav_logsettings">Ustawienia logów</string>
     <string name="resettodefaults">Przywróć ustawienia domyślne</string>
     <string name="nsmalfunction">Usterka NSClient. Spróbuj zrestartować NS i NSClient.</string>
@@ -748,6 +749,8 @@
     <string name="profilenamecontainsdot">Nazwa profilu zawiera kropki.\nTo nie jest obsługiwane przez NS.\nProfil nie zostanie przesyłany do NS.</string>
     <string name="low_mark_comment">Dolna wartość zakresu docelowego (tylko do wyświetlania)</string>
     <string name="high_mark_comment">Górna wartość zakresu docelowego (tylko do wyświetlania)</string>
+    <string name="age">Czas</string>
+    <string name="weight_label">Waga</string>
     <string name="id">ID:</string>
     <string name="submit">Wyślij</string>
     <string name="mostcommonprofile">Najczęściej używany profil:</string>
@@ -797,6 +800,7 @@
     <string name="smscommunicator_otp_install_info">Na każdym telefonie śledzącym zainstalować aplikację uwierzytelniania obsługującą tokeny TOTP RFC 6238 Popularne darmowe aplikacje:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
     <string name="smscommunicator_otp_reset_warning">Resetowanie uwierzytelniania powoduje, że wszystkie już ustawione uwierzytelnienia stają się niepoprawne (przestają działać). Trzeba będzie je jeszcze raz skonfigurować!</string>
     <string name="overview_show_predictions">Prognozy poziomu</string>
+    <string name="overview_show_treatments">Zabiegi</string>
     <string name="overview_show_deviationslope">Krzywa odchylenie</string>
     <string name="authorizationfailed">Autoryzacja nie powiodła się</string>
     <string name="overview_show_absinsulin">Cała insulina</string>
@@ -896,6 +900,7 @@
     <!-- WEAR OS-->
     <string name="remove_selected_items">Usuń wybrane pozycje</string>
     <string name="confirm_remove_multiple_items">Czy na pewno chcesz usunąć %1$d pozycji</string>
+    <string name="no_records_available">Brak wpisów</string>
     <string name="count_selected">Wybrany %1$d</string>
     <string name="sort_label">Sortuj</string>
     <string name="login">Zaloguj się</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 1049c0380e..b435fbeb69 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -631,7 +631,6 @@
     <string name="needsystemwindowpermission">Aplicação precisa de permissão de janela do sistema para notificações</string>
     <string name="needlocationpermission">Aplicação necessita de permissão de localização para pesquisa Bluetooth e identificação Wi-Fi</string>
     <string name="needstoragepermission">A aplicação precisa da permissão de armazenamento para poder armazenar ficheiros de registo e exportar definições</string>
-    <string name="needconnectpermission">Aplicação precisa de permissão Bluetooth</string>
     <string name="request">Pedido</string>
     <string name="open_navigation">Abrir a navegação</string>
     <string name="close_navigation">Fechar a navegação</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 2d55df640a..44c5283a22 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -631,7 +631,6 @@
     <string name="needsystemwindowpermission">Aplicația are nevoie de permisiune la fereastra sistemului pentru a afișa notificări</string>
     <string name="needlocationpermission">Aplicația are nevoie sa acceseze locația pentru scanare Bluetooth și identificare WiFi</string>
     <string name="needstoragepermission">Aplicația are nevoie de permisiunea de a accesa unitatea de stocare pentru a scrie fișierele registru și pentru a exporta setările</string>
-    <string name="needconnectpermission">Aplicația are nevoie de permisiune Bluetooth</string>
     <string name="request">Cerință</string>
     <string name="open_navigation">Afișare navigație</string>
     <string name="close_navigation">Închidere navigație</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index fa3d099a67..76c70619d1 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -645,7 +645,6 @@
     <string name="needsystemwindowpermission">Приложению требуется разрешение системного окна для уведомлений</string>
     <string name="needlocationpermission">Приложению требуется разрешение на доступ к местоположению для сканирования BT и идентификации WiFi</string>
     <string name="needstoragepermission">Приложение требует разрешения на доступ к записи в память, чтобы хранить файлы журналов и настройки экспорта</string>
-    <string name="needconnectpermission">Приложению требуется разрешение Bluetooth</string>
     <string name="request">Запрос</string>
     <string name="open_navigation">Показать панель навигации</string>
     <string name="close_navigation">Cкрыть панель навигации</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index c77651b5d5..5173d5ea18 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -645,7 +645,6 @@
     <string name="needsystemwindowpermission">Aplikácia vyžaduje pre oznámenia systémové oprávnenie</string>
     <string name="needlocationpermission">Aplikácia vyžaduje oprávnenie polohy, pre vyhľadávanie BT a identifikáciu WiFi</string>
     <string name="needstoragepermission">Aby bolo možné nahrávať logy a exportovať nastavenia, je nutné pre aplikáciu povoliť oprávnenie prístupu k úložisku</string>
-    <string name="needconnectpermission">Aplikácia vyžaduje povolenie bluetooth</string>
     <string name="request">Požiadavka</string>
     <string name="open_navigation">Otvoriť Menu</string>
     <string name="close_navigation">Zavrieť Menu</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index a85a2e4cb2..3a6718d5c3 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -636,7 +636,6 @@ Eversense-appen.</string>
     <string name="needsystemwindowpermission">Applikationen behöver förhöjd behörighet för aviseringar</string>
     <string name="needlocationpermission">Appen behöver platsåtkomst för bluetooth- och WiFi-identifiering</string>
     <string name="needstoragepermission">Applikationen behöver lagringsbehörighet för att kunna lagra loggfiler och exportinställningar</string>
-    <string name="needconnectpermission">Applikationen behöver bluetooth-behörighet</string>
     <string name="request">Begäran</string>
     <string name="open_navigation">Öppna menyn</string>
     <string name="close_navigation">Stäng menyn</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 12b3ce5b18..ee47a75e18 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -646,7 +646,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="needsystemwindowpermission">Uygulama, bildirimler için sistem iznine ihtiyaç duyuyor</string>
     <string name="needlocationpermission">Uygulamanın BT taraması ve WiFi tanımlaması için konum iznine ihtiyacı var</string>
     <string name="needstoragepermission">Uygulamanın, günlük dosyalarını saklayabilmesi ve ayarları dışa aktarabilmesi için depolama iznine ihtiyacı var</string>
-    <string name="needconnectpermission">Uygulama bluetooth iznine ihtiyac duyuyor</string>
     <string name="request">İstek</string>
     <string name="open_navigation">Navigasyonu aç</string>
     <string name="close_navigation">Navigasyonu kapat</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 642148ddb4..47018ea425 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -432,6 +432,7 @@
     <string name="ns_localbroadcasts_title">启用本地广播。</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="openaps_smb_dynamic_isf">动态ISF(胰岛素敏感系数)</string>
+    <string name="DynISFAdjust_summary" formatted="false">动态ISF的调整因子。设置100%以上用于更积极的校正，100%以下则不那么积极校正。</string>
     <string name="enableuam">启用 UAM</string>
     <string name="enablesmb">启用微型大剂量</string>
     <string name="enablesmb_summary">使用微型大剂量代替使用临时基础率，更快的干预</string>
@@ -636,7 +637,6 @@
     <string name="needsystemwindowpermission">应用程序需要悬浮窗权限用于发送通知。</string>
     <string name="needlocationpermission">应用程序需要定位权限，才能进行蓝牙扫描及WIFI识别。</string>
     <string name="needstoragepermission">应用程序需要文件存储权限，才能存储日志文件及导出设置。</string>
-    <string name="needconnectpermission">应用程序需要蓝牙权限。</string>
     <string name="request">请求</string>
     <string name="open_navigation">打开导航栏</string>
     <string name="close_navigation">关闭导航栏</string>
diff --git a/automation/src/main/res/values-lt-rLT/strings.xml b/automation/src/main/res/values-lt-rLT/strings.xml
index acd9f4fba0..c4d36915e2 100644
--- a/automation/src/main/res/values-lt-rLT/strings.xml
+++ b/automation/src/main/res/values-lt-rLT/strings.xml
@@ -112,4 +112,5 @@
     <string name="automation_event">Automatizuotas įvykis</string>
     <string name="reorder_label">Pertvarkyti</string>
     <string name="user_action">Vartotojo veiksmas</string>
+    <string name="sort_label">Rūšiuoti</string>
 </resources>
diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
index 183980600d..e6b584986c 100644
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -289,6 +289,7 @@
     <string name="sms" comment="26 characters max for translation">SMS</string>
     <string name="basal">Базал</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">Апликацията изисква разрешение за bluetooth</string>
     <plurals name="days">
         <item quantity="one">%1$d дeн</item>
         <item quantity="other">%1$d дни</item>
diff --git a/core/src/main/res/values-ca-rES/strings.xml b/core/src/main/res/values-ca-rES/strings.xml
index 1eb5f978ea..6cd9b7b34c 100644
--- a/core/src/main/res/values-ca-rES/strings.xml
+++ b/core/src/main/res/values-ca-rES/strings.xml
@@ -70,4 +70,5 @@
     <!-- Command Queue + readStatus reasons -->
     <string name="basal">Basal</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">L\'aplicació necessita el permís del bluethoot</string>
 </resources>
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index b0570bbe77..81d72c8309 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -489,6 +489,7 @@
     <string name="autotune_run_with_autoswitch">Autotune spuštěno, a profil automaticky přepnut</string>
     <string name="autotune_run_with_error">Chyba při posledním spuštění Autotune</string>
     <string name="autotune_run_cancelled">Byla zjištěna jiná běžící úloha Autotune, spuštění zrušeno</string>
+    <string name="needconnectpermission">Aplikace potřebuje oprávnění bluetooth</string>
     <plurals name="days">
         <item quantity="one">%1$d den</item>
         <item quantity="few">%1$d dnů</item>
diff --git a/core/src/main/res/values-da-rDK/strings.xml b/core/src/main/res/values-da-rDK/strings.xml
index d446162c2f..013f43fc61 100644
--- a/core/src/main/res/values-da-rDK/strings.xml
+++ b/core/src/main/res/values-da-rDK/strings.xml
@@ -482,6 +482,7 @@
     <string name="autotune_run_without_autoswitch">Autotune kørt uden profilskift</string>
     <string name="autotune_run_with_autoswitch">Autotune kørt, profilen er automatisk skiftet</string>
     <string name="autotune_run_with_error">Fejl under sidste Autotune kørsel</string>
+    <string name="needconnectpermission">Applikationen kræver tilladelse til bluetooth</string>
     <plurals name="days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dage</item>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index 5b12029067..400da03d56 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -433,6 +433,7 @@
     <string name="count_selected">%1$d ausgewählt</string>
     <string name="sort_label">Sortieren</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">App benötigt Bluetooth-Berechtigung</string>
     <plurals name="days">
         <item quantity="one">%1$d Tag</item>
         <item quantity="other">%1$d Tage</item>
diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml
index 24f6b404b5..502b29f99b 100644
--- a/core/src/main/res/values-es-rES/strings.xml
+++ b/core/src/main/res/values-es-rES/strings.xml
@@ -489,6 +489,7 @@
     <string name="autotune_run_with_autoswitch">Autotune ejecutado y perfil cambiado automáticamente</string>
     <string name="autotune_run_with_error">Error durante la última ejecución de Autotune</string>
     <string name="autotune_run_cancelled">Se ha detectado otra ejecución de Autotune, ejecución cancelada</string>
+    <string name="needconnectpermission">La aplicación necesita permiso de bluetooth</string>
     <plurals name="days">
         <item quantity="one">%1$d día</item>
         <item quantity="other">%1$d días</item>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index fa7260b877..752b4f9264 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -489,6 +489,7 @@
     <string name="autotune_run_with_autoswitch">Autotune eseguito e profilo cambiato automaticamente</string>
     <string name="autotune_run_with_error">Errore durante l\'ultima esecuzione di Autotune</string>
     <string name="autotune_run_cancelled">È stata rilevata un\'altra esecuzione di Autotune, esecuzione annullata</string>
+    <string name="needconnectpermission">L\'applicazione richiede l\'autorizzazione bluetooth</string>
     <plurals name="days">
         <item quantity="one">%1$d giorno</item>
         <item quantity="other">%1$d giorni</item>
diff --git a/core/src/main/res/values-iw-rIL/strings.xml b/core/src/main/res/values-iw-rIL/strings.xml
index 20cb735c6e..c837a798e3 100644
--- a/core/src/main/res/values-iw-rIL/strings.xml
+++ b/core/src/main/res/values-iw-rIL/strings.xml
@@ -489,6 +489,7 @@
     <string name="autotune_run_with_autoswitch">כוונון אוטומטי הופעל והפרופיל הוחלף אוטומטית</string>
     <string name="autotune_run_with_error">שגיאה במהלך הכיוונון האוטומטי האחרון</string>
     <string name="autotune_run_cancelled">נמצאה הפעלה נוספת של הכוונון האוטומטי ברקע, ההפעלה מבוטלת</string>
+    <string name="needconnectpermission">האפליקציה צריכה הרשאה לבלוטות\'</string>
     <plurals name="days">
         <item quantity="one">%1$d יום</item>
         <item quantity="two">%1$d ימים</item>
diff --git a/core/src/main/res/values-lt-rLT/strings.xml b/core/src/main/res/values-lt-rLT/strings.xml
index c834cbf768..7a1c1ae6e6 100644
--- a/core/src/main/res/values-lt-rLT/strings.xml
+++ b/core/src/main/res/values-lt-rLT/strings.xml
@@ -422,6 +422,7 @@
     <string name="insight_refresh_button" comment="26 characters max for translation">Insight Mygtukas Naujinti</string>
     <string name="basal">Valandinė bazė</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">Programai reikalinga Bluetooth prieigos teisė</string>
     <plurals name="days">
         <item quantity="one">%1$d d.</item>
         <item quantity="few">%1$d d.</item>
diff --git a/core/src/main/res/values-no-rNO/strings.xml b/core/src/main/res/values-no-rNO/strings.xml
index b25407ac6a..9e40af43c0 100644
--- a/core/src/main/res/values-no-rNO/strings.xml
+++ b/core/src/main/res/values-no-rNO/strings.xml
@@ -489,6 +489,7 @@
     <string name="autotune_run_with_autoswitch">Autotune utført og profil automatisk skiftet ut</string>
     <string name="autotune_run_with_error">Feil oppdaget under siste Autotune kjøring</string>
     <string name="autotune_run_cancelled">Autotune kjører allerede. Kjøring avbrutt</string>
+    <string name="needconnectpermission">Appen trenger bluetooth tillatelse</string>
     <plurals name="days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dager</item>
diff --git a/core/src/main/res/values-pl-rPL/strings.xml b/core/src/main/res/values-pl-rPL/strings.xml
index eba2bf6385..9c1bd98569 100644
--- a/core/src/main/res/values-pl-rPL/strings.xml
+++ b/core/src/main/res/values-pl-rPL/strings.xml
@@ -424,6 +424,7 @@
     <string name="count_selected">Wybrany %1$d</string>
     <string name="sort_label">Sortuj</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">Aplikacja wymaga uprawnienia Bluetooth</string>
     <plurals name="days">
         <item quantity="one">%1$d dzień</item>
         <item quantity="few">%1$d dni</item>
diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
index fa70256576..d9a500837e 100644
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -229,6 +229,7 @@
     <string name="autotune_tune_insulin_curve_summary">Habilitar apenas se você usar pico livre. Esta opção irá ajustar a duração do pico e da DAI</string>
     <string name="autotune_default_tune_days_summary">Número padrão de dias de dados a serem processados por Autotune (até 30)</string>
     <string name="autotune_error">Erro nos dados de entrada, tente executar novamente autotune ou reduza o número de dias</string>
+    <string name="needconnectpermission">O aplicativo precisa de permissão bluetooth</string>
     <plurals name="days">
         <item quantity="one">%1$d dia</item>
         <item quantity="other">%1$d dias</item>
diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml
index 29c658270c..d4773c312c 100644
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@@ -341,6 +341,7 @@
     <!-- Command Queue + readStatus reasons -->
     <string name="basal">Basal</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">Aplicação precisa de permissão Bluetooth</string>
     <plurals name="days">
         <item quantity="one">%1$d dia</item>
         <item quantity="other">%1$d dias</item>
diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/src/main/res/values-ro-rRO/strings.xml
index dc4b4b01f3..61976e3db9 100644
--- a/core/src/main/res/values-ro-rRO/strings.xml
+++ b/core/src/main/res/values-ro-rRO/strings.xml
@@ -424,6 +424,7 @@
     <string name="basal">Rate bazale</string>
     <string name="sort_label">Sortează</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">Aplicația are nevoie de permisiune Bluetooth</string>
     <plurals name="days">
         <item quantity="one">%1$d zi</item>
         <item quantity="few">%1$d zile</item>
diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/src/main/res/values-ru-rRU/strings.xml
index 473b44ee80..4fe3c93e3a 100644
--- a/core/src/main/res/values-ru-rRU/strings.xml
+++ b/core/src/main/res/values-ru-rRU/strings.xml
@@ -489,6 +489,7 @@
     <string name="autotune_run_with_autoswitch">Autotune выполнен и профиль переключён автоматически</string>
     <string name="autotune_run_with_error">Ошибка во время последнего выполнения Autotune</string>
     <string name="autotune_run_cancelled">Обнаружен другой запуск Autotune, выполнение отменено</string>
+    <string name="needconnectpermission">Приложению требуется разрешение Bluetooth</string>
     <plurals name="days">
         <item quantity="one">%1$d день</item>
         <item quantity="few">%1$d дня</item>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index 1de2cd04aa..2d02b16fcb 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -489,6 +489,7 @@
     <string name="autotune_run_with_autoswitch">Autotune spustený a profil automaticky prepnutý</string>
     <string name="autotune_run_with_error">Chyba pri poslednom spustení Autotune</string>
     <string name="autotune_run_cancelled">Bola zistená iná spustená úloha Autotune, spustenie zrušené</string>
+    <string name="needconnectpermission">Aplikácia vyžaduje povolenie bluetooth</string>
     <plurals name="days">
         <item quantity="one">%1$d deň</item>
         <item quantity="few">%1$d dní</item>
diff --git a/core/src/main/res/values-sv-rSE/strings.xml b/core/src/main/res/values-sv-rSE/strings.xml
index 86d9f25d0c..06ace5156d 100644
--- a/core/src/main/res/values-sv-rSE/strings.xml
+++ b/core/src/main/res/values-sv-rSE/strings.xml
@@ -430,6 +430,7 @@
     <string name="a11y_plus_button_description">öka %1$s med %2$s</string>
     <string name="basal">Basal</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">Applikationen behöver bluetooth-behörighet</string>
     <plurals name="days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dagar</item>
diff --git a/core/src/main/res/values-tr-rTR/strings.xml b/core/src/main/res/values-tr-rTR/strings.xml
index 4ecfd908e0..1aec44dfd1 100644
--- a/core/src/main/res/values-tr-rTR/strings.xml
+++ b/core/src/main/res/values-tr-rTR/strings.xml
@@ -489,6 +489,7 @@
     <string name="autotune_run_with_autoswitch">OtoAyar çalıştırıldı ve profil otomatik olarak değiştirildi</string>
     <string name="autotune_run_with_error">Son OtoAyar çalışması sırasında hata oluştu</string>
     <string name="autotune_run_cancelled">Başka bir OtoAyar çalıştırması tespit edildi, çalıştırma iptal edildi</string>
+    <string name="needconnectpermission">Uygulama bluetooth iznine ihtiyac duyuyor</string>
     <plurals name="days">
         <item quantity="one">%1$d gün</item>
         <item quantity="other">%1$d gün</item>
diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml
index d64d0e7d41..6d270b5a14 100644
--- a/core/src/main/res/values-zh-rCN/strings.xml
+++ b/core/src/main/res/values-zh-rCN/strings.xml
@@ -442,6 +442,7 @@
     <string name="a11y_file">文件</string>
     <string name="a11y_user">用户</string>
     <!-- Autotune -->
+    <string name="needconnectpermission">应用程序需要蓝牙权限。</string>
     <plurals name="days">
         <item quantity="other">%1$d　天</item>
     </plurals>
diff --git a/diaconn/src/main/res/values-ko-rKR/strings.xml b/diaconn/src/main/res/values-ko-rKR/strings.xml
index f17e4a3c77..29cb87c694 100644
--- a/diaconn/src/main/res/values-ko-rKR/strings.xml
+++ b/diaconn/src/main/res/values-ko-rKR/strings.xml
@@ -89,8 +89,6 @@
     <string name="diaconn_g8_logcanulachange_title">바늘 교체</string>
     <string name="diaconn_g8_logcanulachange_summary">로그 동기화 시 케어포털 \"위치 교체\" 정보 자동 업로드</string>
     <string name="diaconn_g8_logbatterychange_summary">로그 동기화 시 케어포털 \"베터리 교체\" 정보 자동 업로드</string>
-    <string name="diaconn_g8_cloudsend_summary">펌프 로그정보를 \"디아콘 클라우드\"로 자동 업로드</string>
-    <string name="diaconn_g8_cloudsend_title">디아콘 클라우드 전송</string>
     <string name="diaconn_g8_logbatterychange_title">베터리 교체</string>
     <string name="diaconn_g8_logsyncinprogress">로그 동기화 진행 중</string>
     <string name="diaconn_g8_loginsulinshorage">인슐린 부족 경고</string>
diff --git a/pump-common/src/main/res/values-af-rZA/strings.xml b/pump-common/src/main/res/values-af-rZA/strings.xml
index 33c77af761..555b0265bf 100644
--- a/pump-common/src/main/res/values-af-rZA/strings.xml
+++ b/pump-common/src/main/res/values-af-rZA/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Operasie nog nie ondersteun deur pomp.</string>
     <!-- PumpCommon - Pump Status -->
     <!-- PumpCommon - History Group -->
     <!-- Time -->
diff --git a/pump-common/src/main/res/values-bg-rBG/strings.xml b/pump-common/src/main/res/values-bg-rBG/strings.xml
index 33c77af761..6d8edea0a3 100644
--- a/pump-common/src/main/res/values-bg-rBG/strings.xml
+++ b/pump-common/src/main/res/values-bg-rBG/strings.xml
@@ -1,11 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Помпата не поддържа тази операция.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Операцията не се поддържа от помпата (ВСЕ ОЩЕ).</string>
+    <string name="common_resultok">ОК</string>
     <!-- PumpCommon - Pump Status -->
+    <string name="pump_status_waking_up">Събуждане</string>
+    <string name="pump_status_error_comm">Грешка в комуникацията</string>
+    <string name="pump_status_timeout_comm">Изтече времето за връзка</string>
+    <string name="pump_status_pump_unreachable">Помпата е недостъпна</string>
+    <string name="pump_status_invalid_config">Грешна конфигурация</string>
+    <string name="pump_status_active">Активна</string>
+    <string name="pump_status_sleeping">Спинка си</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Базали</string>
+    <string name="history_group_configuration">Конфигурации</string>
+    <string name="history_group_notification">Известия</string>
+    <string name="history_group_statistic">Статистика</string>
+    <string name="history_group_unknown">Неизвестни</string>
+    <string name="history_group_all">Всички</string>
+    <string name="history_group_bolus">Болуси</string>
+    <string name="history_group_prime">Пълнене</string>
+    <string name="history_group_alarm">Аларми</string>
+    <string name="history_group_glucose">Кръвна захар</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d ден</item>
+        <item quantity="other">%1$d дни</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d часа</item>
+        <item quantity="other">%1$d часа</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-ca-rES/strings.xml b/pump-common/src/main/res/values-ca-rES/strings.xml
index 33c77af761..9c30e430ff 100644
--- a/pump-common/src/main/res/values-ca-rES/strings.xml
+++ b/pump-common/src/main/res/values-ca-rES/strings.xml
@@ -1,11 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operació no compatible amb la bomba i/o controlador.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operació no compatible ENCARA amb la bomba.</string>
     <!-- PumpCommon - Pump Status -->
+    <string name="pump_status_waking_up">Iniciant</string>
+    <string name="pump_status_error_comm">Error de comunicació</string>
+    <string name="pump_status_timeout_comm">Temps d\'espera excedit en la comunicació</string>
+    <string name="pump_status_pump_unreachable">Bomba no accessible</string>
+    <string name="pump_status_invalid_config">Configuració no vàlida</string>
+    <string name="pump_status_active">Activa</string>
+    <string name="pump_status_sleeping">En suspens</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basals</string>
+    <string name="history_group_configuration">Configuracions</string>
+    <string name="history_group_notification">Avisos</string>
+    <string name="history_group_statistic">Estadístiques</string>
+    <string name="history_group_unknown">Desconeguts</string>
+    <string name="history_group_all">Tots</string>
+    <string name="history_group_bolus">Bolus</string>
+    <string name="history_group_prime">Encebaments</string>
+    <string name="history_group_alarm">Alarmes</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d dia</item>
+        <item quantity="other">%1$d dies</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d hora</item>
+        <item quantity="other">%1$d hores</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-da-rDK/strings.xml b/pump-common/src/main/res/values-da-rDK/strings.xml
index 33c77af761..cdd499a65b 100644
--- a/pump-common/src/main/res/values-da-rDK/strings.xml
+++ b/pump-common/src/main/res/values-da-rDK/strings.xml
@@ -8,4 +8,12 @@
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d dag</item>
+        <item quantity="other">%1$d dage</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d time</item>
+        <item quantity="other">%1$d timer</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-de-rDE/strings.xml b/pump-common/src/main/res/values-de-rDE/strings.xml
index 33c77af761..7c01b0163d 100644
--- a/pump-common/src/main/res/values-de-rDE/strings.xml
+++ b/pump-common/src/main/res/values-de-rDE/strings.xml
@@ -1,11 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Aktion von Pumpe und/oder Treiber nicht unterstützt.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operation NOCH NICHT von Pumpe unterstützt.</string>
+    <string name="common_resultok">OK</string>
     <!-- PumpCommon - Pump Status -->
+    <string name="pump_status_waking_up">Aufwecken</string>
+    <string name="pump_status_error_comm">Fehler bei der Kommunikation</string>
+    <string name="pump_status_timeout_comm">Zeitüberschreitung bei Kommunikation</string>
+    <string name="pump_status_pump_unreachable">Pumpe nicht erreichbar</string>
+    <string name="pump_status_invalid_config">Ungültige Einstellung</string>
+    <string name="pump_status_active">Aktiv</string>
+    <string name="pump_status_sleeping">Schlafen</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basal</string>
+    <string name="history_group_configuration">Konfigurationen</string>
+    <string name="history_group_notification">Benachrichtigungen</string>
+    <string name="history_group_statistic">Statistiken</string>
+    <string name="history_group_unknown">Unbekannte</string>
+    <string name="history_group_all">Alle</string>
+    <string name="history_group_bolus">Boli</string>
+    <string name="history_group_prime">Füllen</string>
+    <string name="history_group_alarm">Alarme</string>
+    <string name="history_group_glucose">Glukose</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d Tag</item>
+        <item quantity="other">%1$d Tage</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d Stunde</item>
+        <item quantity="other">%1$d Stunden</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-el-rGR/strings.xml b/pump-common/src/main/res/values-el-rGR/strings.xml
index 33c77af761..11a7c88fb4 100644
--- a/pump-common/src/main/res/values-el-rGR/strings.xml
+++ b/pump-common/src/main/res/values-el-rGR/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Η λειτουργία δεν υποστηρίζεται ΑΚΟΜΑ από την αντλία.</string>
     <!-- PumpCommon - Pump Status -->
     <!-- PumpCommon - History Group -->
     <!-- Time -->
diff --git a/pump-common/src/main/res/values-ga-rIE/strings.xml b/pump-common/src/main/res/values-ga-rIE/strings.xml
index 33c77af761..6bf78d23ab 100644
--- a/pump-common/src/main/res/values-ga-rIE/strings.xml
+++ b/pump-common/src/main/res/values-ga-rIE/strings.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="common_resultok">Ceart go leor</string>
     <!-- PumpCommon - Pump Status -->
+    <string name="pump_status_active">Gníomhach</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Bunaidhi</string>
+    <string name="history_group_all">Ar fad</string>
+    <string name="history_group_bolus">Bólasi</string>
+    <string name="history_group_alarm">Aláraim</string>
+    <string name="history_group_glucose">Glúcóis</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
diff --git a/pump-common/src/main/res/values-hu-rHU/strings.xml b/pump-common/src/main/res/values-hu-rHU/strings.xml
index 33c77af761..9453621bea 100644
--- a/pump-common/src/main/res/values-hu-rHU/strings.xml
+++ b/pump-common/src/main/res/values-hu-rHU/strings.xml
@@ -8,4 +8,12 @@
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d nap</item>
+        <item quantity="other">%1$d nap</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d óra</item>
+        <item quantity="other">%1$d óra</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-iw-rIL/strings.xml b/pump-common/src/main/res/values-iw-rIL/strings.xml
index da2dfd704a..5142e46ea1 100644
--- a/pump-common/src/main/res/values-iw-rIL/strings.xml
+++ b/pump-common/src/main/res/values-iw-rIL/strings.xml
@@ -4,6 +4,7 @@
     <string name="pump_operation_not_supported_by_pump_driver">הפעולה לא נתמכת ע\"י המשאבה ו\\או מנהל ההתקן.</string>
     <string name="pump_operation_not_yet_supported_by_pump">הפעולה עוד לא נתמכת על ידי המשאבה.</string>
     <string name="common_resultok">אישור</string>
+    <string name="pump_serial_number">המספר הסידורי של המשאבה</string>
     <!-- PumpCommon - Pump Status -->
     <string name="pump_status_never_contacted">מעולם לא נוצר קשר</string>
     <string name="pump_status_waking_up">מתעורר</string>
@@ -13,6 +14,13 @@
     <string name="pump_status_invalid_config">תצורה לא חוקית</string>
     <string name="pump_status_active">פעיל</string>
     <string name="pump_status_sleeping">שינה</string>
+    <string name="pump_status_not_initialized">לא מאותחל</string>
+    <string name="pump_status_initialized">מאותחל</string>
+    <string name="pump_status_encrypt">מצפין תקשורת</string>
+    <string name="pump_status_ready">מוכן</string>
+    <string name="pump_status_busy">עסוק</string>
+    <string name="pump_status_suspended">מושהה</string>
+    <string name="pump_status_executing_command">מבצע פקודה</string>
     <!-- PumpCommon - History Group -->
     <string name="history_group_basal">בזאלים</string>
     <string name="history_group_configuration">תצורות</string>
@@ -24,9 +32,67 @@
     <string name="history_group_prime">תיחול</string>
     <string name="history_group_alarm">התראות</string>
     <string name="history_group_glucose">גלוקוז</string>
+    <string name="history_group_base">בסיס</string>
+    <string name="history_group_other">אחר</string>
+    <string name="history_group_events">כל האירועים</string>
+    <string name="history_group_events_no_stat">אירועים(ללא סטטיסטיקה)</string>
     <!-- Time -->
+    <string name="time_today">היום</string>
+    <string name="time_last_hour">בשעה האחרונה</string>
+    <string name="time_last_3_hours">ב-3 השעות האחרונות</string>
+    <string name="time_last_6_hours">ב-6 השעות האחרונות</string>
+    <string name="time_last_12_hours">ב-12 השעות האחרונות</string>
+    <string name="time_last_2_days">ביומיים אחרונים</string>
+    <string name="time_last_4_days">ב-4 הימים האחרונים</string>
+    <string name="time_last_week">בשבוע שעבר</string>
+    <string name="time_last_month">בחודש שעבר</string>
     <!-- BLE Config -->
+    <string name="ble_config_button_scan_start">סריקה</string>
+    <string name="ble_config_scan_stop">עצור</string>
+    <string name="ble_config_scan_selected">נבחר</string>
+    <string name="ble_config_scan_scanning">סורק</string>
+    <string name="ble_config_scan_finished">הסריקה הושלמה</string>
+    <string name="ble_config_scan_error">שגיאת סריקה: %1$d</string>
+    <string name="ble_config_connected_never">אף פעם</string>
+    <string name="ble_config_remove">הסרה</string>
     <!-- BLE Errors -->
+    <string name="ble_error_bt_disabled">בלוטות\' כבוי</string>
+    <string name="ble_error_no_bt_adapter">אין מתאם בלוטות\'</string>
+    <string name="ble_error_configured_pump_not_found">לא נמצאה משאבה מוגדרת</string>
+    <string name="ble_error_pump_unreachable">המשאבה אינה זמינה</string>
+    <string name="ble_error_failed_to_conn_to_ble_device">נכשל החיבור למכשיר בלוטות\'</string>
+    <string name="ble_error_encryption_failed">ההצפנה נכשלה</string>
+    <string name="ble_error_pump_found_unbonded">נמצאה משאבה שאינה מצומדת</string>
     <!-- Pump Error -->
+    <string name="pump_settings_error_basal_profiles_not_enabled">הגדרת פרופילי הבזאלי\\תבניות אינה מאופשרת במשאבה. הפעילו אותן בגוף המשאבה.</string>
+    <string name="pump_settings_error_incorrect_basal_profile_selected">הפרופיל הבזאלי שהוגדר במשאבה שגוי (חייב להיות %s).</string>
+    <string name="pump_settings_error_wrong_tbr_type_set">סוג הבזאלי הזמני שהוגדר במשאבה שגוי (חייב להיות %s).</string>
+    <string name="pump_settings_error_wrong_max_bolus_set">מינון הבולוס המרבי המוגדר במשאבה אינו נכון (חייב להיות %1$.2f).</string>
+    <string name="pump_settings_error_wrong_max_basal_set">המינון הבזאלי המרבי המוגדר במשאבה אינו נכון (חייב להיות %1$.2f).</string>
     <!-- Pump History -->
+    <string name="pump_history_type">סוג:</string>
+    <plurals name="duration_days">
+        <item quantity="one">יום %1$d</item>
+        <item quantity="two">יומיים</item>
+        <item quantity="many">%1$d ימים</item>
+        <item quantity="other">%1$d ימים</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">שעה</item>
+        <item quantity="two">שעתיים</item>
+        <item quantity="many">%1$d שעות</item>
+        <item quantity="other">%1$d שעות</item>
+    </plurals>
+    <plurals name="hoursago">
+        <item quantity="one">לפני שעה</item>
+        <item quantity="two">לפני שעתיים</item>
+        <item quantity="many">לפני %1$d שעות</item>
+        <item quantity="other">לפני %1$d שעות</item>
+    </plurals>
+    <plurals name="daysago">
+        <item quantity="one">לפני יום אחד</item>
+        <item quantity="two">לפני יומיים</item>
+        <item quantity="many">לפני %1$d ימים</item>
+        <item quantity="other">לפני %1$d ימים</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-ko-rKR/strings.xml b/pump-common/src/main/res/values-ko-rKR/strings.xml
index 33c77af761..e247034563 100644
--- a/pump-common/src/main/res/values-ko-rKR/strings.xml
+++ b/pump-common/src/main/res/values-ko-rKR/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">펌프에서 지원되지 않는 작동.</string>
     <!-- PumpCommon - Pump Status -->
     <!-- PumpCommon - History Group -->
     <!-- Time -->
@@ -8,4 +9,10 @@
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="other">%1$d 일</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="other">%1$d 시간</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-lt-rLT/strings.xml b/pump-common/src/main/res/values-lt-rLT/strings.xml
index 33c77af761..84e1d1c00b 100644
--- a/pump-common/src/main/res/values-lt-rLT/strings.xml
+++ b/pump-common/src/main/res/values-lt-rLT/strings.xml
@@ -1,11 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Pompa ir/ar jos valdiklis nepalaiko operacijos.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Pompa dar nepalaiko operacijos.</string>
+    <string name="common_resultok">Gerai</string>
     <!-- PumpCommon - Pump Status -->
+    <string name="pump_status_waking_up">Pažadinimas</string>
+    <string name="pump_status_error_comm">Ryšio klaida</string>
+    <string name="pump_status_timeout_comm">Ryšiui skirtas laikas baigėsi</string>
+    <string name="pump_status_pump_unreachable">Pompa nepasiekiama</string>
+    <string name="pump_status_invalid_config">Neteisinga konfigūracija</string>
+    <string name="pump_status_active">Aktyvi</string>
+    <string name="pump_status_sleeping">Užmigusi</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Bazė</string>
+    <string name="history_group_configuration">Nustatymai</string>
+    <string name="history_group_notification">Pranešimai</string>
+    <string name="history_group_statistic">Statistika</string>
+    <string name="history_group_unknown">Nežinoma</string>
+    <string name="history_group_all">Visi</string>
+    <string name="history_group_bolus">Bolusai</string>
+    <string name="history_group_prime">Užpildyti sistemą</string>
+    <string name="history_group_alarm">Aliarmai</string>
+    <string name="history_group_glucose">Gliukozė</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <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="duration_hours">
+        <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>
 </resources>
diff --git a/pump-common/src/main/res/values-pl-rPL/strings.xml b/pump-common/src/main/res/values-pl-rPL/strings.xml
index 33c77af761..b306d45c6e 100644
--- a/pump-common/src/main/res/values-pl-rPL/strings.xml
+++ b/pump-common/src/main/res/values-pl-rPL/strings.xml
@@ -3,9 +3,22 @@
     <!-- PumoCommon - Pump Abstract -->
     <!-- PumpCommon - Pump Status -->
     <!-- PumpCommon - History Group -->
+    <string name="history_group_prime">Napełnianie</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d dzień</item>
+        <item quantity="few">%1$d dni</item>
+        <item quantity="many">%1$d dni</item>
+        <item quantity="other">%1$d dni</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d godzina</item>
+        <item quantity="few">%1$d godziny</item>
+        <item quantity="many">%1$d godzin</item>
+        <item quantity="other">%1$d godzin</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-pt-rBR/strings.xml b/pump-common/src/main/res/values-pt-rBR/strings.xml
index 33c77af761..770dc80acb 100644
--- a/pump-common/src/main/res/values-pt-rBR/strings.xml
+++ b/pump-common/src/main/res/values-pt-rBR/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Operação não suportada ainda pela Bomba.</string>
     <!-- PumpCommon - Pump Status -->
     <!-- PumpCommon - History Group -->
     <!-- Time -->
diff --git a/pump-common/src/main/res/values-pt-rPT/strings.xml b/pump-common/src/main/res/values-pt-rPT/strings.xml
index 33c77af761..77bc7ca340 100644
--- a/pump-common/src/main/res/values-pt-rPT/strings.xml
+++ b/pump-common/src/main/res/values-pt-rPT/strings.xml
@@ -1,11 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operação não suportada pela Bomba e/ou Controlador.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operação não suportada ainda pela Bomba.</string>
+    <string name="common_resultok">OK</string>
     <!-- PumpCommon - Pump Status -->
+    <string name="pump_status_waking_up">A acordar</string>
+    <string name="pump_status_error_comm">Erro com comunicação</string>
+    <string name="pump_status_timeout_comm">Tempo limite para comunicação</string>
+    <string name="pump_status_pump_unreachable">Bomba inacessível</string>
+    <string name="pump_status_invalid_config">Configuração inválida</string>
+    <string name="pump_status_active">Activo</string>
+    <string name="pump_status_sleeping">A dormir</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basais</string>
+    <string name="history_group_configuration">Configurações</string>
+    <string name="history_group_notification">Notificações</string>
+    <string name="history_group_statistic">Estatísticas</string>
+    <string name="history_group_unknown">Desconhecido</string>
+    <string name="history_group_all">Tudo</string>
+    <string name="history_group_bolus">Bólus</string>
+    <string name="history_group_prime">Purgar</string>
+    <string name="history_group_alarm">Alarmes</string>
+    <string name="history_group_glucose">Glucose</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d dia</item>
+        <item quantity="other">%1$d dias</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d hora</item>
+        <item quantity="other">%1$d horas</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-ro-rRO/strings.xml b/pump-common/src/main/res/values-ro-rRO/strings.xml
index 33c77af761..5ef0652d1d 100644
--- a/pump-common/src/main/res/values-ro-rRO/strings.xml
+++ b/pump-common/src/main/res/values-ro-rRO/strings.xml
@@ -1,11 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operațiunea nu este suportată de către pompă și/sau driver.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operațiunea nu este ÎNCĂ suportată de către pompă.</string>
+    <string name="common_resultok">OK</string>
     <!-- PumpCommon - Pump Status -->
+    <string name="pump_status_waking_up">Se pornește</string>
+    <string name="pump_status_error_comm">Eroare de comunicație</string>
+    <string name="pump_status_timeout_comm">Comunicația nu a reușit la timp</string>
+    <string name="pump_status_pump_unreachable">Pompă indisponibilă</string>
+    <string name="pump_status_invalid_config">Configurație invalidă</string>
+    <string name="pump_status_active">Activă</string>
+    <string name="pump_status_sleeping">În repaus</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Bazale</string>
+    <string name="history_group_configuration">Configurații</string>
+    <string name="history_group_notification">Notificări</string>
+    <string name="history_group_statistic">Statistici</string>
+    <string name="history_group_unknown">Necunoscute</string>
+    <string name="history_group_all">Toate</string>
+    <string name="history_group_bolus">Bolusuri</string>
+    <string name="history_group_prime">Amorsare</string>
+    <string name="history_group_alarm">Alarme</string>
+    <string name="history_group_glucose">Glicemie</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d zi</item>
+        <item quantity="few">%1$d zile</item>
+        <item quantity="other">%1$d zile</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d oră</item>
+        <item quantity="few">%1$d ore</item>
+        <item quantity="other">%1$d ore</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-sk-rSK/strings.xml b/pump-common/src/main/res/values-sk-rSK/strings.xml
index 2c707642f5..f0498d6f86 100644
--- a/pump-common/src/main/res/values-sk-rSK/strings.xml
+++ b/pump-common/src/main/res/values-sk-rSK/strings.xml
@@ -29,4 +29,16 @@
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d deň</item>
+        <item quantity="few">%1$d dní</item>
+        <item quantity="many">%1$d dní</item>
+        <item quantity="other">%1$d dní</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d hodina</item>
+        <item quantity="few">%1$d hodín</item>
+        <item quantity="many">%1$d hodín</item>
+        <item quantity="other">%1$d hodín</item>
+    </plurals>
 </resources>
diff --git a/pump-common/src/main/res/values-sv-rSE/strings.xml b/pump-common/src/main/res/values-sv-rSE/strings.xml
index 33c77af761..22fbdda8af 100644
--- a/pump-common/src/main/res/values-sv-rSE/strings.xml
+++ b/pump-common/src/main/res/values-sv-rSE/strings.xml
@@ -1,11 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operation stöds inte av pumpen/pumpdrivrutinen.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operationen stöds inte av pumpen ännu.</string>
+    <string name="common_resultok">OK</string>
     <!-- PumpCommon - Pump Status -->
+    <string name="pump_status_waking_up">Väcker</string>
+    <string name="pump_status_error_comm">Kommunikationsfel</string>
+    <string name="pump_status_timeout_comm">Kommunikationstimeout</string>
+    <string name="pump_status_pump_unreachable">Pumpen kan inte nås</string>
+    <string name="pump_status_invalid_config">Felaktig konfiguration</string>
+    <string name="pump_status_active">Aktiv</string>
+    <string name="pump_status_sleeping">Sover</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basaldoser</string>
+    <string name="history_group_configuration">Konfigurationer</string>
+    <string name="history_group_notification">Notiser</string>
+    <string name="history_group_statistic">Statistik</string>
+    <string name="history_group_unknown">Okända</string>
+    <string name="history_group_all">Alla</string>
+    <string name="history_group_bolus">Bolusar</string>
+    <string name="history_group_prime">Förfyllningar</string>
+    <string name="history_group_alarm">Larm</string>
+    <string name="history_group_glucose">Glukos</string>
     <!-- Time -->
     <!-- BLE Config -->
     <!-- BLE Errors -->
     <!-- Pump Error -->
     <!-- Pump History -->
+    <plurals name="duration_days">
+        <item quantity="one">%1$d dag</item>
+        <item quantity="other">%1$d dagar</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d tim</item>
+        <item quantity="other">%1$d tim</item>
+    </plurals>
 </resources>