Skip to content

Commit f6afb8c

Browse files
authored
Merge pull request nightscout#173 from nightscout/meal_settings
Rename Fat And Protein settings to Meal Settings, move Max Carbs to Meal Settings
2 parents 74fd65f + ca55d2e commit f6afb8c

28 files changed

+75
-66
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,7 @@ Enact a temp Basal or a temp target */
12401240
"Enable" = "Enable";
12411241

12421242
/* Header */
1243-
"Conversion settings" = "Conversion settings";
1243+
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";
12441244

12451245
/* Delay */
12461246
"Delay In Minutes" = "Delay In Minutes";
@@ -1273,7 +1273,7 @@ Enact a temp Basal or a temp target */
12731273
"Protein" = "Protein";
12741274

12751275
/* Service Section */
1276-
"Fat And Protein Conversion" = "Fat And Protein Conversion";
1276+
"Meal Settings" = "Meal Settings";
12771277

12781278
/* Service Section */
12791279
"Profile Override" = "Profile Override";

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ Enact a temp Basal or a temp target */
11211121
"Enable" = "Enable";
11221122

11231123
/* Header */
1124-
"Conversion settings" = "Conversion settings";
1124+
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";
11251125

11261126
/* Delay */
11271127
"Delay In Minutes" = "Delay In Minutes";
@@ -1154,7 +1154,7 @@ Enact a temp Basal or a temp target */
11541154
"Protein" = "Protein";
11551155

11561156
/* Service Section */
1157-
"Fat And Protein Conversion" = "Fat And Protein Conversion";
1157+
"Meal Settings" = "Meal Settings";
11581158

11591159
/* Service Section */
11601160
"Profile Override" = "Profile Override";

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,7 @@ Enact a temp Basal or a temp target */
12401240
"Enable" = "Aktivér";
12411241

12421242
/* Header */
1243-
"Conversion settings" = "Indstillinger for konvertering";
1243+
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";
12441244

12451245
/* Delay */
12461246
"Delay In Minutes" = "Forsinkelse I Minutter";
@@ -1258,7 +1258,7 @@ Enact a temp Basal or a temp target */
12581258
"Allows fat and protein to be converted into future carb equivalents using the Warsaw formula of kilocalories divided by 10.\n\nThis spreads the carb equivilants over a maximum duration setting that can be configured from 5-12 hours.\n\nDelay is time from now until the first future carb entry.\n\nInterval in minutes is how many minutes are between entries. The shorter the interval, the smoother the result. 10, 15, 20, 30, or 60 are reasonable choices.\n\nAdjustment factor is how much effect the fat and protein has on the entries. 1.0 is full effect (original Warsaw Method) and 0.5 is half effect. Note that you may find that your normal carb ratio needs to increase to a larger number if you begin adding fat and protein entries. For this reason, it is best to start with a factor of about 0.5 to ease into it.\n\nDefault settings: Time Cap: 8 h, Interval: 30 min, Factor: 0.5, Delay 60 min" = "Allows fat and protein to be converted into future carb equivalents using the Warsaw formula of kilocalories divided by 10.\n\nThis spreads the carb equivilants over a maximum duration setting that can be configured from 5-12 hours.\n\nDelay is time from now until the first future carb entry.\n\nInterval in minutes is how many minutes are between entries. The shorter the interval, the smoother the result. 10, 15, 20, 30, or 60 are reasonable choices.\n\nAdjustment factor is how much effect the fat and protein has on the entries. 1.0 is full effect (original Warsaw Method) and 0.5 is half effect. Note that you may find that your normal carb ratio needs to increase to a larger number if you begin adding fat and protein entries. For this reason, it is best to start with a factor of about 0.5 to ease into it.\n\nDefault settings: Time Cap: 8 h, Interval: 30 min, Factor: 0.5, Delay 60 min";
12591259

12601260
/* FPU Settings Title */
1261-
"Fat and Protein" = "Fedt og Protein";
1261+
"Fat and Protein" = "Fat and Protein";
12621262

12631263
/* Display fat and protein entities */
12641264
"Fat & Protein" = "Fedt & Protein";
@@ -1273,7 +1273,7 @@ Enact a temp Basal or a temp target */
12731273
"Protein" = "Protein";
12741274

12751275
/* Service Section */
1276-
"Fat And Protein Conversion" = "Fedt Og Protein Konvertering";
1276+
"Meal Settings" = "Meal Settings";
12771277

12781278
/* Service Section */
12791279
"Profile Override" = "Profile Override";

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ Enact a temp Basal or a temp target */
12431243
"Enable" = "Einschalten";
12441244

12451245
/* Header */
1246-
"Conversion settings" = "Einstellungen für die Umrechnung";
1246+
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";
12471247

