diff --git a/core/ui/src/main/res/values-es-rES/strings.xml b/core/ui/src/main/res/values-es-rES/strings.xml
index 68d4d2daf78..7cce4db19c9 100644
--- a/core/ui/src/main/res/values-es-rES/strings.xml
+++ b/core/ui/src/main/res/values-es-rES/strings.xml
@@ -176,6 +176,7 @@
     <string name="temp_basal_tsf_percent">%1$.0f%% @%2$s</string>
     <string name="extended_bolus_full">E %1$.2f U/h @%2$s %3$s/%4$s min</string>
     <string name="extended_bolus_medium">%1$.2f U/h %2$s/%3$s\'</string>
+    <string name="nav_export">Exportar ajustes</string>
     <!--    Protection-->
     <string name="wrongpassword">Contraseña incorrecta</string>
     <string name="wrongpin">Pin erróneo</string>
diff --git a/core/ui/src/main/res/values-tr-rTR/strings.xml b/core/ui/src/main/res/values-tr-rTR/strings.xml
index 170ffca6d54..b3d30e62eb9 100644
--- a/core/ui/src/main/res/values-tr-rTR/strings.xml
+++ b/core/ui/src/main/res/values-tr-rTR/strings.xml
@@ -176,6 +176,7 @@
     <string name="temp_basal_tsf_percent">%1$.0f%% @%2$s</string>
     <string name="extended_bolus_full">E %1$.2f Ü/s @%2$s %3$s/%4$s dk</string>
     <string name="extended_bolus_medium">%1$.2f Ü/s %2$s/%3$s\'</string>
+    <string name="nav_export">Dışa aktarma ayarları</string>
     <!--    Protection-->
     <string name="wrongpassword">Hatalı parola</string>
     <string name="wrongpin">Yanlış PIN</string>
diff --git a/core/ui/src/main/res/values-zh-rTW/strings.xml b/core/ui/src/main/res/values-zh-rTW/strings.xml
index 01aa6fe4363..9c1249da917 100644
--- a/core/ui/src/main/res/values-zh-rTW/strings.xml
+++ b/core/ui/src/main/res/values-zh-rTW/strings.xml
@@ -275,7 +275,7 @@
     <string name="timedetection">時間偵測</string>
     <!-- User Entry -->
     <string name="uel_bolus">注射</string>
-    <string name="uel_bolus_calculator">注射計算器</string>
+    <string name="uel_bolus_calculator">注射計算機</string>
     <string name="uel_bolus_advisor">注射顧問</string>
     <string name="uel_extended_bolus">延長注射</string>
     <string name="uel_superbolus_tbr">超級注射臨時基礎率</string>
diff --git a/plugins/constraints/src/main/res/values-tr-rTR/exam.xml b/plugins/constraints/src/main/res/values-tr-rTR/exam.xml
index dfc70ce18a6..e34426e002e 100644
--- a/plugins/constraints/src/main/res/values-tr-rTR/exam.xml
+++ b/plugins/constraints/src/main/res/values-tr-rTR/exam.xml
@@ -103,10 +103,13 @@
     <string name="troubleshooting_wheretoask">AAPS ile ilgili nereden yardım alabilirsiniz?</string>
     <string name="troubleshooting_fb">AAPS Kullanıcıları Facebook grubundan tavsiye isteyebilirsiniz.</string>
     <string name="troubleshooting_wiki">AAPS belgelerini okumalısınız (ve yeniden okumalısınız).</string>
+    <string name="troubleshooting_discord">AAPS Discord\'da, tavsiye isteyebilir, teknik problemleri tartışabilir ve özellik isteğinde bulunabilirsiniz.</string>
+    <string name="troubleshooting_github">Hatalar ve özellik isteklerini de Github\'a gönderebilirsiniz.</string>
     <string name="troubleshooting_yourendo">Diyabet kliniğinize/endokrinoloğunuza sormalısınız.</string>
     <string name="troubleshooting_hint1">https://wiki.aaps.app/tr/latest/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
     <string name="troubleshooting_hint3">https://discord.gg/4fQUWHZ4Mw</string>
+    <string name="troubleshooting_hint4">https://github.com/nightscout/AndroidAPS/issues</string>
     <string name="insulin_plugins">İnsülin Eklentileri</string>
     <string name="insulin_ultrarapid">Ultra-Hızlı Oref eklentisi ile hangi insülini kullanmalısınız?</string>
     <string name="insulin_fiasp">Fiasp®</string>
