diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
index 3951b8415f..0324bed601 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
@@ -21,6 +21,7 @@ import android.widget.RadioButton;
import com.google.common.base.Joiner;
+import info.nightscout.utils.NSUpload;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -394,6 +395,7 @@ public class NewCarbsDialog extends DialogFragment implements OnClickListener, C
CarbsGenerator.createCarb(carbsAfterConstraints, time, CareportalEvent.CARBCORRECTION, notes);
} else {
CarbsGenerator.generateCarbs(carbsAfterConstraints, time, duration, notes);
+ NSUpload.uploadEvent(CareportalEvent.NOTE, now() - 2000, MainApp.gs(R.string.generated_ecarbs_note, carbsAfterConstraints, duration, timeOffset));
}
}
}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java
index 571f1a20e1..b4930a2a1a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java
@@ -95,19 +95,25 @@ public class DanaRUserOptionsActivity extends Activity {
shutdown.setParams((double) pump.shutdownHour, 0d, 24d, 1d, new DecimalFormat("1"), true);
lowReservoir.setParams((double) pump.lowReservoirRate, 10d, 60d, 10d, new DecimalFormat("10"), false);
switch (pump.beepAndAlarm) {
- case 1: pumpAlarmSound.setChecked(true);
+ case 0x01:
+ pumpAlarmSound.setChecked(true);
break;
- case 2: pumpAlarmVibrate.setChecked(true);
+ case 0x02:
+ pumpAlarmVibrate.setChecked(true);
break;
- case 3: pumpAlarmBoth.setChecked(true);
+ case 0x11:
+ pumpAlarmBoth.setChecked(true);
break;
- case 5: pumpAlarmSound.setChecked(true);
+ case 0x101:
+ pumpAlarmSound.setChecked(true);
beep.setChecked(true);
break;
- case 6: pumpAlarmVibrate.setChecked(true);
+ case 0x110:
+ pumpAlarmVibrate.setChecked(true);
beep.setChecked(true);
break;
- case 7: pumpAlarmBoth.setChecked(true);
+ case 0x111:
+ pumpAlarmBoth.setChecked(true);
beep.setChecked(true);
break;
}
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 1cdbfd1393..97540d4d3c 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -271,7 +271,7 @@
Очаква помпата
Ще достави %.2fЕ
Настройка на визуализацията и наблюдението, а също и анализиране на базалните нужди и коефициенти
- Работете в Open Loop няколко дни и ръчно прилагайте на много временни базали
+ Работете в Open Loop няколко дни и ръчно прилагайте на много временни базали. Set up and use temporary and default temporary targets (e.g. for activity or hypo treatment carbs)
Стартиране на Open Loop
Определяне на макс. лимит на базалния инсулин и настройване в помпата и програмата
Разбиране на вашият Open Loop, включително препоръчваните временни базали
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index bcfd47e46f..a3acd83205 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -248,7 +248,7 @@
Podávání %.2fU inzulínu
Zkontrolovat, zda jsou glykémie a údaje z pumpy viditelné v Nightscoutu
Nastavit vizualizaci a monitoring, analyzovat bazály a koeficienty
- Provozovat několik dní otevřenou smyčku a ručně potvrzovat doporučené dočasné bazály
+ Provozovat několik dní otevřenou smyčku a ručně potvrzovat doporučené dočasné bazály. Set up and use temporary and default temporary targets (e.g. for activity or hypo treatment carbs)
Začít s otevřenou smyčkou
Na základě předchozích zkušeností rozhodnout, jaký je třeba maximální bazál a nastavit ho v pumpě a v aplikaci
Porozumět otevřené smyčce a doporučeným dočasným bazálům
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d7e21bf808..c87f93db5a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -428,7 +428,7 @@
Nightscout-URL
Verifiziere, dass BZ- und Pumpen-Insulin-Daten in Nightscout erfolgreich hoch geladen werden
Konfiguriere die Anzeige und das Monitoring (Nightscout) und analysiere Basal-Raten und Faktoren
- Erprobe den Open Loop Modus für ein paar Tage und setze manuell temporäre Basal-Raten
+ Erprobe den Open Loop Modus für ein paar Tage und setze manuell temporäre Basal-Raten. Richte temporäres und Standard temporäre Ziele ein und nutze sie (z.B. für Bewegung, KEs zur Hypobehandlung)
Starte den Open Loop Modus
VERALTETE DATEN
Laufende Benachrichtigungen
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 3dbc1dff28..3ccc0ef424 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -269,7 +269,7 @@
Δημιουργία παρακολούθησης και ανάλυση βασικού ρυθμού και αναλογιών
Επιβεβαιώστε ότι η BG φαίνεται στο Nightscout και τα δεδομένα της DanaR φορτώθηκαν
Ξεκινήστε σε ανοιχτό κύκλωμα
- Τρέξτε σε ανοιχτό κύκλωμα για λίγες ημέρες και χειροκίνητα κάντε πολλούς Προσ.Ρυθμ.
+ Τρέξτε σε ανοιχτό κύκλωμα για λίγες ημέρες και χειροκίνητα κάντε πολλούς Προσ.Ρυθμ. Set up and use temporary and default temporary targets (e.g. for activity or hypo treatment carbs)
Κατανοήστε το ανοιχτό κύκλωμα, περιλαμβάνοντας τις προτάσεις για Προσ.Ρυθμ.
Βάση της εμπειρίας σας, αποφασίστε ποιο είναι το μέγιστο βασικής δόσης και αποθηκεύστε το στην αντλία και στις Επιλογές
"Ξεκινήστε να κλείσετε το κύκλωμα με Σταμάτημα Χαμηλής Γλυκόζης (Low Glucose Suspend) "
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index c3dd7622ef..3a0eb9de6e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -269,7 +269,7 @@
Configuración de visualización y monitoreo, y el análisis de los basales y ratios
Comprobar que los datos de BG están disponibles en Nightscout, y que los datos de la bomba de insulina se están subiendo
Empezar con bucle abierto
- Ejecutar en modo de Loop abierto durante unos días, y aceptar manualmente las basales temporales
+ Ejecutar en modo de Loop abierto durante unos días, y aceptar manualmente las basales temporales. Set up and use temporary and default temporary targets (e.g. for activity or hypo treatment carbs)
Entender el Loop abierto, incluidas las recomendaciones de basales temporales
Sobre la base de esa experiencia, decidir valores de máximo basal, y ajustar la bomba y preferencias
Iniciar el bucle cerrado con suspensión con baja glucosa
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c9a8347adc..8524b72624 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -267,7 +267,7 @@
Paramétrez la visualisation et la surveillance des données, analysez les débits de base et les ratios
Vérifiez que la G est disponible sur Nightscout, et les données d’insuline sur pompe ont été téléchargées
Commencez par le système boucle ouverte
- Utilisez le système Open Loop pour quelques jours, et activez manuellement plusieurs débits de base tempo
+ Utilisez le système Open Loop pour quelques jours, et activez manuellement plusieurs débits de base tempo. Set up and use temporary and default temporary targets (e.g. for activity or hypo treatment carbs)
Comprendre votre système boucle ouverte, y compris ses recommandations de débit de base tempo
"Partant de ce constat, décidez quel est le débit de base maximum à choisir, et entrez le dans la pompe et les préférences "
Commencez par utiliser la boucle fermée avec le système Low Glucose Suspend
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c43fe86094..fec70c4992 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -310,7 +310,7 @@
Abbreviare i titoli delle schede
Semplice profilo
Impostazione di visualizzazione, monitoraggio e analisi basali e rapporti
- Eseguire in modalità Open Loop per alcuni giorni e impostare manualmente la basale tempor
+ Eseguire in modalità Open Loop per alcuni giorni e impostare manualmente la basale tempor. Set up and use temporary and default temporary targets (e.g. for activity or hypo treatment carbs)
Script debug
Comunicazioni SMS
Numero di telefono acettato
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 670e4aae02..d518aadb0d 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -274,7 +274,7 @@
표시설정과 모니터링설정을 완료하고, 기초주입과 비율을 분석한다.
나이트스카우트에서 혈당 데이터가 잘 들어오는지, 펌프데이터가 업로드 되는지 확인한다.
Open Loop를 시작한다.
- Open Loop 모드에서 몇일간 사용하여보고, 임시기초주입을 여러번 수동으로 실행하여본다.
+ Open Loop 모드에서 몇일간 사용하여보고, 임시기초주입을 여러번 수동으로 실행하여본다. Set up and use temporary and default temporary targets (e.g. for activity or hypo treatment carbs)
임시기초주입 추천기능을 포함해서, Open Loop에 대해 이해한다.
이 경험을 토대로, 최대 기초주입량을 결정하고 이를 펌프와 설정에 입력한다.
Closed Loop를 시작하고 저혈당인슐린 중지 기능을 사용해본다.
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index e826d1a821..9cb91508e7 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -393,7 +393,7 @@
Doelen
Controleren van beschikbaarheid BG en insuline pomp data op Nightscout
Opzetten van visualisatie en monitoring eveneens analyze van basaal en ratio\'s
- In Open Loop modus werken voor enkele dagen, manueel tijdelijke basaal instellen
+ In Open Loop modus werken voor enkele dagen, manueel tijdelijke basaal instellen. Set up and use temporary and default temporary targets (e.g. for activity or hypo treatment carbs)
Starten met de Open Loop modus
Gebaseerd op deze ervaringen beslissen wat het maximale basaal mag zijn en dit in de pomp instellen
De Open Loop begrijpen, inclusief de voorgestelde tijdelijke basalen
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index c63f24e2fd..e8ff881837 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -290,7 +290,7 @@
Konfigurowanie wizualizacji i monitorowania, analizowanie dawek bazowych i wartości
Sprawdź czy BG (pomiary cukru) są dostępne w Nightscout, i dane pompy insulinowej są ładowane
Uruchamiam otwartą pętle (OpenLoop)
- Używaj Otwartą pętle (OpenLoop) przez kilka dni, i ręcznie wykonaj wiele dawek bazowych tymczasowych
+ Używaj Otwartą pętle (OpenLoop) przez kilka dni, i ręcznie wykonaj wiele dawek bazowych tymczasowych. Set up and use temporary and default temporary targets (e.g. for activity or hypo treatment carbs)
Zrozumienie działania otwartej pętli, wraz z jej rekomendacjami dawek tymczasowych
Na podstawie tych doświadczeń zdecyduj jaka maksymalna baza powinna być ustawiona, i wprowadź ją w pompie i w ustawieniach AAPS
Rozpoczęcie zamknięcia pętli z zawieszeniem podawania bazy przy niskim poziomie cukru
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 1ed0ce48aa..554dabc628 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -243,7 +243,7 @@
Se stabilesc vizualizările și monitorizarea și se analizează bazalele și valorile ratelor
Verificați că vedeți glicemia în Nightscout și că datele despre insulină date de pompă sunt înregistrate în site
Pornire cu buclă deschisă
- Rulați modul buclă deschisă pentru câteva zile și faceți manual bazalele temporare sugerate
+ Rulați modul buclă deschisă pentru câteva zile și faceți manual bazalele temporare sugerate. Set up and use temporary and default temporary targets (e.g. for activity or hypo treatment carbs)
Trebuie să se înțeleagă modalitatea de funcționare a buclei deschise, incluzând recomandările de bazală temporară
Pe baza acestei experiențe, decideți care va fi bazala maximă și setați această valoare în pompă și în preferințe
Se începe etapa de buclă închisă cu Suspendarea Insulinei la Valori Glicemie Mici (Low Glucose Suspend = LGS)
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 458be997cb..c1eaf74d33 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -279,7 +279,7 @@
Цели
убедитесь что СК и данные помпы передаются в NS
настройка визуализации и мониторинга, анализ базала и коэффициентов
- работа в режиме незамкнутого цикла и ручной подстройки величины временного базала
+ работа в режиме незамкнутого цикла и ручной подстройки величины временного базала. Set up and use temporary and default temporary targets (e.g. for activity or hypo treatment carbs)
старт незамкнутого цикла
на основе полученного опыта определите макс величину базала и введите ее в помпу и настройки
анализ вашего незамкнутого цикла включая рекомендации по врем базалу
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 83804662a6..b97e007b3d 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -478,7 +478,7 @@
Förstå din open loop och hur den föreslår temp basaler
Utifrån vad du nu lärt dig, besluta vilken max basal du vil ha. Ställ in det både i inställningarna i APS och i din pump.
Starta med open loop
- Starta med open loop och använd det några dagar. Försök att ge många föreslagna temp basaler.
+ Starta med open loop och använd det några dagar. Försök att ge många föreslagna temp basaler. Set up and use temporary and default temporary targets (e.g. for activity or hypo treatment carbs)
Tid i timmar när alla kolhydradet förväntas vara absorberade
Max absorptionstid för en måltid [tim]
Absorptionsinställningar
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d7c4fdf3e6..0550c33339 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-
+
Treatments safety
Max allowed bolus [U]
Max allowed carbs [g]
@@ -340,7 +340,7 @@
Setting up visualization and monitoring, and analyzing basals and ratios
Verify that BG is available in Nightscout, and pump insulin data is being uploaded
Starting on an open loop
- Run in Open Loop mode for a few days, and manually enact lots of temp basals
+ Run in Open Loop mode for a few days and manually enact lots of temp basals. Set up and use temporary and default temporary targets (e.g. for activity or hypo treatment carbs)
Understanding your open loop, including its temp basal recommendations
Based on that experience, decide what max basal should be, and set it on the pump and preferences
Starting to close the loop with Low Glucose Suspend
@@ -1163,6 +1163,7 @@
Clean AndroidAPS started
Stored settings found
Attention: If you activate and connect to a hardware pump, AndroidAPS will copy the basal settings from the profile to the pump, overwriting the existing basal rate stored on the pump. Make sure you have the correct basal setting in AndroidAPS. If you are not sure or don\'t want to overwrite the basal settings on your pump, press cancel and repeat switching to the pump at a later time.
+ Generated eCarbs with amount: %1$dg, duration: %2$dh, delay: %3$dm
- %d day