diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 13ce767148..162f756ca6 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -267,6 +267,7 @@
     <string name="configbuilder_shortname">KONF</string>
     <string name="loop_shortname">OKRUH</string>
     <string name="oaps_shortname">OAPS</string>
+    <string name="dynisf_shortname">DYNISF</string>
     <string name="localprofile_shortname">LPRF</string>
     <string name="overview_shortname">PREH</string>
     <string name="virtualpump_shortname">VPUM</string>
@@ -432,6 +433,7 @@
     <string name="ns_localbroadcasts">Povoliť vysielanie do iných aplikácií (napr. xDrip+). Nepovoľujte, pokiaľ máte nainštalovanú viac ako jednu AAPS, alebo NSClient inštanciu!</string>
     <string name="ns_localbroadcasts_title">Povoliť lokálne vysielanie.</string>
     <string name="openapssmb">OpenAPS SMB</string>
+    <string name="openaps_smb_dynamic_isf">Dynamická ISF</string>
     <string name="enableuam">Povoliť UAM</string>
     <string name="enablesmb">Povoliť SMB</string>
     <string name="enablesmb_summary">Použiť Super Mikro Bolusy namiesto dočasných bazálov, pre zrýchleniu účinku</string>
@@ -661,6 +663,9 @@
     <string name="sensitivity_raises_target_title">Citlivosť zvyšuje cieľ</string>
     <string name="sensitivity_raises_target_summary">Ak je zistená vyššia citlivosť, zvýši cieľovú hladinu glykémie</string>
     <string name="careportal_removestartedevents">Vymazať udalosti \"AndroidAPS reštartovaný\"</string>
+    <string name="show_invalidated">Zobraziť neplatné</string>
+    <string name="hide_invalidated">Skryť zneplatnené</string>
+    <string name="remove_items">Odstrániť položky</string>
     <string name="storedsettingsfound">Nájdené uložené nastavenia</string>
     <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>
@@ -877,6 +882,8 @@
     <string name="ns_receive_profile_switch_summary">Prijať prepnutia profilov zadané prostredníctvom NS, alebo NSClienta</string>
     <string name="ns_receive_offline_event">Prijímať udalosti APS offline</string>
     <string name="ns_receive_offline_event_summary">Prijať APS offline udalosti zadané prostredníctvom NS, alebo NSClienta</string>
+    <string name="ns_receive_tbr_eb">Prijímať dočasný bazál a predĺžený bolus</string>
+    <string name="ns_receive_tbr_eb_summary">Prijať dočasný bazál a predĺžený bolus zadaný cez inú inštanciu</string>
     <string name="ns_receive_insulin">Prijímať inzulín</string>
     <string name="ns_receive_insulin_summary">Prijať inzulín vložený cez NS, alebo NSClient (nie je dodaný, iba započítaný do IOB)</string>
     <string name="ns_receive_carbs">Prijímať sacharidy</string>
@@ -969,4 +976,15 @@
     <string name="wear_unknown_action_string">Neznámy príkaz k akcii:</string>
     <string name="overview_editquickwizard_percentage">Percentuálny podiel</string>
     <string name="app_default">Predvolené aplikáciou</string>
+    <string name="select_profile">Vyberte profil pre úpravu</string>
+    <string name="refresh_from_nightscout">Obnoviť z Nightscoutu</string>
+    <string name="remove_selected_items">Odstrániť vybrané položky</string>
+    <string name="select_for_removal">Vyberte pre odstránenie</string>
+    <string name="profile_changes">Zmeny profilu</string>
+    <string name="tempt_targets">Dočasné ciele</string>
+    <string name="carbs_and_bolus">Sacharidy a bolusy</string>
+    <string name="confirm_remove_multiple_items">Naozaj chcete odstrániť %1$d položku(y)</string>
+    <string name="hide_loop">Skryť uzavretý okruh</string>
+    <string name="show_loop">Zobraziť uzavretý okruh</string>
+    <string name="count_selected">Vybrané: %1$d</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/exam.xml b/app/src/main/res/values-zh-rCN/exam.xml
index 87ec82780f..137f0a8767 100644
--- a/app/src/main/res/values-zh-rCN/exam.xml
+++ b/app/src/main/res/values-zh-rCN/exam.xml
@@ -60,10 +60,10 @@
     <string name="exercise_15g">等血糖值低于你的低血糖警戒线之后，吃15克速升的活性碳水合物。</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
     <string name="suspendloop_label">禁用/暂停闭环</string>
-    <string name="suspendloop_doigetinsulin">在禁用/暂停闭环时，是否可以输注胰岛素?</string>
-    <string name="suspendloop_yes">是的，胰岛素基础率可以正常输注的。</string>
+    <string name="suspendloop_doigetinsulin">在禁用/暂停闭环时，我是否接收了胰岛素输注？</string>
+    <string name="suspendloop_yes">是的，胰岛素基础率仍在继续输注。</string>
     <string name="suspendloop_no">不，胰岛素停止输注。</string>