diff --git a/plugins/constraints/src/main/res/values-tr-rTR/strings.xml b/plugins/constraints/src/main/res/values-tr-rTR/strings.xml
index 9c4114088fa..0273e28ae64 100644
--- a/plugins/constraints/src/main/res/values-tr-rTR/strings.xml
+++ b/plugins/constraints/src/main/res/values-tr-rTR/strings.xml
@@ -4,6 +4,7 @@
     <!-- DST Helper -->
     <string name="dst_in_24h_warning">24 saat veya daha kısa süre içinde yaz saati değişikliği</string>
     <string name="dst_loop_disabled_warning">Yaz Saati Uygulaması 3 saatten daha kısa bir süre önce değişti - Kapalı döngü devre dışı</string>
+    <string name="dst_loop_disabled_error">Yaz Saati Uygulaması (DST) değişikliği 3 saatten kısa bir süre önce gerçekleşti. Kapalı döngü geçici olarak devre dışı bırakıldı. DST değişikliğinden 3 saat sonra otomatik olarak yeniden etkinleştirilecek</string>
     <!-- Storage constraint -->
     <string name="disk_full">Dahili depolama biriminden en az %1$d MB yer kaldı! Döngü devre dışı!</string>
     <!-- Version Checker -->
diff --git a/plugins/constraints/src/main/res/values-zh-rTW/exam.xml b/plugins/constraints/src/main/res/values-zh-rTW/exam.xml
index 8ea78a167fd..1630f577c17 100644
--- a/plugins/constraints/src/main/res/values-zh-rTW/exam.xml
+++ b/plugins/constraints/src/main/res/values-zh-rTW/exam.xml
@@ -159,9 +159,9 @@
     <string name="breadgrams_grams">估計和記錄攝入的碳水化合物時應僅使用克。</string>
     <string name="breadgrams_exchange">攝入的碳水化合物可以使用適當的交換系統記錄（例如DAFNE「CHO」交換或歐洲「麵包單位」）。</string>
     <string name="breadgrams_decay">AAPS使用動態模型來估計碳水化合物吸收並計算COB。</string>
-    <string name="breadgrams_calc">如果血糖水平超出可接受範圍（過低或過高），注射計算器可以用來提供碳水化合物或胰島素的修正建議。</string>
+    <string name="breadgrams_calc">如果血糖水平超出可接受範圍（過低或過高），注射計算機可以用來提供碳水化合物或胰島素的修正建議。</string>
     <string name="breadgrams_hint1">https://wiki.aaps.app/en/latest/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
-    <string name="extendedcarbs_label">e-碳水化合物</string>
+    <string name="extendedcarbs_label">展延碳水化合物</string>
     <string name="extendedcarbs_handling">您可以使用e-碳水化合物（延長碳水化合物）做什麼？</string>
     <string name="extendedcarbs_future">計劃未來的碳水化合物攝入，可能分配在一個時間段內（類似於分配在一個時間段內的延長注射）。</string>
     <string name="extendedcarbs_free">記錄您想要隱藏在AAPS之外的「免費」運動碳水化合物。</string>
@@ -172,7 +172,7 @@
     <string name="nsclient_howcanyou">如何遠端監控AAPS（例如監控您的孩子）？</string>
     <string name="nsclient_nightscout">AAPSClient應用、Nightscout應用和Nightscout網頁都允許您遠端監控AAPS。</string>
     <string name="nsclient_dexcomfollow">其他應用（例如Dexcom follow、xDrip運行在跟隨模式下）允許您遠端跟踪某些參數（例如血糖/傳感器值），但使用不同的算法，因此可能會有不準確的IOB或COB值。</string>
-    <string name="nsclient_data">要遠端跟踪AAPS，兩個設備都必須有網絡連線（例如通過Wi-Fi或行動/蜂窩網絡資料）。</string>
+    <string name="nsclient_data">要遠端追踪AAPS，兩個設備都必須有網絡連線（例如通過Wi-Fi或行動網路）。</string>
     <string name="nsclient_fullcontrol">AAPSClient作為遠端跟隨者使用時，既可以監控也可以完全控制AAPS。</string>
     <string name="nsclient_hint1">https://wiki.aaps.app/en/latest/Children/Children.html</string>
     <string name="isf_label_exam">胰島素敏感因子 (ISF)</string>
diff --git a/plugins/constraints/src/main/res/values-zh-rTW/objectives.xml b/plugins/constraints/src/main/res/values-zh-rTW/objectives.xml
index de0ad8edd3b..8b607c782b5 100644
--- a/plugins/constraints/src/main/res/values-zh-rTW/objectives.xml
+++ b/plugins/constraints/src/main/res/values-zh-rTW/objectives.xml
@@ -26,7 +26,7 @@
     <string name="objectives_autosens_learned">如果您的自動感應結果未在100%上下波動，您的個人設置可能是錯誤的。</string>
     <string name="objectives_smb_objective">啟用日間使用的附加功能，例如SMB</string>
     <string name="objectives_smb_gate">您必須閱讀Wiki並提高MaxIOB以使SMB正常工作！一個好的開始是MaxIOB=平均餐前注射+3倍的每日最大基礎速率。在簡單模式下，這個值根據Wiki中的建議計算，不需要設置。</string>
