Merge remote-tracking branch 'ivalkou/dev' into Crowdin

FreeAPS.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/ivalkou/LibreTransmitterX",
         "state": {
           "branch": null,
-          "revision": "2f8df15df7314a940259c93aed38d8ce928c674e",
-          "version": "1.0.7"
+          "revision": "af874b58f03554d92053e06d33fd1b638b721552",
+          "version": "1.0.8"
         }
       },
       {

FreeAPS/Sources/Localizations/Main/ar.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS main settings";
 
 "OpenAPS SMB settings" = "OpenAPS SMB settings";

FreeAPS/Sources/Localizations/Main/ca.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS main settings";
 
 "OpenAPS SMB settings" = "OpenAPS SMB settings";

FreeAPS/Sources/Localizations/Main/da.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS main settings";
 
 "OpenAPS SMB settings" = "OpenAPS SMB settings";

FreeAPS/Sources/Localizations/Main/de.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS Haupteinstellungen";
 
 "OpenAPS SMB settings" = "OpenAPS SMB Einstellungen";

FreeAPS/Sources/Localizations/Main/en.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS main settings";
 
 "OpenAPS SMB settings" = "OpenAPS SMB settings";

FreeAPS/Sources/Localizations/Main/es.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS main settings";
 
 "OpenAPS SMB settings" = "OpenAPS SMB settings";

FreeAPS/Sources/Localizations/Main/fi.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS main settings";
 
 "OpenAPS SMB settings" = "OpenAPS SMB settings";

FreeAPS/Sources/Localizations/Main/fr.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS main settings";
 
 "OpenAPS SMB settings" = "OpenAPS SMB settings";

FreeAPS/Sources/Localizations/Main/he.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS main settings";
 
 "OpenAPS SMB settings" = "OpenAPS SMB settings";

FreeAPS/Sources/Localizations/Main/it.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS main settings";
 
 "OpenAPS SMB settings" = "OpenAPS SMB settings";

FreeAPS/Sources/Localizations/Main/nb.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS hovedinnstillinger";
 
 "OpenAPS SMB settings" = "OpenAPS SMB innstillinger";

FreeAPS/Sources/Localizations/Main/nl.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS main settings";
 
 "OpenAPS SMB settings" = "OpenAPS SMB settings";

FreeAPS/Sources/Localizations/Main/pl.lproj/Localizable.strings

@@ -589,6 +589,7 @@ Połączono z Nightscout!";
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS main settings";
 
 "OpenAPS SMB settings" = "OpenAPS SMB settings";

FreeAPS/Sources/Localizations/Main/pt-BR.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS main settings";
 
 "OpenAPS SMB settings" = "OpenAPS SMB settings";

FreeAPS/Sources/Localizations/Main/ru.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "Основные настройки OpenAPS";
 
 "OpenAPS SMB settings" = "Настройки OpenAPS SMB";

FreeAPS/Sources/Localizations/Main/sv.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS huvudsakliga inställningar";
 
 "OpenAPS SMB settings" = "OpenAPS SMB-inställningar";

FreeAPS/Sources/Localizations/Main/tr.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS main settings";
 
 "OpenAPS SMB settings" = "OpenAPS SMB settings";

FreeAPS/Sources/Localizations/Main/zh-Hans.lproj/Localizable.strings

@@ -587,6 +587,7 @@ Enact a temp Basal or a temp target */
 
 /* Headers for settings ------------------- */
 
+
 "OpenAPS main settings" = "OpenAPS main settings";
 
 "OpenAPS SMB settings" = "OpenAPS SMB settings";

FreeAPS/Sources/Modules/AddCarbs/AddCarbsStateModel.swift

@@ -27,7 +27,7 @@ extension AddCarbs {
                 apsManager.determineBasalSync()
                 showModal(for: nil)
             } else {
-                showModal(for: .bolus(waitForDuggestion: true))
+                showModal(for: .bolus(waitForSuggestion: true))
             }
         }
     }

FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -271,7 +271,7 @@ extension Home {
                                     .padding(8)
                             }.foregroundColor(.loopYellow)
                             Spacer()
-                            Button { state.showModal(for: .bolus(waitForDuggestion: false)) }
+                            Button { state.showModal(for: .bolus(waitForSuggestion: false)) }
                             label: {
                                 Image("bolus")
                                     .renderingMode(.template)

FreeAPS/Sources/Router/Screen.swift

@@ -16,7 +16,7 @@ enum Screen: Identifiable, Hashable {
     case preferencesEditor
     case addCarbs
     case addTempTarget
-    case bolus(waitForDuggestion: Bool)
+    case bolus(waitForSuggestion: Bool)
     case manualTempBasal
     case autotuneConfig
     case dataTable