-    <string name="basaltest_label">Basal(基础率)，ISF(胰岛素敏感系数)和I:C(胰岛素:碳水)测试</string>
+    <string name="basaltest_label">Basal基础率，ISF胰岛素敏感系数，I:C或ICR碳水化合物系数的测试</string>
     <string name="basaltest_when">什么时候需要修订这些值？</string>
     <string name="basaltest_beforeloop">在开始闭环之前。</string>
     <string name="basaltest_havingregularhighlow">当经常出现高血糖或低血糖时。</string>
@@ -84,7 +84,7 @@
     <string name="prerequisites_own670g">一台 MiniMed 670G 泵。</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">一个智能手表.</string>
-    <string name="prerequisites_supportedcgm">一个可正常使用的 CGM。</string>
+    <string name="prerequisites_supportedcgm">受支持的CGM血糖监测产品</string>
     <string name="prerequisites2_label">先决条件</string>
     <string name="prerequisites2_what">什么是建立和使用 AndroidAPS的基本条件？</string>
     <string name="prerequisites2_profile">验证参数信息用于个人配置文件（如ISF胰岛素敏感度系数、I:C胰岛素碳水比率、基础率、DIA胰岛素作用持续时间等等）。</string>
@@ -93,9 +93,9 @@
     <string name="prerequisites2_supportedcgm">一台安装了动态血糖监测应用或兼容软件的手机/设备，用于接收血糖数据。</string>
     <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="update_label">更新 AndroidAPS</string>
-    <string name="whatistrue">检查所有正确的答案.</string>
+    <string name="whatistrue">选择所有正确的答案.</string>
     <string name="update_git">您需要在您的计算机上安装和配置Git。</string>
-    <string name="update_asap">当更新的 AndroidAPS 版本发布时，先前的版本可能会在指定时间之后受到远程限制。</string>
+    <string name="update_asap">当AndroidAPS更新发布正式版本时，先前的版本可能会在指定时间之后受到远程限制。</string>
     <string name="update_keys">您应该保存并记住密钥的存储位置，并使用相同地签名密钥进行更新，与您以前的安装一样。</string>
     <string name="update_neverupdate">如果该系统运作良好，就不要去更新系统。</string>
     <string name="update_askfriend">如果您在构建应用时遇到困难，您可以安装一个由朋友构建的应用程序。</string>
@@ -119,7 +119,7 @@
     <string name="sensitivity_label">敏感度插件</string>
     <string name="sensitivity_which">选择所有正确的答案。</string>
     <string name="sensitivity_adjust">灵敏度插件允许AndroidAPS临时调整胰岛素敏感度的短暂变化(例如激素变化或与输液部位吸收相关的问题)。</string>
-    <string name="sensitivity_edit">灵敏度插件为用户提供基础率、 I:C比率和 ISF 的更改建议，可用来编辑配置文件。</string>
+    <string name="sensitivity_edit">灵敏度插件为用户提供basal基础率，I:C碳水化合物系数和ISF胰岛素敏感系数的更改建议，可用来编辑配置文件。</string>
     <string name="sensitivity_cannula">记录输注导管更换会将Autosens比率重置回100%。</string>
     <string name="sensitivity_time">一些插件选项具有可配置的时间范围，可由用户设置。</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
@@ -195,13 +195,13 @@
     <string name="profileswitchtime_iwant">如果您比平常早起 2 个小时，您应该如何通知AndroidAPS应对个人日程表中的更改?</string>
     <string name="profileswitchtime_2">以增加2小时的方式，启动个人配置文件切换</string>
     <string name="profileswitchtime__2">以减少2小时的方式，启动个人配置文件切换</string>
-    <string name="profileswitchtime_tt">设置一个马上吃饭的临时的目标血糖值。</string>
+    <string name="profileswitchtime_tt">设置一个马上吃饭，临时的血糖目标值。</string>
     <string name="profileswitchtime_100">将配置文件切换到100%以上。</string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profilewitch#timeshift</string>
     <string name="profileswitch4_label">修改配置文件</string>
-    <string name="profileswitch4_rates">基础率、胰岛素敏感系数ISF、胰岛素和碳水比率I:C等，应在配置文件中设定。</string>
+    <string name="profileswitch4_rates">Basal基础率，ISF胰岛素敏感系数，I:C碳水化合物系数等，应该在配置文件中设定。</string>
     <string name="profileswitch4_internet">激活对Nightscout配置文件的更改，需要您的AndroidAPS 手机启用互联网连接。</string>