-    <string name="objectives_smb_learned">使用SMB是您的目標。Oref1算法設計是為了幫助您的注射。您不應該給食物全量注射，只有部分，讓AAPS在需要時給予剩餘的注射。這樣可以給錯誤計算的碳水化合物留出更多空間。您知道可以設置注射計算器結果的百分比以減少注射量嗎？</string>
+    <string name="objectives_smb_learned">使用SMB是您的目標。Oref1算法設計是為了幫助您的注射。您不應該給食物全量注射，只有部分，讓AAPS在需要時給予剩餘的注射。這樣可以給錯誤計算的碳水化合物留出更多空間。您知道可以設置注射計算機結果的百分比以減少注射量嗎？</string>
     <string name="objectives_auto_objective">啟用自動化</string>
     <string name="objectives_auto_gate">閱讀有關自動化如何工作的文檔。設置您的第一個簡單規則。讓AAPS僅顯示通知而不是行動。當您確定自動化在正確的時間觸發時，用實際行動替換通知。(https://wiki.aaps.app/en/latest/Usage/Automation.html)</string>
     <string name="objectives_auto_learned">自動化可以是好的僕人，但壞的主人。不要過度使用它。不要試圖替代基本算法。使用僅訊息測試規則，然後再使用它。這取決於順序。</string>
diff --git a/plugins/main/src/main/res/values-zh-rTW/strings.xml b/plugins/main/src/main/res/values-zh-rTW/strings.xml
index 98f20cec59e..18fda203fbc 100644
--- a/plugins/main/src/main/res/values-zh-rTW/strings.xml
+++ b/plugins/main/src/main/res/values-zh-rTW/strings.xml
@@ -120,7 +120,7 @@
     <string name="short_fat">脂肪</string>
     <string name="category">類別</string>
     <string name="subcategory">子類別</string>
-    <string name="calculator_label">計算器</string>
+    <string name="calculator_label">計算機</string>
     <!-- Theme switcher dark and light mode-->
     <string name="theme_switcher_summary">選擇深色、淺色或跟隨系統主題</string>
     <string name="app_color_scheme">應用顏色方案</string>
@@ -217,7 +217,7 @@
     <string name="quickwizard_settings">快速嚮導設置</string>
     <string name="keep_screen_on_title">保持螢幕開啟</string>
     <string name="keep_screen_on_summary">防止Android關閉螢幕。當未連線電源時，這將消耗大量能量。</string>
-    <string name="treatments">治療紀錄</string>
+    <string name="treatments">治療措施</string>
     <string name="carb_increment_button_message">按下按鈕時要添加的碳水化合物數量</string>
     <string name="insulin_increment_button_message">按下按鈕時要添加的胰島素量</string>
     <string name="firstinsulinincrement">第一次胰島素增量</string>
diff --git a/pump/medtrum/src/main/res/values-tr-rTR/strings.xml b/pump/medtrum/src/main/res/values-tr-rTR/strings.xml
index 0324e7636ef..ea338720f7a 100644
--- a/pump/medtrum/src/main/res/values-tr-rTR/strings.xml
+++ b/pump/medtrum/src/main/res/values-tr-rTR/strings.xml
@@ -78,6 +78,7 @@
     <string name="patch_not_active_note">Bir sonraki adıma kadar pompa tabanı patch\'a bağlanmamalıdır!</string>
     <string name="connect_pump_base">Pompa tabanını yeni bir patch\'a bağlayın, kalan havayı çıkarın ve insülinle doldurun, ardından <b>İleri</b>\'ye basın.</string>
     <string name="note_min_70_units">Not: Etkinleştirme için minimum 70 ünite gereklidir.</string>
+    <string name="reservoir_text_and_level">Rezervuar: %.2f U</string>
     <string name="do_not_attach_to_body">Patch\'i henüz gövdeye takmayın.</string>
     <string name="half_press_needle">İğne düğmesine yarım basın. Daha sonra hazırlamayı başlatmak için <b>İleri</b>\'ye dokunun.</string>
     <string name="wait_for_priming">Lütfen pompa hazırlanırken bekleyin.</string>
@@ -88,6 +89,7 @@
     <string name="activating_pump">Pompa etkinleştiriliyor ve başlangıç bazal hızı ayarlanıyor. Lütfen bekleyin.</string>
     <string name="activating_error">Etkinleştirilemedi. Tekrar denemek için <b>Tekrar Dene</b>\'ye basın.</string>
     <string name="activating_complete">Yeni patch etkinleştirildi. %.2f ünite kaldı.</string>
+    <string name="can_export_settings">Bu pompa oturumunu daha sonra kurtarabilmek için ayarları dışa aktarabilirsiniz.</string>
     <string name="press_OK_to_return">Ana ekrana dönmek için <b>Tamam</b>\'a basın.</string>
     <string name="deactivate_sure">Mevcut patch\'i devre dışı bırakmak istediğinizden emin misiniz?</string>
     <string name="cancel_sure">Etkinleştirmeyi iptal etmek istediğinizden emin misiniz?</string>
diff --git a/pump/omnipod-common/src/main/res/values-zh-rTW/strings.xml b/pump/omnipod-common/src/main/res/values-zh-rTW/strings.xml
index 3c722e3dee9..f0e0948523d 100644
--- a/pump/omnipod-common/src/main/res/values-zh-rTW/strings.xml
+++ b/pump/omnipod-common/src/main/res/values-zh-rTW/strings.xml
@@ -99,7 +99,7 @@
     <string name="omnipod_common_pod_deactivation_wizard_discard_pod">丟棄 Pod</string>
     <!-- Omnipod - Preferences -->
     <string name="omnipod_common_preferences_bolus_beeps_enabled">啟用胰島素劑量時，發出嗶聲</string>
-    <string name="omnipod_common_preferences_basal_beeps_enabled">啟用基礎蜂時，發出嗶聲</string>
+    <string name="omnipod_common_preferences_basal_beeps_enabled">啟用個人設置基礎時，發出嗶聲</string>
     <string name="omnipod_common_preferences_smb_beeps_enabled">啟用 SMB 時，發出嗶聲</string>
     <string name="omnipod_common_preferences_tbr_beeps_enabled">啟用臨時基礎率時，發出嗶聲</string>
     <string name="omnipod_common_preferences_suspend_delivery_button_enabled">在 Omnipod 標籤中顯示暫停輸送按鈕</string>
diff --git a/ui/src/main/res/values-tr-rTR/strings.xml b/ui/src/main/res/values-tr-rTR/strings.xml
index 2d9b6aceb7d..fa1d177be5a 100644
--- a/ui/src/main/res/values-tr-rTR/strings.xml
+++ b/ui/src/main/res/values-tr-rTR/strings.xml
@@ -17,6 +17,7 @@
     <!--     Activities-->
     <string name="activity_monitor">Aktivite monitörü</string>
     <string name="do_you_want_reset_stats">Etkinlik istatistiklerini sıfırlamak istiyor musunuz?</string>
+    <string name="do_you_want_recalculate_tdd_stats">GTD istatistiklerini tekrar hesaplamak istiyor musunuz?</string>
     <string name="statistics">İstatistikler</string>
     <string name="calculation_in_progress">Hesaplanıyor</string>
     <string name="invalid_age">Geçersiz yaş girişi</string>
@@ -145,6 +146,7 @@
     <string name="constraints_violation">Kısıtlamalar ihlali</string>
     <string name="change_your_input">Girişinizi değiştirin!</string>
     <string name="confirm_treatment">Lütfen tedaviyi onaylayın</string>
+    <string name="recalculate">Tekrar Hesapla</string>
     <string-array name="yes_no_positiveonly_negativeonly">
         <item>İkisi de</item>
         <item>Sadece pozitif</item>
diff --git a/wear/src/main/res/values-zh-rTW/strings.xml b/wear/src/main/res/values-zh-rTW/strings.xml
index a7d468719a4..ffed75bc493 100644
--- a/wear/src/main/res/values-zh-rTW/strings.xml
+++ b/wear/src/main/res/values-zh-rTW/strings.xml
@@ -66,17 +66,17 @@
     <string name="pref_ring_history">環形歷史記錄</string>
     <string name="pref_light_ring_history">輕量環形歷史記錄</string>
     <string name="pref_animations">動畫</string>
-    <string name="pref_wizard_in_menu">選單中的計算器</string>
+    <string name="pref_wizard_in_menu">選單中的計算機</string>
     <string name="pref_prime_in_menu">選單中的預填充</string>
     <string name="pref_single_target">單一目標</string>
-    <string name="pref_wizard_percentage">計算器百分比</string>
+    <string name="pref_wizard_percentage">計算機百分比</string>
     <string name="pref_complication_tap_action">複雜功能點擊動作</string>
     <string name="pref_unicode_in_complications">複雜功能中的 Unicode</string>
     <string name="pref_version">版本：</string>
     <string name="pref_moreWatchfaceSettings">更多錶盤設定</string>
     <string name="pref_lookInYourWatchfaceConfiguration">請查看錶盤設定。</string>
     <string name="menu_tempt">臨時目標</string>
-    <string name="menu_wizard">計算器</string>
+    <string name="menu_wizard">計算機</string>
     <string name="menu_wizard_short">計算</string>
     <string name="menu_treatment">治療</string>
     <string name="menu_treatment_short">治療</string>