Jon Mårtensson 2 лет назад
Родитель
Сommit
a6bef6d7f5

+ 1 - 4
FreeAPS/Sources/Localizations/Main/en.lproj/Localizable.strings

@@ -1311,7 +1311,7 @@ Enact a temp Basal or a temp target */
 "Hide" = "Hide";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
-"Eventual Glucose > Target Glucose, but glucose is predicted to drop down to " = "Eventual Glucose > Target Glucose, but glucose is predicted to drop down to ";
+"Eventual Glucose > Target Glucose, but glucose is predicted to drop down to " = "Eventual Glucose > Target Glucose, but glucose is predicted to first drop down to ";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
 "which is below your Threshold (" = "which is below your Threshold (";
@@ -1334,9 +1334,6 @@ Enact a temp Basal or a temp target */
 /* Bolus pop-up / Alert string. Make translations concise! */
 ". Changing: " = ". Changing: ";
 
-/* Bolus pop-up / Alert string. Make translations concise! */
-"Eventual Glucose > Target Glucose, but glucose is predicted to drop down to " = "Glucose is predicted to drop to";
-
 /* Add insulin without bolusing alert */
 " without bolusing" = " without bolusing";
 

+ 1 - 4
FreeAPS/Sources/Localizations/Main/sv.lproj/Localizable.strings

@@ -1345,7 +1345,7 @@ Enact a temp Basal or a temp target */
 "Hide" = "Göm";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
-"Eventual Glucose > Target Glucose, but glucose is predicted to drop down to " = "Eventual Glucose > Target Glucose, but glucose is predicted to drop down to ";
+"Eventual Glucose > Target Glucose, but glucose is predicted to first drop down to " = "Prognos 'r över målvärde, men ditt blodoscker väntas först sjunka till ";
 
 /* Bolus pop-up / Alert string. Make translations concise! */
 "which is below your Threshold (" = "vilket är lägre än ditt tröskelvärde (";
@@ -1368,9 +1368,6 @@ Enact a temp Basal or a temp target */
 /* Bolus pop-up / Alert string. Make translations concise! */
 ". Changing: " = ". Ändras: ";
 
-/* Bolus pop-up / Alert string. Make translations concise! */
-"Eventual Glucose > Target Glucose, but glucose is predicted to drop down to " = "Prognos är > målvärde, men ditt blodsocker väntas sjunka till ";
-
 /* Add insulin without bolusing alert */
 " without bolusing" = " utan att ge insulin";
 

+ 3 - 3
FreeAPS/Sources/Modules/Bolus/View/BolusRootView.swift

@@ -254,13 +254,13 @@ extension Bolus {
             )
         }
 
-        // Localize the Oref0 error/warning strings
+        // Localize the Oref0 error/warning strings. The default should never be returned
         private func alertString() -> String {
             switch state.errorString {
             case 1,
                  2:
                 return NSLocalizedString(
-                    "Eventual Glucose > Target Glucose, but glucose is predicted to drop down to ",
+                    "Eventual Glucose > Target Glucose, but glucose is predicted to first drop down to ",
                     comment: "Bolus pop-up / Alert string. Make translations concise!"
                 ) + state.minGuardBG
                     .formatted(.number.grouping(.never).rounded().precision(.fractionLength(fractionDigits))) + " " + state.units
@@ -299,7 +299,7 @@ extension Bolus {
                     .minDelta.formatted(.number.grouping(.never).rounded().precision(.fractionLength(fractionDigits)))
             case 6:
                 return NSLocalizedString(
-                    "Eventual Glucose > Target Glucose, but glucose is predicted to drop down to ",
+                    "Eventual Glucose > Target Glucose, but glucose is predicted to first drop down to ",
                     comment: "Bolus pop-up / Alert string. Make translations concise!"
                 ) + state
                     .minPredBG