Merge remote-tracking branch 'upstream/dev' into superBolus

Dependencies/G7SensorKit/G7SensorKitUI/de.lproj/Localizable.strings

@@ -1,5 +1,5 @@
 /* No glucose value representation (3 dashes for mg/dL) */
-"– – –" = "– – –";
+"– – –" = "";
 
 /* Format string for glucose trend per minute. (1: glucose value and unit) */
 "%@/min" = "%@/min";
@@ -99,7 +99,7 @@
 "Sensor failed" = "Sensorfehler";
 
 /* title for g7 settings row showing sensor start time */
-"Sensor Start" = "Start sensor";
+"Sensor Start" = "Starte den Sensor";
 
 /* G7 Status highlight text for signal loss */
 "Signal\nLoss" = "Signal\nVerlust";

Dependencies/G7SensorKit/G7SensorKitUI/it.lproj/Localizable.strings

@@ -2,7 +2,7 @@
 "– – –" = "– – –";
 
 /* Format string for glucose trend per minute. (1: glucose value and unit) */
-"%@/min" = "%@/minuto";
+"%@/min" = "%@/min";
 
 /* No comment provided by engineer. */
 "Are you sure you want to delete this CGM?" = "Sei sicuro di voler cancellare questo CGM?";
@@ -63,7 +63,7 @@
 "Name" = "Nome";
 
 /* No comment provided by engineer. */
-"Scan for new sensor" = "Scansiona per nuovo sensore";
+"Scan for new sensor" = "Scansiona nuovo sensore";
 
 /* title for g7 settings connection status when scanning */
 "Scanning" = "Lettura";
@@ -99,7 +99,7 @@
 "Sensor failed" = "Sensore fallito";
 
 /* title for g7 settings row showing sensor start time */
-"Sensor Start" = "Start sensor";
+"Sensor Start" = "Avvia sensore";
 
 /* G7 Status highlight text for signal loss */
 "Signal\nLoss" = "Perdita segnale \n";

FreeAPS/Sources/Modules/Bolus/View/AlternativeBolusCalcRootView.swift

@@ -63,15 +63,6 @@ extension Bolus {
                 }
 
                 Section {
-                    if !fetch {
-                        Button {
-                            carbssView()
-                        }
-                        label: { Text("Add Meal") }.frame(maxWidth: .infinity, alignment: .center)
-                    }
-                } header: { Text(!fetch ? "Meal Summary" : "") }
-
-                Section {
                     HStack {
                         Button(action: {
                             showInfo.toggle()
@@ -155,7 +146,7 @@ extension Bolus {
                             }
                         }
                     }
-                } header: { Text("Bolus Summary") }
+                } header: { Text("Bolus") }
 
                 if state.amount > 0 {
                     Section {
@@ -186,11 +177,9 @@ extension Bolus {
             .navigationBarTitleDisplayMode(.inline)
             .navigationBarItems(
                 leading: Button {
-                    if fetch {
-                        carbssView()
-                    }
+                    carbssView()
                 }
-                label: { Text(fetch ? "Back" : "") },
+                label: { Text(fetch ? "Back" : "Meal") },
 
                 trailing: Button { state.hideModal() }
                 label: { Text("Close") }

FreeAPS/Sources/Modules/Bolus/View/DefaultBolusCalcRootView.swift

@@ -42,15 +42,6 @@ extension Bolus {
                 }
 
                 Section {
-                    if !fetch {
-                        Button {
-                            carbssView()
-                        }
-                        label: { Text("Add Meal") }.frame(maxWidth: .infinity, alignment: .center)
-                    }
-                } header: { Text(!fetch ? "Meal Summary" : "") }
-
-                Section {
                     if state.waitForSuggestion {
                         HStack {
                             Text("Wait please").foregroundColor(.secondary)
@@ -93,8 +84,7 @@ extension Bolus {
                             Text(!(state.amount > state.maxBolus) ? "U" : "😵").foregroundColor(.secondary)
                         }
                     }
-                }
-                header: { Text("Bolus Summary") }
+                } header: { Text("Bolus") }
 
                 if !state.waitForSuggestion {
                     if state.amount > 0 {
@@ -153,11 +143,9 @@ extension Bolus {
             .navigationBarTitleDisplayMode(.inline)
             .navigationBarItems(
                 leading: Button {
-                    if fetch {
-                        carbssView()
-                    }
+                    carbssView()
                 }
-                label: { Text(fetch ? "Back" : "") },
+                label: { Text(fetch ? "Back" : "Meal") },
 
                 trailing: Button { state.hideModal() }
                 label: { Text("Close") }