12481248
/* Delay */
12491249
"Delay In Minutes" = "Verzögerung in Minuten";
@@ -1261,7 +1261,7 @@ Enact a temp Basal or a temp target */
12611261
"Allows fat and protein to be converted into future carb equivalents using the Warsaw formula of kilocalories divided by 10.\n\nThis spreads the carb equivilants over a maximum duration setting that can be configured from 5-12 hours.\n\nDelay is time from now until the first future carb entry.\n\nInterval in minutes is how many minutes are between entries. The shorter the interval, the smoother the result. 10, 15, 20, 30, or 60 are reasonable choices.\n\nAdjustment factor is how much effect the fat and protein has on the entries. 1.0 is full effect (original Warsaw Method) and 0.5 is half effect. Note that you may find that your normal carb ratio needs to increase to a larger number if you begin adding fat and protein entries. For this reason, it is best to start with a factor of about 0.5 to ease into it.\n\nDefault settings: Time Cap: 8 h, Interval: 30 min, Factor: 0.5, Delay 60 min" = "Ermöglicht die Umwandlung von Fett und Eiweiß in zukünftige Kohlenhydratäquivalente unter Verwendung der Warschauer Formel (Kilokalorien geteilt durch 10). Dadurch werden die Kohlenhydratäquivalente über eine maximale Dauer verteilt, die zwischen 5 und 12 Stunden eingestellt werden kann. Je kürzer das Intervall, desto gleichmäßiger das Ergebnis. 10, 15, 20, 30 oder 60 sind eine vernünftige Wahl.\n\nAnpassungsfaktor gibt an, wie stark sich Fett und Eiweiß auf die Einträge auswirken. 1,0 entspricht der vollen Wirkung (ursprüngliche Warschauer Methode) und 0,5 der halben Wirkung. Beachten Sie, dass Ihr normales Kohlenhydratverhältnis möglicherweise auf eine größere Zahl ansteigen muss, wenn Sie beginnen, Fett- und Eiweißeinträge hinzuzufügen. Aus diesem Grund ist es am besten, mit einem Faktor von etwa 0,5 zu beginnen, um den Einstieg zu erleichtern.\n\nStandardeinstellungen: Zeit Cap: 8 h, Interval: 30 min, Faktor: 0,5, Verzögerung: 60 min";
12621262

12631263
/* FPU Settings Title */
1264-
"Fat and Protein" = "Fett und Eiweiß";
1264+
"Fat and Protein" = "Fat and Protein";
12651265

12661266
/* Display fat and protein entities */
12671267
"Fat & Protein" = "Fett und Eiweiß";
@@ -1276,7 +1276,7 @@ Enact a temp Basal or a temp target */
12761276
"Protein" = "Eiweiß";
12771277

12781278
/* Service Section */
1279-
"Fat And Protein Conversion" = "Fett und Eiweiß Berechnung";
1279+
"Meal Settings" = "Meal Settings";
12801280

12811281
/* Service Section */
12821282
"Profile Override" = "Profil überschreibung";

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,7 @@ Enact a temp Basal or a temp target */
12411241
"Enable" = "Enable";
12421242

12431243
/* Header */
1244-
"Conversion settings" = "Conversion settings";
1244+
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";
12451245

12461246
/* Delay */
12471247
"Delay In Minutes" = "Delay In Minutes";
@@ -1274,7 +1274,7 @@ Enact a temp Basal or a temp target */
12741274
"Protein" = "Protein";
12751275

12761276
/* Service Section */
1277-
"Fat And Protein Conversion" = "Fat And Protein Conversion";
1277+
"Meal Settings" = "Meal Settings";
12781278

12791279
/* Service Section */
12801280
"Profile Override" = "Profile Override";

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@ Enact a temp Basal or a temp target */
12391239
"Enable" = "Enable";
12401240

12411241
/* Header */
1242-
"Conversion settings" = "Conversion settings";
1242+
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";
12431243

12441244
/* Delay */
12451245
"Delay In Minutes" = "Delay In Minutes";
@@ -1272,7 +1272,7 @@ Enact a temp Basal or a temp target */
12721272
"Protein" = "Protein";
12731273

12741274
/* Service Section */
1275-
"Fat And Protein Conversion" = "Fat And Protein Conversion";
1275+
"Meal Settings" = "Meal Settings";
12761276

12771277
/* Service Section */
12781278
"Profile Override" = "Profile Override";

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,7 @@ Enact a temp Basal or a temp target */
12401240
"Enable" = "Enable";
12411241

12421242
/* Header */
1243-
"Conversion settings" = "Conversion settings";
1243+
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";
12441244

12451245
/* Delay */
12461246
"Delay In Minutes" = "Delay In Minutes";
@@ -1273,7 +1273,7 @@ Enact a temp Basal or a temp target */
12731273
"Protein" = "Protein";
12741274

