Skip to content

Commit

Permalink
Merge pull request #173 from nightscout/meal_settings
Browse files Browse the repository at this point in the history
Rename Fat And Protein settings to Meal Settings, move Max Carbs to Meal Settings
  • Loading branch information
MikePlante1 authored May 13, 2024
2 parents 74fd65f + ca55d2e commit f6afb8c
Show file tree
Hide file tree
Showing 28 changed files with 75 additions and 66 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ Enact a temp Basal or a temp target */
"Enable" = "Enable";

/* Header */
"Conversion settings" = "Conversion settings";
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";

/* Delay */
"Delay In Minutes" = "Delay In Minutes";
Expand Down Expand Up @@ -1273,7 +1273,7 @@ Enact a temp Basal or a temp target */
"Protein" = "Protein";

/* Service Section */
"Fat And Protein Conversion" = "Fat And Protein Conversion";
"Meal Settings" = "Meal Settings";

/* Service Section */
"Profile Override" = "Profile Override";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,7 @@ Enact a temp Basal or a temp target */
"Enable" = "Enable";

/* Header */
"Conversion settings" = "Conversion settings";
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";

/* Delay */
"Delay In Minutes" = "Delay In Minutes";
Expand Down Expand Up @@ -1154,7 +1154,7 @@ Enact a temp Basal or a temp target */
"Protein" = "Protein";

/* Service Section */
"Fat And Protein Conversion" = "Fat And Protein Conversion";
"Meal Settings" = "Meal Settings";

/* Service Section */
"Profile Override" = "Profile Override";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ Enact a temp Basal or a temp target */
"Enable" = "Aktivér";

/* Header */
"Conversion settings" = "Indstillinger for konvertering";
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";

/* Delay */
"Delay In Minutes" = "Forsinkelse I Minutter";
Expand All @@ -1258,7 +1258,7 @@ Enact a temp Basal or a temp target */
"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";

/* FPU Settings Title */
"Fat and Protein" = "Fedt og Protein";
"Fat and Protein" = "Fat and Protein";

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

/* Service Section */
"Fat And Protein Conversion" = "Fedt Og Protein Konvertering";
"Meal Settings" = "Meal Settings";

/* Service Section */
"Profile Override" = "Profile Override";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,7 @@ Enact a temp Basal or a temp target */
"Enable" = "Einschalten";

/* Header */
"Conversion settings" = "Einstellungen für die Umrechnung";
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";

/* Delay */
"Delay In Minutes" = "Verzögerung in Minuten";
Expand All @@ -1261,7 +1261,7 @@ Enact a temp Basal or a temp target */
"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";

/* FPU Settings Title */
"Fat and Protein" = "Fett und Eiweiß";
"Fat and Protein" = "Fat and Protein";

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

/* Service Section */
"Fat And Protein Conversion" = "Fett und Eiweiß Berechnung";
"Meal Settings" = "Meal Settings";

/* Service Section */
"Profile Override" = "Profil überschreibung";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1241,7 +1241,7 @@ Enact a temp Basal or a temp target */
"Enable" = "Enable";

/* Header */
"Conversion settings" = "Conversion settings";
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";

/* Delay */
"Delay In Minutes" = "Delay In Minutes";
Expand Down Expand Up @@ -1274,7 +1274,7 @@ Enact a temp Basal or a temp target */
"Protein" = "Protein";

/* Service Section */
"Fat And Protein Conversion" = "Fat And Protein Conversion";
"Meal Settings" = "Meal Settings";

/* Service Section */
"Profile Override" = "Profile Override";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1239,7 +1239,7 @@ Enact a temp Basal or a temp target */
"Enable" = "Enable";

/* Header */
"Conversion settings" = "Conversion settings";
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";

/* Delay */
"Delay In Minutes" = "Delay In Minutes";
Expand Down Expand Up @@ -1272,7 +1272,7 @@ Enact a temp Basal or a temp target */
"Protein" = "Protein";

/* Service Section */
"Fat And Protein Conversion" = "Fat And Protein Conversion";
"Meal Settings" = "Meal Settings";

/* Service Section */
"Profile Override" = "Profile Override";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ Enact a temp Basal or a temp target */
"Enable" = "Enable";

/* Header */
"Conversion settings" = "Conversion settings";
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";

