From 834398b8f006a12d08b6024100d50c3df88a2301 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Wed, 28 Dec 2016 23:31:02 +0100 Subject: [PATCH 01/15] remove mm640g translation again --- app/src/main/res/values-ko/strings.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index f4fb743f62..390757e27b 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -238,7 +238,6 @@ Absolute 임시기초주입 취소하기 SMS 전송 - MM 640g 결과 기다리는 중 허가된 전화번호 +XXXXXXXXXX;+YYYYYYYYYY From f127e7bec126291e124d4ab7a17c16982e2416a2 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Wed, 28 Dec 2016 23:48:43 +0100 Subject: [PATCH 02/15] better allign bg arrows --- app/src/main/res/layout/overview_fragment.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml index c6ba630b63..a061e8532d 100644 --- a/app/src/main/res/layout/overview_fragment.xml +++ b/app/src/main/res/layout/overview_fragment.xml @@ -42,10 +42,11 @@ android:layout_gravity="top|left" android:gravity="center_vertical" android:paddingLeft="-5dp" - android:paddingRight="-5dp" + android:paddingRight="-10dp" android:text="→" android:textSize="60dp" - android:textStyle="bold" /> + android:textStyle="bold" + android:layout_marginTop="-15dp" /> Date: Thu, 29 Dec 2016 00:12:52 +0100 Subject: [PATCH 03/15] more rearrangements --- app/src/main/res/layout/overview_fragment.xml | 77 +++++++++---------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml index a061e8532d..e724f9105f 100644 --- a/app/src/main/res/layout/overview_fragment.xml +++ b/app/src/main/res/layout/overview_fragment.xml @@ -20,6 +20,38 @@ + + + + + + + @@ -56,33 +88,13 @@ android:gravity="top" android:orientation="vertical"> - - - - - - - + android:layout_marginLeft="10dp" + android:layout_weight="0.5" + android:textAppearance="?android:attr/textAppearanceMedium" /> - From 0c0e29e73ddf9263bf4fb32efe60fa7f3a1db138 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 29 Dec 2016 14:13:04 +0100 Subject: [PATCH 04/15] Travis badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c8466fef14..b700f18b7a 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,4 @@ * Everyone who’s been looping with AndroidAPS needs to fill out the form after 3 days of looping https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1 [![Gitter](https://badges.gitter.im/MilosKozak/AndroidAPS.svg)](https://gitter.im/MilosKozak/AndroidAPS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Build status](https://travis-ci.org/MilosKozak/AndroidAPS.svg?branch=master)](https://travis-ci.org/MilosKozak/AndroidAPS) From 0059266791b3ae7c7e563403fffde93f94d7053e Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 29 Dec 2016 14:23:05 +0100 Subject: [PATCH 05/15] loop status font size --- app/src/main/res/layout/overview_fragment.xml | 4 +- wear/wear.iml | 46 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml index e724f9105f..517eae9577 100644 --- a/app/src/main/res/layout/overview_fragment.xml +++ b/app/src/main/res/layout/overview_fragment.xml @@ -29,14 +29,14 @@ + android:textAppearance="?android:attr/textAppearanceSmall" /> + + + + + + + @@ -51,13 +58,6 @@ - - - - - - - @@ -66,14 +66,6 @@ - - - - - - - - @@ -82,6 +74,14 @@ + + + + + + + + @@ -106,14 +106,6 @@ - - - - - - - - @@ -122,6 +114,14 @@ + + + + + + + + From 8e46a55e485a5ccf21218ece49c4a93a3d3bf40a Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 29 Dec 2016 16:06:00 +0100 Subject: [PATCH 06/15] allow better translation of min ago --- .../nightscout/androidaps/plugins/DanaR/DanaRFragment.java | 2 +- .../androidaps/plugins/DanaRKorean/DanaRKoreanFragment.java | 2 +- .../androidaps/plugins/Overview/OverviewFragment.java | 3 +-- .../plugins/SmsCommunicator/SmsCommunicatorPlugin.java | 3 +-- app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values/strings.xml | 2 +- 10 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRFragment.java index 4ec54cb37e..63186fc4db 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRFragment.java @@ -200,7 +200,7 @@ public class DanaRFragment extends Fragment implements FragmentBase { if (DanaRPlugin.getDanaRPump().lastConnection.getTime() != 0) { Long agoMsec = new Date().getTime() - DanaRPlugin.getDanaRPump().lastConnection.getTime(); int agoMin = (int) (agoMsec / 60d / 1000d); - lastConnectionView.setText(formatTime.format(DanaRPlugin.getDanaRPump().lastConnection) + " (" + agoMin + " " + MainApp.sResources.getString(R.string.minago) + ")"); + lastConnectionView.setText(formatTime.format(DanaRPlugin.getDanaRPump().lastConnection) + " (" + String.format(MainApp.sResources.getString(R.string.minago), agoMin) + ")"); SetWarnColor.setColor(lastConnectionView, agoMin, 16d, 31d); } if (DanaRPlugin.getDanaRPump().lastBolusTime.getTime() != 0) { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/DanaRKoreanFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/DanaRKoreanFragment.java index 77e320c3a9..94beeea1f3 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/DanaRKoreanFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/DanaRKoreanFragment.java @@ -197,7 +197,7 @@ public class DanaRKoreanFragment extends Fragment implements FragmentBase { if (DanaRKoreanPlugin.getDanaRPump().lastConnection.getTime() != 0) { Long agoMsec = new Date().getTime() - DanaRKoreanPlugin.getDanaRPump().lastConnection.getTime(); int agoMin = (int) (agoMsec / 60d / 1000d); - lastConnectionView.setText(formatTime.format(DanaRKoreanPlugin.getDanaRPump().lastConnection) + " (" + agoMin + " " + MainApp.sResources.getString(R.string.minago) + ")"); + lastConnectionView.setText(formatTime.format(DanaRKoreanPlugin.getDanaRPump().lastConnection) + " (" + String.format(MainApp.sResources.getString(R.string.minago), agoMin) + ")"); SetWarnColor.setColor(lastConnectionView, agoMin, 16d, 31d); } // if (DanaRKoreanPlugin.getDanaRPump().lastBolusTime.getTime() != 0) { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java index 2df6dfc6be..c7760d7af7 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java @@ -82,7 +82,6 @@ import info.nightscout.utils.DateUtil; import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.Round; import info.nightscout.utils.SafeParse; -import info.nightscout.utils.ToastUtils; public class OverviewFragment extends Fragment { @@ -590,7 +589,7 @@ public class OverviewFragment extends Fragment { Long agoMsec = new Date().getTime() - lastBG.timeIndex; int agoMin = (int) (agoMsec / 60d / 1000d); - timeAgoView.setText(agoMin + " " + getString(R.string.minago)); + timeAgoView.setText(String.format(MainApp.sResources.getString(R.string.minago), agoMin)); // iob MainApp.getConfigBuilder().getActiveTreatments().updateTotalIOB(); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java index f878b5676f..fb05787a2a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java @@ -16,7 +16,6 @@ import java.text.Normalizer; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.StringTokenizer; import info.nightscout.androidaps.Constants; import info.nightscout.androidaps.MainApp; @@ -212,7 +211,7 @@ public class SmsCommunicatorPlugin implements PluginBase { if (actualBG != null) { reply = MainApp.sResources.getString(R.string.actualbg) + " " + actualBG.valueToUnitsToString(units) + ", "; } else if (lastBG != null) { - reply = MainApp.sResources.getString(R.string.lastbg) + " " + lastBG.valueToUnitsToString(units) + " " + agoMin + MainApp.sResources.getString(R.string.minago) + ", "; + reply = MainApp.sResources.getString(R.string.lastbg) + " " + lastBG.valueToUnitsToString(units) + " " + String.format(MainApp.sResources.getString(R.string.minago), agoMin) + ", "; } DatabaseHelper.GlucoseStatus glucoseStatus = MainApp.getDbHelper().getGlucoseStatusData(); if (glucoseStatus != null) diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 9d833e5d01..72bab37a12 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -193,7 +193,6 @@ Макс. лимит на временен базал [Е/ч] Български Макс. лимит на не болус IOB подаван от openAPS - min ago Свързан Избраното устройство не съществува Прекъснат diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index bbb8aaf954..3746313c22 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -73,7 +73,6 @@ Nastaveno pumpou SMYČKA ZAKÁZÁNA OMEZENÍM Ručně spuštěno - m zpět Minimální trvání Záloha Ukončit @@ -376,4 +375,5 @@ Pera Glykémie: Poslední glykémie: + před %d min diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b31207f125..9de913ce2d 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -176,7 +176,6 @@ Carbs constraint applied Reset Datenbanken Minimale Dauer - min ago Erneure treatments von NS Exit Fehlend diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c87ec9529e..1d585c4912 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -74,7 +74,6 @@ Glucosa Delta Avg. delta - min antes Config Builder Objetivos diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 390757e27b..c0b1a65d53 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -75,7 +75,6 @@ 혈당 Delta Avg. delta - 분 전 Config Builder 목표 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ab184438f9..d5b7e123aa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -76,7 +76,6 @@ Glucose Delta Avg. delta - m ago Config Builder Objectives @@ -389,4 +388,5 @@ MDI Ongoing Notification OLD DATA + %dmin ago From 1e99c0062671aa69c59f5d4f108a16c2b4900166 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 29 Dec 2016 16:22:40 +0100 Subject: [PATCH 07/15] allow sms string to be translated separately --- .../SmsCommunicatorPlugin.java | 24 +++++++++---------- app/src/main/res/values-bg/strings.xml | 10 ++++---- app/src/main/res/values-cs/strings.xml | 18 ++++++++++---- app/src/main/res/values-de/strings.xml | 4 ++-- app/src/main/res/values-es/strings.xml | 6 ++--- app/src/main/res/values-ko/strings.xml | 10 ++++---- app/src/main/res/values/strings.xml | 16 +++++++++---- 7 files changed, 51 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java index fb05787a2a..4f65995948 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/SmsCommunicatorPlugin.java @@ -209,13 +209,13 @@ public class SmsCommunicatorPlugin implements PluginBase { int agoMin = (int) (agoMsec / 60d / 1000d); if (actualBG != null) { - reply = MainApp.sResources.getString(R.string.actualbg) + " " + actualBG.valueToUnitsToString(units) + ", "; + reply = MainApp.sResources.getString(R.string.sms_actualbg) + " " + actualBG.valueToUnitsToString(units) + ", "; } else if (lastBG != null) { - reply = MainApp.sResources.getString(R.string.lastbg) + " " + lastBG.valueToUnitsToString(units) + " " + String.format(MainApp.sResources.getString(R.string.minago), agoMin) + ", "; + reply = MainApp.sResources.getString(R.string.sms_lastbg) + " " + lastBG.valueToUnitsToString(units) + " " + String.format(MainApp.sResources.getString(R.string.sms_minago), agoMin) + ", "; } DatabaseHelper.GlucoseStatus glucoseStatus = MainApp.getDbHelper().getGlucoseStatusData(); if (glucoseStatus != null) - reply += MainApp.sResources.getString(R.string.delta) + ": " + NSProfile.toUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) + " " + units + ", "; + reply += MainApp.sResources.getString(R.string.sms_delta) + " " + NSProfile.toUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units) + " " + units + ", "; MainApp.getConfigBuilder().getActiveTreatments().updateTotalIOB(); IobTotal bolusIob = MainApp.getConfigBuilder().getActiveTreatments().getLastCalculation().round(); @@ -224,9 +224,9 @@ public class SmsCommunicatorPlugin implements PluginBase { IobTotal basalIob = MainApp.getConfigBuilder().getActiveTempBasals().getLastCalculation().round(); if (basalIob == null) basalIob = new IobTotal(); - reply += MainApp.sResources.getString(R.string.treatments_iob_label_string) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U (" - + MainApp.sResources.getString(R.string.bolus) + ": " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U " - + MainApp.sResources.getString(R.string.basal) + ": " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U)"; + reply += MainApp.sResources.getString(R.string.sms_iob) + " " + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U (" + + MainApp.sResources.getString(R.string.sms_bolus) + " " + DecimalFormatter.to2Decimal(bolusIob.iob) + "U " + + MainApp.sResources.getString(R.string.sms_basal) + " " + DecimalFormatter.to2Decimal(basalIob.basaliob) + "U)"; sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date())); receivedSms.processed = true; @@ -314,7 +314,7 @@ public class SmsCommunicatorPlugin implements PluginBase { resetWaitingMessages(); sendSMS(cancelTempBasalWaitingForConfirmation = new Sms(receivedSms.phoneNumber, reply, new Date(), passCode)); } else { - reply = MainApp.sResources.getString(R.string.remotebasalnotallowed); + reply = MainApp.sResources.getString(R.string.smscommunicator_remotebasalnotallowed); sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date())); } } else { @@ -328,7 +328,7 @@ public class SmsCommunicatorPlugin implements PluginBase { sendSMS(tempBasalWaitingForConfirmation = new Sms(receivedSms.phoneNumber, reply, new Date(), passCode)); tempBasalWaitingForConfirmation.tempBasal = tempBasal; } else { - reply = MainApp.sResources.getString(R.string.remotebasalnotallowed); + reply = MainApp.sResources.getString(R.string.smscommunicator_remotebasalnotallowed); sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date())); } } @@ -336,7 +336,7 @@ public class SmsCommunicatorPlugin implements PluginBase { break; case "BOLUS": if (new Date().getTime() - lastRemoteBolusTime.getTime() < Constants.remoteBolusMinDistance) { - reply = MainApp.sResources.getString(R.string.remotebolusnotallowed); + reply = MainApp.sResources.getString(R.string.smscommunicator_remotebolusnotallowed); sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date())); } else if (splited.length > 1) { amount = SafeParse.stringToDouble(splited[1]); @@ -350,7 +350,7 @@ public class SmsCommunicatorPlugin implements PluginBase { sendSMS(bolusWaitingForConfirmation = new Sms(receivedSms.phoneNumber, reply, new Date(), passCode)); bolusWaitingForConfirmation.bolusRequested = amount; } else { - reply = MainApp.sResources.getString(R.string.remotebolusnotallowed); + reply = MainApp.sResources.getString(R.string.smscommunicator_remotebolusnotallowed); sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date())); } } @@ -364,12 +364,12 @@ public class SmsCommunicatorPlugin implements PluginBase { danaRPlugin = (DanaRPlugin) MainApp.getSpecificPlugin(DanaRPlugin.class); PumpEnactResult result = pumpInterface.deliverTreatment(bolusWaitingForConfirmation.bolusRequested, 0, null); if (result.success) { - reply = String.format(MainApp.sResources.getString(R.string.bolusdelivered), result.bolusDelivered); + reply = String.format(MainApp.sResources.getString(R.string.smscommunicator_bolusdelivered), result.bolusDelivered); if (danaRPlugin != null) reply += "\n" + danaRPlugin.shortStatus(); lastRemoteBolusTime = new Date(); sendSMSToAllNumbers(new Sms(receivedSms.phoneNumber, reply, new Date())); } else { - reply = MainApp.sResources.getString(R.string.bolusfailed); + reply = MainApp.sResources.getString(R.string.smscommunicator_bolusfailed); if (danaRPlugin != null) reply += "\n" + danaRPlugin.shortStatus(); sendSMS(new Sms(receivedSms.phoneNumber, reply, new Date())); } diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 72bab37a12..3557e5d27b 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -213,7 +213,7 @@ MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +XXXXXXXXXX;+YYYYYYYYYY Болус %.2fU беше подаден успешно - Болусът не е доставен + Болусът не е доставен Откажи временен базал Последно свързване: Изчаква резултат @@ -221,7 +221,7 @@ Позволени телефонни номера Успех За да доставите болус %.2fU отговорете с код %s - Отдалечен болус не е разрешен + Отдалечен болус не е разрешен Обнови профила Процент Сензор @@ -307,7 +307,7 @@ Премахни Бърз болус Настройки за бърз болус - Не са позволени отдалечени настройки + Не са позволени отдалечени настройки To start basal %.2fU/h reply with code %s To stop temp basal reply with code %s Loop has been disabled @@ -355,13 +355,13 @@ Базал: Базалните стойности са под минимума. Не е зададен профил! Батерията на помпата е изтощена - КЗ: + КЗ: Забрани EasyUI режим в помпата Разреши удължен болус в помпата Промени режима от U/d на U/h в помпата DanaR за Корея Горна линия - Последна КЗ: + Последна КЗ: Долна линия Изтощена батерия Отвори Опции на часовника diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 3746313c22..61aa07e13f 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -226,8 +226,8 @@ Poslední spojení: Zrušit dočasný bazál Bolus %.2fU aplikován úspěšně - Chyba při aplikování bolusu - Vzdálený bolus není momentálně povolen + Chyba při aplikování bolusu + Vzdálený bolus není momentálně povolen K potvzení bolusu %.2fU odpověz SMS s kódem %s SMS komunikátor Povolená tel. čísla @@ -300,7 +300,7 @@ Spanish Není vybrán žádný profil Hodnota %s je mimo přednastavený rozsah - Vzdálené posílání příkazů není povoleno + Vzdálené posílání příkazů není povoleno Na spuštění bazálu %.2fU/h odpověz SMS s kódem %s Na ukončení bazálu odpověz SMS s kódem %s Dočaný bazál zastaven @@ -373,7 +373,15 @@ Vybrán špatný ovladač pumpy Hodnota bazálu pod minimem. Nenastaveno! Pera - Glykémie: - Poslední glykémie: + Glykémie: + Poslední glykémie: před %d min + Bazál: + Bolus: + Rozdíl: + IOB: + před %d min + Bolus %.2fU aplikován úspěšně + Průběžné oznámení + ZASTARALÉ diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9de913ce2d..fc536ee468 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -197,7 +197,7 @@ Nightscout +XXXXXXXXXX;+YYYYYYYYYY Absolut - Bolus fehlgeschlagen + Bolus fehlgeschlagen Temp Basal abbrechen Temoräres Ziel Temoräres Ziel abbrechen @@ -240,7 +240,7 @@ Nightscout Profil zur Pumpe synchronisieren auf Pumpenergebnis warten Kein Bluetoothadapter gefunden - Remote Bolus nicht erlaubt + Remote Bolus nicht erlaubt Um Bolus %.2fU bitte mit %s antworten Korean Limit erreicht diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 1d585c4912..ec979b5df3 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -239,10 +239,10 @@ Números de teléfono permitidos XXXXXXXXXX +; + YYYYYYYYYY Para entregar bolo% .2fU responder con código% s - bolo falló + bolo falló Bolo% .2fU entregado con éxito Entregando% .2fU - Bolo remoto no permitido + Bolo remoto no permitido Dedo Sensor Manual @@ -333,7 +333,7 @@ NS solo subida. No efectivo con SGV salvo que este seleccionada una fuente local como xDrip. No efectivo en perfiles usando perfiles NS Otros ¡Bomba no iniciada! - No permitidos ajustes basales remotos + No permitidos ajustes basales remotos ¿Realmente quiere resetear la base de datos? Comando desconocido o respuesta incorrecta ¡Por favor asegurar que la cantidad coincide con la especificación del set de infusión! diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index c0b1a65d53..8a950cf344 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -241,11 +241,11 @@ 허가된 전화번호 +XXXXXXXXXX;+YYYYYYYYYY 식사주입 %.2fU 을 실행하려면 %s 를 입력하고 답장하세요 - Bolus failed + Bolus failed Bolus %.2fU delivered successfully %.2fU 주입중 SMS 원격 명령 사용하기 - 원격 식사주입 허용되지 않음 + 원격 식사주입 허용되지 않음 Finger Sensor Manual @@ -310,7 +310,7 @@ Loop가 중지중입니다. Loop가 실행중입니다. 값 %s 은 하드리밋(Hard Limit)를 벗어났습니다 - 원격 기초주입설정이 허가되지 않았습니다 + 원격 기초주입설정이 허가되지 않았습니다 기초주입 %.2fU/h 을 실행하려면 %s 를 입력하고 답장하세요 Temp basal %.2fU/h for %d min started successfully Temp basal start failed @@ -379,7 +379,7 @@ 펌프에서 확장식사기능을 활성화 하세요 펌프에서 U/d에서 U/h로 모드를 변경하세요 기초주입값이 최소값 이하입니다. 프로파일이 설정되지 않습니다! - BG: - Last BG: + BG: + Last BG: MDI diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d5b7e123aa..b147ca2fbc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -31,6 +31,7 @@ Insulin: Carbs: IOB: + IOB: Activity: Toal IOB: Total IOB activity: @@ -75,6 +76,7 @@ Reason Glucose Delta + Delta: Avg. delta Config Builder @@ -122,7 +124,9 @@ Confirmation Enter new treatment: Bolus + Bolus: Basal + Basal: Carbs Change your input! Set new extended bolus: @@ -244,11 +248,12 @@ Allowed phone numbers +XXXXXXXXXX;+YYYYYYYYYY To deliver bolus %.2fU reply with code %s - Bolus failed + Bolus failed Bolus %.2fU delivered successfully + Bolus %.2fU delivered successfully Delivering %.2fU Allow remote commands via SMS - Remote bolus not allowed + Remote bolus not allowed Finger Sensor Manual @@ -313,7 +318,7 @@ Loop is disabled Loop is enabled Value %s is out of hard limits - Remote basal setting is not allowed + Remote basal setting is not allowed To start basal %.2fU/h reply with code %s Temp basal %.2fU/h for %d min started successfully Temp basal start failed @@ -383,10 +388,11 @@ Enable extended boluses on pump Change mode from U/d to U/h on pump Basal value below minimum. Profile not set! - BG: - Last BG: + BG: + Last BG: MDI Ongoing Notification OLD DATA %dmin ago + %dmin ago From ddcc4c147dedc3ca41aecf648deb52ed1d6d1459 Mon Sep 17 00:00:00 2001 From: Radoslav Radev Date: Thu, 29 Dec 2016 20:49:18 +0200 Subject: [PATCH 08/15] Update strings.xml --- app/src/main/res/values-bg/strings.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 3557e5d27b..3ca9fc4008 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -16,12 +16,12 @@ Известие Проверка на КЗ Корекция с въглехидр. - Замяна сензор + Смяна на сензор Рестарт на сензор Комбиниран болус Болус за корекция Физ. активност - Замяна резервоар + Смяна на резервоар Болус за осн. хранене Абсолютна ВХ @@ -41,7 +41,7 @@ Бележка OpenAPS оффлайн Смяна на профил - Замяна сет + Смяна на сет Въпрос Болус за закуска Край на временен базал @@ -375,4 +375,5 @@ Изпрати всички данни отново Wear Избран е грешен тип помпа + преди %d м. From b2be49e631e85d59a605ff385ea5a54f9d10bb85 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 29 Dec 2016 22:40:30 +0100 Subject: [PATCH 09/15] simple profile layout --- .../res/layout/simpleprofile_fragment.xml | 158 ++++++++---------- wear/wear.iml | 6 +- 2 files changed, 76 insertions(+), 88 deletions(-) diff --git a/app/src/main/res/layout/simpleprofile_fragment.xml b/app/src/main/res/layout/simpleprofile_fragment.xml index 0c96593df1..ad1022b3f0 100644 --- a/app/src/main/res/layout/simpleprofile_fragment.xml +++ b/app/src/main/res/layout/simpleprofile_fragment.xml @@ -4,116 +4,99 @@ android:layout_height="match_parent" tools:context=".plugins.SimpleProfile.SimpleProfileFragment"> - + android:layout_height="match_parent"> - + android:layout_height="wrap_content" + android:orientation="vertical"> + - + - + - - - + - - - - - - - - - - - - @@ -124,48 +107,53 @@ android:layout_height="wrap_content" android:layout_column="2" android:inputType="numberDecimal" /> - - - - + - - + -