12751275
/* Service Section */
1276-
"Fat And Protein Conversion" = "Fat And Protein Conversion";
1276+
"Meal Settings" = "Meal Settings";
12771277

12781278
/* Service Section */
12791279
"Profile Override" = "Profile Override";

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,7 @@ Enact a temp Basal or a temp target */
12401240
"Enable" = "Activer";
12411241

12421242
/* Header */
1243-
"Conversion settings" = "Paramètres de la conversation";
1243+
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";
12441244

12451245
/* Delay */
12461246
"Delay In Minutes" = "Délai a minutes";
@@ -1258,7 +1258,7 @@ Enact a temp Basal or a temp target */
12581258
"Allows fat and protein to be converted into future carb equivalents using the Warsaw formula of kilocalories divided by 10.\n\nThis spreads the carb equivilants over a maximum duration setting that can be configured from 5-12 hours.\n\nDelay is time from now until the first future carb entry.\n\nInterval in minutes is how many minutes are between entries. The shorter the interval, the smoother the result. 10, 15, 20, 30, or 60 are reasonable choices.\n\nAdjustment factor is how much effect the fat and protein has on the entries. 1.0 is full effect (original Warsaw Method) and 0.5 is half effect. Note that you may find that your normal carb ratio needs to increase to a larger number if you begin adding fat and protein entries. For this reason, it is best to start with a factor of about 0.5 to ease into it.\n\nDefault settings: Time Cap: 8 h, Interval: 30 min, Factor: 0.5, Delay 60 min" = "Permet de convertir les graisses et les protéines en équivalents glucides futurs en utilisant la formule de Varsovie (kilocalories divisées par 10).\n\nCela répartit les équivalents glucides sur une durée maximale qui peut être configurée de 5 à 12 heures.\n\nLe délai est le temps écoulé entre le moment présent et la première entrée de glucides futurs.\n\nL'intervalle en minutes est le nombre de minutes séparant les entrées. Plus l'intervalle est court, plus le résultat est doux. 10, 15, 20, 30 ou 60 sont des choix raisonnables.\n\nLe facteur d'ajustement est l'effet des graisses et des protéines sur les entrées. 1,0 correspond à un effet complet (méthode originale de Varsovie) et 0,5 à un demi-effet. Notez que vous pouvez constater que votre ratio normal de glucides doit être augmenté si vous commencez à ajouter des graisses et des protéines. Pour cette raison, il est préférable de commencer avec un facteur d'environ 0,5 pour se faciliter la tâche.\n\nPar défaut : Time Cap : 8 h, Interval : 30 min, Facteur : 0.5, Délai 60 min";
12591259

12601260
/* FPU Settings Title */
1261-
"Fat and Protein" = "Graisses et protéines";
1261+
"Fat and Protein" = "Fat and Protein";
12621262

12631263
/* Display fat and protein entities */
12641264
"Fat & Protein" = "Graisses et protéines";
@@ -1273,7 +1273,7 @@ Enact a temp Basal or a temp target */
12731273
"Protein" = "Protéines";
12741274

12751275
/* Service Section */
1276-
"Fat And Protein Conversion" = "Conversion de graisses et de protéines";
1276+
"Meal Settings" = "Meal Settings";
12771277

12781278
/* Service Section */
12791279
"Profile Override" = "Remplacer le profil";

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,7 @@ Enact a temp Basal or a temp target */
12401240
"Enable" = "Enable";
12411241

12421242
/* Header */
1243-
"Conversion settings" = "Conversion settings";
1243+
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";
12441244

12451245
/* Delay */
12461246
"Delay In Minutes" = "Delay In Minutes";
@@ -1273,7 +1273,7 @@ Enact a temp Basal or a temp target */
12731273
"Protein" = "Protein";
12741274

12751275
/* Service Section */
1276-
"Fat And Protein Conversion" = "Fat And Protein Conversion";
1276+
"Meal Settings" = "Meal Settings";
12771277

12781278
/* Service Section */
12791279
"Profile Override" = "Profile Override";

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,7 @@ Enact a temp Basal or a temp target */
12401240
"Enable" = "Enable";
12411241

12421242
/* Header */
1243-
"Conversion settings" = "Conversion settings";
1243+
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";
12441244

12451245
/* Delay */
12461246
"Delay In Minutes" = "Delay In Minutes";
@@ -1273,7 +1273,7 @@ Enact a temp Basal or a temp target */
12731273
"Protein" = "Protein";
12741274

12751275
/* Service Section */
1276-
"Fat And Protein Conversion" = "Fat And Protein Conversion";
1276+
"Meal Settings" = "Meal Settings";
12771277

12781278
/* Service Section */
12791279
"Profile Override" = "Profile Override";

0 commit comments

Comments
 (0)