-    <string name="profileswitch4_sufficient">编辑配置文件并修改参数，足以进行任何更改。</string>
+    <string name="profileswitch4_sufficient">编辑配置文件进行参数的修改，足以适应任何变化。</string>
     <string name="profileswitch4_multi">可以设置和选择多个配置文件，以适应不断变化的环境(例如激素变化、轮班工作、工作日/周末生活方式)。</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
     <string name="basalhelp_label">帮助调整基础率</string>
diff --git a/combo/src/main/res/values-pt-rBR/strings.xml b/combo/src/main/res/values-pt-rBR/strings.xml
index a4a15441d4..82d4ed80ee 100644
--- a/combo/src/main/res/values-pt-rBR/strings.xml
+++ b/combo/src/main/res/values-pt-rBR/strings.xml
@@ -48,7 +48,7 @@
     <string name="combo_check_date">O último bólus tem mais de 24 horas ou está no futuro. Por favor, verifique se a data está definida corretamente.</string>
     <string name="combo_suspious_bolus_time">Hora/data da entrega do bólus na bomba parece errado, insulina ativa parece estar provavelmente incorreto. Verifique hora/data na bomba.</string>
     <string name="combo_bolus_count">Contagem Bólus</string>
-    <string name="combo_tbr_count">Contagem Basal Teporária</string>
+    <string name="combo_tbr_count">Contagem Basal Temporária</string>
     <string name="bolusstopped">Bolus interrompido</string>
     <string name="bolusstopping">Interrompendo bolus</string>
     <string name="pump_commerror_label">Contagem de erro comunicada</string>
diff --git a/combo/src/main/res/values-sk-rSK/strings.xml b/combo/src/main/res/values-sk-rSK/strings.xml
index d6fae8cdb6..7fa36433e3 100644
--- a/combo/src/main/res/values-sk-rSK/strings.xml
+++ b/combo/src/main/res/values-sk-rSK/strings.xml
@@ -51,4 +51,10 @@
     <string name="combo_tbr_count">Počet dočasných bazálov</string>
     <string name="bolusstopped">Bolus zastavený</string>
     <string name="bolusstopping">Zastavenie bolusu</string>
+    <string name="pump_commerror_label">Počet chýb komun.</string>
+    <string name="show_comm_error_count_title">Zobr. počet chýb komun.</string>
+    <string name="show_comm_error_count_summary">Zobrazí počet chýb pri komunikácii s Ruffy. Číslo vyšše, ako 0 obvykle naznačuje problémy s Ruffy (môže byť nutné reštartovať).</string>
+    <string name="combo_error_display_never">Nikdy</string>
+    <string name="combo_error_display_error">Keď dôjde k chybe</string>
+    <string name="combo_error_display_always">Vždy</string>
 </resources>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index 9dd3823963..7c0a7758dc 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -4,6 +4,7 @@
     <!--    General-->
     <string name="refresh">Obnoviť</string>
     <string name="error">Chyba</string>
+    <string name="save">Uložiť</string>
     <string name="not_set_short">Nenastavené</string>
     <string name="failedupdatebasalprofile">Chyba pri aktualizovaní bazálneho profilu</string>
     <string name="profile_set_ok">Bazálny profil v pumpe aktualizovaný</string>
@@ -376,6 +377,7 @@
     <string name="uel_stat_reset">RESET ŠTATISTÍK</string>
     <string name="uel_delete_logs">VYMAZAŤ LOGY</string>
     <string name="uel_delete_future_treatments">VYMAZAŤ BUDÚCE OŠETRENIA</string>
+    <string name="delete_future_treatments">Odstrániť ošetrenia v budúcnosti</string>
     <string name="uel_export_settings">EXPORTOVAŤ NASTAVENIA</string>
     <string name="uel_import_settings">IMPORTOVAŤ NASTAVENIA</string>
     <string name="uel_reset_databases">RESETOVAŤ DATABÁZY</string>
diff --git a/rileylink/src/main/res/values-sk-rSK/strings.xml b/rileylink/src/main/res/values-sk-rSK/strings.xml
index de1f1d6148..6fbf977a6f 100644
--- a/rileylink/src/main/res/values-sk-rSK/strings.xml
+++ b/rileylink/src/main/res/values-sk-rSK/strings.xml
@@ -81,4 +81,5 @@
     </plurals>
     <string name="orange_use_scanning_level">Použi skenovanie</string>
     <string name="orange_use_scanning_level_summary">Skenuj, predtým, ako sa pripojíš k OrangeLinku. Malo by to zlepšiť stabilitu pripojenia (môže byť použité i s inými klonmi RileyLinku, ak je to potrebné).</string>
+    <string name="rileylink_configuration">Konfigurácia RileyLinku</string>
 </resources>