caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' into AMA

Browse source
This commit is contained in:
Milos Kozak 2017-01-17 17:49:21 +01:00
commit 432c937a46
5 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/info/nightscout/androidaps/plugins/DanaR/comm/MsgSetExtendedBolusStart.java
View file

@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.DanaR.comm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.BuildConfig;
import info.nightscout.androidaps.Config;
import info.nightscout.androidaps.MainApp;
@ -21,7 +22,7 @@ public class MsgSetExtendedBolusStart extends MessageBase {
if (halfhours > 16) halfhours = 16;
amount = MainApp.getConfigBuilder().applyBolusConstraints(amount);
if (amount < 0d) amount = 0d;
if (amount > 10d) amount = 10d;
if (amount > BuildConfig.MAXBOLUS) amount = BuildConfig.MAXBOLUS;
AddParamInt((int) (amount * 100));
AddParamByte(halfhours);

2
app/src/main/res/values-bg/strings.xml
View file

@ -365,7 +365,7 @@
<string name="low_mark">Долна линия</string>
<string name="lowbattery">Изтощена батерия</string>
<string name="open_settings_on_wear">Отвори Опции на часовника</string>
<string name="prefs_range_summary">Горна и долна линия на диаграмата на часовника</string>
<string name="prefs_range_summary">Стойност на линиите за ниска и висока КЗ (mmol/l) </string>
<string name="prefs_range_title">Диапазон на визуализация</string>
<string name="profile_set_failed">Неуспешно задаване на базален профил</string>
<string name="profile_set_ok">Базалният профил е обновен</string>

6
app/src/main/res/values-de/strings.xml
View file

@ -36,9 +36,9 @@
<string name="careportal_newnstreatment_carbs_label">Kohlehydrate</string>
<string name="careportal_newnstreatment_duration_min">min</string>
<string name="careportal_newnstreatment_insulin_label">Insulin</string>
<string name="careportal_newnstreatment_glucosetype">Glukose Art</string>
<string name="careportal_newnstreatment_eventtype">Ereigniss Typ</string>
<string name="careportal_newnstreatment_eventtime_label">Ereigniss Zeit</string>
<string name="careportal_newnstreatment_glucosetype">Glukose-Art</string>
<string name="careportal_newnstreatment_eventtype">Ereignis-Typ</string>
<string name="careportal_newnstreatment_eventtime_label">Ereignis-Zeit</string>
<string name="careportal_newnstreatment_percent_label">Prozent</string>
<string name="careportal_note">Notiz</string>
<string name="careportal_openapsoffline">OpenAPS Offline</string>

2
app/src/main/res/values-es/strings.xml
View file

@ -293,7 +293,7 @@
<string name="objectives_2_objective">Entender el lazo abierto, incluidas las recomendaciones de basales temporales</string>
<string name="objectives_2_gate">Sobre la base de esa experiencia, decidir valores de máximo basal, y ajustar la bomba y preferencias</string>
<string name="objectives_3_objective">Iniciar el bucle cerrado con suspensión con baja glucosa</string>
<string name="objectives_3_gate">Ejecutar en lazo cerrado con max IOB=0 durante unos dias sin demasiados valores bajos de glucosa</string>
<string name="objectives_3_gate">Ejecutar en lazo cerrado con max IOB=0 durante unos días sin demasiados valores bajos de glucosa</string>
<string name="objectives_4_objective">Ajuste del bucle cerrado, aumento máximo IOB por encima de 0 y bajando gradualmente objetivos BG</string>
<string name="objectives_4_gate">Funcionando unos cuantos días, y al menos una noche sin alarmas bajas BG, y bajar gradualmente BG</string>
<string name="objectives_5_objective">Ajustar los basales y ratios, si es necesario, y luego activar auto-sens</string>

4
app/src/main/res/xml/pref_others.xml
View file

@ -31,13 +31,13 @@
android:title="@string/low_mark"
android:key="low_mark"
android:defaultValue="0"
android:inputType="number">
android:inputType="numberDecimal">
</EditTextPreference>
<EditTextPreference
android:title="@string/high_mark"
android:key="high_mark"
android:defaultValue="0"
android:inputType="number">
android:inputType="numberDecimal">
</EditTextPreference>
</PreferenceScreen>
</PreferenceCategory>