/* Delay */
"Delay In Minutes" = "Delay In Minutes";
Expand Down Expand Up @@ -1273,7 +1273,7 @@ Enact a temp Basal or a temp target */
"Protein" = "Protein";

/* Service Section */
"Fat And Protein Conversion" = "Fat And Protein Conversion";
"Meal Settings" = "Meal Settings";

/* Service Section */
"Profile Override" = "Profile Override";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ Enact a temp Basal or a temp target */
"Enable" = "Activer";

/* Header */
"Conversion settings" = "Paramètres de la conversation";
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";

/* Delay */
"Delay In Minutes" = "Délai a minutes";
Expand All @@ -1258,7 +1258,7 @@ Enact a temp Basal or a temp target */
"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";

/* FPU Settings Title */
"Fat and Protein" = "Graisses et protéines";
"Fat and Protein" = "Fat and Protein";

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

/* Service Section */
"Fat And Protein Conversion" = "Conversion de graisses et de protéines";
"Meal Settings" = "Meal Settings";

/* Service Section */
"Profile Override" = "Remplacer le profil";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ Enact a temp Basal or a temp target */
"Enable" = "Enable";

/* Header */
"Conversion settings" = "Conversion settings";
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";

/* Delay */
"Delay In Minutes" = "Delay In Minutes";
Expand Down Expand Up @@ -1273,7 +1273,7 @@ Enact a temp Basal or a temp target */
"Protein" = "Protein";

/* Service Section */
"Fat And Protein Conversion" = "Fat And Protein Conversion";
"Meal Settings" = "Meal Settings";

/* Service Section */
"Profile Override" = "Profile Override";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ Enact a temp Basal or a temp target */
"Enable" = "Enable";

/* Header */
"Conversion settings" = "Conversion settings";
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";

/* Delay */
"Delay In Minutes" = "Delay In Minutes";
Expand Down Expand Up @@ -1273,7 +1273,7 @@ Enact a temp Basal or a temp target */
"Protein" = "Protein";

/* Service Section */
"Fat And Protein Conversion" = "Fat And Protein Conversion";
"Meal Settings" = "Meal Settings";

/* Service Section */
"Profile Override" = "Profile Override";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ Enact a temp Basal or a temp target */
"Enable" = "Attiva";

/* Header */
"Conversion settings" = "Impostazioni conversione";
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";

/* Delay */
"Delay In Minutes" = "Ritardo in minuti";
Expand All @@ -1258,7 +1258,7 @@ Enact a temp Basal or a temp target */
"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" = "Consenti di convertire grassi e proteine in futuri equivalenti di carboidrati utilizzando la formula di Varsavia di chilocalorie divisi per 10.\n\nQuesto diffonde gli equivilanti del carb per un'impostazione di durata massima che può essere configurata da 5-12 ore.\n\nIl ritardo è tempo da ora fino al primo ingresso futuro del carb.\n\nL'intervallo in pochi minuti è il numero di minuti tra le voci. Più breve è l'intervallo, più liscia il risultato. 10, 15, 20, 30 o 60 sono scelte ragionevoli.\n\nIl fattore di aggiustamento è il peso che il grasso e la proteina hanno sulle voci. 1.0 è effetto pieno (metodo di Varsavia originale) e 0. è a metà effetto. Nota che potresti scoprire che il tuo normale rapporto carboidrati deve aumentare ad un numero maggiore se inizi ad aggiungere voci di grasso e proteine. Per questo motivo, è meglio iniziare con un fattore di circa 0,5 per facilitare in esso.\n\nImpostazioni predefinite: Limite temporale: 8 h, Intervallo: 30 min, Fatto: 0.5, Ritardo 60 min";

/* FPU Settings Title */
"Fat and Protein" = "Grassi e proteine";
"Fat and Protein" = "Fat and Protein";

/* Display fat and protein entities */
"Fat & Protein" = "Grassi & Proteine";
Expand All @@ -1273,7 +1273,7 @@ Enact a temp Basal or a temp target */
"Protein" = "Proteine";

/* Service Section */
"Fat And Protein Conversion" = "Conversione di grassi e proteine";
"Meal Settings" = "Meal Settings";

/* Service Section */
"Profile Override" = "Regolazione Profilo";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ Enact a temp Basal or a temp target */
"Enable" = "Aktiver";

