From 8b25b5b351624a7b22241ad62f5a90975a888257 Mon Sep 17 00:00:00 2001 From: Bluefox Date: Tue, 18 Aug 2020 12:20:47 +0200 Subject: [PATCH 01/10] Fix too long number in "adj. req. rate: 1.2000000000000000002" --- app/src/main/assets/OpenAPSSMB/determine-basal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/assets/OpenAPSSMB/determine-basal.js b/app/src/main/assets/OpenAPSSMB/determine-basal.js index 137ceca541..64cde918c5 100644 --- a/app/src/main/assets/OpenAPSSMB/determine-basal.js +++ b/app/src/main/assets/OpenAPSSMB/determine-basal.js @@ -1137,7 +1137,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_ var maxSafeBasal = tempBasalFunctions.getMaxSafeBasal(profile); if (rate > maxSafeBasal) { - rT.reason += "adj. req. rate: "+rate+" to maxSafeBasal: "+maxSafeBasal+", "; + rT.reason += "adj. req. rate: "+round(rate, 2)+" to maxSafeBasal: "+maxSafeBasal+", "; rate = round_basal(maxSafeBasal, profile); } From 441030663e22b4a28888622ad8969b92a426a496 Mon Sep 17 00:00:00 2001 From: Bluefox Date: Tue, 18 Aug 2020 12:22:20 +0200 Subject: [PATCH 02/10] Fix too long number in "adj. req. rate: 1.2000000000000000002" 8b25b5b --- app/src/main/assets/OpenAPSAMA/determine-basal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/assets/OpenAPSAMA/determine-basal.js b/app/src/main/assets/OpenAPSAMA/determine-basal.js index 089915685e..8202e7c74b 100644 --- a/app/src/main/assets/OpenAPSAMA/determine-basal.js +++ b/app/src/main/assets/OpenAPSAMA/determine-basal.js @@ -470,7 +470,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_ var maxSafeBasal = tempBasalFunctions.getMaxSafeBasal(profile); if (rate > maxSafeBasal) { - rT.reason += "adj. req. rate: "+rate+" to maxSafeBasal: "+maxSafeBasal+", "; + rT.reason += "adj. req. rate: "+round(rate, 2)+" to maxSafeBasal: "+maxSafeBasal+", "; rate = round_basal(maxSafeBasal, profile); } From 9ca20f425fc4d938e104520c0b84bf43b8dd890e Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Wed, 19 Aug 2020 10:58:45 +0200 Subject: [PATCH 03/10] BG input in wizard improvement --- .../info/nightscout/androidaps/dialogs/WizardDialog.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt index faf27af7b7..5c5da970f2 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt @@ -105,8 +105,12 @@ class WizardDialog : DaggerDialogFragment() { val maxCarbs = constraintChecker.getMaxCarbsAllowed().value() val maxCorrection = constraintChecker.getMaxBolusAllowed().value() - treatments_wizard_bg_input.setParams(savedInstanceState?.getDouble("treatments_wizard_bg_input") - ?: 0.0, 0.0, 500.0, 0.1, DecimalFormat("0.0"), false, ok, textWatcher) + if (profileFunction.getUnits() == Constants.MGDL) + treatments_wizard_bg_input.setParams(savedInstanceState?.getDouble("treatments_wizard_bg_input") + ?: 0.0, 0.0, 500.0, 1.0, DecimalFormat("0.0"), false, ok, textWatcher) + else + treatments_wizard_bg_input.setParams(savedInstanceState?.getDouble("treatments_wizard_bg_input") + ?: 0.0, 0.0, 30.0, 0.1, DecimalFormat("0.0"), false, ok, textWatcher) treatments_wizard_carbs_input.setParams(savedInstanceState?.getDouble("treatments_wizard_carbs_input") ?: 0.0, 0.0, maxCarbs.toDouble(), 1.0, DecimalFormat("0"), false, ok, textWatcher) val bolusStep = activePlugin.activePump.pumpDescription.bolusStep From 09e5c82d4dc051cb9ce727704ab61e9edb8f07b1 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Wed, 19 Aug 2020 21:24:01 +0200 Subject: [PATCH 04/10] unify units spacing --- .../androidaps/dialogs/CarbsDialog.kt | 15 +++++++---- .../androidaps/dialogs/ExtendedBolusDialog.kt | 3 ++- .../androidaps/dialogs/FillDialog.kt | 15 ++++------- .../androidaps/dialogs/InsulinDialog.kt | 9 ++++--- .../androidaps/dialogs/TempBasalDialog.kt | 3 ++- .../androidaps/dialogs/TreatmentDialog.kt | 11 ++++---- .../androidaps/utils/wizard/BolusWizard.kt | 17 ++++++------- app/src/main/res/values/strings.xml | 25 +++++++++---------- .../nightscout/androidaps/db/Treatment.java | 4 +-- .../androidaps/dialogs/ProfileViewerDialog.kt | 6 ++--- .../plugins/aps/loop/APSResult.java | 4 +-- .../androidaps/utils/DecimalFormatter.java | 8 ++++++ .../androidaps/utils/extensions/HtmlString.kt | 11 ++++++++ core/src/main/res/values/strings.xml | 24 ++++++++++-------- 14 files changed, 89 insertions(+), 66 deletions(-) create mode 100644 core/src/main/java/info/nightscout/androidaps/utils/extensions/HtmlString.kt diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt index 31ced947d0..22ed2bb688 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt @@ -15,14 +15,19 @@ import info.nightscout.androidaps.db.CareportalEvent import info.nightscout.androidaps.db.Source import info.nightscout.androidaps.db.TempTarget import info.nightscout.androidaps.interfaces.Constraint -import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker import info.nightscout.androidaps.interfaces.ProfileFunction +import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker import info.nightscout.androidaps.plugins.general.nsclient.NSUpload import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin import info.nightscout.androidaps.plugins.treatments.CarbsGenerator import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin -import info.nightscout.androidaps.utils.* +import info.nightscout.androidaps.utils.DateUtil +import info.nightscout.androidaps.utils.DecimalFormatter +import info.nightscout.androidaps.utils.DefaultValueHelper +import info.nightscout.androidaps.utils.HtmlHelper +import info.nightscout.androidaps.utils.ToastUtils import info.nightscout.androidaps.utils.alertDialogs.OKDialog +import info.nightscout.androidaps.utils.extensions.formatColor import info.nightscout.androidaps.utils.resources.ResourceHelper import kotlinx.android.synthetic.main.dialog_carbs.* import kotlinx.android.synthetic.main.notes.* @@ -159,13 +164,13 @@ class CarbsDialog : DialogFragmentWithDate() { val activitySelected = overview_carbs_activity_tt.isChecked if (activitySelected) - actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to1Decimal(activityTT) + " " + unitLabel + " (" + activityTTDuration + " " + resourceHelper.gs(R.string.unit_minute_short) + ")") + actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(activityTT) + " " + unitLabel + " (" + resourceHelper.gs(R.string.format_mins, activityTTDuration) + ")").formatColor(resourceHelper, R.color.tempTargetConfirmation)) val eatingSoonSelected = overview_carbs_eating_soon_tt.isChecked if (eatingSoonSelected) - actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + eatingSoonTTDuration + " " + resourceHelper.gs(R.string.unit_minute_short) + ")") + actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + resourceHelper.gs(R.string.format_mins, eatingSoonTTDuration) + ")").formatColor(resourceHelper, R.color.tempTargetConfirmation)) val hypoSelected = overview_carbs_hypo_tt.isChecked if (hypoSelected) - actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to1Decimal(hypoTT) + " " + unitLabel + " (" + hypoTTDuration + " " + resourceHelper.gs(R.string.unit_minute_short) + ")") + actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(hypoTT) + " " + unitLabel + " (" + resourceHelper.gs(R.string.format_mins, hypoTTDuration) + ")").formatColor(resourceHelper, R.color.tempTargetConfirmation)) val timeOffset = overview_carbs_time.value.toInt() eventTime -= eventTime % 1000 diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt index 02e46e5c17..78b436269a 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt @@ -17,6 +17,7 @@ import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.utils.HtmlHelper import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.SafeParse +import info.nightscout.androidaps.utils.extensions.formatColor import info.nightscout.androidaps.utils.resources.ResourceHelper import kotlinx.android.synthetic.main.dialog_extendedbolus.* import kotlinx.android.synthetic.main.okcancel.* @@ -68,7 +69,7 @@ class ExtendedBolusDialog : DialogFragmentWithDate() { actions.add(resourceHelper.gs(R.string.formatinsulinunits, insulinAfterConstraint)) actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, durationInMinutes)) if (abs(insulinAfterConstraint - insulin) > 0.01) - actions.add("" + resourceHelper.gs(R.string.constraintapllied) + "") + actions.add(resourceHelper.gs(R.string.constraintapllied).formatColor(resourceHelper, R.color.warning)) activity?.let { activity -> OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.extended_bolus), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), Runnable { diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt index 580b27228c..24b2f798ea 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt @@ -7,8 +7,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import com.google.common.base.Joiner -import dagger.android.HasAndroidInjector -import info.nightscout.androidaps.MainApp import info.nightscout.androidaps.R import info.nightscout.androidaps.activities.ErrorHelperActivity import info.nightscout.androidaps.data.DetailedBolusInfo @@ -20,18 +18,15 @@ import info.nightscout.androidaps.interfaces.Constraint import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker import info.nightscout.androidaps.plugins.general.nsclient.NSUpload import info.nightscout.androidaps.queue.Callback -import info.nightscout.androidaps.utils.DateUtil import info.nightscout.androidaps.utils.DecimalFormatter import info.nightscout.androidaps.utils.HtmlHelper import info.nightscout.androidaps.utils.SafeParse import info.nightscout.androidaps.utils.alertDialogs.OKDialog +import info.nightscout.androidaps.utils.extensions.formatColor import info.nightscout.androidaps.utils.resources.ResourceHelper -import info.nightscout.androidaps.utils.sharedPreferences.SP import kotlinx.android.synthetic.main.dialog_fill.* import kotlinx.android.synthetic.main.notes.* import kotlinx.android.synthetic.main.okcancel.* -import org.json.JSONException -import org.json.JSONObject import java.util.* import javax.inject.Inject import kotlin.math.abs @@ -97,16 +92,16 @@ class FillDialog : DialogFragmentWithDate() { if (insulinAfterConstraints > 0) { actions.add(resourceHelper.gs(R.string.fillwarning)) actions.add("") - actions.add(resourceHelper.gs(R.string.bolus) + ": " + "" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump) + resourceHelper.gs(R.string.insulin_unit_shortname) + "") + actions.add(resourceHelper.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, resourceHelper).formatColor(resourceHelper, R.color.colorInsulinButton)) if (abs(insulinAfterConstraints - insulin) > 0.01) - actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarning, resourceHelper.gc(R.color.warning), insulin, insulinAfterConstraints)) + actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(resourceHelper, R.color.warning)) } val siteChange = fill_catheter_change.isChecked if (siteChange) - actions.add("" + "" + resourceHelper.gs(R.string.record_pump_site_change) + "") + actions.add(resourceHelper.gs(R.string.record_pump_site_change).formatColor(resourceHelper, R.color.actionsConfirm)) val insulinChange = fill_cartridge_change.isChecked if (insulinChange) - actions.add("" + "" + resourceHelper.gs(R.string.record_insulin_cartridge_change) + "") + actions.add(resourceHelper.gs(R.string.record_insulin_cartridge_change).formatColor(resourceHelper, R.color.actionsConfirm)) val notes = notes.text.toString() if (notes.isNotEmpty()) actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_notes_label) + ": " + notes) diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt index b5b3a8f252..f1c9c406db 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt @@ -26,6 +26,7 @@ import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.utils.* import info.nightscout.androidaps.utils.alertDialogs.OKDialog +import info.nightscout.androidaps.utils.extensions.formatColor import info.nightscout.androidaps.utils.extensions.toSignedString import info.nightscout.androidaps.utils.extensions.toVisibility import info.nightscout.androidaps.utils.resources.ResourceHelper @@ -137,16 +138,16 @@ class InsulinDialog : DialogFragmentWithDate() { val eatingSoonChecked = overview_insulin_start_eating_soon_tt.isChecked if (insulinAfterConstraints > 0) { - actions.add(resourceHelper.gs(R.string.bolus) + ": " + "" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump) + resourceHelper.gs(R.string.insulin_unit_shortname) + "") + actions.add(resourceHelper.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, resourceHelper).formatColor(resourceHelper, R.color.bolus)) if (recordOnlyChecked) - actions.add("" + resourceHelper.gs(R.string.bolusrecordedonly) + "") + actions.add(resourceHelper.gs(R.string.bolusrecordedonly).formatColor(resourceHelper, R.color.warning)) if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints)) - actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarning, resourceHelper.gc(R.color.warning), insulin, insulinAfterConstraints)) + actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(resourceHelper, R.color.warning)) } val eatingSoonTTDuration = defaultValueHelper.determineEatingSoonTTDuration() val eatingSoonTT = defaultValueHelper.determineEatingSoonTT() if (eatingSoonChecked) - actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + "" + DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + eatingSoonTTDuration + " " + resourceHelper.gs(R.string.unit_minute_short) + ")") + actions.add(resourceHelper.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + resourceHelper.gs(R.string.format_mins, eatingSoonTTDuration) + ")").formatColor(resourceHelper, R.color.tempTargetConfirmation)) val timeOffset = overview_insulin_time.value.toInt() val time = DateUtil.now() + T.mins(timeOffset.toLong()).msecs() diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt index 7ab5850f87..68be68e060 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt @@ -19,6 +19,7 @@ import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.utils.HtmlHelper import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.SafeParse +import info.nightscout.androidaps.utils.extensions.formatColor import info.nightscout.androidaps.utils.resources.ResourceHelper import kotlinx.android.synthetic.main.dialog_tempbasal.* import kotlinx.android.synthetic.main.okcancel.* @@ -98,7 +99,7 @@ class TempBasalDialog : DialogFragmentWithDate() { actions.add(resourceHelper.gs(R.string.tempbasal_label) + ": " + resourceHelper.gs(R.string.pump_basebasalrate, absolute)) actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, durationInMinutes)) if (abs(absolute - basalAbsoluteInput) > 0.01) - actions.add("" + resourceHelper.gs(R.string.constraintapllied) + "") + actions.add(resourceHelper.gs(R.string.constraintapllied).formatColor(resourceHelper, R.color.warning)) } activity?.let { activity -> OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.tempbasal_label), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), Runnable { diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt index 84663a1cfe..429862ede9 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt @@ -25,6 +25,7 @@ import info.nightscout.androidaps.utils.HtmlHelper import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.SafeParse import info.nightscout.androidaps.utils.ToastUtils +import info.nightscout.androidaps.utils.extensions.formatColor import info.nightscout.androidaps.utils.resources.ResourceHelper import kotlinx.android.synthetic.main.dialog_insulin.* import kotlinx.android.synthetic.main.dialog_treatment.* @@ -101,16 +102,16 @@ class TreatmentDialog : DialogFragmentWithDate() { val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value() if (insulinAfterConstraints > 0) { - actions.add(resourceHelper.gs(R.string.bolus) + ": " + "" + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump) + resourceHelper.gs(R.string.insulin_unit_shortname) + "") + actions.add(resourceHelper.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, resourceHelper).formatColor(resourceHelper, R.color.bolus)) if (recordOnlyChecked) - actions.add("" + resourceHelper.gs(R.string.bolusrecordedonly) + "") + actions.add(resourceHelper.gs(R.string.bolusrecordedonly).formatColor(resourceHelper, R.color.warning)) if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints)) - actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarning, resourceHelper.gc(R.color.warning), insulin, insulinAfterConstraints)) + actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(resourceHelper, R.color.warning)) } if (carbsAfterConstraints > 0) { - actions.add(resourceHelper.gs(R.string.carbs) + ": " + "" + resourceHelper.gs(R.string.format_carbs, carbsAfterConstraints) + "") + actions.add(resourceHelper.gs(R.string.carbs) + ": " + resourceHelper.gs(R.string.format_carbs, carbsAfterConstraints).formatColor(resourceHelper, R.color.carbs)) if (carbsAfterConstraints != carbs) - actions.add("" + resourceHelper.gs(R.string.carbsconstraintapplied) + "") + actions.add(resourceHelper.gs(R.string.carbsconstraintapplied).formatColor(resourceHelper, R.color.warning)) } if (insulinAfterConstraints > 0 || carbsAfterConstraints > 0) { activity?.let { activity -> diff --git a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt index 13fede251e..4d5c2c2649 100644 --- a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt +++ b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt @@ -20,15 +20,15 @@ import info.nightscout.androidaps.logging.LTag import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin import info.nightscout.androidaps.plugins.bus.RxBusWrapper import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker -import info.nightscout.androidaps.interfaces.ProfileFunction import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.utils.DateUtil import info.nightscout.androidaps.utils.HtmlHelper -import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.Round import info.nightscout.androidaps.utils.T +import info.nightscout.androidaps.utils.alertDialogs.OKDialog +import info.nightscout.androidaps.utils.extensions.formatColor import info.nightscout.androidaps.utils.resources.ResourceHelper import org.json.JSONException import org.json.JSONObject @@ -275,7 +275,7 @@ class BolusWizard @Inject constructor( val actions: LinkedList = LinkedList() if (insulinAfterConstraints > 0) { val pct = if (percentageCorrection != 100.0) " (" + percentageCorrection.toInt() + "%)" else "" - actions.add(resourceHelper.gs(R.string.bolus) + ": " + "" + resourceHelper.gs(R.string.formatinsulinunits, insulinAfterConstraints) + pct + "") + actions.add(resourceHelper.gs(R.string.bolus) + ": " + resourceHelper.gs(R.string.formatinsulinunits, insulinAfterConstraints).formatColor(resourceHelper, R.color.bolus) + pct) } if (carbs > 0) { var timeShift = "" @@ -284,19 +284,18 @@ class BolusWizard @Inject constructor( } else if (carbTime < 0) { timeShift += " (-" + resourceHelper.gs(R.string.mins, carbTime) + ")" } - actions.add(resourceHelper.gs(R.string.carbs) + ": " + "" + carbs + "g" + timeShift + "") + actions.add(resourceHelper.gs(R.string.carbs) + ": " + resourceHelper.gs(R.string.format_carbs, carbs).formatColor(resourceHelper, R.color.carbs) + timeShift) } if (insulinFromCOB > 0) { - actions.add(resourceHelper.gs(R.string.insulinFromCob, resourceHelper.gc(R.color.cobAlert), insulinFromBolusIOB + insulinFromBasalsIOB + insulinFromCOB + insulinFromBG)) + actions.add(resourceHelper.gs(R.string.cobvsiob) + ": " + resourceHelper.gs(R.string.formatsignedinsulinunits, insulinFromBolusIOB + insulinFromBasalsIOB + insulinFromCOB + insulinFromBG).formatColor(resourceHelper, R.color.cobAlert)) val absorptionRate = iobCobCalculatorPlugin.slowAbsorptionPercentage(60) if (absorptionRate > .25) actions.add(resourceHelper.gs(R.string.slowabsorptiondetected, resourceHelper.gc(R.color.cobAlert), (absorptionRate * 100).toInt())) } - if (abs(insulinAfterConstraints - calculatedTotalInsulin) > pump.pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints)) { - actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarning, resourceHelper.gc(R.color.warning), calculatedTotalInsulin, insulinAfterConstraints)) - } + if (abs(insulinAfterConstraints - calculatedTotalInsulin) > pump.pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints)) + actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarn, calculatedTotalInsulin, insulinAfterConstraints).formatColor(resourceHelper, R.color.warning)) if (config.NSCLIENT) - actions.add("" + resourceHelper.gs(R.string.bolusrecordedonly) + "") + actions.add(resourceHelper.gs(R.string.bolusrecordedonly).formatColor(resourceHelper, R.color.warning)) return HtmlHelper.fromHtml(Joiner.on("
").join(actions)) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fe902fd74b..602ef20609 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -188,7 +188,7 @@ TempBasal Extended Bolus Nightscout version: - Missing %1$dg + Missing %1$d g Preferences exported Export settings to Import settings from @@ -279,10 +279,10 @@ Minimum number of minutes that must elapse between one remote bolus and the next How many minutes must elapse, at least, between one bolus and the next For your safety, to edit this preference you need to add at least 2 phone numbers. - Bolus %1$.2fU delivered successfully - Going to deliver %1$.2fU - Bolus %1$.2fU delivered successfully - Meal Bolus %1$.2fU delivered successfully + Bolus %1$.2f U delivered successfully + Going to deliver %1$.2f U + Bolus %1$.2f U delivered successfully + Meal Bolus %1$.2f U delivered successfully Target %1$s for %2$d minutes Target %1$s for %2$d minutes set successfully Temp Target canceled successfully @@ -306,9 +306,9 @@ Pump reconnected Remote command is not allowed Remote bolus not available. Try again later. - To start basal %1$.2fU/h for %2$d min reply with code %3$s + To start basal %1$.2f U/h for %2$d min reply with code %3$s To switch profile to %1$s %2$d%% reply with code %3$s - To start extended bolus %1$.2fU for %2$d min reply with code %3$s + To start extended bolus %1$.2f U for %2$d min reply with code %3$s To enter %1$dg at %2$s reply with code %3$s To start basal %1$d%% for %2$d min reply with code %3$s To suspend loop for %1$d minutes reply with code %2$s @@ -317,7 +317,7 @@ To disable loop reply with code %1$s Temp basal %1$.2fU/h for %2$d min started successfully Extended bolus %1$.2fU for %2$d min started successfully - Carbs %1$dg entered successfully + Carbs %1$d g entered successfully Entering %1$dg of carbs failed Temp basal %1$d%% for %2$d min started successfully Temp basal start failed @@ -1020,7 +1020,7 @@ Do the codes displayed on this device and on your pump match? Insight pairing Accu-Chek Insight - %1$.2fU / %2$.2fU delivered + %1$.2f U / %2$.2f U delivered %1$s: %2$s Tube changed Pump time updated @@ -1080,7 +1080,7 @@ Extended: %1$.2f / %2$.2f U for %3$d min Multiwave: %1$.2f / %2$.2f U for %3$d min TDD: %1$.2f - Reser.: %1$.2fU + Reser.: %1$.2f U Batt.: %1$d%% Max. recovery duration [s] Min. recovery duration [s] @@ -1256,8 +1256,8 @@ Send SMS with text - %2$+.2fU]]> - Bolus constraint applied: %2$.2fU to %3$.2fU]]> + COB vs IOB + Bolus constraint applied: %1$.2f U to %2$.2f U !!!!! Slow carbs absorption detected: %2$d%% of time. Double check your calculation. COB can be overestimated thus more insulin could be given !!!!!]]> boluswizard_percentage Deliver this part of bolus wizard result [%] @@ -1281,7 +1281,6 @@ Units Do you want to switch profile and discard changes made to current profile? wizard_calculation_visible - %1$dg On Off Clear finished diff --git a/core/src/main/java/info/nightscout/androidaps/db/Treatment.java b/core/src/main/java/info/nightscout/androidaps/db/Treatment.java index bd3a4c0ebe..4aec4f1d56 100644 --- a/core/src/main/java/info/nightscout/androidaps/db/Treatment.java +++ b/core/src/main/java/info/nightscout/androidaps/db/Treatment.java @@ -243,9 +243,9 @@ public class Treatment implements DataPointWithLabelInterface, DbObjectBase { @Override public String getLabel() { String label = ""; - if (insulin > 0) label += DecimalFormatter.toPumpSupportedBolus(insulin, activePlugin.getActivePump()) + "U"; + if (insulin > 0) label += DecimalFormatter.toPumpSupportedBolus(insulin, activePlugin.getActivePump(), resourceHelper); if (carbs > 0) - label += "~" + DecimalFormatter.to0Decimal(carbs) + "g"; + label += "~" + resourceHelper.gs(R.string.format_carbs, (int) carbs); return label; } diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt index 45feff463c..b3286cb590 100644 --- a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt +++ b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt @@ -194,7 +194,7 @@ class ProfileViewerDialog : DaggerDialogFragment() { val val1 = profile1.getBasalTimeFromMidnight(hour * 60 * 60) val val2 = profile2.getBasalTimeFromMidnight(hour * 60 * 60) if (val1 != prev1 || val2 != prev2) { - s.append(formatColors(Profile.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.00"), resourceHelper.gs(R.string.profile_ins_units_per_hour))) + s.append(formatColors(Profile.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.00"), " " + resourceHelper.gs(R.string.profile_ins_units_per_hour))) s.append("
") } prev1 = val1 @@ -217,7 +217,7 @@ class ProfileViewerDialog : DaggerDialogFragment() { val val1 = profile1.getIcTimeFromMidnight(hour * 60 * 60) val val2 = profile2.getIcTimeFromMidnight(hour * 60 * 60) if (val1 != prev1 || val2 != prev2) { - s.append(formatColors(Profile.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), resourceHelper.gs(R.string.profile_carbs_per_unit))) + s.append(formatColors(Profile.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), " " + resourceHelper.gs(R.string.profile_carbs_per_unit))) s.append("
") } prev1 = val1 @@ -234,7 +234,7 @@ class ProfileViewerDialog : DaggerDialogFragment() { val val1 = Profile.fromMgdlToUnits(profile1.getIsfMgdlTimeFromMidnight(hour * 60 * 60), profile1.units) val val2 = Profile.fromMgdlToUnits(profile2.getIsfMgdlTimeFromMidnight(hour * 60 * 60), profile1.units) if (val1 != prev1 || val2 != prev2) { - s.append(formatColors(Profile.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), profile1.units + resourceHelper.gs(R.string.profile_per_unit))) + s.append(formatColors(Profile.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), profile1.units + " " + resourceHelper.gs(R.string.profile_per_unit))) s.append("
") } prev1 = val1 diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java b/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java index 4e3d6bd3d5..1dbe845feb 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java +++ b/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java @@ -128,7 +128,7 @@ public class APSResult { // smb if (smb != 0) - ret += ("SMB: " + DecimalFormatter.toPumpSupportedBolus(smb, activePlugin.getActivePump()) + " U\n"); + ret += ("SMB: " + DecimalFormatter.toPumpSupportedBolus(smb, activePlugin.getActivePump(), resourceHelper) + "\n"); if (isCarbsRequired()) { ret += getCarbsRequiredText()+"\n"; @@ -166,7 +166,7 @@ public class APSResult { // smb if (smb != 0) - ret += ("" + "SMB" + ": " + DecimalFormatter.toPumpSupportedBolus(smb, activePlugin.getActivePump()) + " U
"); + ret += ("" + "SMB" + ": " + DecimalFormatter.toPumpSupportedBolus(smb, activePlugin.getActivePump(), resourceHelper) + "
"); if (isCarbsRequired()) { ret += getCarbsRequiredText()+"
"; diff --git a/core/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.java b/core/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.java index c4ddfc39a4..d52f520757 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.java +++ b/core/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.java @@ -2,7 +2,9 @@ package info.nightscout.androidaps.utils; import java.text.DecimalFormat; +import info.nightscout.androidaps.core.R; import info.nightscout.androidaps.interfaces.PumpInterface; +import info.nightscout.androidaps.utils.resources.ResourceHelper; /** * Created by mike on 11.07.2016. @@ -51,6 +53,12 @@ public class DecimalFormatter { : to1Decimal(value); } + public static String toPumpSupportedBolus(double value, PumpInterface pump, ResourceHelper resourceHelper) { + return pump.getPumpDescription().bolusStep <= 0.051 + ? resourceHelper.gs(R.string.formatinsulinunits, value) + : resourceHelper.gs(R.string.formatinsulinunits1, value); + } + public static DecimalFormat pumpSupportedBolusFormat(PumpInterface pump) { return pump.getPumpDescription().bolusStep <= 0.051 ? new DecimalFormat("0.00") diff --git a/core/src/main/java/info/nightscout/androidaps/utils/extensions/HtmlString.kt b/core/src/main/java/info/nightscout/androidaps/utils/extensions/HtmlString.kt new file mode 100644 index 0000000000..6dbb621c6a --- /dev/null +++ b/core/src/main/java/info/nightscout/androidaps/utils/extensions/HtmlString.kt @@ -0,0 +1,11 @@ +package info.nightscout.androidaps.utils.extensions + +import androidx.annotation.ColorRes +import info.nightscout.androidaps.utils.resources.ResourceHelper + +fun String.formatBold(): String = + "$this" + +fun String.formatColor(resourceHelper: ResourceHelper, @ColorRes colorId: Int): String = + "" + this + "" + diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index af37bbf430..cc79280850 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -31,22 +31,24 @@ Basal profile in pump updated Invalid input data Tempbasal delivery error - Going to deliver %1$.2fU + Going to deliver %1$.2f U Waiting for pump Connecting for %1$d s - Delivering %1$.2fU + Delivering %1$.2f U Handshaking Connecting Connected Disconnected Disconnecting AndroidAPS started - %1$.2fU + %1$.1f U + %1$.2f U + %1$+.2f U + %1$d g %1$.0f / %2$d U - %1$.2fU/h + %1$.2f U/h %1$.2f h %1$d mins - %1$dm Pump is busy Pump connection error You reached allowed limit @@ -109,8 +111,8 @@ For Bluetooth discovery to work on newer devices, location must be enabled. AAPS does not track your location and it can be disabled after pairing is successful. - %1$dm ago - %1$.1fh ago + %1$d m ago + %1$.1f h ago h days hours @@ -153,11 +155,11 @@ Invalid profile: %1$s - %1$dmin + %1$d min - %1$s: ∑: %2$.2fU Bol: %3$.2fU Bas: %4$.2fU(%5$.0f%%)]]> - %1$s: ∑: %2$.2fU Bol: %3$.2fU Bas: %4$.2fU(%5$.0f%%) Carbs: %6$.0fg]]> + %1$s: ∑: %2$.2f U Bol: %3$.2f U Bas: %4$.2f U(%5$.0f%%)]]> + %1$s: ∑: %2$.2f U Bol: %3$.2f U Bas: %4$.2f U(%5$.0f%%) Carbs: %6$.0f g]]> BG Check @@ -201,7 +203,7 @@ SMB - %dg Additional Carbs Required Within %d Minutes + %d g Additional Carbs Required Within %d Minutes Stats From 4d32b65aab2d2bd3d6c8c8e0935e73aea7307a01 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 20 Aug 2020 11:19:30 +0200 Subject: [PATCH 05/10] New Crowdin updates (#2897) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Lithuanian) * New translations strings.xml (Lithuanian) * New translations strings.xml (Lithuanian) * New translations strings.xml (Lithuanian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Russian) * New translations strings.xml (Korean) * New translations strings.xml (Dutch) * New translations strings.xml (Dutch) * New translations strings.xml (Polish) * New translations strings.xml (Polish) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese) * New translations strings.xml (Russian) * New translations strings.xml (Slovak) * New translations strings.xml (Italian) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Italian) * New translations strings.xml (Czech) * New translations strings.xml (French) * New translations strings.xml (Czech) * New translations strings.xml (Slovak) * New translations strings.xml (Swedish) * New translations strings.xml (Swedish) * New translations strings.xml (Lithuanian) * New translations strings.xml (Lithuanian) * New translations strings.xml (Romanian) * New translations strings.xml (Romanian) * New translations strings.xml (French) * New translations strings.xml (Spanish) * New translations strings.xml (Spanish) * New translations strings.xml (Afrikaans) * New translations strings.xml (Bulgarian) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Greek) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (Czech) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Bulgarian) * New translations strings.xml (Bulgarian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Russian) * New translations strings.xml (Italian) * New translations strings.xml (Italian) * New translations strings.xml (Italian) * New translations strings.xml (Italian) --- app/src/main/res/values-af-rZA/strings.xml | 8 ----- app/src/main/res/values-bg-rBG/strings.xml | 11 +++---- app/src/main/res/values-cs-rCZ/strings.xml | 13 ++++---- app/src/main/res/values-de-rDE/strings.xml | 25 +++++++-------- app/src/main/res/values-el-rGR/strings.xml | 11 ------- app/src/main/res/values-es-rES/strings.xml | 13 -------- app/src/main/res/values-fr-rFR/strings.xml | 13 -------- app/src/main/res/values-it-rIT/strings.xml | 23 +++++++------ app/src/main/res/values-ko-rKR/strings.xml | 13 -------- app/src/main/res/values-lt-rLT/strings.xml | 18 +++-------- app/src/main/res/values-nl-rNL/strings.xml | 13 -------- app/src/main/res/values-pl-rPL/strings.xml | 13 -------- app/src/main/res/values-pt-rBR/strings.xml | 12 ------- app/src/main/res/values-pt-rPT/strings.xml | 13 -------- app/src/main/res/values-ro-rRO/strings.xml | 13 -------- app/src/main/res/values-ru-rRU/strings.xml | 17 +++++----- app/src/main/res/values-sk-rSK/strings.xml | 13 -------- app/src/main/res/values-sv-rSE/strings.xml | 13 -------- app/src/main/res/values-zh-rCN/strings.xml | 7 ---- core/src/main/res/values-bg-rBG/strings.xml | 6 ++-- core/src/main/res/values-cs-rCZ/strings.xml | 22 +++++++------ core/src/main/res/values-de-rDE/strings.xml | 14 ++++---- core/src/main/res/values-es-rES/strings.xml | 9 ------ core/src/main/res/values-fr-rFR/strings.xml | 11 ------- core/src/main/res/values-it-rIT/strings.xml | 24 +++++++------- core/src/main/res/values-lt-rLT/strings.xml | 32 ++++++++++++------- core/src/main/res/values-nl-rNL/strings.xml | 9 ------ core/src/main/res/values-pl-rPL/strings.xml | 9 ------ core/src/main/res/values-pt-rBR/strings.xml | 4 --- core/src/main/res/values-pt-rPT/strings.xml | 11 ------- core/src/main/res/values-ro-rRO/strings.xml | 11 ------- core/src/main/res/values-ru-rRU/strings.xml | 18 ++++++----- core/src/main/res/values-sk-rSK/strings.xml | 11 ------- core/src/main/res/values-sv-rSE/strings.xml | 30 +++++++++++------ .../src/main/res/values-lt-rLT/strings.xml | 8 +++++ .../src/main/res/values-sv-rSE/strings.xml | 9 ++++++ .../src/main/res/values-lt-rLT/strings.xml | 17 ++++++++++ .../src/main/res/values-sv-rSE/strings.xml | 13 ++++++++ 38 files changed, 183 insertions(+), 347 deletions(-) diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml index 71a0a1debb..e173ca624b 100644 --- a/app/src/main/res/values-af-rZA/strings.xml +++ b/app/src/main/res/values-af-rZA/strings.xml @@ -170,9 +170,6 @@ Om %1$.2fU bolus te lewer antwoord met kode %2$s Om kalibrasie %1$.2f te stuur antwoord met kode %2$s Bolus het misluk - Bolus %1$.2fU suksesvol afgelewer - Gaan %1$.2fU lewer - Bolus %1$.2fU suksesvol afgelewer Laat afstandbeheerde bevele toe via SMS DanaR profiel stellings DIA [h] @@ -188,9 +185,7 @@ Waarde %1$s is uit harde perke Afstandbeheerde bevel word nie toegelaat nie Afstandbeheerde bolus nie beskikbaar nie. Probeer later weer. - Om %1$.2fU basale vir %2$d min te aktiveer antwoord met kode %3$s Om profiel te verander na %1$s %2$d%% antwoord met %3$s - Om bolus %1$.2fU vir %2$d min te verleng kies %3$s Om basal e %1$d%% vir %2$d min te begin kies %3$s Om lus op te skort vir %1$d minute antwoord met kode %2$s Temp basale %1$.2fU/h vir %2$d min suksesvol geaktiveerd @@ -717,7 +712,6 @@ Stem die kodes gewys op hierdie toestel en op jou pomp saam? Insight maatjies Accu-Chek Insight - %1$.2fU / %2$.2fU gelewer %1$s:%2$s Pyp verander Pomp tyd opgedateer @@ -771,7 +765,6 @@ Verleng: %1$.2f / %2$.2f U vir %3$d min Multigolf: %1$.2f / %2$.2f U vir %3$d min TDD: %1$.2f - Stoor.: %1$.2fU Bat.: %1$d%% Max. herstel duur [s] Min. herstel duur [s] @@ -899,7 +892,6 @@ Vorige konneksie na pomp %1$s %2$s min terug Stuur\'n SMS: %1$s Stuur\'n SMS met die teks - Bolus beperking aangewend: %2$.2fU to %3$.2fU]]> Laai tans... Sluimer Tyd reeks diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index fdcfa21a10..2d2597a27a 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -156,7 +156,7 @@ Временен базал Удължен болус Nightscout версия: - Нужни %1$dг + Нужни %1$d гр Настройките са експортирани Експортирай настройките в Импорт на настройки от @@ -854,7 +854,7 @@ Съвпадат ли кодовете, показани на това устройство и на Вашата помпа? Insight свързване Accu-Chek Insight - %1$.2fU / %2$.2fU доставени + %1$.2fЕ / %2$.2fЕ доставени %1$s:%2$s Тръба сменена Актуализирано време на помпата @@ -912,7 +912,7 @@ Удължен: %1$.2f / %2$.2f U за %3$d мин Удължен: %1$.2f / %2$.2f U за %3$d мин ТДД: %1$.2f - Рез.: %1$.2fU + Рез.: %1$.2fE Бат.: %1$d%% Макс време за възстановяване [сек] Мин време за възстановяване [сек] @@ -1055,8 +1055,8 @@ Изпращане на SMS с текст %1$s Изпратете SMS на всички Изпрати SMS с текст - %2$+.2fг Е]]> - Ограничение на болуса: %2$.2fЕ на %3$.2fЕ]]> + COB срещу IOB + Ограничение на болус: от %1$.2f Е на %2$.2f Е !!!!! Бавна абсорбция на въглехидрати: %2$d%% от времето. Проверете въведените данни. Може да има голяма грешка !!!!!]]> Стартирай част от резултата в калкулатора [%] Калкулатора изчислява нужния инсулин, но само тази част ще бъде доставена. Полезно със SMB алгоритъма. @@ -1077,7 +1077,6 @@ Избрано: Единици Искате да смените профила и премахнете на промените, направени в текущия профил? - %1$dг Вкл Изкл Изчисти приключение diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index d9dac2ee95..d5fece0d2b 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -262,9 +262,9 @@ Pumpa byla znovu připojena Vzdálený příkaz není povolen Vzdálený bolus není momentálně povolen. Zkuste to později. - Pro spuštění bazálu %1$.2fU/h na %2$d min odpovězte SMS s kódem %3$s + Pro spuštění bazálu %1$.2f U/h na %2$d min odpovězte SMS s kódem %3$s Pro přepnutí profilu na %1$s %2$d%% odpovězte SMS s kódem %3$s - Pro spuštění prodlouženého bolusu %1$.2fU na %2$d min odpovězte SMS s kódem %3$s + Pro spuštění prodlouženého bolusu %1$.2f U na %2$d min odpovězte SMS s kódem %3$s Pro zadání %1$dg na %2$s odpovězte pomocí SMS s kódem %3$s Pro spuštění bazálu %1$d%% na %2$d min odpovězte SMS s kódem %3$s K pozastavení smyčky na %1$d minut odpověz SMS s kódem %2$s @@ -854,7 +854,7 @@ Souhlasí kódy na tomto zařízení a na pumpě? Insight párování Accu-Chek Insight - %1$.2fU / %2$.2fU podáno + %1$.2f U / %2$.2f U podáno %1$s: %2$s Vyměněna hadičky Čas v pumpě aktualizován @@ -912,7 +912,7 @@ Prodl. bolus: %1$.2f / %2$.2f U na %3$d min Duální bolus: %1$.2f / %2$.2f U na %3$d min CDD: %1$.2f - Zásobník: %1$.2fU + Zásobník: %1$.2f U Bat.: %1$d%% Max. doba čekání na obnovení spojení [s] Min. doba čekání na obnovení spojení [s] @@ -1055,8 +1055,8 @@ Poslat SMS: %1$s Poslat SMS na všechna čísla Odeslat SMS s textem - %2$+.2fU]]> - Aplikováno omezení bolusu: %2$.2fU na %3$.2fU]]> + COB vs. IOB + Použito omezení bolusu: %1$.2f U na %2$.2f U !!!!! Detekována pomalá absorbce sacharidů: %2$d%% času. Překontrolujte kalkulaci. COB může být nadhodnocené, a proto může být započítáno více inzulínu !!!!!]]> Podat tuto část z výsledku kalkulace [%] Kalkulátor provede výpočet, ale dodána je pouze tato část inzulínu. Výhodné při používání SMB algoritmu. @@ -1077,7 +1077,6 @@ Vybráno: Jednotky Chcete přepnout profil a zahodit změny provedené v aktuálním profilu? - %1$d g ZAP VYP Vymazat dokončeno diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 47d0631c37..14a8b8f2a5 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -156,7 +156,7 @@ TBR Verzögerter Bolus Nightscout-Version: - Fehlend %1$d g + %1$d g fehlen Einstellungen exportiert Einstellungen exportieren nach Importiere Einstellungen von @@ -235,10 +235,10 @@ Minimale Dauer in Minuten, die nach einem Remote-Bolus verstrichen sein muss, bevor ein neuer abgegeben werden kann. Anzahl der Minuten, die mindestens zwischen zwei Remote-Bolusabgaben liegen müssen. Aus Sicherheitsgründen musst Du mindestens zwei Telefonnummern eintragen, um diese Voreinstellung zu ändern. - Bolus %1$.2fIE erfolgreich abgegeben - Werde %1$.2fIE abgeben - Bolus %1$.2fIE erfolgreich abgegeben - Mahlzeiten-Bolus %1$.2f IE erfolgreich abgegeben. + Bolus %1$.2f IE erfolgreich abgegeben + Werde %1$.2f IE abgeben + Bolus %1$.2f IE erfolgreich abgegeben + Mahlzeiten-Bolus %1$.2f IE erfolgreich abgegeben Ziel %1$s für %2$d Minuten Ziel %1$s für %2$d Minuten erfolgreich gesetzt. Temporäres Ziel wurde erfolgreich abgebrochen @@ -262,9 +262,9 @@ Verbindung zur Pumpe wiederhergestellt Ferngesteuerte Befehle sind nicht erlaubt. Bolusabgabe aus der Ferne nicht verfügbar. Versuche es später erneut. - Um eine Basalrate von %1$.2fIE/h für %2$d Minuten zu setzen, antworte mit dem Code %3$s + Um eine Basalrate von %1$.2f IE/h für %2$d Minuten zu setzen, antworte mit dem Code %3$s Um das Profil auf %1$s %2$d%% zu setzen, antworte mit dem Code %3$s - Um den erweiterten Bolus %1$.2fIE für %2$d Minuten abzugeben, antworte mit dem Code %3$s + Um einen Verzögerungs-Bolus von %1$.2f IE über %2$d Minuten abzugeben, antworte mit dem Code %3$s Um %1$dg Kohlenhydrate um %2$s einzugeben, antworte mit dem Code %3$s Um die Basalrate von %1$d%% für %2$d Minuten zu setzen, antworte mit dem Code %3$s Um das Loopen für %1$d Minuten zu pausieren, antworte mit dem Code %2$s. @@ -273,7 +273,7 @@ Um den Loop zu deaktivieren, antworte mit dem Code %1$s TBR mit %1$.2f IE/h für %2$d min wurde erfolgreich gestartet. Der erweiterte Bolus %1$.2f IE/h für %2$d Minuten wurde erfolgreich gestartet - %1$d g Kohlenhydrate erfolgreich erfasst. + %1$d g Kohlenhydrate erfolgreich erfasst Eingabe von %1$d g Kohlenhydraten ist fehlgeschlagen. Die temporäre Basalrate wurde erfolgreich für %2$d Minuten auf %1$d%% gesetzt. Das Starten der TBR ist fehlgeschlagen. @@ -855,7 +855,7 @@ Unerwartetes Verhalten. Stimmen die Codes auf diesem Gerät und auf deiner Pumpe überein? Insight Kopplung Accu-Chek Insight - %1$.2f U / %2$.2f U abgegeben + %1$.2f IE / %2$.2f IE abgegeben %1$s: %2$s Schlauch gewechselt Pumpenzeit aktualisiert @@ -913,7 +913,7 @@ Unerwartetes Verhalten. Verzögert: %1$.2f / %2$.2f IE für %3$d min. Multiwave: %1$.2f / %2$.2f IE für %3$d min. TDD: %1$.2f - Reser.: %1$.2fIE + Reser.: %1$.2f IE Batt.: %1$d%% Max. Erholungsdauer [s] Min. Erholungsdauer [s] @@ -1056,8 +1056,8 @@ Unerwartetes Verhalten. SMS senden: %1$s SMS an alle Nummern senden SMS mit Text senden - %2$+.2fU]]> - Bolus-Einschränkung angewendet: %2$.2fIE zu %3$.2fIE]]> + COB vs IOB + Bolus Einschränkung angewandt: %2$.2f U statt %1$.2f U !!!!! Langsamer Kohlenhydrat-Abbau erkannt: %2$d%% der Zeit. Überprüfe Deine Berechnung. COB könnte zu hoch sein und deswegen zu viel Insulin abgegeben werden!!!!!]]> Abgabe von [%] des Ergebnisses des Bolusrechners Der Bolus-Assistent führt Berechnungen durch, aber nur dieser Teil der berechneten Insulin wird abgegeben. Nützlich mit SMB-Algorithmus. @@ -1078,7 +1078,6 @@ Unerwartetes Verhalten. Ausgewählt: Einheiten Willst Du das Profil wechseln und die Änderungen am aktuellen Profil verwerfen? - %1$d g Ein Aus Ziel erneut öffnen diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml index 0410c5b8d7..3520b90a0c 100644 --- a/app/src/main/res/values-el-rGR/strings.xml +++ b/app/src/main/res/values-el-rGR/strings.xml @@ -151,7 +151,6 @@ Προσ Ρυθμός Εκτεταμμένο Bolus Έκδοση Nightscout: - Λείπει %1$dg Επιλογές εξήχθησαν Εξαγωγή ρυθμίσεων σε Εισαγωγή ρυθμίσεων από @@ -173,9 +172,6 @@ Για έγχυση bolus %1$.2fU στείλτε με κωδικό %2$s Για αποστολή καλιμπραρίσματος %1$.2f στείλτε με κωδικό %2$s Αποτυχία Bolus - Bolus %1$.2fU δόθηκε επιτυχώς - Προς έγχυση %1$.2fU - Bolus %1$.2fU δόθηκε επιτυχώς Άδεια για απομακρυσμένες εντολές μέσω SMS Ρυθμίσεις προφίλ DanaR DIA [h] @@ -191,9 +187,7 @@ Η τιμή %1$s είναι έξω από τα όρια Δεν επιτρέπεται απομακρυσμένη εντολή Απομακρυσμένο bolus μη διαθέσιμο. Δοκιμάστε ξανά αργότερα. - Για έναρξη βασικού %1$.2fU/h για %2$d λεπτά στείλτε κωδικό %3$s Για αλλαγή προφίλ σε %1$s %2$d%% στείλτε κωδικό %3$s - Για έναρξη εκτεταμένου bolus %1$.2fU για %2$d λεπτά στείλτε κωδικό %3$s Για έναρξη βασικού %1$d%% για %2$d λεπτά στείλτε κωδικό %3$s Για αναστολή κυκλκώματος για %1$d λεπτών στείλτε με κωδικό %2$s Προσωρινός Ρυθμός %1$.2fU/h για %2$d λεπτά ξεκίνησε επιτυχώς @@ -724,7 +718,6 @@ Ταιριάζουν οι εμφανιζόμενοι κωδικοί με αυτούς της αντλίας; Σύζευξη Insight Accu-Chek Insight - %1$.2fU / %2$.2fU παραδόθηκε %1$s: %2$s Σωληνάκι αλλάχθηκε Η ώρα στην αντλία άλλαξε @@ -778,7 +771,6 @@ Εκτεταμένο: %1$.2f / %2$.2f U για %3$d λεπτά Συνδυαστικό: %1$.2f / %2$.2f U για %3$d λεπτά TDD: %1$.2f - Αμπούλα:%1$.2fU Μπατ.:%1$d%% Μέγ. διάρκεια αποκατάστασης [s] Ελάχ. διάρκεια αποκατάστασης [s] @@ -907,8 +899,6 @@ Τελευταία σύνδεση με αντλία %1$s %2$s λεπτά πριν Στείλτε SMS: %1$s Στείλτε SMS με κείμενο - %2$+.2fU]]> - Bolus constraint applied: %2$.2fU to %3$.2fU]]> !!!!! Μικρή απορρόφηση υδατανθράκων ανιχνεύτηκε: %2$d%% της ώρας. Τσεκάρετε τους υπολογισμούς σας. COB μπορεί να υπερεκτιμήθηκε και να δόθηκε περισσότερη ινσουλίνη!!!!!]]> Χορήγηση του αποτελέσματος αυτού του μέρους του υπολογισμού bolus [%] Ο Υπολογισμός Bolus κάνει υπολογισμούς αλλά μόνο αυτό το μέρος της υπολογίσημης ινσουλίνης χορηγείται. Χρήσιμο με τον αλγόριθμο SMB. @@ -925,7 +915,6 @@ %1$d%% Οδηγός Bolus min - %1$dg Ποτέ δεν επικοινωνήσατε diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 08d7d3de0b..ebc478e5fd 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -156,7 +156,6 @@ Basal Temporal Bolo extendido Nightscout versión: - Falta %1$dg Preferencias exportadas Exportar ajustes a Importar configuración de @@ -233,10 +232,6 @@ Número mínimo de minutos que deben transcursar entre un bolus remoto y el siguiente Cuántos minutos deben transcurrir, al menos, entre un bolo y el siguiente Por su seguridad, para editar esta preferencia es necesario añadir al menos 2 números de teléfono. - El bolo %1$.2fU se ha infundido correctamente - Se van a infundir %1$.2fU - El bolo %1$.2fU se ha infundido correctamente - Bolo %1$.2fU entregado correctamente Objetivo %1$s para %2$d minutos Objetivo %1$s para %2$d minutos establecido correctamente Objetivo temporal cancelado con éxito @@ -260,9 +255,7 @@ Bomba reconectada Comando remoto no permitido El bolo remoto no está disponible. Inténtalo de nuevo más tarde. - Para iniciar una basal de %1$.2fU/h durante %2$d min, responder con el código %3$s Para cambiar el perfil a %1$s %2$d%% responder con el código %3$s - Para iniciar un bolo extendido de %1$.2fU durante %2$d minutos, responder con el código %3$s Para introducir %1$dg en %2$s responder con código %3$s Para iniciar una basal de %1$d%% durante %2$d min, responder con el código %3$s Para cancelar lazo por %1$d minutos responde con código %2$s @@ -271,7 +264,6 @@ Para desactivar el lazo responder con código %1$s Basal temporal %1$.2fU/h para %2$d min iniciada correctamente Bolo ampliado de %1$.2fU durante %2$d min se inició correctamente - Los carbohidratos %1$dg introducidos con éxito Error al introducir %1$dg de carbohidratos Basal temporal de %1$d%% durante %2$d min iniciada correctamente Fallo inicio basal temporal @@ -849,7 +841,6 @@ ¿Coinciden los códigos mostrados en este dispositivo y en su infusor? Insight sincronizada Accu-Chek Insight - %1$.2fU / %2$.2fU Entregado %1$s: %2$s Tubo cambiado Hora del infusor actualizada @@ -907,7 +898,6 @@ Multionda: %1$.2f / %2$.2f U durante %3$d min Multionda: %1$.2f / %2$.2f U durante %3$d min TDD: %1$.2f - Reser.: %1$.2fU Batería.: %1$d%% Max. duración de recuperación [s] Min. duración de recuperación [s] @@ -1050,8 +1040,6 @@ Enviar a %1$s Enviar SMS a todos los números Mandar mensaje SMS - %2$+.2fU]]> - Restricción de bolo aplicada: %2$.2fU a %3$.2fU]]> ! Se ha detectado una absorción lenta de hidratos de carbono: %2$d%% de tiempo. Compruebe de nuevo su calculo. Los COB se pueden sobrestimar, por lo que ¡se podría administrar más insulina de la cuenta!]]> Administrar esta parte del resultado del asistente de bolos [%] El asistente de bolos realiza el cálculo, pero solo se entrega esta parte de la insulina calculada. Útil con el algoritmo SMB. @@ -1072,7 +1060,6 @@ Seleccionado: Unidades ¿Desea cambiar el perfil y descartar los cambios realizados al perfil actual? - %1$dg Activado Desactivado Limpieza finalizada diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 7f43be9166..725d2b8d51 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -156,7 +156,6 @@ Basal Temporaire Bolus étendu Version Nightscout : - Manquant %1$dg Préférences exportées Exporter les paramètres au Importer les paramètres depuis @@ -236,10 +235,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Nombre minimum de minutes qu\'il doit y avoir entre un bolus distant et le suivant Combien de minutes doit-il y avoir, au minimum, entre un bolus et le suivant Pour votre sécurité, pour modifier cette préférence vous devez ajouter au moins 2 numéros de téléphone. - Bolus %1$.2fU délivré avec succès - %1$.2fU vont être injectées - Bolus %1$.2fU délivré avec succès - Bolus repas de %1$.2fU injecté avec succès Cible %1$s pendant %2$d minutes Cible %1$s pendant %2$d minutes définie avec succès Cible Temp annulée avec succès @@ -263,9 +258,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Pompe reconnectée La commande à distance n\'est pas autorisée Bolus à distance non disponible. Réessayez plus tard. - Pour démarrer la Basal %1$.2fU/h pendant %2$d min, renvoyer le code %3$s Pour changer le profil vers %1$s %2$d%%, renvoyer le code %3$s - Pour démarrer le Bolus étendu %1$.2fU pendant %2$d min, renvoyer le code %3$s Pour entrer %1$dg à %2$s renvoyer le code %3$s Pour démarrer la Basal %1$d%% pendant %2$d min, renvoyer le code %3$s Envoyer le code %2$s pour suspendre la Boucle pour %1$d minutes @@ -274,7 +267,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Pour désactiver la boucle veuillez répondre avec le code %1$s Démarrage réussi pour %1$.2fU/h de basal temporaire pour %2$d min Le Bolus étendu %1$.2fU pendant %2$d min a commencé avec succès - Les %1$dg de glucides entrés avec succès L\'entrée de %1$dg de glucides a échoué Démarrage réussi pour %1$d%% de Basal temporaire pour %2$d min Le démarrage du basal temporaire a échoué @@ -855,7 +847,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Les codes affichés sur cet appareil et sur la pompe sont-ils identiques ? Appairage de Insight Accu-Chek Insight - %1$.2fU / %2$.2fU injecté %1$s : %2$s Tubulure changée Mise à jour de l\'heure de la pompe @@ -913,7 +904,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Étendue : %1$.2f / %2$.2f U pour %3$d min Mixte : %1$.2f / %2$.2f U pour %3$d min DTI : %1$.2f - Réserv. : %1$.2fU Batt.: %1$d%% Durée max. de récupération [s] Durée min. de récupération [s] @@ -1056,8 +1046,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Envoyer SMS : %1$s Envoyer SMS à tous les numéros Envoyer SMS avec du texte - %2$+.2fU]]> - Contraintes de Bolus appliquées : %2$.2fU à %3$.2f]]> !!!!! Absorption lente des glucides détectée : %2$d%% du temps. Vérifiez de nouveau votre calcul. Les GA (Glucides Actifs) peuvent être surestimés et alors plus d\'insuline pourrait être délivré !!!!!]]> Injecter cette partie de Bolus calculée par l’assistant [%] L\'assistant Bolus effectue le calcul mais seulement cette partie de l\'insuline calculée est délivrée. Utile avec l\'algorithme SMB. @@ -1078,7 +1066,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Sélectionné : Unités Voulez-vous changer de profil et annuler les modifications faites dans le profil actuel ? - %1$dg On Off Refaire l\'objectif diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index 3b53b7f31b..fb761cdf60 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -156,7 +156,7 @@ Basale temporanea Bolo esteso Versione Nightscout: - Mancanti %1$dg + Mancanti %1$d g Preferenze esportate Esportare impostazioni su Importare impostazioni da @@ -235,10 +235,10 @@ Numero minimo di minuti che devono trascorrere tra un bolo remoto e il successivo Quanti minuti devono trascorrere, almeno, tra un bolo e il successivo Per la tua sicurezza, per modificare questa preferenza hai bisogno di aggiungere almeno 2 numeri di telefono. - Bolo di %1$.2fU erogato con successo + Bolo di %1$.2f U erogato con successo Sto per erogare %1$.2fU - Bolo di %1$.2fU erogato con successo - Bolo pasto di %1$.2fU erogato con successo + Bolo di %1$.2f U erogato con successo + Bolo pasto di %1$.2f U erogato con successo Target %1$s per %2$d minuti Target %1$s per %2$d minuti impostato con successo Temp-Target cancellato con successo @@ -262,9 +262,9 @@ Micro riconnesso Il comando da remoto non è permesso Bolo remoto non disponibile. Riprova più tardi. - Per avviare la basale %1$.2fU/h per %2$d min rispondi col codice %3$s + Per avviare la basale %1$.2f U/h per %2$d min rispondi col codice %3$s Per passare al profilo %1$s %2$d%% rispondi col codice %3$s - Per avviare il bolo esteso %1$.2fU/h per %2$d min rispondi col codice %3$s + Per avviare il bolo esteso %1$.2f U/h per %2$d min rispondi col codice %3$s Per inserire %1$dg a %2$s rispondi col codice %3$s Per avviare la basale %1$d%% per %2$d min rispondi col codice %3$s Per sospendere il loop per %1$d minuti rispondi col codice %2$s @@ -273,7 +273,7 @@ Per disabilitare il loop rispondi col codice %1$s Basale temporanea %1$.2fU/h per %2$d min avviata con successo Bolo esteso %1$.2fU/h per %2$d min avviato con successo - CHO %1$dg inseriti con successo + CHO %1$d g inseriti con successo Inserimento di %1$dg di CHO fallito Basale temporanea %1$d%% per %2$d min avviata con successo Avvio basale temporanea fallito @@ -854,7 +854,7 @@ I codici mostrati su questo dispositivo e sul micro combaciano? Associazione Insight Accu-Chek Insight - %1$.2fU / %2$.2fU erogato + %1$.2f U / %2$.2f U erogato %1$s: %2$s Catetere sostituito Ora del micro aggiornata @@ -912,7 +912,7 @@ Esteso: %1$.2f / %2$.2f U per %3$d min Multiwave: %1$.2f / %2$.2f U per %3$d min TDD: %1$.2f - Serb.: %1$.2fU + Serb.: %1$.2f U Batt: %1$d%% Max. durata recupero [s] Min. durata recupero [s] @@ -1055,8 +1055,8 @@ Invia SMS: %1$s Invia SMS a tutti i numeri Invia SMS con testo - %2$+.2fU]]> - Vincolo Bolo applicato: %2$.2fU a %3$.2fU]]> + COB vs IOB + Vincolo bolo applicato: %1$.2f U a %2$.2f U !!!!! Rilevato assorbimento lento dei carboidrati: %2$d%% del tempo. Ricontrolla il tuo calcolo. COB potrebbero essere sovrastimati e potrebbe essere somministrata più insulina !!!!!]]> Eroga parte del risultato del calcolatore [%] Il calcolatore esegue il calcolo, ma solo questa parte dell\'insulina calcolata è erogata. Utile con algoritmo SMB. @@ -1077,7 +1077,6 @@ Selezionato: Unità Vuoi cambiare profilo e scartare le modifiche apportate al profilo corrente? - %1$dg On Off Cancella completamento diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 92b135a30c..d01047143b 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -153,7 +153,6 @@ 임시Basal 확장 Bolus Nightscout 버전: - 누락 %1$dg 설정이 저장되었습니다 다음 위치에 설정을 저장하시겠습니까 다음 위치에서 설정을 불러오시겠습니까 @@ -183,10 +182,6 @@ 원격 Bolus를 주입한 후 얼마간의 시간이 흐른 후에야 다음 원격 Bolus주입이 가능합니다 원격 Bolus를 주입한 후 몇분이 지나야 다음 원격 Bolus 주입이 가능하게 합니까 안전을 위하여 이 설정을 수정하기 위해 최소 2개의 폰 번호를 추가해야합니다. - Bolus %1$.2fU이 주입 완료되었습니다. - %1$.2fU을 주입합니다 - Bolus %1$.2fU이 주입 완료되었습니다 - Meal Bolus %1$.2f이 주입 완료되었습니다 %2$d 분 동안 목표 %1$s %2$d 분 동안 목표 %1$s 설정이 완료되었습니다 임시 목표 취소가 완료되었습니다 @@ -205,15 +200,12 @@ %1$s값이 하드한계를 벗어났습니다 원격 명령이 허가되지 않았습니다 원격 주입이 불가능합니다. 나중에 다시 시도해주세요. - %2$d분 동안 Basal %1$.2fU/h 주입하려면 %3$s 를 입력하고 답장하세요 프로파일 %1$s %2$d%%로 변경하려면 %3$s 를 입력하고 답장하세요 - %2$d분 동안 확장 Bolus %1$.2fU 주입하려면 %3$s 를 입력하고 답장하세요 %2$s에 %1$dg을 입력하려면 %3$s를 입력하고 답장하세요 %2$d 분 동안 Basal %1$d%% 주입하려면 %3$s을 입력하고 답장하세요 %1$d분동안 Loop 일시중지하려면 %2$s 를 입력하고 답장하세요 Temp Basal %1$.2fU/h for %2$d min started successfully Extended bolus %1$.2fU for %2$d min started successfully - 탄수화물 %1$dg 입력이 완료되었습니다 탄수화물 %1$dg 입력이 실패하였습니다 Temp basal %1$d%% for %2$d min started successfully Temp Basal start failed @@ -748,7 +740,6 @@ 이 장치에서 보여지는 코드와 펌프에서 보여지는 코드가 동일한가요? Insight와 동기화 아큐-첵 Insight - %1$.2fU / %2$.2fU 주입됨 %1$s: %2$s 튜브 변경 펌프 시간 업데이트 @@ -802,7 +793,6 @@ 확장: %3$d분 동안 %1$.2f / %2$.2f U Multiwave: %3$d 분 동안 %1$.2f / %2$.2f U TDD: %1$.2f - Reser.: %1$.2fU Batt.: %1$d%% 최대 재연결 시간 [초] 최소 재연결 시간 [초] @@ -943,8 +933,6 @@ SMS 전송: %1$s 모든 번호에 SMS 전송 문자 포함된 SMS 보내기 - %2$+.2fU]]> - Bolus 제약 적용: %2$.2fU 에서 %3$.2fU]]> !!!!! 느린 탄수화물 흡수 감지: %2$d%% of time. 계산을 다시 확인하십시오. COB를 과대하게 측정하여 더 많은 인슐린이 주입될 수 있습니다 !!!!!]]> Bolus 마법사 결과의 이 부분 주입[%] Bolus 마법사는 계산을 수행하지만 계산된 인슐린의 이 부분만 주입됩니다. SMB 알고리즘에 유용합니다. @@ -965,7 +953,6 @@ 선택: 단위 프로파일을 변경하고 현재 프로파일에 대한 변경 사항을 버리시겠습니까? - %1$dg 켜기 끄기 완료 초기화 diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml index c9d1071b97..026c0433f1 100644 --- a/app/src/main/res/values-lt-rLT/strings.xml +++ b/app/src/main/res/values-lt-rLT/strings.xml @@ -156,7 +156,6 @@ Laikina bazė Ištęstas bolusas Nightscout versija: - Trūksta %1$dg Nustatymai eksportuoti Eksportuoti nustatymus Importuoti nustatymus iš @@ -172,6 +171,8 @@ Jūsų paprašys nustatyti slaptažodį, kuris bus naudojamas atšifruojant importuotus nustatymus. Eksportas nutrauktas! Nustatymai NE eksportuoti! Importas nutrauktas! Nustatymai NE importuoti! + Negalima importuoti nustatymų! + Prašome grįžti į pagrindinį ekraną ir bandyti dar kartą. Pasirinkite failą importavimui Prašom patikrinti nustatymus prieš importuojant: Nustatymai negali būti importuoti! @@ -233,10 +234,6 @@ Minimalus minučių skaičius, kuris turi praeiti nuo vieno boluso, suleisto nuotoliniu būdu iki kito Kiek mažiausiai minučių turi praeiti tarp vieno ir kito boluso Jūsų saugumui, norėdami redaguoti šį pasirinkimą, jums reikia pridėti ne mažiau kaip 2 telefono numerius. - %1$.2fvv bolusas sėkmingai suleistas - Bus suleista %1$.2fvv - %1$.2fvv bolusas sėkmingai suleistas - Bolusas %1$.2fvv sėkmingai suleistas Tikslas %1$s %2$d min. Tikslas %1$s %2$d min. nustatytas sėkmingai Laikinas tikslas atšauktas sėkmingai @@ -260,9 +257,7 @@ Pompa prijungta Nuotolinis valdymas negalimas Nuotolinis bolusas negalimas. Bandykite vėliau. - Norėdami aktyvuoti %1$.2fvv/val bazę, kurios trukmė %2$d min, atsakykite kodu %3$s Norėdami perjungti profilį %1$s %2$d%%, atsakykite kodu %3$s - Norint pradėti ištęstinį bolusą %1$.2fvv %2$d min., atsakykite kodu %3$s Įvedimui %1$dg %2$s atsakykite kodu %3$s Norėdami aktyvuoti %1$d%% bazę %2$d min., atsakykite kodu %3$s Norėdami sustabdyti Ciklą %1$d min., atsakykite kodu %2$s @@ -271,7 +266,6 @@ Ciklo išjungimui atsakykite su kodu %1$s %1$.2f vv/val laikina bazė, kurios trukmė %2$d min., aktyvuota sėkmingai %1$.2f vv ištęstas bolusas, kurio trukmė %2$d min., aktyvuotas sėkmingai - %1$dg angliavandeniai įrašyti sėkmingai Įvesti %1$dg angliavandenių nepavyko %1$d%% laikina bazė, kurios trukmė %2$d min., aktyvuota sėkmingai Laikina bazė neaktyvuota @@ -645,6 +639,7 @@ Įjungti SMB su laikinais tikslais Įjungti SMB, kai laikinas tikslas aktyvuotas (Netrukus valgysiu, Aktyvumas) Įjungti SMB su intensyviais laikinais tikslais + Įjungti SMB, kai yra aktyvus aukštas tikslas (aktyvumas, daugiau nei 100 mg/dl arba 5,5 mmol/l) Insulinas AV Mygtukai @@ -678,6 +673,7 @@ Boluso nesuleisti, tik įrašyti Kategorija Subkategorija + Bolusai bus tik įrašyti (nebus suleisti iš pompos) Automatiškai atstatyti trūkstamus KG duomenis iš NS SMB nustatyta iš pompos Aktyvumas @@ -794,6 +790,7 @@ Prašyti leidimo Norint gauti pranešimus, programai reikalingas sisteminio lango leidimas Programai reikia vietos nustatymo leidimo, kad būtų galima naudoti Bluetooth ir WiFi + Aplikacijai reikia leidimo prieigai prie saugyklos, kad galėtų išsaugoti žurnalo įrašus ir eksportavimo nustatymus Užklausa Konfigūruoti insulino įskiepį Išeiti @@ -849,7 +846,6 @@ Ar kodas, kurį matote įrenginyje, sutampa su pompos kodu? Insight sujungimas Accu-Chek Insight - %1$.2fvv iš %2$.2fvv suleista %1$s: %2$s Kateteris pakeistas Pompos laikas pakeistas @@ -907,7 +903,6 @@ Ištęstas: %1$.2f / %2$.2f V %3$d min Daugiabangis: %1$.2f / %2$.2f vv %3$d min BPD: %1$.2f - Rez.: %1$.2fvv Bat.: %1$d%% Didž. atkūrimo trukmė [s] Min. atkūrimo trukmė [s] @@ -1050,8 +1045,6 @@ Siųsti SMS: %1$s Siųsti SMS į visus numerius Išsiųsti SMS žinutę su tekstu - %2$+.2fU]]> - Pritaikyti boluso apribojimai: %2$.2fU to %3$.2fU]]> !!!!! Nustatytas lėtas angliavandenių įsisavinimas: %2$d%% laiko. Dar karą patikrinkite savo skaičiavimus. AAO gali būti pervertinti, todėl gali būti suleista per daug insulino!!!!!]]> Suleisti šią boluso skaičiuoklės rezultato dalį [%] Boluso skaičiuoklė atlieka skaičiavimus, tačiau tik dalis apskaičiuoto insulino yra suleidžiama. Naudinga kartu su SMB algoritmu. @@ -1072,7 +1065,6 @@ Parinkta: Vienetai Ar norite pakeisti profilį ir atsisakyti pakeitimų, atliktų dabartiniame profilyje? - %1$dg Įjungta Išjungta Išvalyti užbaigtus diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml index 38ad09a378..d0ec392641 100644 --- a/app/src/main/res/values-nl-rNL/strings.xml +++ b/app/src/main/res/values-nl-rNL/strings.xml @@ -156,7 +156,6 @@ Tijdelijk basaal Vertraagde bolus Nightscout versie: - Ontbrekend %1$dg Instellingen geëxporteerd Exporteer instellingen naar Importeer instellingen van @@ -233,10 +232,6 @@ Minimum aantal minuten dat moet verstrijken tussen de ene bolus op afstand en de volgende Hoeveel minuten er ten minste moeten verstrijken tussen de ene bolus en de volgende Voor de veiligheid moet je ten minste 2 telefoonnummers toevoegen om deze instelling te kunnen bijwerken. - Bolus van %1$.2fE succesvol toegediend - Er worden %1$.2fE toegediend - Bolus van %1$.2fE succesvol toegediend - Bolus van %1$.2fE succesvol toegediend Streefdoel %1$s gedurende %2$d minuten Streefdoel %1$s gedurende %2$d minuten succesvol ingesteld Tijdelijk streefdoel is geannuleerd @@ -260,9 +255,7 @@ Pomp opnieuw verbonden Commando\'s op afstand zijn niet toegestaan Bolus op afstand niet beschikbaar. Probeer het later opnieuw. - Om een basaal van %1$.2fE/u voor %2$d min te starten antwoord met code %3$s Om naar profiel %1$s %2$d%% te wisselen antwoord met code %3$s - Om een vertraagde bolus van %1$.2fE voor %2$d min te starten antwoord met code %3$s Antwoord met code %3$s om %1$dg in te voeren op %2$s Om een basaal van %1$d%% voor %2$d min te starten antwoord met code %3$s Om de loop te onderbreken voor %1$d minuten antwoord met de code %2$s @@ -271,7 +264,6 @@ Om loop uit te schakelen antwoord met code %1$s Tijdelijk basaal %1$.2fE/u voor %2$d minuten succesvol gestart Vertraagde bolus %1$.2fE voor %2$d minuten succesvol gestart - Koolhydraten %1$dg succesvol ingevoerd Invoeren van %1$dg koolhydraten is mislukt Tijdelijk basaal van %1$d%% voor %2$d minuten succesvol gestart Start tijdelijk basaal mislukt @@ -849,7 +841,6 @@ Worden dezelfde codes weergegeven op dit apparaat als op je pomp? Insight koppelen Accu-Chek Insight - %1$.2fE / %2$.2fE afgeleverd %1$s: %2$s Slang vervangen Pomp tijd bijgewerkt @@ -907,7 +898,6 @@ Vertraagd: %1$.2f / %2$.2f U gedurende %3$d min Multiwave: %1$.2f / %2$.2f E gedurende %3$d min TDD: %1$.2f - Reservoir: %1$.2fE Batt.: %1$d%% Max. herstel duur [s] Min. herstel duur [s] @@ -1050,8 +1040,6 @@ Stuur SMS: %1$s SMS verzenden naar alle nummers Stuur SMS met tekst - %2$+.2fU]]> - Bolus limiet bereikt: %2$.2fU naar %3$.2fU]]> !!! Trage koolhydraat absorptie gedetecteerd: %2$d%% van de tijd. Controleer je berekening nogmaals. COB kan zijn overschat waardoor er misschien meer insuline wordt afgegeven!!! zijn]]> Voer dit deel van het bolus wizard resultaat uit [%] Bolus wizard voert de berekening uit maar alleen dit deel van berekende insuline wordt geleverd. Handig in combinatie met het SMB algoritme. @@ -1072,7 +1060,6 @@ Geselecteerd: Eenheden Wilt u van profiel wisselen en de wijzigingen in het huidige profiel ongedaan maken? - %1$dg Aan Uit Voltooiing wissen diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index 1f83406ce9..e97fba0680 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -156,7 +156,6 @@ BazaTymczasowa Bolus Przedłużony Wersja Nightscout: - Brakuje %1$dg Ustawienia wyeksportowane Eksportuj ustawienia do Importuj ustawienia z @@ -233,10 +232,6 @@ Minimalna liczba minut która musi upłynąć pomiędzy jednym a drugim zdalnie podawanym bolusem Ile co najmniej minut musi upłynąć pomiędzy jednym a drugim bolusem Dla twojego bezpieczeństwa, aby zmienić to ustawienie musisz dodać co najmniej 2 numery telefonów. - Bolus %1$.2fU dostarczony prawidłowo - Zamierzam podać %1$.2fU - Bolus %1$.2fU dostarczony prawidłowo - Pomyślnie podano %1$.2fU bolusa posiłkowego Cel %1$s na %2$d minut Pomyślnie ustawiono cel %1$s na %2$d minuty Pomyślnie anulowano cel tymczasowy @@ -260,9 +255,7 @@ Pompa ponownie podłączona Zdalne komendy nie są dozwolone Bolus zdalny niedostępny. Spróbuj ponownie później. - Aby rozpocząć bazę %1$.2fU/h przez %2$d min. odpowiedz kodem %3$s Aby przełączyć profil na %1$s %2$d%% odpowiedz kodem %3$s - Aby rozpocząć bolus przedłużony %1$.2fU przez %2$d min. odpowiedz kodem %3$s Aby wprowadzić %1$dg o %2$s odeślij w SMS kod %3$s Aby rozpocząć bolus przedłużony %1$d%% przez %2$d min. odpowiedz kodem %3$s Aby wstrzymać pętle na %1$d minut odpowiedz kodem %2$s @@ -271,7 +264,6 @@ Aby wyłączyć pętlę odpowiedz kodem %1$s Tymczasowa baza %1$.2fU/h przez %2$d min rozpoczęta Bolus przedłużony %1$.2fU na %2$d min. rozpoczęty pomyślnie - Pomyślnie wprowadzono %1$dg węglowodanów Próba wprowadzenia %1$dg węglowodanów nie powiodła się Tymczasowa baza %1$d%% przez %2$d min. pomyślnie rozpoczęta Rozpoczęcie tymczasowej bazy nie powiodło się @@ -850,7 +842,6 @@ Czy kody wyświetlone na tym urządzeniu i na twojej pompie pasują? Parowanie Insight Accu-Chek Insight - %1$.2fU / %2$.2fU dostarczone %1$s: %2$s Dren zmieniony Czas pompy uaktualniony @@ -908,7 +899,6 @@ Przedłużony: %1$.2f / %2$.2f U na %3$d min Multiwave (zwykły + przedłużony): %1$.2f / %2$.2f U for %3$d min TDD: %1$.2f - Zbiornik: %1$.2fU Bat.: %1$d%% Max. czas odzyskiwania [s] Min. czas odzyskiwania [s] @@ -1051,8 +1041,6 @@ Wyślij SMS: %1$s Wyślij SMS do wszystkich numerów Wyślij SMS z tekstem - %2$+.2fU]]> - Wprowadzono ograniczenie bolusa: %2$.2fU to %3$.2fU]]> !!!!! Wykryto powolne wchłanianie węglowodanów: %2$d%% czasu. Sprawdź ponownie swoje obliczenia. COB mogły być przeszacowane przez co mogło być podane zbyt dużo insuliny !!!!!]]> Dostarcz tą część dawki insuliny z wyniku kalkulatora bolusa [%] Kreator bolusa wykonuje obliczenia, ale tylko ta część obliczonej dawki insuliny jest dostarczana. Pomocne z algorytmem SMB. @@ -1073,7 +1061,6 @@ Wybrany: Jednostki Czy chcesz przełączyć profil i porzucić zmiany wprowadzone w bieżącym profilu? - %1$dg Włącz Wyłącz Wyczyść skończone diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 572d9e3cb8..9ccd7c2cf4 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -156,7 +156,6 @@ Basal Temporária Bólus estendido Versão do Nightscout: - Falta %1$dg Preferências exportadas Exportar configurações para Importar configurações de @@ -229,10 +228,6 @@ Número mínimo de minutos que deve decorrer entre um bólus remoto e o próximo Quantos minutos deve decorrer, pelo menos, entre um bólus e o próximo Para sua segurança, para editar esta preferência você precisa adicionar pelo menos 2 números de telefone. - Bolus %1$.2fU entregue com sucesso - Vão ser administradas %1$.2fU - Bólus %1$.2fU enviado com êxito - Bólus de refeição %1$.2fU entregue com sucesso Alvo %1$s para %2$d minutos Alvo %1$s para %2$d minutos definido com sucesso Alvo Temp cancelado com êxito @@ -253,15 +248,12 @@ Bomba reconectada O comando remoto não é permitido O bolus remoto não está disponível. Tente novamente mais tarde. - Para começar a basal %1$.2fU/h durante%2$d min responda com o código %3$s Para mudar o perfil para %1$s %2$d%% responda com o código %3$s - Para começar o bólus estendido %1$.2fU/h para %2$d min responda com o código %3$s Para inserir %1$dg em %2$s responda com código %3$s Para começar a basal %1$d%% U/h durante %2$d min responda com o código %3$s Para suspender o loop por %1$d minutos resposta com código %2$s Basal temporária %1$.2fU/h para %2$d min iniciada com êxito Bólus estendido %1$.2fU/h para %2$d min iniciado com êxito - Hidratos %1$dg inseridos com sucesso Introdução de %1$dg de hidratos falhou Basal temporária %1$d%% U/h durante%2$d min iniciada com êxito Falha ao iniciar basal temp @@ -815,7 +807,6 @@ Os códigos exibidos neste dispositivo e na sua bomba correspondem? Emparelhamento Insight Accu-Chek Insight - %1$.2fU / %2$.2fU entregue %1$s: %2$s Tubo mudado Hora da bomba actualizada @@ -869,7 +860,6 @@ Estendido: %1$.2f / %2$.2f U por %3$d min Multionda: %1$.2f / %2$.2f U por %3$d min TDD: %1$.2f - Reser:%1$.2fU Bat.: %1$d%% Duração máxima da recuperação [s] Duração mínima da recuperação [s] @@ -1012,8 +1002,6 @@ Enviar SMS: %1$s Enviar SMS para todos os números Enviar SMS com texto - %2$+.2fU]]> - Restrição de Bolus aplicada: %2$.2fU para %3$.2fU]]> !!!!! Absorção lenta de hidratos detectada: %2$d%% do tempo. Verifique o seu cálculo. COB pode estar sobreestimado, assim mais insulina pode ser dada !!!]]> Entregue esta parte do resultado do assistente de bólus [%] Assistente de bólus executa o cálculo, mas apenas esta parte da insulina calculada é entregue. Útil com o algoritmo SMB. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 53d86619f7..28691e1395 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -156,7 +156,6 @@ BasalTemp Bólus Prolongado Versão Nightscout: - Falta %1$dg Preferências exportadas Exportar configurações para Importar configurações de @@ -235,10 +234,6 @@ Número mínimo de minutos que deve decorrer entre um bólus remoto e o próximo Quantos minutos deve decorrer, pelo menos, entre um bólus e o próximo Para sua segurança, para editar esta preferência você precisa adicionar pelo menos 2 números de telefone. - Bólus %1$.2fU administrado com êxito - A ser administrado %1$.2fU - Bólus %1$.2fU administrado com êxito - Bólus de refeição %1$.2fU administrado com sucesso Alvo %1$s para %2$d minutos Alvo %1$s para %2$d minutos definido com sucesso Alvo Temp cancelado com êxito @@ -262,9 +257,7 @@ Bomba ligada novamente O comando remoto não é permitido O bólus remoto não está disponível. Tente novamente mais tarde. - Para começar a basal %1$.2fU/h durante %2$d min responda com o código %3$s Para mudar o perfil para %1$s %2$d%% responda com o código %3$s - Para começar o bólus prolongado %1$.2fU/h para %2$d min responda com o código %3$s Para inserir %1$dg em %2$s responda com código %3$s Para começar a basal %1$d%% U/h durante %2$d min responda com o código %3$s Para suspender o loop por %1$d minutos resposta com código %2$s @@ -273,7 +266,6 @@ Para desactivar o loop responda com o código %1$s Basal temporária %1$.2fU/h para %2$d min iniciada com êxito Bólus prolongado %1$.2fU/h para %2$d min iniciado com êxito - Hidratos %1$dg inseridos com sucesso Introdução de %1$dg de hidratos falhou Basal temporária %1$d%% U/h durante%2$d min iniciada com êxito Início basal temp falhou @@ -854,7 +846,6 @@ Os códigos exibidos neste dispositivo e na sua bomba correspondem? Emparelhamento Insight Accu-Chek Insight - %1$.2fU / %2$.2fU administado %1$s: %2$s Tubo mudado Hora da bomba actualizada @@ -912,7 +903,6 @@ Prolongado: %1$.2f / %2$.2f U por %3$d min Multionda: %1$.2f / %2$.2f U por %3$d min TDD: %1$.2f - Reser:%1$.2fU Bat.: %1$d%% Duração máxima da recuperação [s] Duração mínima da recuperação [s] @@ -1055,8 +1045,6 @@ Enviar SMS: %1$s Enviar SMS para todos os números Enviar SMS com texto - %2$+.2fU]]> - Restrição de Bolus aplicada: %2$.2fU para %3$.2fU]]> !!!!! Absorção lenta de hidratos detectada: %2$d%% do tempo. Verifique o seu cálculo. COB pode estar sobreestimado, assim mais insulina pode ser dada !!!]]> Administrar esta parte do resultado do assistente de bólus [%] Assistente de bólus executa o cálculo, mas apenas esta parte da insulina calculada é administada. Útil com o algoritmo SMB. @@ -1077,7 +1065,6 @@ Seleccionado: Unidades Deseja mudar de perfil e descartar as alterações feitas no perfil actual? - %1$dg Ligado Desligado Limpar terminado diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml index c81aa82286..f04d78c2d8 100644 --- a/app/src/main/res/values-ro-rRO/strings.xml +++ b/app/src/main/res/values-ro-rRO/strings.xml @@ -156,7 +156,6 @@ Bazală temporară Bolus extins Versiune Nightscout: - Lipsă %1$dg Am exportat preferințele Exportă setările către Importă setările din @@ -235,10 +234,6 @@ Numarul minim de minute care trebuie sa treaca intre un bolus la distanta si urmatorul Cate minute trebuie sa treaca, cel puţin, intre un bolus si următorul Pentru siguranta dumneavoastra, pentru a edita aceasta preferinta trebuie sa adaugati cel putin 2 numere de telefon. - Bolusul de %1$.2fU a fost livrat cu succes - Se va livra un bolus de %1$.2fU - Bolusul de %1$.2fU a fost livrat cu succes - Bolusul de %1$.2fU a fost livrat cu succes Țintă %1$s pentru %2$d minute Tinta %1$s pentru %2$d minute este setata cu succes Tinta temporara anulata cu succes @@ -262,9 +257,7 @@ Pompă reconectată Comanda de la distanță nu este permisă Bolus de la distanță nu este disponibil. Încearcă din nou mai târziu. - Pentru a iniția bazala de %1$.2fU/h pentru %2$d min trimiteți codul %3$s Pentru a schimba profilul în %1$s %2$d%% trimiteți codul %3$s - Pentru a stabili bazala de %1$.2fU/h pentru %2$d min trimiteți codul %3$s Pentru a introduce %1$dg la %2$s, raspundeti cu: %3$s Pentru a iniția bazala de %1$d%% pentru %2$d min trimiteți codul %3$s Pentru suspendarea buclei pentru %1$d minute trimiteți codul %2$s @@ -273,7 +266,6 @@ Pentru a dezactiva bucla inchisa, raspundeti cu %1$s Bazala temporară %1$.2fU/h pentru %2$d minute a fost trimisă cu succes Bolusul extins de %1$.2fU pentru %2$d min a fost inițiat - %1$dg carbohidrati introdusi cu succes Introducerea a %1$dg de carbohidrati a esuat Bazala temporară %1$d%% pentru %2$d minute a fost stabilită cu succes Trimiterea bazalei temporare a eșuat @@ -854,7 +846,6 @@ Sunt identice codurile afișate aici și cele de pe pompă? Asociere Insight Accu-Chek Insight - Livrat %1$.2fU / %2$.2fU %1$s:%2$s Canulă schimbată Timpul din pompă a fost actualizat @@ -912,7 +903,6 @@ Extins: %1$.2f / %2$.2f U pentru %3$d min Multiwave: %1$.2f / %2$.2f U pentru %3$d min TDD: %1$.2f - Rzvr.: %1$.2fU Bat.: %1$d%% Timpul maxim de restabilire [s] Timpul minim de restabilire [s] @@ -1055,8 +1045,6 @@ Trimite SMS: %1$s Trimite SMS către toate numerele Trimite SMS cu text - %2$+.2fU]]> - Restricție de bolus aplicată: %2$.2fU la %3$.2fU]]> !!!!! A fost detectată o absorbție lentă a carbohidraților: %2$d%% din timp. Reverificați calculele. COB poate fi supraestimat, astfel că este posibilă administrarea de mai multă insulină !!!!!]]> Livrați doar partea aceasta din rezultatul sugerat de wizard [%] Wizard bolus face un calcul, dar numai o parte din insulina calculată este și livrată. Este mai eficient când se folosește cu algoritmul SMB. @@ -1077,7 +1065,6 @@ Selectat: Unități Doriți să schimbați profilul și să renunțați la modificările făcute profilului curent? - %1$dg Pornit Oprit Șterge starea \"Terminat\" diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index 2926425650..f44a07ebd3 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -156,7 +156,7 @@ ВремБазал расширенный болюс версия Nightscout: - Отсутствует %1$dg + Не хватает %1$d г настройки экспортированы экспортировать настройки в импортировать настройки из @@ -236,7 +236,7 @@ Минимум минут, должных пройти между одним болюсом и следующим В целях безопасности, для изменения этого параметра необходимо добавить не менее 2 телефонных номеров. Болюс %1$.2fед. подан успешно - Начинается подача болюса %1$.2fед. + Будет подано %1$.2fU ед. инс Болюс %1$.2fед. подан успешно Болюс на еду %1$.2f ед. подан успешно Цель %1$s на %2$d минут @@ -262,9 +262,9 @@ Связь с помпой возобновлена удаленная команда не разрешена Удаленный болюс недоступен, повторите попытку позже. - Чтобы подать базал %1$.2fед./ч в течение %2$d мин. ответьте кодом %3$s + Для начала подачи базала %1$.2f ед./ч на %2$d мин. ответьте кодом %3$s Для переключения профиля на %1$s %2$d%% ответьте кодом %3$s - Для начала подачи пролонгированного болюса %1$.2fед. за %2$d мин. ответьте кодом %3$s + Для начала подачи пролонгированного болюса %1$.2fед. на %2$d мин. ответьте кодом %3$s Чтобы ввести %1$d г в %2$s ответьте кодом %3$s Для начала подачи базала %1$d%% на %2$d мин. ответьте кодом %3$s для приостановки цикла на %1$d мин ответьте кодом %2$s @@ -856,7 +856,7 @@ Context | Edit Context Коды на этом устройстве и на вашей помпе совпадают? Сопряжение с Insight Accu-Chek Insight - Подано %1$.2fед./ %2$.2fед + Подано %1$.2fед / %2$.2fед %1$s: %2$s Трубка заменена Время на помпе обновлено @@ -914,7 +914,7 @@ Context | Edit Context Пролонгированный: %1$.2f / %2$.2f U за %3$d мин Пролонгированный: %1$.2f / %2$.2f U за %3$d мин Суммарный инсулин TDD: %1$.2f - Резервуар: %1$.2fед + Резерв.: %1$.2f ед Батарея: %1$d%% Макс продолжительность восстановления [s] Мин. продолжительность восстановления [s] @@ -1057,8 +1057,8 @@ Context | Edit Context Отправить SMS: %1$s Отправить SMS на все номера Отправить SMS с текстом - %2$+.2fед]]> - Применено ограничение на болюс: %2$.2fед до %3$.2fед]]> + угл COB к инс IOB + Применено ограничение болюса: %1$.2f ед до %2$.2f ед !!!!! Обнаружено медленное всасывание углеводов: %2$d%% времени. Еще раз проверьте свои расчеты. Возможно акт углеводы COB вне диапазона и может быть подано больше инсулина!!!!!]]> Подать эту часть рекомендации мастера болюса [%] Мастер болюса выполняет расчет, но подана только эта часть рекомендуемого инсулина. Полезно с алгоритмом SMB. @@ -1079,7 +1079,6 @@ Context | Edit Context Выбрано: Единицы Хотите переключить профиль и сбросить изменения, внесенные в текущий профиль? - %1$d гр Вкл. Выкл. Очистить завершенные diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index 170a8051b7..0206be8061 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -156,7 +156,6 @@ Dočasný bazál Predĺžený bolus Verzia Nightscoutu: - Chýba %1$dg Nastavenie exportované Exportovať nastavenia do Importovať nastavenia z @@ -235,10 +234,6 @@ Minimálny počet minút, ktorý musí uplynúť medzi jedným vzdialeným bolusom a tým nasledujúcim Aspoň koľko minút musí uplynúť, medzi jedným vzdialeným bolusom a tým nasledujúcim Pre vašu bezpečnosť, musíte pridať aspoň 2 telefónne čísla, aby ste zmenili toto prednastavenie. - Bolus %1$.2fJI podaný úspešne - Podávanie %1$.2fJ inzulínu - Bolus %1$.2fJI podaný úspešne - Bolus %1$.2fJI podaný úspešne Cieľ %1$s na %2$d minút Cieľ %1$s na %2$d minút bol úspešne nastavený Dočasný cieľ úspešne zrušený @@ -262,9 +257,7 @@ Pumpa bola znovu pripojená Príkazy na diaľku nie sú povolené Diaľkovo ovládaný bolus nie je momentálne povolený. Skúste to neskôr. - Pre spustenie bazálu %1$.2fJI/h na %2$d min odpovedzte SMS s kódom %3$s Pre prepnutie profilu na %1$s %2$d%% odpovedzte SMS s kódom %3$s - Pre spustenie predĺženého bolusu %1$.2fJI na %2$d min odpovedzte SMS s kódom %3$s Pre zadanie %1$dg na %2$s odpovedz SMS kódom %3$s Pre spustenie bazálu %1$d%% na %2$d min odpovedzte SMS s kódom %3$s Pre pozastavenie uzavretého okruhu na %1$d minút odpovedaj SMS s kódom %2$s @@ -273,7 +266,6 @@ Pre zakázanie uzavretého okruhu, odpovedzte SMS s kódom %1$s Dočasný bazál %1$.2fJI/h spustený na %2$d minút Predĺžený bolus %1$.2fJI na %2$d min úspešne spustený - Sacharidy %1$dg zadané úspešne Zadanie %1$dg sacharidov sa nepodarilo Dočasný bazál %1$d%% na %2$d minút úspešne spustený Spustenie dočasného bazálu zlyhalo @@ -854,7 +846,6 @@ Zhodujú sa kódy zobrazené na tomto zariadení a na pumpe? Párovanie Insight Accu-Chek Insight - %1$.2fJI / %2$.2fJI podaných %1$s: %2$s Hadička vymenená Čas v pumpe bol aktualizovaný @@ -912,7 +903,6 @@ Predl. bolus: %1$.2f / %2$.2f JI na %3$d min Duálny bolus: %1$.2f / %2$.2f JI na %3$d min CDD: %1$.2f - Zásobník: %1$.2fJI Bat.: %1$d%% Max. doba trvania obnovenia [s] Min. doba trvania obnovenia [s] @@ -1055,8 +1045,6 @@ Poslať SMS: %1$s Poslať SMS na všetky čísla Odoslať SMS s textom - %2$+.2fU]]> - Aplikované obmedzenie bolusu: %2$.2fJI na %3$.2fJI]]> !!!!! Detekovaná pomalá absorbcia sacharidov: %2$d%% času. Prekontrolujte kalkuláciu. COB môže byť úplne iné, môže byť podaného viac inzulínu!!!!!]]> Podaj túto časť z výsledku kalkulácie [%] Bolusová kalkulačka urobí výpočet, ale iba táto časť vypočítaného inzulínu je podaná. Pomáha pri SMB algoritme. @@ -1077,7 +1065,6 @@ Vybrané: Jednotky Chcete prepnúť profil a zahodiť zmeny vykonané v aktuálnom profile? - %1$dg ZAP VYP Vymazanie dokončené diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index d1203af347..e17e7d055c 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -157,7 +157,6 @@ Eversense-appen. Temp basal Förlängd bolus Nightscoutversion: - Saknar %1$dg Inställningar exporterade Exportera inställningar till Importera inställningar från @@ -236,10 +235,6 @@ Eversense-appen. Minsta antal minuter som måste förflyta mellan en fjärrbolus och nästa Minsta antal minuter mellan fjärrbolus För att redigera den här inställningen måste du, för din säkerhet, lägga till minst 2 telefonnummer. - Bolus %1$.2f enheter levererat - Kommer att leverera %1$.2f enheter - Bolus %1$.2f enheter levererat - Bolus på %1$.2f enheter levererat Temporärt mål på %1$s är satt i %2$d minuter Temporärt mål på %1$s är satt i %2$d minuter Temporärt mål avbrutet @@ -263,9 +258,7 @@ Eversense-appen. Pump återansluten Otillåtet fjärrkommando Fjärrbolus inte tillgängligt. Försök igen senare. - För att starta temp basal %1$.2f enheter/tim i %2$d min, svara med kod %3$s För att byta till profil %1$s %2$d%% svara med kod %3$s - För att starta förlängd bolus med %1$.2f enheter över %2$d min, svara med kod %3$s Om du vill ange %1$dg kl. %2$s, svara med kod %3$s För att starta temp basal %1$d%% i %2$d min, svara med kod %3$s För att pausa loop i %1$d minuter, svara med kod %2$s @@ -274,7 +267,6 @@ Eversense-appen. För att inaktivera loopen, svara med kod %1$s Temp basal %1$.2f enheter/tim i %2$d min startad Förlängd bolus %1$.2f enheter över %2$d min har startats - %1$dg kolhydrater registrerat Misslyckades med att registrera %1$dg kolhydrater Temp basal %1$d%% enheter/tim i %2$d min startad Fel vid start av temp basal @@ -855,7 +847,6 @@ Eversense-appen. Stämmer koderna överens mellan denna enhet och din pump? Parkoppling av Insight Accu-Chek Insight - %1$.2fU / %2$.2fU levererat %1$s: %2$s Slang bytt Tiden uppdaterad i pumpen @@ -913,7 +904,6 @@ Eversense-appen. Förl: %1$.2f / %2$.2f U i %3$d min Kombi: %1$.2f / %2$.2f U i %3$d min TDD: %1$.2f - Reser.: %1$.2fU Batt.: %1$d%% Max paus mellan återanslutningsförsök [s] Min paus mellan återanslutningsförsök [s] @@ -1056,8 +1046,6 @@ Eversense-appen. Skicka SMS: %1$s Skicka SMS till alla nummer Skicka SMS med text - %2$+.2fU]]> - Bolusbegränsning: %2$.2fU till %3$.2fU]]> Varning! Långsam KH-absorption upptäckt %2$d%% av tiden. Dubbelkolla din beräkning. COB kan vara väldigt missvisande och du riskerar få för mycket insulin!]]> Direkt bolus [%] Bolusguiden utför beräkningar, men endast denna del av beräknat insulin levereras. Användbar med SMB-algoritm. @@ -1078,7 +1066,6 @@ Eversense-appen. Valt: Enheter Vill du byta profil och ta bort ändringar som gjorts i den aktuella profilen? - %1$dg På Av Rensa avslutade diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3c9c231856..41c36951a1 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -169,9 +169,6 @@ 要输注大剂量胰岛素%1$.2fU 回复如下代码 %2$s 要发送校准值 %1$.2f 回复如下代码 %2$s 大剂量输注失败 - 已经成功输注大剂量%1$.2fU - 将要输注 %1$.2fU - 已经成功输注大剂量%1$.2fU 通过SMS短信允许远程命令 DanaR 配置文件设置 DIA [h] @@ -187,9 +184,7 @@ 值 %1$s 超过了硬限制 远程命令没有被允许 远程大剂量不可用。请稍后再试。 - 要开始基础率 %1$.2fU/h 持续时间%2$d 分钟，请回复如下代码 %3$s 要切换配置文件到 %1$s %2$d%% 请回复代码 %3$s - 要开始扩展大剂量 %1$.2fU/h 持续时间%2$d 分钟，请回复如下代码 %3$s 要开始基础率 %1$d%% 持续时间%2$d 分钟，请回复如下代码 %3$s 要暂停闭环 %1$d 分钟请回复如下代码 %2$s 临时基础率 %1$.2fU/h 持续 %2$d 分钟启用成功了 @@ -713,7 +708,6 @@ 此设备和您的泵上显示的代码是否匹配？ Insight 正在配对 Accu-Chek Insight - 已输注%1$.2fU / %2$.2fU %1$s: %2$s 管路已经更换 泵时间已经更新 @@ -767,7 +761,6 @@ 扩展: %1$.2f / %2$.2f U 为 %3$d 分钟 多波: %1$.2f / %2$.2f U 持续时间 %3$d 分钟 TDD(日输注总量): %1$.2f - Reser.: %1$.2fU 电池: %1$d%% 最大恢复时间 [s] 最小恢复持续时间 [s] diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml index d2fc002a47..ab0a97b28a 100644 --- a/core/src/main/res/values-bg-rBG/strings.xml +++ b/core/src/main/res/values-bg-rBG/strings.xml @@ -18,12 +18,14 @@ Не е сврзана Разкачане Стартиран AndroidAPS + %1$.1fЕ %1$.2fЕ + %1$+.2fЕ + %1$d гр %1$.0f / %2$d Е %1$.2f Е/ч %1$.2f ч %1$d мин - %1$dm Помпата е заета Грешка при връзка с помпата Достигнахте лимита @@ -120,7 +122,7 @@ Грешен профил: %1$s - %1$dмин + %1$d мин %1$s: ∑: %2$.2fЕ Бол: %3$.2fЕ Баз: %4$.2fЕ(%5$.0f%%)]]> %1$s: ∑: %2$.2fЕ Бол: %3$.2fЕ Баз: %4$.2fЕ(%5$.0f%%) Въгл: %6$.0fгр]]> diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml index 1ca72eba96..d8a92915a8 100644 --- a/core/src/main/res/values-cs-rCZ/strings.xml +++ b/core/src/main/res/values-cs-rCZ/strings.xml @@ -8,22 +8,24 @@ Bazální profil aktualizován Chybná vstupní data Chyba nastavování dočasného bazálu - Podávání %1$.2fU inzulínu + Podávání %1$.2f U inzulínu Čekání na pumpu Připojování %1$d sec - Aplikováno %1$.2fU + Aplikováno %1$.2f U Navazování spojení Připojuji Připojeno Odpojeno Odpojuji AndroidAPS restartován - %1$.2fU + %1$.1f U + %1$.2f U + %1$+.2f U + %1$d g %1$.0f / %2$d U - %1$.2fU/h + %1$.2f U/h %1$.2f h %1$d min - %1$d m Pumpa je zaneprázdněna Chyba připojování pumpy Dosaženo limitu @@ -82,8 +84,8 @@ Zjišťování polohy není povoleno Pro vyhledání Bluetooth zařízení na novějších telefonech musí být povoleno zjišťování polohy. AAPS vás nesleduje a po provedení párování můžete tuto volbu opět zakázat. - před %1$dm - před %1$.1fh + před %1$d min + před %1$.1f h h dnů hodin @@ -120,10 +122,10 @@ Chybný profil: %1$s - %1$d minut + %1$d min - %1$s: ∑: %2$.2fU Bol: %3$.2fU Baz: %4$.2fU(%5$.0f%%)]]> - %1$s: ∑: %2$.2fU Bol: %3$.2fU Baz: %4$.2fU(%5$.0f%%) Sach.: %6$.0fg]]> + %1$s: ∑: %2$.2f U Bol: %3$.2f U Baz: %4$.2f U(%5$.0f%%)]]> + %1$s: ∑: %2$.2f U Bol: %3$.2f U Baz: %4$.2f U(%5$.0f%%) Sach.: %6$.0f g]]> Kontrola glykémie Oznámení diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml index b26b0f6032..385e053603 100644 --- a/core/src/main/res/values-de-rDE/strings.xml +++ b/core/src/main/res/values-de-rDE/strings.xml @@ -8,7 +8,7 @@ Basal-Profil in der Pumpe aktualisiert Ungültige Eingabedaten TBR Abgabe-Fehler - Werde %1$.2fIE abgeben + Werde %1$.2f IE abgeben Warte auf Pumpe Verbindungsaufbau seit %1$d s Gebe %1$.2fIE ab @@ -18,12 +18,14 @@ Getrennt Verbindung wird getrennt AndroidAPS gestartet + %1$.1f IE %1$.2f IE + %1$+.2f IE + %1$d g %1$.0f / %2$d IE %1$.2f IE/h %1$.2f h %1$d min. - %1$dm Pumpe ist beschäftigt Pumpen-Verbindungsfehler Limit erreicht @@ -120,10 +122,10 @@ Ungültiges Profil: %1$s - %1$d Min. + %1$d min. - %1$s: ∑: %2$.2fU Bol: %3$.2fU Bas: %4$.2fIE(%5$.0f%%)]]> - %1$s: ∑: %2$.2fU Bol: %3$.2fU Bas: %4$.2fIE(%5$.0f%%) KH: %6$.0fg]]> + %1$s: ∑: %2$.2f IE Bol: %3$.2f U Bas: %4$.2f IE(%5$.0f%%)]]> + %1$s: ∑: %2$.2f IE Bol: %3$.2f U Bas: %4$.2f IE(%5$.0f%%) KH: %6$.0f g]]> BZ-Test Ankündigung @@ -163,7 +165,7 @@ Auf Pumpenergebnis warten SMB - %dg Kohlenhydrate sollten innerhalb von %d Minuten aufgenommen werden + %d g zusätzliche Kohlenhydrate innerhalb von %d Minuten erforderlich Statistik Kumulative TDD diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml index 321d35aee2..7969bb22d4 100644 --- a/core/src/main/res/values-es-rES/strings.xml +++ b/core/src/main/res/values-es-rES/strings.xml @@ -8,22 +8,17 @@ Perfil basal actualizado en bomba Datos inválidos Basal Temporal no emitida - Se van a infundir %1$.2fU Esperando bomba Conexión por %1$d s - Infundiendo %1$.2fU Estableciendo comunicacion Conectando Conectado Desconectado Desconectando AndroidAPS iniciado - %1$.2fU %1$.0f/%2$dU - %1$.2fU/h %1$.2f h %1$d min - %1$dm Bomba ocupada Error de conexión de la bomba Límite permitido alcanzado @@ -82,8 +77,6 @@ Ubicación no habilitada Para activar la visibilidad Bluetooth en nuevos dispositivos, la ubicación debe estar habilitada. AAPS no hace un seguimiento de su ubicación y se puede desactivar después de realizar la vinculación. - Hace %1$dm - Hace %1$.1fh h días horas @@ -120,7 +113,6 @@ Perfil inválido: %1$s - %1$dmin Medir glucosa @@ -161,7 +153,6 @@ Esperando resultado SMB - %dg Carbohidratos adicionales son necesarios dentro de %d minutos Estadísticas TDD acumulativa diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml index b9f44d9d35..61f1015ab1 100644 --- a/core/src/main/res/values-fr-rFR/strings.xml +++ b/core/src/main/res/values-fr-rFR/strings.xml @@ -8,22 +8,17 @@ Profil Basal mise à jour dans la pompe Données saisies invalides Erreur injection basal temporaire - %1$.2fU vont être injectées Attente connection pompe Connexion à %1$d en cours - Injection en cours %1$.2fU Connexion Connection en cours Connectée Déconnectée Déconnexion en cours AndroidAPS est lancé - %1$.2fU %1$.0f / %2$d U - %1$.2fU/h %1$.2f h %1$d min - %1$dm Pompe occupée Erreur connection pompe Vous avez atteint la limite maximale @@ -82,8 +77,6 @@ Localisation désactivée La localisation doit être activée sur les nouveaux appareils pour que la recherche Bluetooth fonctionne. AAPS n\'enregistre pas votre localisation et la localisation peut être désactivée après l\'appairage. - il y a %1$dm - il y a %1$.1fh h jours heures @@ -120,10 +113,7 @@ Profil incorrect : %1$s - %1$dmin - %1$s: ∑: %2$.2fU Bol: %3$.2fU Bas: %4$.2fU(%5$.0f%%)]]> - %1$s: ∑: %2$.2fU Bol: %3$.2fU Bas: %4$.2fU(%5$.0f%%) Gluc.: %6$.0fg]]> Contrôle Glycémie Notification @@ -163,7 +153,6 @@ Attente de résultat SMB - %dg de glucides supplémentaires requis d\'ici %d minutes Stats DTI cumulé diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml index cfa8421b84..84791f1ea3 100644 --- a/core/src/main/res/values-it-rIT/strings.xml +++ b/core/src/main/res/values-it-rIT/strings.xml @@ -8,22 +8,24 @@ Profilo basale aggiornato nel micro Dati di input non validi Errore erogazione basale temporanea - Sto per erogare %1$.2fU + Sto per erogare %1$.2f U In attesa del micro In connessione per %1$d s - Erogazione di %1$.2fU + Erogazione di %1$.2f U Connessione Connessione Connesso Disconnesso Disconnessione AndroidAPS avviato - %1$.2fU + %1$.1f U + %1$.2f U + %1$+.2f U + %1$d g %1$.0f / %2$d U - %1$.2fU/h + %1$.2f U/h %1$.2f h %1$d min - %1$dm Il micro è occupato Errore connessione micro Hai raggiunto il limite consentito @@ -82,8 +84,8 @@ La localizzazione non è abilitata Affinché la ricerca bluetooth funzioni sui dispositivi più recenti, la localizzazione deve essere abilitata, ma può essere disabilitata dopo l\'associazione. AAPS non tiene traccia della tua posizione. - %1$dm fa - %1$.1fh fa + %1$d m fa + %1$.1f h fa h giorni ore @@ -120,10 +122,10 @@ Profilo non valido: %1$s - %1$dmin + %1$d min - %1$s: ∑: %2$.2fU Boli: %3$.2fU Bas: %4$.2fU(%5$.0f%%)]]> - %1$s: ∑: %2$.2fU Boli: %3$.2fU Bas: %4$.2fU(%5$.0f%%) CHO: %6$.0fg]]> + %1$s: ∑: %2$.2f U Bol: %3$.2f U Bas: %4$.2f U(%5$.0f%%)]]> + %1$s: ∑: %2$.2f U Bol: %3$.2f U Bas: %4$.2f U(%5$.0f%%) CHO: %6$.0f g]]> Controllo BG Avviso @@ -163,7 +165,7 @@ In attesa del risultato SMB - %dg di CHO aggiuntivi richiesti entro %d minuti + %d g di CHO aggiuntivi richiesti entro %d minuti Statistiche TDD cumulativo diff --git a/core/src/main/res/values-lt-rLT/strings.xml b/core/src/main/res/values-lt-rLT/strings.xml index 00cd2ef279..74e46e0868 100644 --- a/core/src/main/res/values-lt-rLT/strings.xml +++ b/core/src/main/res/values-lt-rLT/strings.xml @@ -8,22 +8,17 @@ Bazės profilis pompoje atnaujintas Neteisingai įvesti duomenys Laikinos bazės suleidimo klaida - Bus suleista %1$.2fvv Laukiama ryšio su pompa Jungiamasi %1$d s - Leidžiama %1$.2fvv Ryšio užmezgimas Jungiamasi Prisijungta Atsijungta Atsijungiama AndroidAPS paleista - %1$.2fvv %1$.0f / %2$d vv - %1$.2fvv/val %1$.2f val. %1$d min. - %1$dm Pompa šiuo metu veikia Pompos prisijungimo klaida Pasiekėte leistiną ribą @@ -82,8 +77,6 @@ Vietovės nustatymas neįjungtas Vietos nustatymo paslauga turi būti įjungta, kad Bluetooth aptikimas veiktų naujesniuose įrenginiuose. AAPS neseka Jūsų lokacijos, o vietos nustatymo paslauga gali būti išjungta po sėkmingo įrenginių suporavimo. - prieš %1$d min - Prieš %1$.1f val. val d. val. @@ -120,10 +113,7 @@ Netinkamas profilis: %1$s - %1$dmin - %1$s: ∑: %2$.2fU Boluso: %3$.2fU Bazės: %4$.2fU(%5$.0f%%)]]> - %1$s: ∑: %2$.2fU Boluso: %3$.2fU Bazės: %4$.2fU(%5$.0f%%) AV: %6$.0fg]]> KG testas Pranešimas @@ -163,7 +153,6 @@ Laukiama rezultato SMB - Būtini %dg papildomų AV per %d min Statistika BPD viso @@ -180,10 +169,31 @@ PB * 2 Laiko nustatymas + %1$dh %2$dm + Pompa ir/ar jos valdiklis nepalaiko operacijos. Pompa dar nepalaiko operacijos. + Gerai + Niekada nebuvo sujungta + Pažadinimas + Ryšio klaida + Ryšiui skirtas laikas baigėsi + Pompa nepasiekiama + Neteisinga konfigūracija + Aktyvi + Užmigusi + Bazė + Nustatymai + Pranešimai + Statistika + Nežinoma + Visi + Bolusai + Užpildyti sistemą + Aliarmai + Gliukozė diff --git a/core/src/main/res/values-nl-rNL/strings.xml b/core/src/main/res/values-nl-rNL/strings.xml index bdd382799c..ea1668a7af 100644 --- a/core/src/main/res/values-nl-rNL/strings.xml +++ b/core/src/main/res/values-nl-rNL/strings.xml @@ -8,22 +8,17 @@ Basaal profiel in pomp bijgewerkt Ongeldige invoer Storing toedienen tijdelijk basaal - Er worden %1$.2fE toegediend Wacht op pomp Verbinding maken gedurende %1$d s - Toedienen van %1$.2fE Handshaking Verbining maken Verbonden Verbinding verbroken Verbinding aan het verbreken AndroidAPS gestart - %1$.2fE %1$.0f / %2$d E - %1$.2f E/uur %1$.2f u %1$d minuten - %1$dm Pomp is bezig Pomp verbindingsstoring Limiet bereikt @@ -82,8 +77,6 @@ Locatie is niet ingeschakeld Om Bluetooth discovery met nieuwere apparaten te laten werken moet locatie worden ingeschakeld. AAPS volgt je locatie niet en locatie kan ook weer worden uitgeschakeld nadat het koppelen is gelukt. - %1$dm geleden - %1$.1fu geleden u dagen uren @@ -120,7 +113,6 @@ Ongeldig profiel: %1$s - %1$dmin BG Controle @@ -161,7 +153,6 @@ Wachtend op resultaat SMB - %dg Extra Koolhydraten Nodig Binnen %d Minuten Statistieken Cumulatieve TDD diff --git a/core/src/main/res/values-pl-rPL/strings.xml b/core/src/main/res/values-pl-rPL/strings.xml index 4e387f137c..5d81b084e2 100644 --- a/core/src/main/res/values-pl-rPL/strings.xml +++ b/core/src/main/res/values-pl-rPL/strings.xml @@ -8,22 +8,17 @@ Profil bazowy w pompie uaktualniony Błędne dane wejściowe Błąd podania bazy tymczasowej - Zamierzam podać %1$.2fU Czekam na pompę Łączenie przez %1$d s - Dostarczam %1$.2fU Uściskdłoni Łączę Połączono Rozłączono Rozłączanie AndroidAPS uruchomiony - %1$.2fU %1$.0f / %2$d U - %1$.2fJ/g %1$.2f h %1$d min. - %1$dm Pompa jest zajęta Błąd połączenia z pompą Osiągnąłeś dozwolony limit @@ -82,8 +77,6 @@ Lokalizacja nie jest włączona Aby uruchomić odnajdywanie Bluetooth na nowszych urządzeniach, lokalizacja musi być uruchomiona. AAPS nie śledzi twojej lokalizacji więc po udanym parowaniu urządzenia Bluetooth można wyłączyć lokalizację. - %1$dmin temu - %1$.1fh temu h dni godzin @@ -120,7 +113,6 @@ Nieprawidłowy profil: %1$s - %1$dmin Sprawdź BG @@ -161,7 +153,6 @@ Oczekiwanie na wynik SMB - Zalecane podanie %dg węglowodanów w przeciągu %d minut Statystyki Kumulatywna TDD (dawka dzienna) diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml index 3d9a8ff084..19f6ad354a 100644 --- a/core/src/main/res/values-pt-rBR/strings.xml +++ b/core/src/main/res/values-pt-rBR/strings.xml @@ -8,17 +8,14 @@ Perfil Basal atualizado na bomba Dados de entrada inválidos Erro na entrega da basal temporária - Vão ser administradas %1$.2fU Aguardando a bomba Conectando para %1$d - Administrando %1$.2fU Cumprimento Conectando Conectado Desconectado A desligar AndroidAPS iniciado - %1$.2fU %1$.0f / %2$d U %1$.2f h A bomba está ocupada @@ -79,7 +76,6 @@ Localização Não Está Activada Para que a procura de Bluetooth funcione em aparelhos mais recentes, a localização tem que ser activada. A app não rastreia a sua localização e pode ser desativada depois de um emparelhamento bem sucedido. - %1$.1fh atrás h dias horas diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml index 009755726b..cd723f43ae 100644 --- a/core/src/main/res/values-pt-rPT/strings.xml +++ b/core/src/main/res/values-pt-rPT/strings.xml @@ -8,22 +8,17 @@ Perfil Basal actualizado na bomba Entrada Inválida Erro na administração da Basal Temp - A ser administrado %1$.2fU À espera da bomba A ligar durante %1$d s - A administrar %1$.2fU Cumprimento A ligar Ligado Desligado A desligar AndroidAPS iniciado - %1$.2fU %1$.0f / %2$d U - %1$.2fU/h %1$.2f h %1$d mins - %1$dm A bomba está ocupada Erro de ligação da bomba Atingiu o limite autorizado @@ -82,8 +77,6 @@ Localização Não Está Activa Para a Pesquisa Bluetooth funcionar em dispositivos mais recentes, a localização deve ser activada. AAPS não acompanha a sua localização e pode ser desactivada após o emparelhamento bem-sucedido. - %1$dm atrás - %1$.1fh atrás h dias horas @@ -120,10 +113,7 @@ Perfil inválido: %1$s - %1$dmin - %1$s: ∑: %2$.2fU Bol: %3$.2fU Bas: %4$.2fU(%5$.0f%%)]]> - %1$s: ∑: %2$.2fU Bol: %3$.2fU Bas: %4$.2fU(%5$.0f%%) Hidratos: %6$.0fg]]> Verificar Glic Anúncio @@ -163,7 +153,6 @@ À espera de resultado SMB - %dg Hidratos Adicionais Necessários Dentro de %d Minutos Estatísticas Dose diária acumulativa diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/src/main/res/values-ro-rRO/strings.xml index 883b79b98f..97227a6235 100644 --- a/core/src/main/res/values-ro-rRO/strings.xml +++ b/core/src/main/res/values-ro-rRO/strings.xml @@ -8,22 +8,17 @@ Profilul bazalei a fost modificat în pompă Date de intrare incorecte Eroare la livrare bazală temporară - Se vor livra %1$.2fU Se așteaptă pompa Conectat de %1$d s - Se livrează %1$.2fU Împerechere Se conectează Conectat Deconectat Se deconectează AndroidAPS a pornit - %1$.2fU %1$.0f / %2$d U - %1$.2fU/h %1$.2f h %1$d min - %1$dm Pompa face altă acțiune Eroare de conexiune cu pompa Ați atins limita permisă @@ -82,8 +77,6 @@ Localizarea este dezactivată Pentru a putea căuta dispozitive Bluetooth noi, trebuie să activați localizarea. AAPS nu folosește datele dumneavoastră de localizare și acestea pot fi dezactivate după stabilirea conexiunii cu pompa. - acum %1$dmin - %1$.1f h în urmă h zile ore @@ -121,10 +114,7 @@ Profil invalid: %1$s - %1$dmin - %1$s: ∑: %2$.2fU Bolus: %3$.2fU Bazal: %4$.2fU(%5$.0f%%)]]> - %1$s: ∑: %2$.2fU Bolus: %3$.2fU Bazal: %4$.2fU(%5$.0f%%) CH: %6$.0fg]]> Verificare glicemie Anunț @@ -164,7 +154,6 @@ Se așteaptă rezultatul SMB - %dg carbohidrați suplimentari necesari în %d minute Statistici TDD cumulat diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/src/main/res/values-ru-rRU/strings.xml index 317fe218d4..54791a31c7 100644 --- a/core/src/main/res/values-ru-rRU/strings.xml +++ b/core/src/main/res/values-ru-rRU/strings.xml @@ -8,22 +8,24 @@ базальный профиль помпы обновлен введенные данные неверны Ошибка подачи врем базала - Начинается подача болюса %1$.2fед. + Будет подано %1$.2f ед инс ожидание помпы Связь установлена за %1$d сек - Подается болюс %1$.2fед. + Подается болюс %1$.2fед Подтверждение связи соединение устанавливается соединение установлено Разъединено разъединение AndroidAPS запущен + %1$.1f ед %1$.2f ед + %1$+.2f ед + %1$d гр %1$.0f/%2$d ед - %1$.2f ед/час + %1$.2f ед/ч %1$.2f ч %1$d мин - %1$dм помпа занята ошибка соединения разрешенный предел достигнут @@ -120,10 +122,10 @@ Недопустимый профиль: %1$s - %1$d мин + %1$d мин. - %1$s: ∑: %2$.2fедБол:%3$.2fед Баз: %4$.2fед(%5$.0f%%)]]> - %1$s∑: %2$.2fU Бол: %3$.2fед Баз: %4$.2fед(%5$.0f%%) ГУ: %6$.0fг]]> + %1$s: ∑: %2$.2fед Бол:%3$.2fед Баз: %4$.2fед(%5$.0f%%)]]> + %1$s∑: %2$.2fед Бол: %3$.2fед Баз: %4$.2fед(%5$.0f%%) Угл: %6$.0fг]]> Проверка ГК Оовещение @@ -163,7 +165,7 @@ Ожидание результата Супер микро болюс SMB - Необходимы дополнительные углеводы \"%d г в течение %d минут\" + Необходимо дополнительно %d г углеводов в течение %d минут Статистика накопительные TDD diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml index f510501ac7..d88e689ffd 100644 --- a/core/src/main/res/values-sk-rSK/strings.xml +++ b/core/src/main/res/values-sk-rSK/strings.xml @@ -8,22 +8,17 @@ Bazálny profil v pumpe aktualizovaný Chybné vstupné dáta Chyba podávania dočasného bazálu - Podávanie %1$.2fJ inzulínu Čakám na pumpu Pripájanie %1$d sek - Podávanie %1$.2fJI Overovanie Pripájanie Pripojené Odpojené Odpájanie AndroidAPS spustený - %1$.2fJI %1$.0f / %2$d JI - %1$.2fJI/h %1$.2f h %1$d min - %1$dm Pumpa je zaneprázdnená Chyba pripájania pumpy Dosiahnutý limit @@ -82,8 +77,6 @@ Poloha nie je aktivovaná Pre vyhľadanie Bluetooth zariadení na novších telefónoch musí byť povolené zisťovanie polohy. AAPS vás nesleduje a po úspešnom spárovaní môžete túto voľbu opäť zakázať. - pred %1$d min - pred %1$.1fh h dní hodín @@ -120,10 +113,7 @@ Chybný profil: %1$s - %1$dmin - %1$s: ∑: %2$.2fJI Bol: %3$.2fJI Baz: %4$.2fJI(%5$.0f%%)]]> - %1$s: ∑: %2$.2fJI Bol: %3$.2fJI Baz: %4$.2fJI(%5$.0f%%) Sach.: %6$.0fg]]> Kontrola glykémie Oznámenie @@ -163,7 +153,6 @@ Čakanie na výsledok SMB - %dg dodatočných sacharidov vyžadovaných v priebehu %d minút Štatistiky Kumulatívny TDD diff --git a/core/src/main/res/values-sv-rSE/strings.xml b/core/src/main/res/values-sv-rSE/strings.xml index 933c64d88b..ae274cd2fd 100644 --- a/core/src/main/res/values-sv-rSE/strings.xml +++ b/core/src/main/res/values-sv-rSE/strings.xml @@ -8,22 +8,17 @@ Basalprofilen uppdaterad i pumpen Fel på inmatning Fel vid justering av temp basal - Kommer att leverera %1$.2f enheter Väntar på pump Ansluter (%1$d s) - Levererar %1$.2f enheter Anslutningen verifieras Ansluter Ansluten Frånkopplad Kopplar från AndroidAPS startad - %1$.2f U %1$.0f / %2$d U - %1$.2fU/h %1$.2f h %1$d min - %1$dm Pump upptagen Anslutningsfel Du har nått din tillåtna gräns @@ -82,8 +77,6 @@ Platsdata är inte aktiverat För att Bluetooth ska fungera med nyare enheter, måste platsdata vara aktiverat. AAPS sparar inte din plats och det kan stängas av efter att enheten har parkopplats. - %1$dm sedan - %1$.1f tim sedan h dagar timmar @@ -120,7 +113,6 @@ Ogiltig profil: %1$s - %1$d min BG-kontroll @@ -161,7 +153,6 @@ Väntar på resultat SMB - %dg kolhydrater krävs inom %d minuter Statistik Kumulativ TDD @@ -178,10 +169,31 @@ TDB * 2 Tidsdetektering + %1$dh %2$dm + Operation stöds inte av pumpen/pumpdrivrutinen. Operationen stöds inte av pumpen ännu. + OK + Aldrig ansluten + Väcker + Kommunikationsfel + Kommunikationstimeout + Pumpen kan inte nås + Felaktig konfiguration + Aktiv + Sover + Basaldoser + Konfigurationer + Notiser + Statistik + Okända + Alla + Bolusar + Förfyllningar + Larm + Glukos diff --git a/medtronic/src/main/res/values-lt-rLT/strings.xml b/medtronic/src/main/res/values-lt-rLT/strings.xml index e95440b5ec..50fd081c9a 100644 --- a/medtronic/src/main/res/values-lt-rLT/strings.xml +++ b/medtronic/src/main/res/values-lt-rLT/strings.xml @@ -25,6 +25,7 @@ NiMH (išplėstinis vaizdas) Boluso/Terapijos Derinimas + Klaidos Serijos Nr. nenustatytas. Serijos Nr. neteisingas. Nenustatytas pompos tipas. @@ -47,6 +48,7 @@ + Medtronic pompos istorija Atšaukėte bolusą, kuris jau buvo nustatytas pompoje. Medronic pompa nepalaiko šio atšaukimo, todėl turite jį atšaukti rankiniu būdu. Sustabdykite pompą ir vėl ją paleiskite (jei vis dar norite atšaukti bolusą). Aplikacija perims pokyčius su kitu atnaujinimu (per mažiau nei 5 minutes). Negalima sužinoti dabartinės laikinos bazės. @@ -68,9 +70,15 @@ Gauti laikiną bazę Nustatyti laikiną bazę Nustatyti bolusą + Pompa nepasiekiama + Perspėjimas + Dabar + prieš + Būtina atnaujinti pompos laikrodį + Įjungti Išjungta Pompos laikas pakeistas diff --git a/medtronic/src/main/res/values-sv-rSE/strings.xml b/medtronic/src/main/res/values-sv-rSE/strings.xml index c87bb96889..97c30af184 100644 --- a/medtronic/src/main/res/values-sv-rSE/strings.xml +++ b/medtronic/src/main/res/values-sv-rSE/strings.xml @@ -25,6 +25,7 @@ NiMH (utökad vy) Avlusning av Bolus/Behandlingar + Fel Serienummer ej angett. Serienummer felaktigt. Pumptyp ej vald. @@ -47,6 +48,7 @@ + Pumphistorik Du avbröt bolusen efter att kommandot skickats till pumpen. Detta stöds inte av Medtronicpumpar, så därför måste du avbryta på själva pumpen. Det kan man göra genom att pausa insulintillförseln tillfälligt och sedan starta den igen. Appen kommer att uppdatera bolusmängd vid nästa anslutning (inom 5 min). Kunde inte hämta nuvarande temp basal. @@ -68,8 +70,15 @@ Hämta temp basal Sätt temp basal Leverera bolus + Pumpen kan inte nås + Varning + Nu + sedan + Pumpens klocka behöver ställas om + På + Av Tiden uppdaterad i pumpen diff --git a/rileylink/src/main/res/values-lt-rLT/strings.xml b/rileylink/src/main/res/values-lt-rLT/strings.xml index 5732fe3862..4da7997172 100644 --- a/rileylink/src/main/res/values-lt-rLT/strings.xml +++ b/rileylink/src/main/res/values-lt-rLT/strings.xml @@ -6,9 +6,11 @@ Parinkta RileyLink skanavimas Įjungti + Ne Skanuojama Skanavimas baigtas Skanavimo klaida: %1$d + Niekada Parametrai Istorija @@ -35,18 +37,33 @@ RileyLink klaida RileyLink ir Pompos suderinimas Sujungimo su pompa problema + Prisijungta Įrenginys nėra RileyLink RileyLink nepasiekiama Bluetooth išjungtas Nėra Bluetooth adapterio TuneUp klaida + Pompa nepasiekiama Pod nepasiekiamas Pompa Medtronic Omnipod + Omnipod (433.91 MHz) US & Kanada (916 MHz) Pasaulinis (868 Mhz) + + %1$d d. + %1$d d. + %1$d d. + %1$d d. + + + %1$d val. + %1$d val. + %1$d val. + %1$d val. + diff --git a/rileylink/src/main/res/values-sv-rSE/strings.xml b/rileylink/src/main/res/values-sv-rSE/strings.xml index ef2aafebaa..91fb4c53c3 100644 --- a/rileylink/src/main/res/values-sv-rSE/strings.xml +++ b/rileylink/src/main/res/values-sv-rSE/strings.xml @@ -6,9 +6,11 @@ Vald Riley Link-sökning Aktivera + Nej Söker Sökning avslutad Fel vid sökning: %1$d + Aldrig Inställningar Historik @@ -35,18 +37,29 @@ Riley Link-fel Justerar Riley Link mot pump Problem att ansluta till pumpen + Ansluten Enheten är inte en Riley Link Riley Link kan inte nås Bluetooth avstängt Ingen bluetoothadapter Frekvensjustering misslyckades + Pumpen kan inte nås Podden kan inte nås Medtronicpump Omnipod + Omnipod (433.91 MHz) USA & Kanada (916 MHz) Resten av världen (868 MHz) + + %1$d dag + %1$d dagar + + + %1$d tim + %1$d tim + From c22119bb8591bb018225358abb9ff50f34c69a3a Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Thu, 20 Aug 2020 18:39:16 +0200 Subject: [PATCH 06/10] Store LastRun SMB data in their dedicated fields instead of overwriting TBR fields --- .../androidaps/plugins/aps/loop/LoopPlugin.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java index dcbb0bb9d3..ba01db465c 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java @@ -537,11 +537,11 @@ public class LoopPlugin extends PluginBase implements LoopInterface { applySMBRequest(resultAfterConstraints, new Callback() { @Override public void run() { - //Callback is only called if a bolus was acutally requested + // Callback is only called if a bolus was actually requested if (result.enacted || result.success) { - lastRun.setTbrSetByPump(result); - lastRun.setLastTBRRequest(lastRun.getLastAPSRun()); - lastRun.setLastTBREnact(DateUtil.now()); + lastRun.setSmbSetByPump(result); + lastRun.setLastSMBRequest(lastRun.getLastAPSRun()); + lastRun.setLastSMBEnact(DateUtil.now()); } else { new Thread(() -> { SystemClock.sleep(1000); From 7282f460fc7ddd915f28bc9fa29efda5d401b4bd Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Fri, 21 Aug 2020 10:29:23 +0200 Subject: [PATCH 07/10] better synchronize graph rendering --- .../general/overview/OverviewFragment.kt | 151 +++++++++--------- 1 file changed, 78 insertions(+), 73 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt index ecacb42b6d..614d7180c3 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt @@ -159,6 +159,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList private var carbAnimation: AnimationDrawable? = null + private val graphLock = Object() + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { @@ -478,43 +480,43 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList } - @Synchronized private fun prepareGraphs() { - val numOfGraphs = overviewMenus.setting.size + synchronized(graphLock) { + val numOfGraphs = overviewMenus.setting.size - if (numOfGraphs != secondaryGraphs.size - 1) { - //aapsLogger.debug("New secondary graph count ${numOfGraphs-1}") - // rebuild needed - secondaryGraphs.clear() - secondaryGraphsLabel.clear() - overview_iobgraph.removeAllViews() - for (i in 1 until numOfGraphs) { - val relativeLayout = RelativeLayout(context) - relativeLayout.layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) + if (numOfGraphs != secondaryGraphs.size - 1) { + //aapsLogger.debug("New secondary graph count ${numOfGraphs-1}") + // rebuild needed + secondaryGraphs.clear() + secondaryGraphsLabel.clear() + overview_iobgraph.removeAllViews() + for (i in 1 until numOfGraphs) { + val relativeLayout = RelativeLayout(context) + relativeLayout.layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) - val graph = GraphView(context) - graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resourceHelper.dpToPx(skinProvider.activeSkin().secondaryGraphHeight)).also { it.setMargins(0, resourceHelper.dpToPx(15), 0, resourceHelper.dpToPx(10)) } - graph.gridLabelRenderer?.gridColor = resourceHelper.gc(R.color.graphgrid) - graph.gridLabelRenderer?.reloadStyles() - graph.gridLabelRenderer?.isHorizontalLabelsVisible = false - graph.gridLabelRenderer?.labelVerticalWidth = axisWidth - graph.gridLabelRenderer?.numVerticalLabels = 3 - graph.viewport.backgroundColor = Color.argb(20, 255, 255, 255) // 8% of gray - relativeLayout.addView(graph) + val graph = GraphView(context) + graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resourceHelper.dpToPx(skinProvider.activeSkin().secondaryGraphHeight)).also { it.setMargins(0, resourceHelper.dpToPx(15), 0, resourceHelper.dpToPx(10)) } + graph.gridLabelRenderer?.gridColor = resourceHelper.gc(R.color.graphgrid) + graph.gridLabelRenderer?.reloadStyles() + graph.gridLabelRenderer?.isHorizontalLabelsVisible = false + graph.gridLabelRenderer?.labelVerticalWidth = axisWidth + graph.gridLabelRenderer?.numVerticalLabels = 3 + graph.viewport.backgroundColor = Color.argb(20, 255, 255, 255) // 8% of gray + relativeLayout.addView(graph) - val label = TextView(context) - val layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { it.setMargins(resourceHelper.dpToPx(30), resourceHelper.dpToPx(25), 0, 0) } - layoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP) - layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT) - label.layoutParams = layoutParams - relativeLayout.addView(label) - secondaryGraphsLabel.add(label) + val label = TextView(context) + val layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { it.setMargins(resourceHelper.dpToPx(30), resourceHelper.dpToPx(25), 0, 0) } + layoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP) + layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT) + label.layoutParams = layoutParams + relativeLayout.addView(label) + secondaryGraphsLabel.add(label) - overview_iobgraph.addView(relativeLayout) - secondaryGraphs.add(graph) + overview_iobgraph.addView(relativeLayout) + secondaryGraphs.add(graph) + } } } - } private fun scheduleUpdateGUI(from: String) { @@ -533,7 +535,6 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList scheduledUpdate = worker.schedule(task, 500, TimeUnit.MILLISECONDS) } - @Synchronized @SuppressLint("SetTextI18n") fun updateGUI(from: String) { aapsLogger.debug("UpdateGUI from $from") @@ -857,53 +858,57 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList graphData.addNowLine(now) // ------------------ 2nd graph - for (g in 0 until min(secondaryGraphs.size, overviewMenus.setting.size + 1)) { - val secondGraphData = GraphData(injector, secondaryGraphs[g], iobCobCalculatorPlugin, treatmentsPlugin) - var useABSForScale = false - var useIobForScale = false - var useCobForScale = false - var useDevForScale = false - var useRatioForScale = false - var useDSForScale = false - var useIAForScale = false - when { - overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal] -> useABSForScale = true - overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal] -> useIobForScale = true - overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal] -> useCobForScale = true - overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal] -> useDevForScale = true - overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal] -> useRatioForScale = true - overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal] -> useIAForScale = true - overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] -> useDSForScale = true + synchronized(graphLock) { + for (g in 0 until min(secondaryGraphs.size, overviewMenus.setting.size + 1)) { + val secondGraphData = GraphData(injector, secondaryGraphs[g], iobCobCalculatorPlugin, treatmentsPlugin) + var useABSForScale = false + var useIobForScale = false + var useCobForScale = false + var useDevForScale = false + var useRatioForScale = false + var useDSForScale = false + var useIAForScale = false + when { + overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal] -> useABSForScale = true + overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal] -> useIobForScale = true + overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal] -> useCobForScale = true + overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal] -> useDevForScale = true + overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal] -> useRatioForScale = true + overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal] -> useIAForScale = true + overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] -> useDSForScale = true + } + + if (overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal]) secondGraphData.addAbsIob(fromTime, now, useABSForScale, 1.0) + if (overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal]) secondGraphData.addIob(fromTime, now, useIobForScale, 1.0, overviewMenus.setting[g + 1][OverviewMenus.CharType.PRE.ordinal]) + if (overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal]) secondGraphData.addCob(fromTime, now, useCobForScale, if (useCobForScale) 1.0 else 0.5) + if (overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal]) secondGraphData.addDeviations(fromTime, now, useDevForScale, 1.0) + if (overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal]) secondGraphData.addRatio(fromTime, now, useRatioForScale, 1.0) + if (overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal]) secondGraphData.addActivity(fromTime, endTime, useIAForScale, 0.8) + if (overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(fromTime, now, useDSForScale, 1.0) + + // set manual x bounds to have nice steps + secondGraphData.formatAxis(fromTime, endTime) + secondGraphData.addNowLine(now) + secondaryGraphsData.add(secondGraphData) } - - if (overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal]) secondGraphData.addAbsIob(fromTime, now, useABSForScale, 1.0) - if (overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal]) secondGraphData.addIob(fromTime, now, useIobForScale, 1.0, overviewMenus.setting[g + 1][OverviewMenus.CharType.PRE.ordinal]) - if (overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal]) secondGraphData.addCob(fromTime, now, useCobForScale, if (useCobForScale) 1.0 else 0.5) - if (overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal]) secondGraphData.addDeviations(fromTime, now, useDevForScale, 1.0) - if (overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal]) secondGraphData.addRatio(fromTime, now, useRatioForScale, 1.0) - if (overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal]) secondGraphData.addActivity(fromTime, endTime, useIAForScale, 0.8) - if (overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(fromTime, now, useDSForScale, 1.0) - - // set manual x bounds to have nice steps - secondGraphData.formatAxis(fromTime, endTime) - secondGraphData.addNowLine(now) - secondaryGraphsData.add(secondGraphData) } } // finally enforce drawing of graphs in UI thread graphData.performUpdate() - for (g in 0 until min(secondaryGraphs.size, overviewMenus.setting.size + 1)) { - secondaryGraphsLabel[g].text = overviewMenus.enabledTypes(g + 1) - secondaryGraphs[g].visibility = ( - overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal] || - overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal] || - overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal] || - overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal] || - overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal] || - overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal] || - overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] - ).toVisibility() - secondaryGraphsData[g].performUpdate() + synchronized(graphLock) { + for (g in 0 until min(secondaryGraphs.size, overviewMenus.setting.size + 1)) { + secondaryGraphsLabel[g].text = overviewMenus.enabledTypes(g + 1) + secondaryGraphs[g].visibility = ( + overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal] || + overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal] || + overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal] || + overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal] || + overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal] || + overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal] || + overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] + ).toVisibility() + secondaryGraphsData[g].performUpdate() + } } } } From 353c9641dc717a6b0c7c0bcd86184b96752ded5f Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Fri, 21 Aug 2020 12:52:52 +0200 Subject: [PATCH 08/10] New Crowdin updates (#2905) * New translations strings.xml (Slovak) * New translations strings.xml (Slovak) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (French) --- app/src/main/res/values-fr-rFR/strings.xml | 12 ++++++++++++ app/src/main/res/values-sk-rSK/strings.xml | 12 ++++++++++++ core/src/main/res/values-fr-rFR/strings.xml | 13 +++++++++++++ core/src/main/res/values-sk-rSK/strings.xml | 13 +++++++++++++ 4 files changed, 50 insertions(+) diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 725d2b8d51..837a357cde 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -156,6 +156,7 @@ Basal Temporaire Bolus étendu Version Nightscout : + %1$d g manquants Préférences exportées Exporter les paramètres au Importer les paramètres depuis @@ -235,6 +236,10 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Nombre minimum de minutes qu\'il doit y avoir entre un bolus distant et le suivant Combien de minutes doit-il y avoir, au minimum, entre un bolus et le suivant Pour votre sécurité, pour modifier cette préférence vous devez ajouter au moins 2 numéros de téléphone. + Bolus de %1$.2f U délivré avec succès + %1$.2f U vont être injectées + Bolus de %1$.2f U délivré avec succès + Bolus repas de %1$.2f U délivré avec succès Cible %1$s pendant %2$d minutes Cible %1$s pendant %2$d minutes définie avec succès Cible Temp annulée avec succès @@ -258,7 +263,9 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Pompe reconnectée La commande à distance n\'est pas autorisée Bolus à distance non disponible. Réessayez plus tard. + Pour démarrer la basal de %1$.2f U/h pendant %2$d min, renvoyer le code %3$s Pour changer le profil vers %1$s %2$d%%, renvoyer le code %3$s + Pour démarrer le bolus étendu de %1$.2f U/h pendant %2$d min, renvoyer le code %3$s Pour entrer %1$dg à %2$s renvoyer le code %3$s Pour démarrer la Basal %1$d%% pendant %2$d min, renvoyer le code %3$s Envoyer le code %2$s pour suspendre la Boucle pour %1$d minutes @@ -267,6 +274,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Pour désactiver la boucle veuillez répondre avec le code %1$s Démarrage réussi pour %1$.2fU/h de basal temporaire pour %2$d min Le Bolus étendu %1$.2fU pendant %2$d min a commencé avec succès + %1$d g de glucides entrés avec succès L\'entrée de %1$dg de glucides a échoué Démarrage réussi pour %1$d%% de Basal temporaire pour %2$d min Le démarrage du basal temporaire a échoué @@ -847,6 +855,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Les codes affichés sur cet appareil et sur la pompe sont-ils identiques ? Appairage de Insight Accu-Chek Insight + %1$.2f U / %2$.2f U délivrés %1$s : %2$s Tubulure changée Mise à jour de l\'heure de la pompe @@ -904,6 +913,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Étendue : %1$.2f / %2$.2f U pour %3$d min Mixte : %1$.2f / %2$.2f U pour %3$d min DTI : %1$.2f + Réserv.: %1$.2f U Batt.: %1$d%% Durée max. de récupération [s] Durée min. de récupération [s] @@ -1046,6 +1056,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Envoyer SMS : %1$s Envoyer SMS à tous les numéros Envoyer SMS avec du texte + GA vs IA + Contrainte de Bolus appliquée : %1$.2f U vers %2$.2f U !!!!! Absorption lente des glucides détectée : %2$d%% du temps. Vérifiez de nouveau votre calcul. Les GA (Glucides Actifs) peuvent être surestimés et alors plus d\'insuline pourrait être délivré !!!!!]]> Injecter cette partie de Bolus calculée par l’assistant [%] L\'assistant Bolus effectue le calcul mais seulement cette partie de l\'insuline calculée est délivrée. Utile avec l\'algorithme SMB. diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index 0206be8061..68b8313891 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -156,6 +156,7 @@ Dočasný bazál Predĺžený bolus Verzia Nightscoutu: + Chýba %1$d g Nastavenie exportované Exportovať nastavenia do Importovať nastavenia z @@ -234,6 +235,10 @@ Minimálny počet minút, ktorý musí uplynúť medzi jedným vzdialeným bolusom a tým nasledujúcim Aspoň koľko minút musí uplynúť, medzi jedným vzdialeným bolusom a tým nasledujúcim Pre vašu bezpečnosť, musíte pridať aspoň 2 telefónne čísla, aby ste zmenili toto prednastavenie. + Bolus %1$.2f JI podaný úspešne + Podávanie %1$.2f J inzulínu + Bolus %1$.2f JI podaný úspešne + Bolus na jedlo %1$.2f JI podaný úspešne Cieľ %1$s na %2$d minút Cieľ %1$s na %2$d minút bol úspešne nastavený Dočasný cieľ úspešne zrušený @@ -257,7 +262,9 @@ Pumpa bola znovu pripojená Príkazy na diaľku nie sú povolené Diaľkovo ovládaný bolus nie je momentálne povolený. Skúste to neskôr. + Pre spustenie bazálu %1$.2f JI/h na %2$d min odpovedzte SMS s kódom %3$s Pre prepnutie profilu na %1$s %2$d%% odpovedzte SMS s kódom %3$s + Pre spustenie predĺženého bolusu %1$.2f JI na %2$d min odpovedzte SMS s kódom %3$s Pre zadanie %1$dg na %2$s odpovedz SMS kódom %3$s Pre spustenie bazálu %1$d%% na %2$d min odpovedzte SMS s kódom %3$s Pre pozastavenie uzavretého okruhu na %1$d minút odpovedaj SMS s kódom %2$s @@ -266,6 +273,7 @@ Pre zakázanie uzavretého okruhu, odpovedzte SMS s kódom %1$s Dočasný bazál %1$.2fJI/h spustený na %2$d minút Predĺžený bolus %1$.2fJI na %2$d min úspešne spustený + Sacharidy %1$d g zadané úspešne Zadanie %1$dg sacharidov sa nepodarilo Dočasný bazál %1$d%% na %2$d minút úspešne spustený Spustenie dočasného bazálu zlyhalo @@ -846,6 +854,7 @@ Zhodujú sa kódy zobrazené na tomto zariadení a na pumpe? Párovanie Insight Accu-Chek Insight + %1$.2f JI / %2$.2f JI podaných %1$s: %2$s Hadička vymenená Čas v pumpe bol aktualizovaný @@ -903,6 +912,7 @@ Predl. bolus: %1$.2f / %2$.2f JI na %3$d min Duálny bolus: %1$.2f / %2$.2f JI na %3$d min CDD: %1$.2f + Zásobník: %1$.2f JI Bat.: %1$d%% Max. doba trvania obnovenia [s] Min. doba trvania obnovenia [s] @@ -1045,6 +1055,8 @@ Poslať SMS: %1$s Poslať SMS na všetky čísla Odoslať SMS s textom + COB vs. IOB + Použité obmedzenie bolusu: %1$.2f J na %2$.2f J !!!!! Detekovaná pomalá absorbcia sacharidov: %2$d%% času. Prekontrolujte kalkuláciu. COB môže byť úplne iné, môže byť podaného viac inzulínu!!!!!]]> Podaj túto časť z výsledku kalkulácie [%] Bolusová kalkulačka urobí výpočet, ale iba táto časť vypočítaného inzulínu je podaná. Pomáha pri SMB algoritme. diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml index 61f1015ab1..f835394731 100644 --- a/core/src/main/res/values-fr-rFR/strings.xml +++ b/core/src/main/res/values-fr-rFR/strings.xml @@ -8,15 +8,22 @@ Profil Basal mise à jour dans la pompe Données saisies invalides Erreur injection basal temporaire + %1$.2f U vont être injectées Attente connection pompe Connexion à %1$d en cours + %1$.2f U en cours d\'injection Connexion Connection en cours Connectée Déconnectée Déconnexion en cours AndroidAPS est lancé + %1$.1f U + %1$.2f U + %1$+.2f U + %1$d g %1$.0f / %2$d U + %1$.2f U/h %1$.2f h %1$d min Pompe occupée @@ -77,6 +84,8 @@ Localisation désactivée La localisation doit être activée sur les nouveaux appareils pour que la recherche Bluetooth fonctionne. AAPS n\'enregistre pas votre localisation et la localisation peut être désactivée après l\'appairage. + il y a %1$d m + il y a %1$.1f h h jours heures @@ -113,7 +122,10 @@ Profil incorrect : %1$s + %1$d min + %1$s: ∑ : %2$.2f U Bol : %3$.2f U Bas : %4$.2f U (%5$.0f%%)]]> + %1$s: ∑ : %2$.2f U Bol : %3$.2f U Bas : %4$.2f U (%5$.0f%%) Gluc : %6$.0f g]]> Contrôle Glycémie Notification @@ -153,6 +165,7 @@ Attente de résultat SMB + %d g de glucides supplémentaires requis d\'ici %d minutes Stats DTI cumulé diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml index d88e689ffd..1aacfad6ec 100644 --- a/core/src/main/res/values-sk-rSK/strings.xml +++ b/core/src/main/res/values-sk-rSK/strings.xml @@ -8,15 +8,22 @@ Bazálny profil v pumpe aktualizovaný Chybné vstupné dáta Chyba podávania dočasného bazálu + Podávanie %1$.2f J inzulínu Čakám na pumpu Pripájanie %1$d sek + Podávanie %1$.2f JI Overovanie Pripájanie Pripojené Odpojené Odpájanie AndroidAPS spustený + %1$.1f JI + %1$.2f JI + %1$+.2f JI + %1$d g %1$.0f / %2$d JI + %1$.2f JI/h %1$.2f h %1$d min Pumpa je zaneprázdnená @@ -77,6 +84,8 @@ Poloha nie je aktivovaná Pre vyhľadanie Bluetooth zariadení na novších telefónoch musí byť povolené zisťovanie polohy. AAPS vás nesleduje a po úspešnom spárovaní môžete túto voľbu opäť zakázať. + pred %1$d min + pred %1$.1f h h dní hodín @@ -113,7 +122,10 @@ Chybný profil: %1$s + %1$d min. + %1$s: ∑: %2$.2f JI Bol: %3$.2f JI Baz: %4$.2f JI(%5$.0f%%)]]> + %1$s: ∑: %2$.2f JI Bol: %3$.2f JI Baz: %4$.2f JI(%5$.0f%%) Sach.: %6$.0f g]]> Kontrola glykémie Oznámenie @@ -153,6 +165,7 @@ Čakanie na výsledok SMB + %d g dodatočných sacharidov požadovaných v priebehu %d minút Štatistiky Kumulatívny TDD From 2177cfebdc78ee9accdd0b7fbb688264d8b93af3 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Fri, 21 Aug 2020 12:55:16 +0200 Subject: [PATCH 09/10] 2.7.0-rc4 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 58c4d73eac..94c6403e67 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -125,7 +125,7 @@ android { targetSdkVersion 28 multiDexEnabled true versionCode 1500 - version "2.6.7-dev" + version "2.7.0-rc4" buildConfigField "String", "VERSION", '"' + version + '"' buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"' buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"' From e7627f4f6ccedc00be070971b70498ac6012b4da Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Fri, 21 Aug 2020 13:41:48 +0200 Subject: [PATCH 10/10] try to fix IllegalStateException --- .idea/codeStyles/Project.xml | 16 ++++ .../dialogs/DialogFragmentWithDate.kt | 16 +++- .../androidaps/dialogs/WizardDialog.kt | 16 +++- .../general/overview/OverviewFragment.kt | 88 +++++++++---------- 4 files changed, 88 insertions(+), 48 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index ff53f4004f..3542887fac 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -2,6 +2,22 @@