From 067ebee5cb5afe39158ac1b51a9e0c92ec117ce9 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Wed, 17 Feb 2021 23:08:17 +0200 Subject: [PATCH 01/63] New translations en.json (Greek) --- translations/el_GR.json | 66 ++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/translations/el_GR.json b/translations/el_GR.json index 9c7460566c0..3b3df63eb94 100644 --- a/translations/el_GR.json +++ b/translations/el_GR.json @@ -590,41 +590,41 @@ "virtAsstPumpBattery": "Η μπαταρία της αντλίας σας είναι στο %1 %2", "virtAsstUploaderBattery": "Η μπαταρία του uploader είναι στο %1", "virtAsstLastLoop": "Το τελευταίο επιτυχές loop ήταν %1", - "virtAsstLoopNotAvailable": "Το loop plugin δε φαίνεται να είναι ενεργοποιημένο", - "virtAsstLoopForecastAround": "Σύμφωνα με την πρόγνωση του loop, αναμένεται να είναι περίπου %1 στο επόμενο %2", - "virtAsstLoopForecastBetween": "According to the loop forecast you are expected to be between %1 and %2 over the next %3", - "virtAsstAR2ForecastAround": "According to the AR2 forecast you are expected to be around %1 over the next %2", - "virtAsstAR2ForecastBetween": "According to the AR2 forecast you are expected to be between %1 and %2 over the next %3", - "virtAsstForecastUnavailable": "Unable to forecast with the data that is available", - "virtAsstRawBG": "Your raw bg is %1", - "virtAsstOpenAPSForecast": "The OpenAPS Eventual BG is %1", - "virtAsstCob3person": "%1 has %2 carbohydrates on board", - "virtAsstCob": "You have %1 carbohydrates on board", - "virtAsstCGMMode": "Your CGM mode was %1 as of %2.", - "virtAsstCGMStatus": "Your CGM status was %1 as of %2.", - "virtAsstCGMSessAge": "Your CGM session has been active for %1 days and %2 hours.", - "virtAsstCGMSessNotStarted": "There is no active CGM session at the moment.", - "virtAsstCGMTxStatus": "Your CGM transmitter status was %1 as of %2.", - "virtAsstCGMTxAge": "Your CGM transmitter is %1 days old.", - "virtAsstCGMNoise": "Your CGM noise was %1 as of %2.", - "virtAsstCGMBattOne": "Your CGM battery was %1 volts as of %2.", - "virtAsstCGMBattTwo": "Your CGM battery levels were %1 volts and %2 volts as of %3.", - "virtAsstDelta": "Your delta was %1 between %2 and %3.", - "virtAsstDeltaEstimated": "Your estimated delta was %1 between %2 and %3.", - "virtAsstUnknownIntentTitle": "Unknown Intent", - "virtAsstUnknownIntentText": "I'm sorry, I don't know what you're asking for.", - "Fat [g]": "Fat [g]", - "Protein [g]": "Protein [g]", - "Energy [kJ]": "Energy [kJ]", + "virtAsstLoopNotAvailable": "Το πρόσθετο κλειστού κυκλώματος δεν φαίνεται να είναι ενεργοποιημένο", + "virtAsstLoopForecastAround": "Σύμφωνα με την πρόβλεψη του κλειστού κυκλώματος, αναμένεται να είναι περίπου %1 στα επόμενα %2", + "virtAsstLoopForecastBetween": "Σύμφωνα με την πρόβλεψη του κλειστού κυκλώματος, αναμένεται να είστε ανάμεσα στο %1 και %2 στα επόμενα %3", + "virtAsstAR2ForecastAround": "Σύμφωνα μετην πρόβλεψη AR2 αναμένεται να είστε γύρω στο %1 στα επόμενα %2", + "virtAsstAR2ForecastBetween": "Σύμφωνα μετην πρόβλεψη AR2 αναμένεται να είστε ανάμεσα στο %1 και %2 στα επόμενα %3", + "virtAsstForecastUnavailable": "Δεν υπάρχει η δυνατότητα πρόβλεψηε με τα διαθέσιμα δεδομένα", + "virtAsstRawBG": "Η μη φιλτραρισμένη τιμή ζαχάρου είναι %1", + "virtAsstOpenAPSForecast": "Η πιθανή τιμή ζαχάρου βάσει OpenAPS is %1", + "virtAsstCob3person": "%1 έχει %2 ενεργούς υδατάνθρακες", + "virtAsstCob": "Έχετε %1 ενεργούς υδατάνθρακες", + "virtAsstCGMMode": "Η λειτουργία καταγραφής ήταν %1 από %2.", + "virtAsstCGMStatus": "Η κατάσταση καταγραφής ήταν %1 από %2.", + "virtAsstCGMSessAge": "Η περίοδος χρήσης της καταγραφής είναι %1 ημέρες και %2 ώρες.", + "virtAsstCGMSessNotStarted": "Δεν υπάρχει ενεργή καταγραφή ατυή τη στιγμή.", + "virtAsstCGMTxStatus": "Η κατάσταση του πομπού καταγραφής ήταν %1 από %2.", + "virtAsstCGMTxAge": "Ο πομπός καταγραφής είναι %1 ημέρών.", + "virtAsstCGMNoise": "Ο θόρυβος του συστήματος καταγραφής ήταν %1 από %2.", + "virtAsstCGMBattOne": "Η μπαταρία της καταγραφής ήταν %1 vols από τα %2.", + "virtAsstCGMBattTwo": "Το επίπεδο μπαταρίας της καταγραφής ήταν %1 volts και %2 volts από %3.", + "virtAsstDelta": "Η διαφορά τιμών ήταν %1 ανάμεσα στο %2 και το %3.", + "virtAsstDeltaEstimated": "Η εκτιμώμενη διαφορά τιμών ήταν %1 ανάμεσα σε %2 και %3.", + "virtAsstUnknownIntentTitle": "Άγνωστη πρόθεση", + "virtAsstUnknownIntentText": "Συγγνώμη, δεν γνωρίζω τι είναι αυτό που μου ζητάτε.", + "Fat [g]": "Λιπαρά [g]", + "Protein [g]": "Πρωτεΐνη [g]", + "Energy [kJ]": "Ενέργεια [kJ]", "Clock Views:": "Clock Views:", "Clock": "Clock", - "Color": "Color", - "Simple": "Simple", - "TDD average": "TDD average", - "Bolus average": "Bolus average", - "Basal average": "Basal average", - "Base basal average:": "Base basal average:", - "Carbs average": "Carbs average", + "Color": "Χρώμα", + "Simple": "Απλή", + "TDD average": "Μέσος όρος Συνολικής πρόσληψης ημερήσιας ινσουλίνης", + "Bolus average": "Μέσος όρος bolus", + "Basal average": "Μέσος όρος βασικού ρυθμού", + "Base basal average:": "Μέσος όρος βασικού ρυθμού:", + "Carbs average": "Μέσος όρος υδατανθράκων", "Eating Soon": "Eating Soon", "Last entry {0} minutes ago": "Last entry {0} minutes ago", "change": "change", From c06cf21dc81b5986dd9284e1c4b48d63f572a5aa Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Thu, 18 Feb 2021 02:26:21 +0200 Subject: [PATCH 02/63] New translations en.json (Portuguese, Brazilian) --- translations/pt_BR.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/pt_BR.json b/translations/pt_BR.json index 40610f0758a..379d27d1001 100644 --- a/translations/pt_BR.json +++ b/translations/pt_BR.json @@ -209,8 +209,8 @@ "CGM Sensor Start": "Início de sensor", "CGM Sensor Stop": "Parar sensor de glicose", "CGM Sensor Insert": "Troca de sensor", - "Sensor Code": "Sensor Code", - "Transmitter ID": "Transmitter ID", + "Sensor Code": "Código de Sensor", + "Transmitter ID": "ID do transmissor", "Dexcom Sensor Start": "Início de sensor", "Dexcom Sensor Change": "Troca de sensor", "Insulin Cartridge Change": "Troca de reservatório de insulina", @@ -548,7 +548,7 @@ "Mean Hourly Change": "Mudança média de hora", "FortyFiveDown": "ligeira descida", "FortyFiveUp": "ligeira subida", - "Flat": "holding", + "Flat": "em espera", "SingleUp": "subindo", "SingleDown": "descendo", "DoubleDown": "queda rápida", From 2f0f8ab826d9f6441af90bc2f090632ad2956e6c Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Thu, 18 Feb 2021 05:25:48 +0200 Subject: [PATCH 03/63] New translations en.json (Portuguese, Brazilian) --- translations/pt_BR.json | 52 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/translations/pt_BR.json b/translations/pt_BR.json index 379d27d1001..f8028c237d0 100644 --- a/translations/pt_BR.json +++ b/translations/pt_BR.json @@ -589,27 +589,27 @@ "virtAsstReservoir": "Você tem %1 unidades restantes", "virtAsstPumpBattery": "Sua bateria de bomba está às %1 %2", "virtAsstUploaderBattery": "Your uploader battery is at %1", - "virtAsstLastLoop": "The last successful loop was %1", - "virtAsstLoopNotAvailable": "Loop plugin does not seem to be enabled", - "virtAsstLoopForecastAround": "According to the loop forecast you are expected to be around %1 over the next %2", - "virtAsstLoopForecastBetween": "According to the loop forecast you are expected to be between %1 and %2 over the next %3", - "virtAsstAR2ForecastAround": "According to the AR2 forecast you are expected to be around %1 over the next %2", + "virtAsstLastLoop": "O último loop de sucesso foi %1", + "virtAsstLoopNotAvailable": "O plugin Loop parece não estar ativado", + "virtAsstLoopForecastAround": "De acordo com a previsão do loop você deverá estar em torno de %1 durante o próximo %2", + "virtAsstLoopForecastBetween": "De acordo com a previsão do loop você deverá estar entre %1 e %2 durante o próximo %3", + "virtAsstAR2ForecastAround": "De acordo com a previsão do AR2, você deverá estar em torno de %1 durante o próximo %2", "virtAsstAR2ForecastBetween": "According to the AR2 forecast you are expected to be between %1 and %2 over the next %3", - "virtAsstForecastUnavailable": "Unable to forecast with the data that is available", - "virtAsstRawBG": "Your raw bg is %1", - "virtAsstOpenAPSForecast": "The OpenAPS Eventual BG is %1", - "virtAsstCob3person": "%1 has %2 carbohydrates on board", - "virtAsstCob": "You have %1 carbohydrates on board", - "virtAsstCGMMode": "Your CGM mode was %1 as of %2.", - "virtAsstCGMStatus": "Your CGM status was %1 as of %2.", - "virtAsstCGMSessAge": "Your CGM session has been active for %1 days and %2 hours.", - "virtAsstCGMSessNotStarted": "There is no active CGM session at the moment.", - "virtAsstCGMTxStatus": "Your CGM transmitter status was %1 as of %2.", - "virtAsstCGMTxAge": "Your CGM transmitter is %1 days old.", - "virtAsstCGMNoise": "Your CGM noise was %1 as of %2.", - "virtAsstCGMBattOne": "Your CGM battery was %1 volts as of %2.", - "virtAsstCGMBattTwo": "Your CGM battery levels were %1 volts and %2 volts as of %3.", - "virtAsstDelta": "Your delta was %1 between %2 and %3.", + "virtAsstForecastUnavailable": "Não é possível fazer previsão com os dados disponíveis", + "virtAsstRawBG": "Seu BG é %1", + "virtAsstOpenAPSForecast": "O BG Eventual do OpenAPS é %1", + "virtAsstCob3person": "%1 tem %2 carboidratos ativos", + "virtAsstCob": "Voce tem %1 carboidratos ativos", + "virtAsstCGMMode": "Seu modo CGM era %1 a partir de %2.", + "virtAsstCGMStatus": "Seu status do CGM era %1 a partir de %2.", + "virtAsstCGMSessAge": "Sua sessão do CGM está ativa por %1 dias e %2 horas.", + "virtAsstCGMSessNotStarted": "Neste momento não existe uma sessão activa do CGM.", + "virtAsstCGMTxStatus": "Seu status do transmissor CGM era de %1 a partir de %2.", + "virtAsstCGMTxAge": "Seu transmissor CGM tem %1 dias.", + "virtAsstCGMNoise": "Seu ruído CGM era de %1 a partir de %2.", + "virtAsstCGMBattOne": "Sua bateria do CGM estava com %1 volts a partir de %2.", + "virtAsstCGMBattTwo": "Os seus níveis de bateria do CGM foram de %1 volts e %2 volts as %3.", + "virtAsstDelta": "Seu delta estava %1 entre %2 e %3.", "virtAsstDeltaEstimated": "Your estimated delta was %1 between %2 and %3.", "virtAsstUnknownIntentTitle": "Unknown Intent", "virtAsstUnknownIntentText": "I'm sorry, I don't know what you're asking for.", @@ -633,7 +633,7 @@ "Target Bottom": "Target Bottom", "Canceled": "Canceled", "Meter BG": "Meter BG", - "predicted": "predicted", + "predicted": "prevista", "future": "future", "ago": "ago", "Last data received": "Last data received", @@ -677,11 +677,11 @@ "Show profiles table": "Show profiles table", "Show predictions": "Show predictions", "Timeshift on meals larger than %1 g carbs consumed between %2 and %3": "Timeshift on meals larger than %1 g carbs consumed between %2 and %3", - "Previous": "Previous", - "Previous day": "Previous day", - "Next day": "Next day", - "Next": "Next", - "Temp basal delta": "Temp basal delta", + "Previous": "Anterior", + "Previous day": "Dia anterior", + "Next day": "Próximo Dia", + "Next": "Próximo", + "Temp basal delta": "Variacao basal temporária", "Authorized by token": "Authorized by token", "Auth role": "Auth role", "view without token": "view without token", From 3200af6299c584a826623713c4e2809e84fc47f3 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Thu, 18 Feb 2021 18:10:50 +0200 Subject: [PATCH 04/63] * Bump dev to 14.2.2 * Add ADMIN_NOTIFIES_ENABLED feature flag * Skip setting language code if language value is not null --- lib/adminnotifies.js | 5 +++++ lib/language.js | 1 + lib/server/bootevent.js | 1 + lib/server/swagger.json | 2 +- lib/server/swagger.yaml | 2 +- lib/settings.js | 2 ++ package-lock.json | 2 +- package.json | 2 +- 8 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/adminnotifies.js b/lib/adminnotifies.js index b035779d672..7c3603609f6 100644 --- a/lib/adminnotifies.js +++ b/lib/adminnotifies.js @@ -7,6 +7,11 @@ function init (ctx) { const adminnotifies = {}; adminnotifies.addNotify = function addnotify (notify) { + if (!ctx.settings.adminNotifiesEnabled) { + console.log('Admin notifies disabled, skipping notify', notify); + return; + } + if (!notify) return; notify.title = notify.title || 'No title'; diff --git a/lib/language.js b/lib/language.js index d02fe358c8b..43752869783 100644 --- a/lib/language.js +++ b/lib/language.js @@ -150,6 +150,7 @@ function init (fs) { } language.set = function set (newlang) { + if (!newlang) return; language.lang = newlang; language.languages.forEach(function(l) { diff --git a/lib/server/bootevent.js b/lib/server/bootevent.js index 171ac75b3fd..bb2d29afd7d 100644 --- a/lib/server/bootevent.js +++ b/lib/server/bootevent.js @@ -10,6 +10,7 @@ function boot (env, language) { console.log('Executing startBoot'); ctx.runtimeState = 'booting'; + ctx.settings = env.settings; ctx.bus = require('../bus')(env.settings, ctx); ctx.adminnotifies = require('../adminnotifies')(ctx); if (env.notifies) { diff --git a/lib/server/swagger.json b/lib/server/swagger.json index abfc23371e8..bc5589b786e 100755 --- a/lib/server/swagger.json +++ b/lib/server/swagger.json @@ -8,7 +8,7 @@ "info": { "title": "Nightscout API", "description": "Own your DData with the Nightscout API", - "version": "14.2.1", + "version": "14.2.2", "license": { "name": "AGPL 3", "url": "https://www.gnu.org/licenses/agpl.txt" diff --git a/lib/server/swagger.yaml b/lib/server/swagger.yaml index cb559a46bab..dc4594c3133 100755 --- a/lib/server/swagger.yaml +++ b/lib/server/swagger.yaml @@ -4,7 +4,7 @@ servers: info: title: Nightscout API description: Own your DData with the Nightscout API - version: 14.2.1 + version: 14.2.2 license: name: AGPL 3 url: 'https://www.gnu.org/licenses/agpl.txt' diff --git a/lib/settings.js b/lib/settings.js index fc3b71d9757..32cf888e8c0 100644 --- a/lib/settings.js +++ b/lib/settings.js @@ -69,6 +69,7 @@ function init () { , frameName7: '' , frameName8: '' , authFailDelay: 5000 + , adminNotifiesEnabled: true }; var secureSettings = [ @@ -105,6 +106,7 @@ function init () { , bgTargetTop: mapNumber , bgTargetBottom: mapNumber , authFailDelay: mapNumber + , adminNotifiesEnabled: mapTruthy }; function filterObj(obj, secureKeys) { diff --git a/package-lock.json b/package-lock.json index 6bacd52d00a..a05aeb3f7c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nightscout", - "version": "14.2.0", + "version": "14.2.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e795ee0b00e..68967772ae7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nightscout", - "version": "14.2.1", + "version": "14.2.2", "description": "Nightscout acts as a web-based CGM (Continuous Glucose Montinor) to allow multiple caregivers to remotely view a patients glucose data in realtime.", "license": "AGPL-3.0", "author": "Nightscout Team", From d73de56b5baf39b4e9334526296c65a05511bd43 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Thu, 18 Feb 2021 18:23:40 +0200 Subject: [PATCH 05/63] Fix adminnotifies test --- tests/adminnotifies.test.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/adminnotifies.test.js b/tests/adminnotifies.test.js index 27473dd7969..86655708d26 100644 --- a/tests/adminnotifies.test.js +++ b/tests/adminnotifies.test.js @@ -8,6 +8,8 @@ const ctx = {}; ctx.bus = {}; ctx.bus.on = function mockOn(channel, f) { }; +ctx.settings = {}; +ctx.settings.adminNotifiesEnabled = true; const mockJqueryResults = {}; const mockButton = {}; From 22f4336e7f044969e0050ccaba5827eb1e68a4ba Mon Sep 17 00:00:00 2001 From: Ben West Date: Thu, 18 Feb 2021 09:05:15 -0800 Subject: [PATCH 06/63] re-install server.js at root This continues to allow using server.js programmatically from the root of the project. --- server.js | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 server.js diff --git a/server.js b/server.js new file mode 100644 index 00000000000..a1375ff75c7 --- /dev/null +++ b/server.js @@ -0,0 +1,3 @@ + +require('./lib/server/server'); + From be183f5d1b436ca06e556c374a941045da41e372 Mon Sep 17 00:00:00 2001 From: Ben West Date: Thu, 18 Feb 2021 09:09:02 -0800 Subject: [PATCH 07/63] include standard header for server.js at root. --- server.js | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/server.js b/server.js index a1375ff75c7..d1c3f30897b 100644 --- a/server.js +++ b/server.js @@ -1,3 +1,26 @@ +/* +* cgm-remote-monitor - web app to broadcast cgm readings +* Copyright (C) 2014 Nightscout contributors. See the COPYRIGHT file +* at the root directory of this distribution and at +* https://github.com/nightscout/cgm-remote-monitor/blob/master/COPYRIGHT +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License as published +* by the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see . +*/ + +// Description: Basic web server to display data from Dexcom G4. Requires a database that contains +// the Dexcom SGV data. +'use strict'; require('./lib/server/server'); From a42408b0a789a02b90dcc69fa091c57ea67e19e6 Mon Sep 17 00:00:00 2001 From: Ben West Date: Thu, 18 Feb 2021 09:46:29 -0800 Subject: [PATCH 08/63] task: clean repo root This change seeks to continue tidying up the repo. * The database_configuration.json file is not used and has not been used since the project was published on github. We remove the ability to look at files inside the source tree for database credentials. * Move example-profiles.md to the relevant documentation for plugins area and update the link to match. --- README.md | 2 +- database_configuration.json | 4 ---- example-profiles.md => docs/plugins/example-profiles.md | 0 lib/server/env.js | 5 +---- 4 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 database_configuration.json rename example-profiles.md => docs/plugins/example-profiles.md (100%) diff --git a/README.md b/README.md index d7c272787b4..3a94250f5b1 100644 --- a/README.md +++ b/README.md @@ -670,7 +670,7 @@ For remote overrides, the following extended settings must be configured: * `target_high` - Upper target for correction boluses. * `target_low` - Lower target for correction boluses. - Some example profiles are [here](example-profiles.md). + Some example profiles are [here](docs/plugins/example-profiles.md). ## Setting environment variables Easy to emulate on the commandline: diff --git a/database_configuration.json b/database_configuration.json deleted file mode 100644 index d768358bbb1..00000000000 --- a/database_configuration.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "url": null, - "collection": null -} diff --git a/example-profiles.md b/docs/plugins/example-profiles.md similarity index 100% rename from example-profiles.md rename to docs/plugins/example-profiles.md diff --git a/lib/server/env.js b/lib/server/env.js index c05581f206e..afb53d51332 100644 --- a/lib/server/env.js +++ b/lib/server/env.js @@ -130,10 +130,7 @@ function setStorage () { env.food_collection = readENV('MONGO_FOOD_COLLECTION', 'food'); env.activity_collection = readENV('MONGO_ACTIVITY_COLLECTION', 'activity'); - // TODO: clean up a bit - // Some people prefer to use a json configuration file instead. - // This allows a provided json config to override environment variables - var DB = require('../../database_configuration.json') + var DB = { url: null, collection: null } , DB_URL = DB.url ? DB.url : env.storageURI , DB_COLLECTION = DB.collection ? DB.collection : env.entries_collection; env.storageURI = DB_URL; From 3bb4f6be01d1a5e317860e072f8f686bea5b8e19 Mon Sep 17 00:00:00 2001 From: Ben West Date: Thu, 18 Feb 2021 09:52:11 -0800 Subject: [PATCH 09/63] move script for repo maintenance aside This script is used to help prep release branches and tags. Since it's not crucial to the business of remote monitoring and only useful as a maintenance tool, we're moving it away from the project root. --- prep_repo_release.sh => bin/prep_repo_release.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename prep_repo_release.sh => bin/prep_repo_release.sh (100%) diff --git a/prep_repo_release.sh b/bin/prep_repo_release.sh similarity index 100% rename from prep_repo_release.sh rename to bin/prep_repo_release.sh From 5ae162cc6bbcdde04fb5f25f52c4ceba75fc5818 Mon Sep 17 00:00:00 2001 From: Ben West Date: Thu, 18 Feb 2021 09:55:47 -0800 Subject: [PATCH 10/63] task: clean project root Move update image into docs folder, away from project root. --- README.md | 2 +- update.png => docs/update.png | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename update.png => docs/update.png (100%) diff --git a/README.md b/README.md index 3a94250f5b1..cbaecb5f4ab 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) [discord-url]: https://discord.gg/rTKhrqz [heroku-img]: https://www.herokucdn.com/deploy/button.png [heroku-url]: https://heroku.com/deploy?template=https://github.com/nightscout/cgm-remote-monitor -[update-img]: update.png +[update-img]: docs/update.png [update-fork]: http://nightscout.github.io/pages/update-fork/ [original]: https://github.com/rnpenguin/cgm-remote-monitor diff --git a/update.png b/docs/update.png similarity index 100% rename from update.png rename to docs/update.png From 5953f082df9fddb631cf8f872d44a9784546d88b Mon Sep 17 00:00:00 2001 From: Ben West Date: Thu, 18 Feb 2021 09:59:15 -0800 Subject: [PATCH 11/63] remove empty file from project root --- test | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test diff --git a/test b/test deleted file mode 100644 index e69de29bb2d..00000000000 From 3149bf8b9562521015c17cda12d2b13e35cc9614 Mon Sep 17 00:00:00 2001 From: Ben West Date: Thu, 18 Feb 2021 10:02:00 -0800 Subject: [PATCH 12/63] task: clean project root setup.sh appears to be a developer utility to assist in bootstrapping a debian based system. It is intended to help install the dependencies needed to run node, and not used in any automated deploy pipeline. Instructions have been updated to suite this change which simply moves the developer tool out of the project repo and into the bin subdirectory. --- README.md | 6 +++--- setup.sh => bin/setup.sh | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename setup.sh => bin/setup.sh (100%) diff --git a/README.md b/README.md index cbaecb5f4ab..767d954eeca 100644 --- a/README.md +++ b/README.md @@ -164,7 +164,7 @@ Some features may not work with devices/browsers on the older end of these requi ## Windows installation software requirements: -- [Node.js](http://nodejs.org/) Latest Node 12 LTS. Node versions that do not have the latest security patches will not work. Use [Install instructions for Node](https://nodejs.org/en/download/package-manager/) or use `setup.sh`) +- [Node.js](http://nodejs.org/) Latest Node 12 LTS. Node versions that do not have the latest security patches will not work. Use [Install instructions for Node](https://nodejs.org/en/download/package-manager/) or use `bin/setup.sh`) - [MongoDB](https://www.mongodb.com/download-center?jmp=nav#community) 3.x or later. MongoDB 2.4 is only supported for Raspberry Pi. As a non-root user clone this repo then install dependencies into the root of the project: @@ -690,13 +690,13 @@ Your hosting provider probably has a way to set these through their GUI. ### Vagrant install Optionally, use [Vagrant](https://www.vagrantup.com/) with the -included `Vagrantfile` and `setup.sh` to install OS and node packages to +included `Vagrantfile` and `bin/setup.sh` to install OS and node packages to a virtual machine. ```bash host$ vagrant up host$ vagrant ssh -vm$ setup.sh +vm$ ./bin/setup.sh ``` The setup script will install OS packages then run `npm install`. diff --git a/setup.sh b/bin/setup.sh similarity index 100% rename from setup.sh rename to bin/setup.sh From 52cca32bf38a2e6ec9f6aab04742f57e6a8a964e Mon Sep 17 00:00:00 2001 From: Ben West Date: Thu, 18 Feb 2021 10:08:34 -0800 Subject: [PATCH 13/63] task: tidy project root This change moves the azure deployment script from the root of the project into the bin subdirectory with a name that makes its purpose more clear. .deployment file has been updated to execute the new path. --- .deployment | 2 +- deploy.sh => bin/azure-deploy.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename deploy.sh => bin/azure-deploy.sh (98%) diff --git a/.deployment b/.deployment index 1e42f16cade..7d94259b916 100644 --- a/.deployment +++ b/.deployment @@ -1,2 +1,2 @@ [config] -command = bash deploy.sh \ No newline at end of file +command = bash bin/azure-deploy.sh diff --git a/deploy.sh b/bin/azure-deploy.sh similarity index 98% rename from deploy.sh rename to bin/azure-deploy.sh index 710cbb14d3f..5ffbee022ab 100755 --- a/deploy.sh +++ b/bin/azure-deploy.sh @@ -103,7 +103,7 @@ echo "\"$SCM_COMMIT_ID\"" > $DEPLOYMENT_SOURCE/scm-commit-id.json # 1. KuduSync if [[ "$IN_PLACE_DEPLOYMENT" -ne "1" ]]; then - "$KUDU_SYNC_CMD" -v 50 -f "$DEPLOYMENT_SOURCE" -t "$DEPLOYMENT_TARGET" -n "$NEXT_MANIFEST_PATH" -p "$PREVIOUS_MANIFEST_PATH" -i ".git;.hg;.deployment;deploy.sh" + "$KUDU_SYNC_CMD" -v 50 -f "$DEPLOYMENT_SOURCE" -t "$DEPLOYMENT_TARGET" -n "$NEXT_MANIFEST_PATH" -p "$PREVIOUS_MANIFEST_PATH" -i ".git;.hg;.deployment;bin/azure-deploy.sh" exitWithMessageOnError "Kudu Sync failed" fi From aa4dca7cc7ad889ef31b0b241f5560c1c21e2874 Mon Sep 17 00:00:00 2001 From: Ben West Date: Thu, 18 Feb 2021 10:39:44 -0800 Subject: [PATCH 14/63] task: tidy project root: webpack This change attempts to tidy the project root by moving webpack configuration into it's own subdirectory. The metadata has been updated to match this information. In addition, the configuration file itself is simplified for future maintainers in some ways. Now the configuration to a projectRoot which is calculated exactly once, instead of introspecting from __dirname each time. --- package.json | 8 ++++---- webpack.config.js => webpack/webpack.config.js | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) rename webpack.config.js => webpack/webpack.config.js (96%) diff --git a/package.json b/package.json index 68967772ae7..01bdb0efe80 100644 --- a/package.json +++ b/package.json @@ -31,10 +31,10 @@ "test-single": "env-cmd -f ./my.test.env mocha --require ./tests/hooks.js --exit ./tests/$TEST.test.js", "test-ci": "env-cmd -f ./ci.test.env nyc --reporter=lcov --reporter=text-summary mocha --require ./tests/hooks.js --exit ./tests/*.test.js", "env": "env", - "postinstall": "webpack --mode production --config webpack.config.js && npm run-script generate-keys", - "bundle": "webpack --mode production --config webpack.config.js && npm run-script generate-keys", - "bundle-dev": "webpack --mode development --config webpack.config.js && npm run-script generate-keys", - "bundle-analyzer": "webpack --mode development --config webpack.config.js --profile --json > stats.json && webpack-bundle-analyzer stats.json", + "postinstall": "webpack --mode production --config webpack/webpack.config.js && npm run-script generate-keys", + "bundle": "webpack --mode production --config webpack/webpack.config.js && npm run-script generate-keys", + "bundle-dev": "webpack --mode development --config webpack/webpack.config.js && npm run-script generate-keys", + "bundle-analyzer": "webpack --mode development --config webpack/webpack.config.js --profile --json > stats.json && webpack-bundle-analyzer stats.json", "generate-keys": "node bin/generateRandomString.js >tmp/randomString", "coverage": "cat ./coverage/lcov.info | env-cmd -f ./ci.test.env codacy-coverage", "dev": "env-cmd -f ./my.env nodemon --inspect lib/server/server.js 0.0.0.0", diff --git a/webpack.config.js b/webpack/webpack.config.js similarity index 96% rename from webpack.config.js rename to webpack/webpack.config.js index 0193fedc859..66ab433bd9f 100644 --- a/webpack.config.js +++ b/webpack/webpack.config.js @@ -4,6 +4,7 @@ const MomentLocalesPlugin = require('moment-locales-webpack-plugin'); const pluginArray = []; const sourceMapType = 'source-map'; const MomentTimezoneDataPlugin = require('moment-timezone-data-webpack-plugin'); +const projectRoot = path.resolve(__dirname, '..'); /* if (process.env.NODE_ENV === 'development') { @@ -94,7 +95,7 @@ const rules = [ options: { babelrc: true, cacheDirectory: true, - extends: path.join(__dirname + '/.babelrc') + extends: path.join(projectRoot, '/.babelrc') } } }, @@ -148,16 +149,16 @@ if (process.env.NODE_ENV === 'development') { const optimization = {}; + module.exports = { mode, - context: __dirname, - context: path.resolve(__dirname, '.'), + context: projectRoot, entry: { app: appEntry, clock: clockEntry }, output: { - path: path.resolve(__dirname, './tmp/public'), + path: path.resolve(projectRoot, './tmp/public'), publicPath, filename: 'js/bundle.[name].js', sourceMapFilename: 'js/bundle.[name].js.map', From 24dfa43aa779f5ef3ad06e57d16410751910b825 Mon Sep 17 00:00:00 2001 From: Ben West Date: Thu, 18 Feb 2021 10:53:31 -0800 Subject: [PATCH 15/63] task: tidy example environment template Move this away from project root and into docs area. CONTRIBUTING file updated to match. --- CONTRIBUTING.md | 5 +++-- my.env.template => docs/example-template.env | 0 2 files changed, 3 insertions(+), 2 deletions(-) rename my.env.template => docs/example-template.env (100%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 97204edff44..ddc20c1620e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,6 +34,7 @@ [coverage-url]: https://coveralls.io/r/nightscout/cgm-remote-monitor?branch=master [discord-img]: https://img.shields.io/discord/629952586895851530?label=discord%20chat [discord-url]: https://discord.gg/rTKhrqz +[example-env-template]: docs/example-template.env ## Translations @@ -49,7 +50,7 @@ Nightscout is a Node.js application. The basic installation of the software for dependency installation has to be done using a non-root user - _do not use root_ for development and hosting the software! 3. Get a Mongo database by either installing Mongo locally, or get a free cloud account from mLab or MongoDB Atlas. -4. Configure Nightscout by copying `my.env.template` to `my.env` and run it - see the next chapter in the instructions +4. Configure Nightscout by copying [`docs/example-template.env`][example-env-template] to `my.env` and run it - see the next chapter in the instructions ## Develop on `dev` @@ -57,7 +58,7 @@ We develop on the `dev` branch. All new pull requests should be targeted to `dev You can get the `dev` branch checked out using `git checkout dev`. -Once checked out, install the dependencies using `npm install`, then copy the included `my.env.template`file to `my.env` and edit the file to include your settings (like the Mongo URL). Leave the `NODE_ENV=development` line intact. Once set, run the site using `npm run dev`. This will start Nightscout in the development mode, with different code packaging rules and automatic restarting of the server using nodemon, when you save changed files on disk. The client also hot-reloads new code in, but it's recommended to reload the website after changes due to the way the plugin sandbox works. +Once checked out, install the dependencies using `npm install`, then copy the included [`docs/example-template.env`][example-env-template] to `my.env` file to `my.env` and edit the file to include your settings (like the Mongo URL). Leave the `NODE_ENV=development` line intact. Once set, run the site using `npm run dev`. This will start Nightscout in the development mode, with different code packaging rules and automatic restarting of the server using nodemon, when you save changed files on disk. The client also hot-reloads new code in, but it's recommended to reload the website after changes due to the way the plugin sandbox works. Note the template sets `INSECURE_USE_HTTP` to `true` to enable the site to work over HTTP in local development. diff --git a/my.env.template b/docs/example-template.env similarity index 100% rename from my.env.template rename to docs/example-template.env From f45e7b8d6b54cef7c950cefc0529f169d4fa41f1 Mon Sep 17 00:00:00 2001 From: Ben West Date: Thu, 18 Feb 2021 11:15:45 -0800 Subject: [PATCH 16/63] task: tidy ci test env away from project root This change moves the ci.test.env file into the tests/ subdirectory in an effort to reduce the number of files in the project root. The package.json metadata is updated to enable continuous integration tools to continue to work as expected. --- package.json | 4 ++-- ci.test.env => tests/ci.test.env | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename ci.test.env => tests/ci.test.env (100%) diff --git a/package.json b/package.json index 01bdb0efe80..44eeb3a985d 100644 --- a/package.json +++ b/package.json @@ -29,14 +29,14 @@ "start": "node lib/server/server.js", "test": "env-cmd -f ./my.test.env mocha --require ./tests/hooks.js -exit ./tests/*.test.js", "test-single": "env-cmd -f ./my.test.env mocha --require ./tests/hooks.js --exit ./tests/$TEST.test.js", - "test-ci": "env-cmd -f ./ci.test.env nyc --reporter=lcov --reporter=text-summary mocha --require ./tests/hooks.js --exit ./tests/*.test.js", + "test-ci": "env-cmd -f ./tests/ci.test.env nyc --reporter=lcov --reporter=text-summary mocha --require ./tests/hooks.js --exit ./tests/*.test.js", "env": "env", "postinstall": "webpack --mode production --config webpack/webpack.config.js && npm run-script generate-keys", "bundle": "webpack --mode production --config webpack/webpack.config.js && npm run-script generate-keys", "bundle-dev": "webpack --mode development --config webpack/webpack.config.js && npm run-script generate-keys", "bundle-analyzer": "webpack --mode development --config webpack/webpack.config.js --profile --json > stats.json && webpack-bundle-analyzer stats.json", "generate-keys": "node bin/generateRandomString.js >tmp/randomString", - "coverage": "cat ./coverage/lcov.info | env-cmd -f ./ci.test.env codacy-coverage", + "coverage": "cat ./coverage/lcov.info | env-cmd -f ./tests/ci.test.env codacy-coverage", "dev": "env-cmd -f ./my.env nodemon --inspect lib/server/server.js 0.0.0.0", "dev-test": "env-cmd -f ./my.devtest.env nodemon --inspect lib/server/server.js 0.0.0.0", "prod": "env-cmd -f ./my.prod.env node lib/server/server.js 0.0.0.0", diff --git a/ci.test.env b/tests/ci.test.env similarity index 100% rename from ci.test.env rename to tests/ci.test.env From 8e553ea1e52bbc2d442e7f2d03c88c631d809314 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Thu, 18 Feb 2021 21:38:55 +0200 Subject: [PATCH 17/63] New translations en.json (Hungarian) --- translations/hu_HU.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/hu_HU.json b/translations/hu_HU.json index 5483c2dbd37..0271b6b68d5 100644 --- a/translations/hu_HU.json +++ b/translations/hu_HU.json @@ -281,7 +281,7 @@ "Care Portal": "Care portál", "Medium/Unknown": "Átlagos/Ismeretlen", "IN THE FUTURE": "A JÖVŐBEN", - "Order": "Sorrend", + "Order": "Rendezés", "oldest on top": "legrégebbi elől", "newest on top": "legújabb elől", "All sensor events": "Ősszes szenzor esemény", From 37ca7219476e1066644eb89fc5ad153ae25ba02b Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 00:46:55 +0200 Subject: [PATCH 18/63] New translations en.json (Hungarian) --- translations/hu_HU.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/translations/hu_HU.json b/translations/hu_HU.json index 0271b6b68d5..5a191339cba 100644 --- a/translations/hu_HU.json +++ b/translations/hu_HU.json @@ -213,12 +213,12 @@ "Transmitter ID": "Transzmitter ID", "Dexcom Sensor Start": "Dexcom Szenzor Indítása", "Dexcom Sensor Change": "Dexcom Szenzor Csere", - "Insulin Cartridge Change": "Inzulin Tartály Csere", + "Insulin Cartridge Change": "Tartálycsere", "D.A.D. Alert": "D.A.D Figyelmeztetés", - "Glucose Reading": "Vércukor Érték", + "Glucose Reading": "Vércukorérték", "Measurement Method": "Mérés módja", "Meter": "Vércukormérő", - "Amount in grams": "Adag gramm-ban", + "Amount in grams": "Mennyiség grammban", "Amount in units": "Adag egység-ben", "View all treatments": "Összes kezelés mutatása", "Enable Alarms": "Riasztások bekapcsolása", @@ -244,7 +244,7 @@ "Custom Title": "Egyéni Cím", "Theme": "Téma", "Default": "Alapértelmezett", - "Colors": "Színek", + "Colors": "Színes", "Colorblind-friendly colors": "Beállítás színvakok számára", "Reset, and use defaults": "Visszaállítás a kiinduló állapotba", "Calibrations": "Kalibrációk", From 8f2d9cdd0cbe22012d6ee65c19ab50861e953b86 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 10:29:16 +0200 Subject: [PATCH 19/63] New translations en.json (Hungarian) --- translations/hu_HU.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/hu_HU.json b/translations/hu_HU.json index 5a191339cba..5b69acdac9e 100644 --- a/translations/hu_HU.json +++ b/translations/hu_HU.json @@ -213,14 +213,14 @@ "Transmitter ID": "Transzmitter ID", "Dexcom Sensor Start": "Dexcom Szenzor Indítása", "Dexcom Sensor Change": "Dexcom Szenzor Csere", - "Insulin Cartridge Change": "Tartálycsere", + "Insulin Cartridge Change": "Inzulintartály-csere", "D.A.D. Alert": "D.A.D Figyelmeztetés", "Glucose Reading": "Vércukorérték", "Measurement Method": "Mérés módja", "Meter": "Vércukormérő", "Amount in grams": "Mennyiség grammban", - "Amount in units": "Adag egység-ben", - "View all treatments": "Összes kezelés mutatása", + "Amount in units": "Mennyiség Egység-ben", + "View all treatments": "Összes kezelés", "Enable Alarms": "Riasztások bekapcsolása", "Pump Battery Change": "Pumpa Elem Csere", "Pump Battery Low Alarm": "Pumpa Elem Alacsony Töltöttség Riasztás", From c340d7ba2c46e0abd0b552ca25c13595abe431ac Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 13:28:47 +0200 Subject: [PATCH 20/63] New translations en.json (Hungarian) --- translations/hu_HU.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/translations/hu_HU.json b/translations/hu_HU.json index 5b69acdac9e..70683fbd303 100644 --- a/translations/hu_HU.json +++ b/translations/hu_HU.json @@ -222,7 +222,7 @@ "Amount in units": "Mennyiség Egység-ben", "View all treatments": "Összes kezelés", "Enable Alarms": "Riasztások bekapcsolása", - "Pump Battery Change": "Pumpa Elem Csere", + "Pump Battery Change": "Pumpa elem kora", "Pump Battery Low Alarm": "Pumpa Elem Alacsony Töltöttség Riasztás", "Pump Battery change overdue!": "Pumpa Elem cserére szorul!", "When enabled an alarm may sound.": "Bekapcsoláskor hang figyelmeztetés várható", @@ -236,7 +236,7 @@ "Night Mode": "Éjjeli Mód", "When enabled the page will be dimmed from 10pm - 6am.": "Ezt bekapcsolva a képernyő halványabb lesz 22-től 6-ig", "Enable": "Bekapcsolva", - "Show Raw BG Data": "Nyers VC értékek megjelenítése", + "Show Raw BG Data": "Nyers SzG értékek megjelenítése", "Never": "Soha", "Always": "Mindig", "When there is noise": "Ha zajos a mérés", @@ -264,7 +264,7 @@ "Medium": "Közepes", "Heavy": "Nehéz", "Treatment type": "Kezelés típusa", - "Raw BG": "Nyers SzC", + "Raw BG": "Nyers SzG", "Device": "Készülék", "Noise": "Zaj", "Calibration": "Kalibráció", @@ -676,7 +676,7 @@ "Please select a maximum of two weeks duration and click Show again.": "Válassz legfeljebb két hét időtartamot, majd kattints újra a Megjelenítés gombra.", "Show profiles table": "Profil táblázat megjelenítése", "Show predictions": "Prognózis megjelenítése", - "Timeshift on meals larger than %1 g carbs consumed between %2 and %3": "Timeshift on meals larger than %1 g carbs consumed between %2 and %3", + "Timeshift on meals larger than %1 g carbs consumed between %2 and %3": "Időeltolás %1 g-nál nagyobb szénhidrátú étkezéseknél %2 és %3 között", "Previous": "Előző", "Previous day": "Előző nap", "Next day": "Következő nap", @@ -689,18 +689,18 @@ "Weekly Distribution": "Heti eloszlás", "Failed authentication": "Sikertelen hitelesítés", "A device at IP address %1 attempted authenticating with Nightscout with wrong credentials. Check if you have an uploader setup with wrong API_SECRET or token?": "A(z) %1 IP-címmel rendelkező eszköz hibás adatokkal próbálta meg a hitelesítést a Nightscout-tal. Ellenőrizd, hogy van-e rossz API_SECRET-tel vagy tokennel rendelkező feltöltő.", - "Default (with leading zero and U)": "Default (with leading zero and U)", - "Concise (with U, without leading zero)": "Concise (with U, without leading zero)", - "Minimal (without leading zero and U)": "Minimal (without leading zero and U)", - "Small Bolus Display": "Small Bolus Display", - "Large Bolus Display": "Large Bolus Display", - "Bolus Display Threshold": "Bolus Display Threshold", - "%1 U and Over": "%1 U and Over", - "Event repeated %1 times.": "Event repeated %1 times.", - "minutes": "minutes", - "Last recorded %1 %2 ago.": "Last recorded %1 %2 ago.", - "Security issue": "Security issue", - "Weak API_SECRET detected. Please use a mix of small and CAPITAL letters, numbers and non-alphanumeric characters such as !#%&/ to reduce the risk of unauthorized access. The minimum length of the API_SECRET is 12 characters.": "Weak API_SECRET detected. Please use a mix of small and CAPITAL letters, numbers and non-alphanumeric characters such as !#%&/ to reduce the risk of unauthorized access. The minimum length of the API_SECRET is 12 characters.", - "less than 1": "less than 1", - "MongoDB password and API_SECRET match. This is a really bad idea. Please change both and do not reuse passwords across the system.": "MongoDB password and API_SECRET match. This is a really bad idea. Please change both and do not reuse passwords across the system." + "Default (with leading zero and U)": "Alapért. (kezdő nullával és E-gel)", + "Concise (with U, without leading zero)": "Tömör (E-gel, kezdő nulla nélkül)", + "Minimal (without leading zero and U)": "Minimalista (kezdő nulla és E nélkül)", + "Small Bolus Display": "Kis bólus megjelenítése", + "Large Bolus Display": "Nagy bólus megjelenítése", + "Bolus Display Threshold": "Kis/nagy bólus határ", + "%1 U and Over": "%1 E és felette", + "Event repeated %1 times.": "Az esemény %1 alkalommal ismétlődött meg.", + "minutes": "perc", + "Last recorded %1 %2 ago.": "Legutóbb rögzítve: %1 %2", + "Security issue": "Biztonsági probléma", + "Weak API_SECRET detected. Please use a mix of small and CAPITAL letters, numbers and non-alphanumeric characters such as !#%&/ to reduce the risk of unauthorized access. The minimum length of the API_SECRET is 12 characters.": "Gyenge API_SECRET észlelve! Kérjük, használj kis- és nagybetűk, számok és nem-alfanumerikus karakterek, például !#%&/ keverékét az illetéktelen hozzáférés kockázatának csökkentésére. Az API_SECRET minimális hossza 12 karakter.", + "less than 1": "kisebb, mint 1", + "MongoDB password and API_SECRET match. This is a really bad idea. Please change both and do not reuse passwords across the system.": "A MongoDB jelszó és az API_SECRET egyezik. Ez nagyon rossz ötlet. Kérjük, változtasd meg mindkettőt, és ne használj meglévő jelszavakat a rendszerben." } From ad3fc3c72e0761674e60c7949082dd20405b2b71 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 13:59:35 +0200 Subject: [PATCH 21/63] * Fix running the site in dev mode * Fix Pump Battery Age plugin name localization --- lib/plugins/batteryage.js | 2 +- lib/server/app.js | 2 +- translations/en/en.json | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/plugins/batteryage.js b/lib/plugins/batteryage.js index 22f25705aa3..466c4faa77a 100644 --- a/lib/plugins/batteryage.js +++ b/lib/plugins/batteryage.js @@ -9,7 +9,7 @@ function init(ctx) { var bage = { name: 'bage' - , label: 'Pump Battery Change' + , label: 'Pump Battery Age' , pluginType: 'pill-minor' }; diff --git a/lib/server/app.js b/lib/server/app.js index 553ac48a646..74153138ba1 100644 --- a/lib/server/app.js +++ b/lib/server/app.js @@ -305,7 +305,7 @@ function create (env, ctx) { app.locals.bundle = '/devbundle'; const webpack = require('webpack'); - var webpack_conf = require('../../webpack.config'); + const webpack_conf = require('../../webpack/webpack.config'); const middleware = require('webpack-dev-middleware'); const compiler = webpack(webpack_conf); diff --git a/translations/en/en.json b/translations/en/en.json index cc4f95ea41e..13782a2f503 100644 --- a/translations/en/en.json +++ b/translations/en/en.json @@ -223,6 +223,7 @@ ,"View all treatments":"View all treatments" ,"Enable Alarms":"Enable Alarms" ,"Pump Battery Change":"Pump Battery Change" + ,"Pump Battery Age":"Pump Battery Age" ,"Pump Battery Low Alarm":"Pump Battery Low Alarm" ,"Pump Battery change overdue!":"Pump Battery change overdue!" ,"When enabled an alarm may sound.":"When enabled an alarm may sound." From fd26c77f2defb1d168327f9d6bac9a66b893223a Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:00 +0200 Subject: [PATCH 22/63] New translations en.json (Hebrew) --- translations/he_IL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/he_IL.json b/translations/he_IL.json index dd3096d0f54..3b42fdf6582 100644 --- a/translations/he_IL.json +++ b/translations/he_IL.json @@ -223,6 +223,7 @@ "View all treatments": "הצג את כל הטיפולים", "Enable Alarms": "הפעל התראות", "Pump Battery Change": "החלפת סוללת משאבה", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "התראת סוללת משאבה חלשה", "Pump Battery change overdue!": "הגיע הזמן להחליף סוללת משאבה!", "When enabled an alarm may sound.": "כשמופעל התראות יכולות להישמע.", From 79dbe7ffdfa4a1ed7ad6f982b83f7a2eec9a477d Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:02 +0200 Subject: [PATCH 23/63] New translations en.json (Japanese) --- translations/ja_JP.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/ja_JP.json b/translations/ja_JP.json index 72b13ce8b4e..7b53b4aee78 100644 --- a/translations/ja_JP.json +++ b/translations/ja_JP.json @@ -223,6 +223,7 @@ "View all treatments": "全治療内容を参照", "Enable Alarms": "アラームを有効にする", "Pump Battery Change": "ポンプバッテリー交換", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "ポンプバッテリーが低下", "Pump Battery change overdue!": "ポンプバッテリー交換期限切れてます！", "When enabled an alarm may sound.": "有効にすればアラームが鳴動します。", From 6a604404024eb24b3fbb45c3887c47ba206c6f5e Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:03 +0200 Subject: [PATCH 24/63] New translations en.json (Portuguese) --- translations/pt_PT.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/pt_PT.json b/translations/pt_PT.json index ede32a5447f..316ccceb55e 100644 --- a/translations/pt_PT.json +++ b/translations/pt_PT.json @@ -223,6 +223,7 @@ "View all treatments": "Ver todos os tratamentos", "Enable Alarms": "Activar Alarmes", "Pump Battery Change": "Troca de Bateria da Bomba", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Alarme de Bateria Fraca da Bomba", "Pump Battery change overdue!": "Troca de Bateria da Bomba atrasada!", "When enabled an alarm may sound.": "Quando activado um alarme pode soar.", From ebf64e92b0167beeb095f3cc75a98a3936a48349 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:05 +0200 Subject: [PATCH 25/63] New translations en.json (Arabic) --- translations/ar_SA.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/ar_SA.json b/translations/ar_SA.json index 9e2560be798..dbab7297f0d 100644 --- a/translations/ar_SA.json +++ b/translations/ar_SA.json @@ -223,6 +223,7 @@ "View all treatments": "View all treatments", "Enable Alarms": "Enable Alarms", "Pump Battery Change": "Pump Battery Change", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Pump Battery Low Alarm", "Pump Battery change overdue!": "Pump Battery change overdue!", "When enabled an alarm may sound.": "When enabled an alarm may sound.", From b6fea42cbdb7126f2afbb331573c1f01f7b083d5 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:06 +0200 Subject: [PATCH 26/63] New translations en.json (Hindi) --- translations/hi_IN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/hi_IN.json b/translations/hi_IN.json index 95bf6f92215..37e1d47e97d 100644 --- a/translations/hi_IN.json +++ b/translations/hi_IN.json @@ -223,6 +223,7 @@ "View all treatments": "View all treatments", "Enable Alarms": "Enable Alarms", "Pump Battery Change": "Pump Battery Change", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Pump Battery Low Alarm", "Pump Battery change overdue!": "Pump Battery change overdue!", "When enabled an alarm may sound.": "When enabled an alarm may sound.", From 7028d3a7c67bed05ed5f23a237b00db37e702b8b Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:08 +0200 Subject: [PATCH 27/63] New translations en.json (Croatian) --- translations/hr_HR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/hr_HR.json b/translations/hr_HR.json index cd2ddb405ab..0ef7223a18f 100644 --- a/translations/hr_HR.json +++ b/translations/hr_HR.json @@ -223,6 +223,7 @@ "View all treatments": "Prikaži sve tretmane", "Enable Alarms": "Aktiviraj alarme", "Pump Battery Change": "Zamjena baterije pumpe", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Upozorenje slabe baterije pumpe", "Pump Battery change overdue!": "Prošao je rok za zamjenu baterije pumpe!", "When enabled an alarm may sound.": "Kad je aktiviran, alarm se može oglasiti", From be592da12f92044b7217a35d24839067b7f2b29f Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:09 +0200 Subject: [PATCH 28/63] New translations en.json (Portuguese, Brazilian) --- translations/pt_BR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/pt_BR.json b/translations/pt_BR.json index f8028c237d0..17aa5a61b42 100644 --- a/translations/pt_BR.json +++ b/translations/pt_BR.json @@ -223,6 +223,7 @@ "View all treatments": "Visualizar todos os procedimentos", "Enable Alarms": "Ativar alarmes", "Pump Battery Change": "Bateria da bomba de infusão de insulina descarregada", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Alarme de bateria baixa da bomba de infusão de insulina", "Pump Battery change overdue!": "Mudança de bateria da bomba atrasada!", "When enabled an alarm may sound.": "Quando ativado, um alarme poderá soar", From 02034de7cafd9c4685ffe7fd3536b27720a59e29 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:11 +0200 Subject: [PATCH 29/63] New translations en.json (Chinese Traditional) --- translations/zh_TW.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/zh_TW.json b/translations/zh_TW.json index bd800a22713..eefd243fd67 100644 --- a/translations/zh_TW.json +++ b/translations/zh_TW.json @@ -223,6 +223,7 @@ "View all treatments": "View all treatments", "Enable Alarms": "啟用報警", "Pump Battery Change": "Pump Battery Change", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Pump Battery Low Alarm", "Pump Battery change overdue!": "Pump Battery change overdue!", "When enabled an alarm may sound.": "啟用後可發出聲音報警", From b9fc18961b09dfe50c2b0158b8c219e4134f8c71 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:12 +0200 Subject: [PATCH 30/63] New translations en.json (Chinese Simplified) --- translations/zh_CN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/zh_CN.json b/translations/zh_CN.json index 19875601832..992fc83c816 100644 --- a/translations/zh_CN.json +++ b/translations/zh_CN.json @@ -223,6 +223,7 @@ "View all treatments": "查看所有操作", "Enable Alarms": "启用报警", "Pump Battery Change": "更换泵电池", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "胰岛素泵电量低", "Pump Battery change overdue!": "Pump Battery change overdue!", "When enabled an alarm may sound.": "启用后可发出声音报警", From 1991c2c70eb81428bc078cf63aec7725f557853d Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:14 +0200 Subject: [PATCH 31/63] New translations en.json (Turkish) --- translations/tr_TR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/tr_TR.json b/translations/tr_TR.json index 990d59d4a16..ff7be104a7c 100644 --- a/translations/tr_TR.json +++ b/translations/tr_TR.json @@ -223,6 +223,7 @@ "View all treatments": "Tüm tedavileri görüntüle", "Enable Alarms": "Alarmları Etkinleştir", "Pump Battery Change": "Pompa pil değişimi", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Pompa Düşük pil alarmı", "Pump Battery change overdue!": "Pompa pil değişimi gecikti!", "When enabled an alarm may sound.": "Etkinleştirilirse, alarm çalar.", From 0c9cacb677a9a734f70c14d123eaba50631a95a9 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:15 +0200 Subject: [PATCH 32/63] New translations en.json (Slovenian) --- translations/sl_SI.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/sl_SI.json b/translations/sl_SI.json index ce23adeb14c..563e6c6d164 100644 --- a/translations/sl_SI.json +++ b/translations/sl_SI.json @@ -223,6 +223,7 @@ "View all treatments": "Zobraziť všetky ošetrenia", "Enable Alarms": "Aktivovať alarmy", "Pump Battery Change": "Zamenjaj baterijo crpalke", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Baterija crpalke nizka Alarm", "Pump Battery change overdue!": "Čas za zamenjavo baterije črpalke prekoračen!", "When enabled an alarm may sound.": "Pri aktivovanom alarme znie zvuk ", From 9b921c3cab06dbf63d5df2811fac9c492654cdc7 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:16 +0200 Subject: [PATCH 33/63] New translations en.json (Polish) --- translations/pl_PL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/pl_PL.json b/translations/pl_PL.json index 9a6e05b485d..0539092ee7b 100644 --- a/translations/pl_PL.json +++ b/translations/pl_PL.json @@ -223,6 +223,7 @@ "View all treatments": "Pokaż całość leczenia", "Enable Alarms": "Włącz alarmy", "Pump Battery Change": "Zmiana baterii w pompie", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Alarm! Niski poziom baterii w pompie", "Pump Battery change overdue!": "Bateria pompy musi być wymieniona!", "When enabled an alarm may sound.": "Sygnalizacja dzwiękowa przy włączonym alarmie", From c51ce39bc0ef5185f5b35013aa5301f37b312b18 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:18 +0200 Subject: [PATCH 34/63] New translations en.json (Dutch) --- translations/nl_NL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/nl_NL.json b/translations/nl_NL.json index 48d9cfda577..6c6105b595b 100644 --- a/translations/nl_NL.json +++ b/translations/nl_NL.json @@ -223,6 +223,7 @@ "View all treatments": "Bekijk alle behandelingen", "Enable Alarms": "Alarmen aan!", "Pump Battery Change": "Pompbatterij vervangen", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Pompbatterij bijna leeg Alarm", "Pump Battery change overdue!": "Pompbatterij moet vervangen worden!", "When enabled an alarm may sound.": "Als ingeschakeld kan alarm klinken", From 941870eef9e0455642482d87f2cf72037cab787c Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:19 +0200 Subject: [PATCH 35/63] New translations en.json (Korean) --- translations/ko_KR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/ko_KR.json b/translations/ko_KR.json index adc6a08cdc8..6404a9b6bc3 100644 --- a/translations/ko_KR.json +++ b/translations/ko_KR.json @@ -223,6 +223,7 @@ "View all treatments": "모든 treatments 보기", "Enable Alarms": "알람 켜기", "Pump Battery Change": "Pump Battery Change", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Pump Battery Low Alarm", "Pump Battery change overdue!": "Pump Battery change overdue!", "When enabled an alarm may sound.": "알림을 활성화 하면 알람이 울립니다.", From 5b0a87c44bcad7e78b05541d11deb12de671c07c Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:21 +0200 Subject: [PATCH 36/63] New translations en.json (Italian) --- translations/it_IT.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/it_IT.json b/translations/it_IT.json index d23872bde40..1f5d0ab4ffc 100644 --- a/translations/it_IT.json +++ b/translations/it_IT.json @@ -223,6 +223,7 @@ "View all treatments": "Visualizza tutti le somministrazioni", "Enable Alarms": "Attiva Allarmi", "Pump Battery Change": "Cambio Batteria Microinfusore", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Allarme Batteria Microinfusore Bassa", "Pump Battery change overdue!": "Sostituzione Batteria del Microinfusore in ritardo!", "When enabled an alarm may sound.": "Quando è abilitato, può suonare un allarme.", From 4f7ec4662ce484b1c6456aaf370087769129bdd4 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:22 +0200 Subject: [PATCH 37/63] New translations en.json (Norwegian Bokmal) --- translations/nb_NO.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/nb_NO.json b/translations/nb_NO.json index 2f3fe107cb5..cc5f29d3899 100644 --- a/translations/nb_NO.json +++ b/translations/nb_NO.json @@ -223,6 +223,7 @@ "View all treatments": "Vis behandlinger", "Enable Alarms": "Aktiver alarmer", "Pump Battery Change": "Bytte av pumpebatteri", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Pumpebatteri: Lav alarm", "Pump Battery change overdue!": "Pumpebatteriet må byttes!", "When enabled an alarm may sound.": "Når aktivert kan en alarm lyde.", From 84ee8f2f8fd5e929c65fbbba941e9e639ff185a3 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:23 +0200 Subject: [PATCH 38/63] New translations en.json (Hungarian) --- translations/hu_HU.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/hu_HU.json b/translations/hu_HU.json index 70683fbd303..4ebca767314 100644 --- a/translations/hu_HU.json +++ b/translations/hu_HU.json @@ -223,6 +223,7 @@ "View all treatments": "Összes kezelés", "Enable Alarms": "Riasztások bekapcsolása", "Pump Battery Change": "Pumpa elem kora", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Pumpa Elem Alacsony Töltöttség Riasztás", "Pump Battery change overdue!": "Pumpa Elem cserére szorul!", "When enabled an alarm may sound.": "Bekapcsoláskor hang figyelmeztetés várható", From 8acc5e5356ab4e35397db5ae4b6181010bbeee9c Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:25 +0200 Subject: [PATCH 39/63] New translations en.json (Finnish) --- translations/fi_FI.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/fi_FI.json b/translations/fi_FI.json index 949a93e1435..b496f5e47fc 100644 --- a/translations/fi_FI.json +++ b/translations/fi_FI.json @@ -223,6 +223,7 @@ "View all treatments": "Katso kaikki hoitotoimenpiteet", "Enable Alarms": "Aktivoi hälytykset", "Pump Battery Change": "Pumpun patterin vaihto", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Varoitus! Pumpun patteri loppumassa", "Pump Battery change overdue!": "Pumpun patterin vaihto myöhässä!", "When enabled an alarm may sound.": "Aktivointi mahdollistaa äänihälytykset", From dc13d2d278b68982924f9f1824befa0a046d0ec7 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:27 +0200 Subject: [PATCH 40/63] New translations en.json (German) --- translations/de_DE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/de_DE.json b/translations/de_DE.json index b70f99564df..a86c1ea93cf 100644 --- a/translations/de_DE.json +++ b/translations/de_DE.json @@ -223,6 +223,7 @@ "View all treatments": "Zeige alle Behandlungen", "Enable Alarms": "Alarme einschalten", "Pump Battery Change": "Pumpenbatterie wechseln", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Pumpenbatterie niedrig Alarm", "Pump Battery change overdue!": "Pumpenbatterie Wechsel überfällig!", "When enabled an alarm may sound.": "Sofern eingeschaltet ertönt ein Alarm", From 850a9b4390a65d950807686902f532161768c9a5 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:28 +0200 Subject: [PATCH 41/63] New translations en.json (Danish) --- translations/da_DK.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/da_DK.json b/translations/da_DK.json index 82d5f5655d8..ca5747e9bfa 100644 --- a/translations/da_DK.json +++ b/translations/da_DK.json @@ -223,6 +223,7 @@ "View all treatments": "Se alle behandlinger", "Enable Alarms": "Aktivere alarmer", "Pump Battery Change": "Udskiftet pumpebatteri", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Pumpebatteri lav Alarm", "Pump Battery change overdue!": "Pumpebatteri skal skiftes!", "When enabled an alarm may sound.": "Når aktiveret kan en alarm starte.", From 6722805d917b27f7d17061bd0ee528febc7910d7 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:29 +0200 Subject: [PATCH 42/63] New translations en.json (Czech) --- translations/cs_CZ.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/cs_CZ.json b/translations/cs_CZ.json index 6aa843dcbe1..db62a5af51e 100644 --- a/translations/cs_CZ.json +++ b/translations/cs_CZ.json @@ -223,6 +223,7 @@ "View all treatments": "Zobraz všechny ošetření", "Enable Alarms": "Povolit alarmy", "Pump Battery Change": "Výměna baterie pumpy", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Upozornění na nízký stav baterie pumpy", "Pump Battery change overdue!": "Překročen čas pro výměnu baterie!", "When enabled an alarm may sound.": "Při povoleném alarmu zní zvuk.", From 93c484188e6fb20bbd4427d071d997abb6b1bc73 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:31 +0200 Subject: [PATCH 43/63] New translations en.json (Bulgarian) --- translations/bg_BG.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/bg_BG.json b/translations/bg_BG.json index a94abe3b547..9623c18833f 100644 --- a/translations/bg_BG.json +++ b/translations/bg_BG.json @@ -223,6 +223,7 @@ "View all treatments": "Преглед на всички събития", "Enable Alarms": "Активни аларми", "Pump Battery Change": "Смяна на батерия на помпата", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Аларма за слаба батерия на помпата", "Pump Battery change overdue!": "Смяната на батерията на помпата - наложителна", "When enabled an alarm may sound.": "Когато е активирано, алармата ще има звук", From ba6c17ca61c77773a69a3b42afedd3419504f1be Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:32 +0200 Subject: [PATCH 44/63] New translations en.json (Spanish) --- translations/es_ES.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/es_ES.json b/translations/es_ES.json index 6c245a61463..24bea3434a9 100644 --- a/translations/es_ES.json +++ b/translations/es_ES.json @@ -223,6 +223,7 @@ "View all treatments": "Visualizar todos los tratamientos", "Enable Alarms": "Activar las alarmas", "Pump Battery Change": "Cambio batería bomba", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Alarma de Bomba Baja", "Pump Battery change overdue!": "Cambio de batería de bomba atrasado!", "When enabled an alarm may sound.": "Cuando estén activas, una alarma podrá sonar", From d029726a97aa8de6b085da088a3fd33e01aa1290 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:34 +0200 Subject: [PATCH 45/63] New translations en.json (French) --- translations/fr_FR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/fr_FR.json b/translations/fr_FR.json index 0e1c84ef658..9744179c9db 100644 --- a/translations/fr_FR.json +++ b/translations/fr_FR.json @@ -223,6 +223,7 @@ "View all treatments": "Voir tous les traitements", "Enable Alarms": "Activer les alarmes", "Pump Battery Change": "Changer les batteries de la pompe", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Alarme batterie de la pompe faible", "Pump Battery change overdue!": "Changement de la batterie de la pompe nécessaire !", "When enabled an alarm may sound.": "Si activée, un alarme peut sonner.", From 46c3a835850ef5d9a4e607630b660a19f460ccbd Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:35 +0200 Subject: [PATCH 46/63] New translations en.json (Romanian) --- translations/ro_RO.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/ro_RO.json b/translations/ro_RO.json index 412471f3d4b..f0240d80ade 100644 --- a/translations/ro_RO.json +++ b/translations/ro_RO.json @@ -223,6 +223,7 @@ "View all treatments": "Vezi toate evenimentele", "Enable Alarms": "Activează alarmele", "Pump Battery Change": "Schimbare baterie pompă", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Alarmă Baterie Scăzută la pompă", "Pump Battery change overdue!": "Intârziere la schimbarea bateriei de la pompă!", "When enabled an alarm may sound.": "Când este activ, poate suna o alarmă.", From 2efb59b502ccfef0519cb5bb1a4f06f4efbd204c Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:37 +0200 Subject: [PATCH 47/63] New translations en.json (Russian) --- translations/ru_RU.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/ru_RU.json b/translations/ru_RU.json index d4a1710bff2..b613622a6ad 100644 --- a/translations/ru_RU.json +++ b/translations/ru_RU.json @@ -223,6 +223,7 @@ "View all treatments": "Показать все события", "Enable Alarms": "Активировать сигналы", "Pump Battery Change": "Замена батареи помпы", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Внимание! низкий заряд батареи помпы", "Pump Battery change overdue!": "Пропущен срок замены батареи!", "When enabled an alarm may sound.": "При активации может звучать сигнал", From d07cd1699247df4bc888f218a0854bda545b0a7d Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:38 +0200 Subject: [PATCH 48/63] New translations en.json (Swedish) --- translations/sv_SE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/sv_SE.json b/translations/sv_SE.json index 1dfe06f94db..38e9cfef07e 100644 --- a/translations/sv_SE.json +++ b/translations/sv_SE.json @@ -223,6 +223,7 @@ "View all treatments": "Visa behandlingar", "Enable Alarms": "Aktivera larm", "Pump Battery Change": "Byte av pumpbatteri", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Pumpbatteri lågt Alarm", "Pump Battery change overdue!": "Pumpbatteriet måste bytas!", "When enabled an alarm may sound.": "När markerad är ljudlarm aktivt", From b27c8c099da543817ddac85a88f839ff7f97cdcd Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:40 +0200 Subject: [PATCH 49/63] New translations en.json (Greek) --- translations/el_GR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/el_GR.json b/translations/el_GR.json index 3b3df63eb94..b1669ca1904 100644 --- a/translations/el_GR.json +++ b/translations/el_GR.json @@ -223,6 +223,7 @@ "View all treatments": "Προβολή όλων των θεραπειών", "Enable Alarms": "Ενεργοποίηση συναγερμών", "Pump Battery Change": "Αλλαγή μπαταρίας αντλίας", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Συναγερμός χαμηλής στάθμης μπαταρίας", "Pump Battery change overdue!": "Η αλλαγή της μπαταρίας της αντλίας έχει καθυστερήσει!", "When enabled an alarm may sound.": "Όταν είναι ενεργοποιημένο, μπορεί να ακουστεί συναγερμός.", From f4c4f29bbac8d934f9dfd66a7d1b33ee6a0949ea Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 14:02:41 +0200 Subject: [PATCH 50/63] New translations en.json (Slovak) --- translations/sk_SK.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/sk_SK.json b/translations/sk_SK.json index f9eb437f0e9..a44e0d8bc8f 100644 --- a/translations/sk_SK.json +++ b/translations/sk_SK.json @@ -223,6 +223,7 @@ "View all treatments": "Zobraziť všetky ošetrenia", "Enable Alarms": "Aktivovať alarmy", "Pump Battery Change": "Zamenjaj baterijo crpalke", + "Pump Battery Age": "Pump Battery Age", "Pump Battery Low Alarm": "Baterija crpalke nizka Alarm", "Pump Battery change overdue!": "Pump Battery change overdue!", "When enabled an alarm may sound.": "Pri aktivovanom alarme znie zvuk ", From f8bd9fd2256b8cf19f0ae7c7c7aad21a6d812ebf Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 17:07:58 +0200 Subject: [PATCH 51/63] Update source file en.json --- translations/en/en.json | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/en/en.json b/translations/en/en.json index cc4f95ea41e..13782a2f503 100644 --- a/translations/en/en.json +++ b/translations/en/en.json @@ -223,6 +223,7 @@ ,"View all treatments":"View all treatments" ,"Enable Alarms":"Enable Alarms" ,"Pump Battery Change":"Pump Battery Change" + ,"Pump Battery Age":"Pump Battery Age" ,"Pump Battery Low Alarm":"Pump Battery Low Alarm" ,"Pump Battery change overdue!":"Pump Battery change overdue!" ,"When enabled an alarm may sound.":"When enabled an alarm may sound." From 98dd02a956c2b47e28b4f3df0b61056972bcd482 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 17:08:04 +0200 Subject: [PATCH 52/63] New translations en.json (Portuguese) --- translations/pt_PT.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/pt_PT.json b/translations/pt_PT.json index 316ccceb55e..946df2e8006 100644 --- a/translations/pt_PT.json +++ b/translations/pt_PT.json @@ -223,7 +223,7 @@ "View all treatments": "Ver todos os tratamentos", "Enable Alarms": "Activar Alarmes", "Pump Battery Change": "Troca de Bateria da Bomba", - "Pump Battery Age": "Pump Battery Age", + "Pump Battery Age": "Idade Bateria da Bomba", "Pump Battery Low Alarm": "Alarme de Bateria Fraca da Bomba", "Pump Battery change overdue!": "Troca de Bateria da Bomba atrasada!", "When enabled an alarm may sound.": "Quando activado um alarme pode soar.", From 47213e2f6e34ad4bf41a24c063e0430e6ec31df1 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 17:08:15 +0200 Subject: [PATCH 53/63] New translations en.json (Dutch) --- translations/nl_NL.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/nl_NL.json b/translations/nl_NL.json index 6c6105b595b..ef0094d9a2b 100644 --- a/translations/nl_NL.json +++ b/translations/nl_NL.json @@ -223,7 +223,7 @@ "View all treatments": "Bekijk alle behandelingen", "Enable Alarms": "Alarmen aan!", "Pump Battery Change": "Pompbatterij vervangen", - "Pump Battery Age": "Pump Battery Age", + "Pump Battery Age": "Pomp Batterij Leeftijd", "Pump Battery Low Alarm": "Pompbatterij bijna leeg Alarm", "Pump Battery change overdue!": "Pompbatterij moet vervangen worden!", "When enabled an alarm may sound.": "Als ingeschakeld kan alarm klinken", From 82716d5e98d0daa6d7fb0c0be9e7cb8c580937fd Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 17:08:19 +0200 Subject: [PATCH 54/63] New translations en.json (Norwegian Bokmal) --- translations/nb_NO.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/nb_NO.json b/translations/nb_NO.json index cc5f29d3899..2bfcdb15c36 100644 --- a/translations/nb_NO.json +++ b/translations/nb_NO.json @@ -223,7 +223,7 @@ "View all treatments": "Vis behandlinger", "Enable Alarms": "Aktiver alarmer", "Pump Battery Change": "Bytte av pumpebatteri", - "Pump Battery Age": "Pump Battery Age", + "Pump Battery Age": "Pumpebatteri alder", "Pump Battery Low Alarm": "Pumpebatteri: Lav alarm", "Pump Battery change overdue!": "Pumpebatteriet må byttes!", "When enabled an alarm may sound.": "Når aktivert kan en alarm lyde.", From 18eced75e784746c9fdd6a944332b6db4507dde2 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 17:08:21 +0200 Subject: [PATCH 55/63] New translations en.json (Finnish) --- translations/fi_FI.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/fi_FI.json b/translations/fi_FI.json index b496f5e47fc..bf2a37b4b90 100644 --- a/translations/fi_FI.json +++ b/translations/fi_FI.json @@ -223,7 +223,7 @@ "View all treatments": "Katso kaikki hoitotoimenpiteet", "Enable Alarms": "Aktivoi hälytykset", "Pump Battery Change": "Pumpun patterin vaihto", - "Pump Battery Age": "Pump Battery Age", + "Pump Battery Age": "Pumpun Patterin Ikä", "Pump Battery Low Alarm": "Varoitus! Pumpun patteri loppumassa", "Pump Battery change overdue!": "Pumpun patterin vaihto myöhässä!", "When enabled an alarm may sound.": "Aktivointi mahdollistaa äänihälytykset", From c036829796b6d1a710c4922d6dedc5977448b5e2 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 17:08:23 +0200 Subject: [PATCH 56/63] New translations en.json (German) --- translations/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/de_DE.json b/translations/de_DE.json index a86c1ea93cf..ad2dbd979fa 100644 --- a/translations/de_DE.json +++ b/translations/de_DE.json @@ -223,7 +223,7 @@ "View all treatments": "Zeige alle Behandlungen", "Enable Alarms": "Alarme einschalten", "Pump Battery Change": "Pumpenbatterie wechseln", - "Pump Battery Age": "Pump Battery Age", + "Pump Battery Age": "Alter der Pumpenbatterie", "Pump Battery Low Alarm": "Pumpenbatterie niedrig Alarm", "Pump Battery change overdue!": "Pumpenbatterie Wechsel überfällig!", "When enabled an alarm may sound.": "Sofern eingeschaltet ertönt ein Alarm", From ea85560a5c03cf91d7ccafa6be60d2624eb1cbb8 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 17:08:24 +0200 Subject: [PATCH 57/63] New translations en.json (Danish) --- translations/da_DK.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/da_DK.json b/translations/da_DK.json index ca5747e9bfa..576c2a1de9a 100644 --- a/translations/da_DK.json +++ b/translations/da_DK.json @@ -223,7 +223,7 @@ "View all treatments": "Se alle behandlinger", "Enable Alarms": "Aktivere alarmer", "Pump Battery Change": "Udskiftet pumpebatteri", - "Pump Battery Age": "Pump Battery Age", + "Pump Battery Age": "Pumpe batterialder", "Pump Battery Low Alarm": "Pumpebatteri lav Alarm", "Pump Battery change overdue!": "Pumpebatteri skal skiftes!", "When enabled an alarm may sound.": "Når aktiveret kan en alarm starte.", From 1223e6dd5e14c7ccf2dbb939b90db8bc43b95447 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 17:08:26 +0200 Subject: [PATCH 58/63] New translations en.json (Czech) --- translations/cs_CZ.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/cs_CZ.json b/translations/cs_CZ.json index db62a5af51e..4815eabaf8d 100644 --- a/translations/cs_CZ.json +++ b/translations/cs_CZ.json @@ -223,7 +223,7 @@ "View all treatments": "Zobraz všechny ošetření", "Enable Alarms": "Povolit alarmy", "Pump Battery Change": "Výměna baterie pumpy", - "Pump Battery Age": "Pump Battery Age", + "Pump Battery Age": "Stáří baterie v pumpě", "Pump Battery Low Alarm": "Upozornění na nízký stav baterie pumpy", "Pump Battery change overdue!": "Překročen čas pro výměnu baterie!", "When enabled an alarm may sound.": "Při povoleném alarmu zní zvuk.", From 253433dcd5953e27ca18f9b1a34daccf09f51fb7 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 17:08:28 +0200 Subject: [PATCH 59/63] New translations en.json (Spanish) --- translations/es_ES.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/es_ES.json b/translations/es_ES.json index 24bea3434a9..b16e68dc0c7 100644 --- a/translations/es_ES.json +++ b/translations/es_ES.json @@ -223,7 +223,7 @@ "View all treatments": "Visualizar todos los tratamientos", "Enable Alarms": "Activar las alarmas", "Pump Battery Change": "Cambio batería bomba", - "Pump Battery Age": "Pump Battery Age", + "Pump Battery Age": "Edad de la batería de la bomba", "Pump Battery Low Alarm": "Alarma de Bomba Baja", "Pump Battery change overdue!": "Cambio de batería de bomba atrasado!", "When enabled an alarm may sound.": "Cuando estén activas, una alarma podrá sonar", From 3a6f5f22640bba56da1ed9a4471ad8f2e25d61c1 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 17:08:33 +0200 Subject: [PATCH 60/63] New translations en.json (Swedish) --- translations/sv_SE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/sv_SE.json b/translations/sv_SE.json index 38e9cfef07e..c6817eb61ae 100644 --- a/translations/sv_SE.json +++ b/translations/sv_SE.json @@ -223,7 +223,7 @@ "View all treatments": "Visa behandlingar", "Enable Alarms": "Aktivera larm", "Pump Battery Change": "Byte av pumpbatteri", - "Pump Battery Age": "Pump Battery Age", + "Pump Battery Age": "Pump Batteriets ålder", "Pump Battery Low Alarm": "Pumpbatteri lågt Alarm", "Pump Battery change overdue!": "Pumpbatteriet måste bytas!", "When enabled an alarm may sound.": "När markerad är ljudlarm aktivt", From 6d4982e9955d1e3ff495a028fe04dc5ef0cd6ff8 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Fri, 19 Feb 2021 22:11:09 +0200 Subject: [PATCH 61/63] New translations en.json (Hungarian) --- translations/hu_HU.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/translations/hu_HU.json b/translations/hu_HU.json index 4ebca767314..0d9dbad022d 100644 --- a/translations/hu_HU.json +++ b/translations/hu_HU.json @@ -18,15 +18,15 @@ "Subcategory": "Alkategória", "Name": "Név", "Today": "Ma", - "Last 2 days": "Elmúlt 2 nap", - "Last 3 days": "Elmúlt 3 nap", + "Last 2 days": "Utolsó 2 nap", + "Last 3 days": "Utolsó 3 nap", "Last week": "Elmúlt hét", "Last 2 weeks": "Elmúlt 2 hét", "Last month": "Elmúlt hónap", "Last 3 months": "Elmúlt 3 hónap", "From": "Ettől", "To": "Eddig", - "Notes": "Megjegyzések", + "Notes": "Megjegyzés", "Food": "Étel", "Insulin": "Inzulin", "Carbs": "Szénhidrát", @@ -223,13 +223,13 @@ "View all treatments": "Összes kezelés", "Enable Alarms": "Riasztások bekapcsolása", "Pump Battery Change": "Pumpa elem kora", - "Pump Battery Age": "Pump Battery Age", + "Pump Battery Age": "Pumpa elem kora", "Pump Battery Low Alarm": "Pumpa Elem Alacsony Töltöttség Riasztás", "Pump Battery change overdue!": "Pumpa Elem cserére szorul!", "When enabled an alarm may sound.": "Bekapcsoláskor hang figyelmeztetés várható", "Urgent High Alarm": "Nagyon magas cukorszint figyelmeztetés", - "High Alarm": "Magas cukorszint fegyelmeztetés", - "Low Alarm": "Alacsony cukorszint figyelmeztetés", + "High Alarm": "Magas riasztás", + "Low Alarm": "Alacsony riasztás", "Urgent Low Alarm": "Nagyon alacsony cukorszint figyelmeztetés", "Stale Data: Warn": "Figyelmeztetés: Az adatok öregnek tűnnek", "Stale Data: Urgent": "Figyelmeztetés: Az adatok nagyon öregnek tűnnek", From d263a04f59efc5a441d0e83292e81e03f9ac9c57 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Sat, 20 Feb 2021 18:18:59 +0200 Subject: [PATCH 62/63] New translations en.json (Hungarian) (#6907) --- translations/hu_HU.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/hu_HU.json b/translations/hu_HU.json index 0d9dbad022d..4bfaeebf3e2 100644 --- a/translations/hu_HU.json +++ b/translations/hu_HU.json @@ -32,7 +32,7 @@ "Carbs": "Szénhidrát", "Notes contain": "Jegyzet tartalmazza", "Target BG range bottom": "Alsó cukorszint határ", - "top": "teteje", + "top": "Felső", "Show": "Mutasd", "Display": "Megjelenítés", "Loading": "Betöltés", @@ -43,9 +43,9 @@ "Loading CGM data of": "CGM adatok betöltése tőle", "Loading treatments data of": "Kezelési adatok betöltése tőle", "Processing data of": "Adatok feldolgozása tőle", - "Portion": "Rész", + "Portion": "Adag", "Size": "Méret", - "(none)": "(semmi)", + "(none)": "(nincs)", "None": "Semmi", "": "", "Result is empty": "Az eredmény üres", From 8516fe922f61070df19c0454af5f93715e169ff2 Mon Sep 17 00:00:00 2001 From: Sulka Haro Date: Mon, 22 Feb 2021 10:16:44 +0200 Subject: [PATCH 63/63] New translations en.json (Hungarian) (#6908) --- translations/hu_HU.json | 120 ++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/translations/hu_HU.json b/translations/hu_HU.json index 4bfaeebf3e2..7698dc7dc36 100644 --- a/translations/hu_HU.json +++ b/translations/hu_HU.json @@ -18,21 +18,21 @@ "Subcategory": "Alkategória", "Name": "Név", "Today": "Ma", - "Last 2 days": "Utolsó 2 nap", - "Last 3 days": "Utolsó 3 nap", + "Last 2 days": "Elmúlt 2 nap", + "Last 3 days": "Elmúlt 3 nap", "Last week": "Elmúlt hét", "Last 2 weeks": "Elmúlt 2 hét", "Last month": "Elmúlt hónap", "Last 3 months": "Elmúlt 3 hónap", "From": "Ettől", "To": "Eddig", - "Notes": "Megjegyzés", + "Notes": "Megjegyzések", "Food": "Étel", "Insulin": "Inzulin", "Carbs": "Szénhidrát", "Notes contain": "Jegyzet tartalmazza", - "Target BG range bottom": "Alsó cukorszint határ", - "top": "Felső", + "Target BG range bottom": "Céltartomány alja", + "top": "teteje", "Show": "Mutasd", "Display": "Megjelenítés", "Loading": "Betöltés", @@ -67,21 +67,21 @@ "Upper Quartile": "Magas kvartilis", "Quartile": "Kvartilis", "Date": "Dátum", - "Normal": "Normális", + "Normal": "Céltartományban", "Median": "Medián", "Readings": "Értékek", - "StDev": "Standard eltérés", + "StDev": "Szórás", "Daily stats report": "Napi statisztika jelentés", - "Glucose Percentile report": "Vércukorszint percentilis jelentés", - "Glucose distribution": "Vércukorszint eloszlás", + "Glucose Percentile report": "Szenzorglükóz percentilis jelentés", + "Glucose distribution": "Szenzorglükóz eloszlás", "days total": "nap összesen", - "Total per day": "Naponta összesen", + "Total per day": "Napi összes", "Overall": "Összesen", "Range": "Tartomány", - "% of Readings": "értékek %-a", - "# of Readings": "értékek száma", + "% of Readings": "Értékek %-a", + "# of Readings": "Értékek száma", "Mean": "Középérték", - "Standard Deviation": "Standard eltérés", + "Standard Deviation": "Szórás", "Max": "Max", "Min": "Min", "A1c estimation*": "HbA1c becslés*", @@ -92,10 +92,10 @@ "Database loaded": "Adatbázis betöltve", "Error: Database failed to load": "Hiba: adatbázis betöltése sikertelen", "Error": "Hiba", - "Create new record": "Új bejegyzés", + "Create new record": "Bejegyzés létrehozása", "Save record": "Bejegyzés mentése", - "Portions": "Porció", - "Unit": "Egység", + "Portions": "Adag", + "Unit": "Mértékegység", "GI": "GI", "Edit record": "Bejegyzés szerkesztése", "Delete record": "Bejegyzés törlése", @@ -107,30 +107,30 @@ "API secret hash stored": "API_SECRET hash elmentve", "Status": "Állapot", "Not loaded": "Nincs betöltve", - "Food Editor": "Étel Szerkesztő", - "Your database": "Az adatbázisod", + "Food Editor": "Ételszerkesztő", + "Your database": "Saját adatbázis", "Filter": "Szűrő", "Save": "Mentés", "Clear": "Törlés", "Record": "Bejegyzés", "Quick picks": "Gyors választások", "Show hidden": "Rejtettek mutatása", - "Your API secret or token": "Az API jelszo", - "Remember this device. (Do not enable this on public computers.)": "A berendezés megjegyzése. (Csak saját berendezésen használd", + "Your API secret or token": "Saját API_secret vagy token", + "Remember this device. (Do not enable this on public computers.)": "Eszköz megjegyzése (ne jelöld be nyilvános eszközökön)", "Treatments": "Kezelések", "Time": "Idő", "Event Type": "Esemény típusa", - "Blood Glucose": "Vércukorszint", - "Entered By": "Beírta", + "Blood Glucose": "Szenzorglükóz", + "Entered By": "Rögzítette", "Delete this treatment?": "Kezelés törlése?", - "Carbs Given": "Bevitt szénhidrát", - "Insulin Given": "Beadott inzulin", + "Carbs Given": "Szénhidrát", + "Insulin Given": "Inzulin", "Event Time": "Esemény időpontja", "Please verify that the data entered is correct": "Kérlek ellenőrizd az adatok helyességét", - "BG": "VC", - "Use BG correction in calculation": "Használj VC korrekciót a számításban", - "BG from CGM (autoupdated)": "VC a CGM-től (automatikusan frissítve)", - "BG from meter": "VC a merőtől", + "BG": "SzG", + "Use BG correction in calculation": "Használj SzG korrekciót a számításban", + "BG from CGM (autoupdated)": "SzG a CGM-től (auto. frissítve)", + "BG from meter": "VC a mérőtől", "Manual BG": "Kézi VC", "Quickpick": "Gyors választás", "or": "vagy", @@ -140,17 +140,17 @@ "Use IOB in calculation": "Használd az IOB-t a számításban", "Other correction": "Egyéb korrekció", "Rounding": "Kerekítés", - "Enter insulin correction in treatment": "Add be az inzulin korrekciót a kezeléshez", + "Enter insulin correction in treatment": "A korrekciós inzulint a kezeléseknél add meg", "Insulin needed": "Inzulin szükséges", "Carbs needed": "Szénhidrát szükséges", "Carbs needed if Insulin total is negative value": "Szénhidrát szükséges ha a teljes inzulin negatív", - "Basal rate": "Bazál arány", + "Basal rate": "Bázisinzulin", "60 minutes earlier": "60 perccel korábban", "45 minutes earlier": "45 perccel korábban", "30 minutes earlier": "30 perccel korábban", "20 minutes earlier": "20 perccel korábban", "15 minutes earlier": "15 perccel korábban", - "Time in minutes": "Idő percekben", + "Time in minutes": "perc-ben", "15 minutes later": "15 perccel később", "20 minutes later": "20 perccel később", "30 minutes later": "30 perccel később", @@ -159,44 +159,44 @@ "Additional Notes, Comments": "További megjegyzések, kommentárok", "RETRO MODE": "RETRO MÓD", "Now": "Most", - "Other": "Egyéb", - "Submit Form": "Elküldés", - "Profile Editor": "Profil Szerkesztő", + "Other": "Egyéb:", + "Submit Form": "Ok", + "Profile Editor": "Profilszerkesztő", "Reports": "Jelentések", - "Add food from your database": "Étel hozzáadása az adatbázisodból", + "Add food from your database": "Étel hozzáadása saját adatbázisból", "Reload database": "Adatbázis újratöltése", "Add": "Hozzáadni", - "Unauthorized": "Jogosulatlan", - "Entering record failed": "Hozzáadás nem sikerült", - "Device authenticated": "Berendezés hitelesítve", + "Unauthorized": "Nem hitelesített", + "Entering record failed": "Bejegyzés hozzáadása sikertelen", + "Device authenticated": "Eszköz hitelesítve", "Device not authenticated": "Nem hitelesített eszköz", "Authentication status": "Hitelesítés állapota", "Authenticate": "Hitelesít", "Remove": "Eltávolítani", - "Your device is not authenticated yet": "A berendezés még nincs hitelesítve", + "Your device is not authenticated yet": "Az eszköz még nincs hitelesítve", "Sensor": "Szenzor", "Finger": "Ujj", "Manual": "Kézi", - "Scale": "Méretarány", + "Scale": "Skála", "Linear": "Lineáris", "Logarithmic": "Logaritmikus", - "Logarithmic (Dynamic)": "Logaritmikus (Dinamikus)", + "Logarithmic (Dynamic)": "Logaritmikus (dinamikus)", "Insulin-on-Board": "Aktív inzulin (IOB)", "Carbs-on-Board": "Aktív szénhidrát (COB)", "Bolus Wizard Preview": "Bolus Varázsló", "Value Loaded": "Érték betöltve", "Cannula Age": "Kanül kora", - "Basal Profile": "Bazál profil", + "Basal Profile": "Bázisprofil", "Silence for 30 minutes": "Némítás 30 percre", "Silence for 60 minutes": "Némítás 60 percre", "Silence for 90 minutes": "Némítás 90 percre", "Silence for 120 minutes": "Némítás 120 percre", "Settings": "Beállítások", - "Units": "Egység", - "Date format": "Dátum formátum", + "Units": "Mértékegység", + "Date format": "Időformátum", "12 hours": "12 óra", "24 hours": "24 óra", - "Log a Treatment": "Kezelés bejegyzése", + "Log a Treatment": "Kezelés rögzítése", "BG Check": "VC ellenőrzés", "Meal Bolus": "Étkezési bólus", "Snack Bolus": "Kis étkezési bólus", @@ -206,26 +206,26 @@ "Question": "Kérdés", "Exercise": "Edzés", "Pump Site Change": "Kanülcsere", - "CGM Sensor Start": "CGM Szenzor Indítás", - "CGM Sensor Stop": "CGM Szenzor Leállítás", - "CGM Sensor Insert": "CGM Szenzor Behelyezés", + "CGM Sensor Start": "CGM szenzor indítás", + "CGM Sensor Stop": "CGM szenzor leállítás", + "CGM Sensor Insert": "CGM szenzor behelyezés", "Sensor Code": "Szenzor kód", "Transmitter ID": "Transzmitter ID", - "Dexcom Sensor Start": "Dexcom Szenzor Indítása", - "Dexcom Sensor Change": "Dexcom Szenzor Csere", + "Dexcom Sensor Start": "Dexcom szenzor indítás", + "Dexcom Sensor Change": "Dexcom szenzor csere", "Insulin Cartridge Change": "Inzulintartály-csere", - "D.A.D. Alert": "D.A.D Figyelmeztetés", - "Glucose Reading": "Vércukorérték", + "D.A.D. Alert": "D.A.D riasztás", + "Glucose Reading": "Cukorszint", "Measurement Method": "Mérés módja", "Meter": "Vércukormérő", - "Amount in grams": "Mennyiség grammban", - "Amount in units": "Mennyiség Egység-ben", + "Amount in grams": "gramm-ban", + "Amount in units": "Egység-ben", "View all treatments": "Összes kezelés", "Enable Alarms": "Riasztások bekapcsolása", - "Pump Battery Change": "Pumpa elem kora", - "Pump Battery Age": "Pumpa elem kora", - "Pump Battery Low Alarm": "Pumpa Elem Alacsony Töltöttség Riasztás", - "Pump Battery change overdue!": "Pumpa Elem cserére szorul!", + "Pump Battery Change": "Pumpaelem kora", + "Pump Battery Age": "Pumpaelem kora", + "Pump Battery Low Alarm": "Pumpa elem merül riasztás", + "Pump Battery change overdue!": "Pumpa elem cserére szorul!", "When enabled an alarm may sound.": "Bekapcsoláskor hang figyelmeztetés várható", "Urgent High Alarm": "Nagyon magas cukorszint figyelmeztetés", "High Alarm": "Magas riasztás", @@ -234,7 +234,7 @@ "Stale Data: Warn": "Figyelmeztetés: Az adatok öregnek tűnnek", "Stale Data: Urgent": "Figyelmeztetés: Az adatok nagyon öregnek tűnnek", "mins": "perc", - "Night Mode": "Éjjeli Mód", + "Night Mode": "Éjszakai mód", "When enabled the page will be dimmed from 10pm - 6am.": "Ezt bekapcsolva a képernyő halványabb lesz 22-től 6-ig", "Enable": "Bekapcsolva", "Show Raw BG Data": "Nyers SzG értékek megjelenítése", @@ -250,7 +250,7 @@ "Reset, and use defaults": "Visszaállítás a kiinduló állapotba", "Calibrations": "Kalibrációk", "Alarm Test / Smartphone Enable": "Figyelmeztetés teszt / Mobiltelefon aktiválása", - "Bolus Wizard": "Bólus Varázsló", + "Bolus Wizard": "Bólus varázsló", "in the future": "a jövőben", "time ago": "idővel ezelőtt", "hr ago": "órája",