/* Header */
"Conversion settings" = "Innstillinger for omregning";
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";

/* Delay */
"Delay In Minutes" = "Forsinkelse i minutter";
Expand All @@ -1258,7 +1258,7 @@ Enact a temp Basal or a temp target */
"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" = "Bruker Warsaw-formelen til å konvertere fett og proteiner til fremtidige karbohydrat-ekvivalenter.\n\nDette fordeler karbohydrat-ekvivalentene over et antall timer som kan justeres mellom 5 og 12.\n\nForsinkelse er tiden fra nå til den første fremtidige karbohydrat-ekvivalenten blir lagt til.\n\nIntervall i minutter er antall minutter mellom hver registrering. Jo kortere intervall, jo jevnere blir resultatet. 10, 15, 20, 30 eller 60 er fornuftige valg.\n\nJusteringsfaktor er hvor stor effekt fett og proteiner har på registreringene. 1,0 er full effekt (original Warsaw-formel) og 0,5 er halv effekt. Merk at du kan ha behov for å justere opp din vanlige karbohydrat-ratio hvis du begynner å registrere fett og proteiner. På grunn av dette, anbefales det å starte med en faktor på rundt 0,5 for å starte forsiktig.\n\nStandardinnstilling: Maks varighet: 8 t, Intervall: 30 min, Faktor: 0,5, Forsinkelse: 60 min";

/* FPU Settings Title */
"Fat and Protein" = "Fett og Proteiner";
"Fat and Protein" = "Fat and Protein";

/* Display fat and protein entities */
"Fat & Protein" = "Fett og protein";
Expand All @@ -1273,7 +1273,7 @@ Enact a temp Basal or a temp target */
"Protein" = "Proteiner";

/* Service Section */
"Fat And Protein Conversion" = "Omregning av fett og protein";
"Meal Settings" = "Meal Settings";

/* Service Section */
"Profile Override" = "Overstyring av profil";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ Enact a temp Basal or a temp target */
"Enable" = "Activeer";

/* Header */
"Conversion settings" = "Omrekeningsinstellingen";
"Fat and Protein Conversion Settings" = "Fat and Protein Conversion Settings";

/* Delay */
"Delay In Minutes" = "Vertraging in minuten";
Expand All @@ -1258,7 +1258,7 @@ Enact a temp Basal or a temp target */
"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" = "Dit laat je vet en eiwit omzetten in toekomstige koolhydraten met behulp van de Warschau-formule. Deze formule verdeelt de koolhydraten over een zelf in te stellen tijdsduur van 5-12 uur.\n\nDe vertraging is de tijd tussen nu en de eerste toekomstige koolhydrateninvoer. Het interval in minuten is het aantal minuten tussen elke invoer. Als je een korter interval kiest, wordt het resultaat gelijkmatiger. Goede keuzes zijn bijvoorbeeld 10, 15, 20, 30 of 60 minuten.\n\nDe aanpassingsfactor bepaalt het effect van vet en eiwit op de waarden. Een factor van 1,0 betekent volledig effect (de oorspronkelijke Warschau-methode), en 0,5 betekent half effect.\n\nLet op dat je mogelijk moet opmerken dat je normale koolhydratenverhouding moet verhogen tot een hoger getal wanneer je vet en eiwit toevoegt. Daarom is het het beste om te beginnen met een factor van ongeveer 0,5 om het jezelf makkelijk te maken.\n\nStandaardinstellingen zijn een tijdslimiet van 8 uur, een interval van 30 minuten, een factor van 0,5 en een vertraging van 60 minuten";

/* FPU Settings Title */
"Fat and Protein" = "Vetten & eiwitten";
"Fat and Protein" = "Fat and Protein";

/* Display fat and protein entities */
"Fat & Protein" = "Vetten & eiwitten";
Expand All @@ -1273,7 +1273,7 @@ Enact a temp Basal or a temp target */
"Protein" = "Eiwit";

/* Service Section */
"Fat And Protein Conversion" = "Omrekening vet en eiwit";
"Meal Settings" = "Meal Settings";

/* Service Section */
"Profile Override" = "Overschrijf profiel";
Expand Down
Loading

0 comments on commit f6afb8c

Please sign in to comment.