diff --git a/.nvmrc b/.nvmrc index 486db33615e..6a11a032426 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -8.9.1 +8.9.x diff --git a/.travis.yml b/.travis.yml index fb6fd879e6d..14a3dfe59d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,8 @@ language: node_js sudo: required dist: trusty node_js: - - "8.9.1" + - "8.9.3" +before_install: if [[ `npm --version` != "5.6" ]]; then npm install -g npm@latest; npm --version; fi matrix: fast_finish: true services: diff --git a/README.md b/README.md index 5d47832c4aa..0dd62cf7173 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,7 @@ Community maintained fork of the - [Alarms](#alarms) - [Core](#core) - [Predefined values for your browser settings (optional)](#predefined-values-for-your-browser-settings-optional) + - [Views](#views) - [Plugins](#plugins) - [Default Plugins](#default-plugins) - [`delta` (BG Delta)](#delta-bg-delta) @@ -228,7 +229,7 @@ To learn more about the Nightscout API, visit https://YOUR-SITE.com/api-docs.htm * `NIGHT_MODE` (`off`) - possible values `on` or `off` * `SHOW_RAWBG` (`never`) - possible values `always`, `never` or `noise` * `CUSTOM_TITLE` (`Nightscout`) - Usually name of T1 - * `THEME` (`default`) - possible values `default` or `colors` + * `THEME` (`default`) - possible values `default`, `colors`, or `colorblindfriendly` * `ALARM_TIMEAGO_WARN` (`on`) - possible values `on` or `off` * `ALARM_TIMEAGO_WARN_MINS` (`15`) - minutes since the last reading to trigger a warning * `ALARM_TIMEAGO_URGENT` (`on`) - possible values `on` or `off` @@ -242,6 +243,13 @@ To learn more about the Nightscout API, visit https://YOUR-SITE.com/api-docs.htm * The `log-dynamic` is similar to the default `log` options, but uses the same dynamic range and the `linear` scale. * `EDIT_MODE` (`on`) - possible values `on` or `off`. Enable or disable icon allowing enter treatments edit mode +### Views + + There are a few alternate web views available that display a simplified BG stream. Append any of these to your Nightscout URL: + * `/clock.html` - Shows current BG. Grey text on a black background. + * `/bgclock.html` - Shows current BG, trend arrow, and time of day. Grey text on a black background. + * `/clock-color.html` - Shows current BG and trend arrow. White text on a background that changes color to indicate current BG threshold (green = in range; blue = below range; yellow = above range; red = urgent below/above). + ### Plugins Plugins are used extend the way information is displayed, how notifications are sent, alarms are triggered, and more. @@ -377,7 +385,7 @@ To learn more about the Nightscout API, visit https://YOUR-SITE.com/api-docs.htm Generic Pump Monitoring for OpenAPS, MiniMed Connect, RileyLink, t:slim, with more on the way * Requires `DEVICESTATUS_ADVANCED="true"` to be set * `PUMP_ENABLE_ALERTS` (`false`) - Set to `true` to enable notifications for Pump battery and reservoir. - * `PUMP_WARNONSUSPEND` (`false`) - Set to `true` to get an alarm when the pump is suspended. + * `PUMP_WARN_ON_SUSPEND` (`false`) - Set to `true` to get an alarm when the pump is suspended. * `PUMP_FIELDS` (`reservoir battery`) - The fields to display by default. Any of the following fields: `reservoir`, `battery`, `clock`, `status`, and `device` * `PUMP_RETRO_FIELDS` (`reservoir battery clock`) - The fields to display in retro mode. Any of the above fields. * `PUMP_WARN_CLOCK` (`30`) - The number of minutes ago that needs to be exceed before an alert is triggered. diff --git a/app.json b/app.json index 63a5aa37c1c..17909419c54 100644 --- a/app.json +++ b/app.json @@ -8,7 +8,7 @@ "required": true }, "API_SECRET": { - "description": "REQUIRED: A secret passphrase that must be at least 12 characters long, required to enable POST and PUT; also required for the Care Portal", + "description": "REQUIRED: A secret passphrase that must be at least 12 characters long, required to enable POST and PUT; also required for the Care Portal.", "value": "", "required": true }, @@ -18,12 +18,12 @@ "required": false }, "ENABLE": { - "description": "Used to enable optional features, expects a space delimited list, such as: careportal rawbg iob, see https://github.com/nightscout/cgm-remote-monitor/blob/master/README.md for more info", + "description": "Used to enable optional features, expects a space delimited list, such as: careportal rawbg iob, see https://github.com/nightscout/cgm-remote-monitor/blob/master/README.md for more info.", "value": "", "required": false }, "DISABLE": { - "description": "Used to disable default features, expects a space delimited list, such as: direction upbat, see https://github.com/nightscout/cgm-remote-monitor/blob/master/README.md for more info", + "description": "Used to disable default features, expects a space delimited list, such as: direction upbat, see https://github.com/nightscout/cgm-remote-monitor/blob/master/README.md for more info.", "value": "", "required": false }, @@ -33,22 +33,22 @@ "required": false }, "BG_HIGH": { - "description": "Urgent high BG alarm. Default null value implies 260. Must be set in mg/dL. Only used with simple alarms.", + "description": "Urgent high BG alarm. Default null value implies 260. Must be set in mg/dL (multiply with 18 if you have a value in mmol/L). Only used with simple alarms.", "value": "", "required": false }, "BG_TARGET_TOP": { - "description": "Non-urgent high BG alarm, the top of your target range. Default null value implies 180. Must be set in mg/dL. Only used with simple alarms.", + "description": "Non-urgent high BG alarm, the top of your target range. Default null value implies 180. Must be set in mg/dL (multiply with 18 if you have a value in mmol/L). Only used with simple alarms.", "value": "", "required": false }, "BG_TARGET_BOTTOM": { - "description": "Non urgent low BG alarm, the bottom of your target range. Default null value implies 80. Must be set in mg/dL. Only used with simple alarms.", + "description": "Non urgent low BG alarm, the bottom of your target range. Default null value implies 80. Must be set in mg/dL (multiply with 18 if you have a value in mmol/L). Only used with simple alarms.", "value": "", "required": false }, "BG_LOW": { - "description": "Urgent Low BG alarm. Default null value implies 55. Must be set in mg/dL. Only used with simple alarms.", + "description": "Urgent Low BG alarm. Default null value implies 55. Must be set in mg/dL (multiply with 18 if you have a value in mmol/L). Only used with simple alarms.", "value": "", "required": false }, @@ -72,83 +72,73 @@ "value": "", "required": false }, - "THEME": { - "description": "Possible values default, colors or colorblindfriendly", - "value": "", - "required": false - }, - "SHOW_RAWBG": { - "description": "Possible values always, never or noise", - "value": "", - "required": false - }, "BRIDGE_USER_NAME": { - "description": "Share bridge - Your user name for the Share service. ENSURE bridge is in ENABLE if you want to use the share bridge", + "description": "Share bridge - Your user name for the Share service. ENSURE bridge is in ENABLE if you want to use the share bridge.", "value": "", "required": false }, "BRIDGE_PASSWORD": { - "description": "Share bridge - Your password for the Share service. ENSURE bridge is in ENABLE if you want to use the share bridge", + "description": "Share bridge - Your password for the Share service. ENSURE bridge is in ENABLE if you want to use the share bridge.", "value": "", "required": false }, "TIME_FORMAT": { - "description": "Browser default time mode valid settings are 12 or 24", + "description": "Browser default time mode. Valid settings are 12 or 24", "value": "12", "required": false }, "NIGHT_MODE": { - "description": "Browser defaults to night mode valid settings are on or off", + "description": "Browser defaults to night mode. Valid settings are on or off", "value": "off", "required": false }, "SHOW_RAWBG": { - "description": "Browser default raw display mode vaild settings are always never or noise", + "description": "Browser default raw display mode. Valid settings are always, never, or noise", "value": "never", "required": false }, "THEME": { - "description": "Browser default theme setting vaild settings are default or colors", + "description": "Browser default theme setting. Valid settings are default, colors, or colorblindfriendly", "value": "default", "required": false }, "ALARM_URGENT_HIGH": { - "description": "Browser default urgent high alarm enabled vaild settings are on or off", + "description": "Browser default urgent high alarm enabled. Valid settings are on or off", "value": "on", "required": false }, "ALARM_HIGH": { - "description": "Browser default high alarm enabled vaild settings are on or off", + "description": "Browser default high alarm enabled. Valid settings are on or off", "value": "on", "required": false }, "ALARM_LOW": { - "description": "Browser default low alarm enabled vaild settings are on or off", + "description": "Browser default low alarm enabled. Valid settings are on or off", "value": "on", "required": false }, "ALARM_URGENT_LOW": { - "description": "Browser default urgent low alarm enabled vaild settings are on or off", + "description": "Browser default urgent low alarm enabled. Valid settings are on or off", "value": "on", "required": false }, "ALARM_TIMEAGO_WARN": { - "description": "Browser default warn after time of last data exceeds ALARM_TIMEAGO_WARN_MINS alarm enabled vaild settings are on or off", + "description": "Browser default warn after time of last data exceeds ALARM_TIMEAGO_WARN_MINS alarm enabled. Valid settings are on or off", "value": "on", "required": false }, "ALARM_TIMEAGO_WARN_MINS": { - "description": "Browser default minutes since the last reading to trigger a warning", + "description": "Browser default minutes since the last reading to trigger a warning.", "value": "15", "required": false }, "ALARM_TIMEAGO_URGENT": { - "description": "Browser default urgent warning after time of last data exceeds ALARM_TIMEAGO_URGENT_MINS alarm enabled vaild settings are on or off", + "description": "Browser default urgent warning after time of last data exceeds ALARM_TIMEAGO_URGENT_MINS alarm enabled. Valid settings are on or off", "value": "on", "required": false }, "ALARM_TIMEAGO_URGENT_MINS": { - "description": "Browser default minutes since last reading to trigger an urgent alarm", + "description": "Browser default minutes since last reading to trigger an urgent alarm.", "value": "30", "required": false }, diff --git a/bower.json b/bower.json deleted file mode 100644 index 9c69a0346c5..00000000000 --- a/bower.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "nightscout", - "version": "0.10.3-dev-20171205"", - "dependencies": { - "colorbrewer": "~1.0.0", - "jQuery-Storage-API": "~1.7.2", - "jquery": "2.1.0", - "jquery-flot": "0.8.3", - "jquery-ui": "~1.11.3", - "swagger-ui": "~2.1.2", - "tipsy-jmalonzo": "~1.0.1", - "tone": "*" - }, - "resolutions": { - "jquery": "2.1.0" - } -} diff --git a/env.js b/env.js index 6527d0750f0..b347d3852e8 100644 --- a/env.js +++ b/env.js @@ -79,17 +79,6 @@ function setAPISecret() { function setVersion() { var software = require('./package.json'); - var git = require('git-rev'); - - if (readENV('APPSETTING_ScmType') === readENV('ScmType') && readENV('ScmType') === 'GitHub') { - env.head = require('./scm-commit-id.json'); - console.log('SCM COMMIT ID', env.head); - } else { - git.short(function record_git_head(head) { - console.log('GIT HEAD', head); - env.head = head || readENV('SCM_COMMIT_ID') || readENV('COMMIT_HASH', ''); - }); - } env.version = software.version; env.name = software.name; } diff --git a/lib/api/entries/index.js b/lib/api/entries/index.js index 425fee4f7a1..19bcfed9526 100644 --- a/lib/api/entries/index.js +++ b/lib/api/entries/index.js @@ -94,25 +94,6 @@ function configure (app, wares, ctx) { return next(); } - // check for last modified from query results - - function ifModifiedSince (req, res, next) { - - var lastEntryDate = new Date(_.last(res.entries).dateString); - res.setHeader('Last-Modified', lastEntryDate.toUTCString()); - - var ifModifiedSince = req.get('If-Modified-Since'); - - if (!ifModifiedSince) { return next(); } - - if (lastEntryDate <= new Date(ifModifiedSince)) { - res.status(304).send({status:304, message: 'Not modified', type:'internal'}); - return; - } - - return next(); - } - /** * @method format_entries * A final middleware to send payloads assembled by previous middlewares diff --git a/lib/api/index.js b/lib/api/index.js index 7926ab5fd9a..4f4239c55d8 100644 --- a/lib/api/index.js +++ b/lib/api/index.js @@ -11,11 +11,7 @@ function create (env, ctx) { // set up express app with our options app.set('name', env.name); app.set('version', env.version); - // app.set('head', env.head); - function get_head ( ) { - return env.head; - } - wares.get_head = get_head; + app.set('units', env.DISPLAY_UNITS); // Only allow access to the API if API_SECRET is set on the server. app.disable('api'); diff --git a/lib/api/status.js b/lib/api/status.js index 350f428fdc4..9d18b524ec3 100644 --- a/lib/api/status.js +++ b/lib/api/status.js @@ -23,7 +23,6 @@ function configure (app, wares, env, ctx) { , apiEnabled: app.enabled('api') , careportalEnabled: app.enabled('api') && env.settings.enable.indexOf('careportal') > -1 , boluscalcEnabled: app.enabled('api') && env.settings.enable.indexOf('boluscalc') > -1 - , head: wares.get_head( ) , settings: env.settings , extendedSettings: app.extendedClientSettings , authorized: ctx.authorization.authorize(req.query.token || '') diff --git a/lib/authorization/storage.js b/lib/authorization/storage.js index 5b89f2b4177..d90c21351a2 100644 --- a/lib/authorization/storage.js +++ b/lib/authorization/storage.js @@ -5,7 +5,7 @@ var crypto = require('crypto'); var shiroTrie = require('shiro-trie'); var ObjectID = require('mongodb').ObjectID; -var find_options = require('../query'); +var find_options = require('../server/query'); function init (env, ctx) { var storage = { }; diff --git a/lib/client/index.js b/lib/client/index.js index f8ca8e56fbe..ff9a337c675 100644 --- a/lib/client/index.js +++ b/lib/client/index.js @@ -1127,6 +1127,7 @@ client.load = function load(serverSettings, callback) { chart.update(true); } else if (!inRetroMode()) { chart.update(false); + client.plugins.updateVisualisations(client.nowSBX); } } diff --git a/lib/client/receiveddata.js b/lib/client/receiveddata.js index e80b971710f..12f4da5901c 100644 --- a/lib/client/receiveddata.js +++ b/lib/client/receiveddata.js @@ -37,7 +37,6 @@ function mergeDataUpdate(isDelta, cachedDataArray, receivedDataArray, maxAge) { } // purge old data from cache before updating - var purgeCount = 0; var mAge = (isNaN(maxAge) || maxAge == null) ? TWO_DAYS : maxAge; var twoDaysAgo = new Date().getTime() - mAge; @@ -45,14 +44,8 @@ function mergeDataUpdate(isDelta, cachedDataArray, receivedDataArray, maxAge) { var element = cachedDataArray[i]; if (element !== null && element !== undefined && element.mills <= twoDaysAgo) { cachedDataArray.splice(i,0); - purgeCount += 1; } } - - //if (purgeCount > 0) { - // console.log('Purged ' + purgeCount + ' elements from cache due to age'); - //} - // If this is delta, calculate the difference, merge and sort var diff = nsArrayDiff(cachedDataArray, receivedDataArray); diff --git a/lib/client/renderer.js b/lib/client/renderer.js index e9478e4a378..f0666277715 100644 --- a/lib/client/renderer.js +++ b/lib/client/renderer.js @@ -393,8 +393,6 @@ function init (client, d3) { function calcTreatmentRadius(treatment, opts, carbratio) { var CR = treatment.CR || carbratio || 20; - var carbs = treatment.carbs || CR; - var insulin = treatment.insulin || 1; var carbsOrInsulin = CR; if ( treatment.carbs ) { carbsOrInsulin = treatment.carbs; diff --git a/lib/data/dataloader.js b/lib/data/dataloader.js index 541e32a9c38..c6ab99dfa77 100644 --- a/lib/data/dataloader.js +++ b/lib/data/dataloader.js @@ -20,6 +20,7 @@ function init(env, ctx) { var dataloader = { }; dataloader.update = function update(ddata, opts, done) { + if (opts && done == null && opts.call) { done = opts; opts = { lastUpdated: Date.now( ), frame: false }; @@ -91,6 +92,9 @@ function loadEntries (ddata, ctx, callback) { }; ctx.entries.list(q, function (err, results) { + + if (err) { console.log("Problem loading entries"); } + if (!err && results) { var mbgs = []; var sgvs = []; diff --git a/lib/language.js b/lib/language.js index bd0ee2384d8..3216c53dadb 100644 --- a/lib/language.js +++ b/lib/language.js @@ -618,7 +618,7 @@ function init() { cs: 'Od' ,de: 'Von' ,es: 'Desde' - ,fr: 'De' + ,fr: 'Du' ,el: 'Από' ,pt: 'De' ,sv: 'Från' @@ -641,7 +641,7 @@ function init() { cs: 'Do' ,de: 'Bis' ,es: 'Hasta' - ,fr: 'À' + ,fr: 'Au' ,el: 'Έως' ,pt: 'a' ,ro: 'La' @@ -801,7 +801,7 @@ function init() { cs: 'horní' ,de: 'oben' ,es: 'Superior' - ,fr: 'Supérieur' + ,fr: 'Supérieure' ,el: 'Πάνω όριο' ,pt: 'Superior' ,ro: 'Sus' @@ -1642,6 +1642,7 @@ function init() { ,nb: 'Standardavvik' ,he: 'סטיית תקן' ,pl: 'Stand. odchylenie' + ,nl: 'Std. deviatie' ,ru: 'Стандартное отклонение' ,sk: 'Štand. odch.' ,ko: '표준 편차' @@ -1832,7 +1833,7 @@ function init() { } ,'# of Readings' : { cs: 'počet záznamů' - ,de: '# des Messwerts' + ,de: 'Anzahl der Messwerte' ,es: 'N° de valores' ,fr: 'nbr de valeurs' ,el: 'Πλήθος μετρήσεων' @@ -2017,7 +2018,7 @@ function init() { ,'Using stored API secret hash' : { cs: 'Používám uložený hash API hesla' ,de: 'Gespeicherte API-Prüfsumme verwenden' - ,es: 'Usando el hash del API pre-almacenado' + ,es: 'Usando hash del API secreto pre-almacenado' ,fr: 'Utilisation du hash API existant' ,el: 'Χρηση αποθηκευμένου συνθηματικού' ,pt: 'Usando o hash de API existente' @@ -2040,8 +2041,9 @@ function init() { ,'No API secret hash stored yet. You need to enter API secret.' : { cs: 'Není uložený žádný hash API hesla. Musíte zadat API heslo.' ,de: 'Keine API-Prüfsumme gespeichert. Bitte API-Prüfsumme eingeben.' + ,es: 'No se ha almacenado ningún hash todavía. Debe introducir su API secreto.' ,es: 'No se ha almacenado ningún hash todavía. Debe introducir su secreto API.' - ,fr: 'Pas de secret API existant. Vous devez l\'en entrer.' + ,fr: 'Pas de secret API existant. Vous devez en entrer un.' ,el: 'Δεν υπάρχει αποθηκευμένο συνθηματικό API. Πρέπει να εισάγετε το συνθηματικό API' ,pt: 'Hash de segredo de API inexistente. Insira um segredo de API.' ,ro: 'Încă nu există cheie API secretă. Aceasta trebuie introdusă.' @@ -2337,7 +2339,7 @@ function init() { ,'Your API secret must be at least 12 characters long' : { cs: 'Vaše API heslo musí mít alespoň 12 znaků' ,de: 'Deine API-Prüfsumme muss mindestens 12 Zeichen lang sein' - ,es: 'Su secreo API debe contener al menos 12 caracteres' + ,es: 'Su API secreo debe contener al menos 12 carácteres' ,fr: 'Votre secret API doit contenir au moins 12 caractères' ,el: 'Το συνθηματικό πρέπει να είναι τουλάχιστον 12 χαρακτήρων' ,pt: 'Seu segredo de API deve conter no mínimo 12 caracteres' @@ -2360,7 +2362,7 @@ function init() { ,'Bad API secret' : { cs: 'Chybné API heslo' ,de: 'Fehlerhafte API-Prüfsumme' - ,es: 'Secreto API incorrecto' + ,es: 'API secreto incorrecto' ,fr: 'Secret API erroné' ,el: 'Λάθος συνθηματικό' ,pt: 'Segredo de API incorreto' @@ -2383,7 +2385,7 @@ function init() { ,'API secret hash stored' : { cs: 'Hash API hesla uložen' ,de: 'API-Prüfsumme gespeichert' - ,es: 'Hash de secreto API guardado' + ,es: 'Hash del API secreto guardado' ,fr: 'Hash API secret sauvegardé' ,el: 'Το συνθηματικό αποθηκεύτηκε' ,pt: 'Segredo de API guardado' @@ -2635,7 +2637,7 @@ function init() { ,'Your API secret' : { cs: 'Vaše API heslo' ,de: 'Deine API-Prüfsumme' - ,es: 'Su secreto API' + ,es: 'Su API secreto' ,fr: 'Votre secret API' ,el: 'Το συνθηματικό σας' ,pt: 'Seu segredo de API' @@ -2659,7 +2661,7 @@ function init() { cs: 'Ulož hash na tomto počítači (používejte pouze na soukromých počítačích)' ,de: 'Speichere Prüfsumme auf diesem Computer (nur auf privaten Computern anwenden)' ,es: 'Guardar hash en este ordenador (Usar solo en ordenadores privados)' - ,fr: 'Sauver le hash sur cet ordinateur (privé uniquement)' + ,fr: 'Sauvegarder le hash sur cet ordinateur (privé uniquement)' ,el: 'Αποθήκευση συνθηματικού σε αυτό τον υπολογιστή (μόνο για υπολογιστές προσωπικής χρήσης)' ,pt: 'Salvar hash nesse computador (Somente em computadores privados)' ,ro: 'Salvează cheia pe acest PC (Folosiți doar PC de încredere)' @@ -2956,7 +2958,7 @@ function init() { ,'BG from CGM (autoupdated)' : { cs: 'Glykémie z CGM (automaticky aktualizovaná)' ,de: 'Blutglukose vom CGM (Auto-Update)' - ,es: 'Glucemia del sensor (Actualizado automáticamente)' + ,es: 'Glucemia del sensor (Auto-actualizado)' ,fr: 'Glycémie CGM (automatique)' ,el: 'Τιμή γλυκόζης από τον αισθητήρα (αυτόματο)' ,pt: 'Glicemia do sensor (Automático)' @@ -2979,7 +2981,7 @@ function init() { cs: 'Glykémie z glukoměru' ,de: 'Blutzucker vom Messgerät' ,es: 'Glucemia del glucómetro' - ,fr: 'Glycémie de glucomètre' + ,fr: 'Glycémie du glucomètre' ,el: 'Τιμή γλυκόζης από τον μετρητή' ,pt: 'Glicemia do glicosímetro' ,sv: 'BS från blodsockermätare' @@ -3112,7 +3114,7 @@ function init() { ,'Use COB correction in calculation' : { cs: 'Použij korekci na COB' ,de: 'Verwende verzehrte Kohlenhydrate zur Kalkulation' - ,es: 'Usar la corrección de COB en los cálculos' + ,es: 'Usar carbohidratos activos para los cálculos' ,fr: 'Utiliser les COB dans les calculs' ,el: 'Χρήση των υδατανθράκων που απομένουν για τον υπολογισμό' ,pt: 'Usar correção de COB no cálculo' @@ -3134,7 +3136,7 @@ function init() { ,'Use IOB in calculation' : { cs: 'Použij IOB ve výpočtu' ,de: 'Verwende gespritzes Insulin zur Kalkulation' - ,es: 'Usar la IOB en los cálculos' + ,es: 'Usar Insulina activa en los cálculos' ,fr: 'Utiliser l\'IOB dans les calculs' ,el: 'Χρήση της υπολογισθείσας ινσουλίνης που έχει απομείνει για τον υπολογισμό' ,pt: 'Usar IOB no cálculo' @@ -3156,7 +3158,7 @@ function init() { ,'Other correction' : { cs: 'Jiná korekce' ,de: 'Weitere Korrektur' - ,es: 'Otra correción' + ,es: 'Otra corrección' ,fr: 'Autre correction' ,el: 'Άλλη διόρθωση' ,pt: 'Outra correção' @@ -3268,7 +3270,7 @@ function init() { ,'Carbs needed if Insulin total is negative value' : { cs: 'Chybějící sacharidy v případě, že výsledek je záporný' ,de: 'Benötigte Kohlenhydrate sofern Gesamtinsulin einen negativen Wert aufweist' - ,es: 'Hidratos de carbono necesarios si el total de insulina es un valor negativo' + ,es: 'Carbohidratos necesarios si total insulina es un valor negativo' ,fr: 'Glucides nécessaires si insuline totale est un valeur négative' ,el: 'Απαιτούνται υδατάνθρακες εάν η συνολική ινσουλίνη έχει αρνητική τιμή' ,pt: 'Carboidratos necessários se Insulina total for negativa' @@ -3313,7 +3315,7 @@ function init() { cs: '60 min předem' ,de: '60 Min. früher' ,es: '60 min antes' - ,fr: '60 min avant' + ,fr: '60 min plus tôt' ,el: '60 λεπτά πριν' ,pt: '60 min antes' ,sv: '60 min tidigare' @@ -3335,7 +3337,7 @@ function init() { cs: '45 min předem' ,de: '45 Min. früher' ,es: '45 min antes' - ,fr: '45 min avant' + ,fr: '45 min plus tôt' ,el: '45 λεπτά πριν' ,pt: '45 min antes' ,sv: '45 min tidigare' @@ -3357,7 +3359,7 @@ function init() { cs: '30 min předem' ,de: '30 Min früher' ,es: '30 min antes' - ,fr: '30 min avant' + ,fr: '30 min plus tôt' ,el: '30 λεπτά πριν' ,pt: '30 min antes' ,sv: '30 min tidigare' @@ -3379,7 +3381,7 @@ function init() { cs: '20 min předem' ,de: '20 Min. früher' ,es: '20 min antes' - ,fr: '20 min avant' + ,fr: '20 min plus tôt' ,el: '20 λεπτά πριν' ,pt: '20 min antes' ,sv: '20 min tidigare' @@ -3401,7 +3403,7 @@ function init() { cs: '15 min předem' ,de: '15 Min. früher' ,es: '15 min antes' - ,fr: '15 min avant' + ,fr: '15 min plus tôt' ,el: '15 λεπτά πριν' ,pt: '15 min antes' ,sv: '15 min tidigare' @@ -3446,7 +3448,7 @@ function init() { cs: '15 min po' ,de: '15 Min. später' ,es: '15 min más tarde' - ,fr: '15 min après' + ,fr: '15 min plus tard' ,el: '15 λεπτά αργότερα' ,pt: '15 min depois' ,ro: 'după 15 min' @@ -3469,7 +3471,7 @@ function init() { cs: '20 min po' ,de: '20 Min. später' ,es: '20 min más tarde' - ,fr: '20 min après' + ,fr: '20 min plus tard' ,el: '20 λεπτά αργότερα' ,pt: '20 min depois' ,ro: 'după 20 min' @@ -3492,7 +3494,7 @@ function init() { cs: '30 min po' ,de: '30 Min. später' ,es: '30 min más tarde' - ,fr: '30 min après' + ,fr: '30 min plus tard' ,el: '30 λεπτά αργότερα' ,pt: '30 min depois' ,ro: 'după 30 min' @@ -3515,7 +3517,7 @@ function init() { cs: '45 min po' ,de: '45 Min. später' ,es: '45 min más tarde' - ,fr: '45 min après' + ,fr: '45 min plus tard' ,el: '45 λεπτά αργότερα' ,pt: '45 min depois' ,ro: 'după 45 min' @@ -3538,7 +3540,7 @@ function init() { cs: '60 min po' ,de: '60 Min. später' ,es: '60 min más tarde' - ,fr: '60 min après' + ,fr: '60 min plus tard' ,el: '60 λεπτά αργότερα' ,pt: '60 min depois' ,ro: 'după 60 min' @@ -3595,6 +3597,7 @@ function init() { ,dk: 'Retro mode' ,fi: 'VANHENTUNEET TIEDOT' ,nb: 'Retro mode' + ,nl: 'Retro mode' ,pl: 'Tryb RETRO' ,ru: 'режим РЕТРО' ,sk: 'V MINULOSTI' @@ -3651,7 +3654,7 @@ function init() { cs: 'Odeslat formulář' ,de: 'Formular absenden' ,es: 'Enviar formulario' - ,fr: 'Formulaire de soumission' + ,fr: 'Suomettre le formulaire' ,el: 'Υποβολή Φόρμας' ,pt: 'Enviar formulário' ,sv: 'Överför händelse' @@ -3831,7 +3834,7 @@ function init() { ,'Device authenticated' : { cs: 'Zařízení ověřeno' ,de: 'Gerät authentifiziert' - ,es: 'Dispositivo autenticado' + ,es: 'Dispositivo autorizado' ,fr: 'Appareil authentifié' ,el: 'Εξουσιοδοτημένη Συσκευή' ,pt: 'Dispositivo autenticado' @@ -3854,7 +3857,7 @@ function init() { ,'Device not authenticated' : { cs: 'Zařízení není ověřeno' ,de: 'Gerät nicht authentifiziert' - ,es: 'Dispositivo no autenticado' + ,es: 'Dispositivo no autorizado' ,fr: 'Appareil non authentifié' ,el: 'Συσκευή Μη Εξουσιοδοτημένη' ,pt: 'Dispositivo não autenticado' @@ -3877,7 +3880,7 @@ function init() { ,'Authentication status' : { cs: 'Stav ověření' ,de: 'Authentifikations Status' - ,es: 'Estado de autenticación' + ,es: 'Estado de autorización' ,fr: 'Status de l\'authentification' ,el: 'Κατάσταση Εξουσιοδότησης' ,pt: 'Status de autenticação' @@ -3900,7 +3903,7 @@ function init() { ,'Authenticate' : { cs: 'Ověřit' ,de: 'Authentifizieren' - ,es: 'Autenticar' + ,es: 'Autentificar' ,fr: 'Authentifier' ,el: 'Πιστοποίηση' ,pt: 'Autenticar' @@ -3946,7 +3949,7 @@ function init() { ,'Your device is not authenticated yet' : { cs: 'Toto zařízení nebylo dosud ověřeno' ,de: 'Dein Gerät ist noch nicht authentifiziert' - ,es: 'Su dispositivo no ha sido autenticado todavía' + ,es: 'Su dispositivo no ha sido autentificado todavía' ,fr: 'Votre appareil n\'est pas encore authentifié' ,el: 'Η συκευή σας δεν έχει πιστοποιηθεί' ,pt: 'Seu dispositivo ainda não foi autenticado' @@ -4109,8 +4112,10 @@ function init() { ,'Logarithmic (Dynamic)' : { cs: 'Logaritmické (Dynamické)' ,de: 'Logaritmisch (dynamisch)' + ,es: 'Logarítmo (Dinámico)' ,dk: 'Logaritmisk (Dynamisk)' ,it: 'Logaritmica (Dinamica)' + ,fr: 'Logarithmique (Dynamique)' ,el: 'Λογαριθμική (Δυναμική)' ,ro: 'Logaritmic (Dinamic)' ,bg: 'Логоритмична (Динамична)' @@ -4129,6 +4134,8 @@ function init() { ,'Insulin-on-Board' : { cs: 'IOB' ,de: 'Aktives Bolus-Insulin' + ,es: 'Insulina activa' + ,fr: 'Insuline à bord' ,dk: 'Aktivt insulin (IOB)' ,it: 'IOB-Insulina a Bordo' ,nb: 'AI' @@ -4149,6 +4156,8 @@ function init() { ,'Carbs-on-Board' : { cs: 'COB' ,de: 'Aktiv wirksame Kohlenhydrate' + ,es: 'Carbohidratos activos' + ,fr: 'Glucides à bord' ,dk: 'Aktive kulhydrater (COB)' ,it: 'COB-Carboidrati a Bordo' ,nb: 'AK' @@ -4169,6 +4178,8 @@ function init() { ,'Bolus Wizard Preview' : { cs: 'BWP-Náhled bolusového kalk.' ,de: 'Bolus-Kalkulator Vorschau' + ,es: 'Vista previa del cálculo del bolo' + ,fr: 'Prévue du Calculatuer de bolus' ,dk: 'Bolus Wizard (BWP)' ,it: 'BWP-Calcolatore di bolo' ,nb: 'Boluskalkulator' @@ -4189,6 +4200,8 @@ function init() { ,'Value Loaded' : { cs: 'Hodnoty načteny' ,de: 'Geladener Wert' + ,es: 'Valor cargado' + ,fr: 'Valeur chargée' ,dk: 'Værdi indlæst' ,it: 'Valori Caricati' ,nb: 'Verdi lastet' @@ -4209,6 +4222,8 @@ function init() { ,'Cannula Age' : { cs: 'CAGE-Stáří kanyly' ,de: 'Kanülenalter' + ,es: 'Antigüedad cánula' + ,fr: 'Age de la canule' ,dk: 'Insuflon alder (CAGE)' ,it: 'CAGE-Cambio Ago' ,el: 'Ημέρες Χρήσης Κάνουλας (CAGE)' @@ -4229,6 +4244,8 @@ function init() { ,'Basal Profile' : { cs: 'Bazál' ,de: 'Basalraten-Profil' + ,es: 'Perfil Basal' + ,fr: 'Profil Basal' ,dk: 'Basal profil' ,it: 'BASAL-Profilo Basale' ,el: 'Προφίλ Βασικής Ινσουλίνης (BASAL)' @@ -4503,7 +4520,7 @@ function init() { cs: '12 hodin' ,de: '12 Stunden' ,es: '12 horas' - ,fr: '12hr' + ,fr: '12 heures' ,el: '12ωρο' ,pt: '12 horas' ,sv: '12-timmars' @@ -4526,7 +4543,7 @@ function init() { cs: '24 hodin' ,de: '24 Stunden' ,es: '24 horas' - ,fr: '24hr' + ,fr: '24 heures' ,el: '24ωρο' ,pt: '24 horas' ,sv: '24-timmars' @@ -4663,7 +4680,7 @@ function init() { ,'Carb Correction' : { cs: 'Přídavek sacharidů' ,de: 'Kohlenhydrate Korrektur' - ,es: 'Hidratos de carbono de corrección' + ,es: 'Carbohidratos de corrección' ,fr: 'Correction glucide' ,el: 'Διόρθωση με Υδατάνθρακεςς' ,pt: 'Correção com carboidrato' @@ -4733,7 +4750,7 @@ function init() { cs: 'Cvičení' ,de: 'Bewegung' ,es: 'Ejercicio' - ,fr: 'Exercice' + ,fr: 'Exercice physique' ,el: 'Άσκηση' ,pt: 'Exercício' ,sv: 'Aktivitet' @@ -5126,7 +5143,7 @@ function init() { cs: 'Urgentní vysoká glykémie' ,de: 'Achtung Hoch Alarm' ,es: 'Alarma de glucemia alta urgente' - ,fr: 'Alarme haute urgente' + ,fr: 'Alarme hyperglycémie urgente' ,el: 'Ειδοποίηση επικίνδυνα υψηλής γλυκόζης' ,pt: 'URGENTE: Alarme de glicemia alta' ,sv: 'Brådskande högt larmvärde' @@ -5150,7 +5167,7 @@ function init() { cs: 'Vysoká glykémie' ,de: 'Hoch Alarm' ,es: 'Alarma de glucemia alta' - ,fr: 'Alarme haute' + ,fr: 'Alarme hyperglycémie' ,el: 'Ειδοποίηση υψηλής γλυκόζης' ,pt: 'Alarme de glicemia alta' ,sv: 'Högt larmvärde' @@ -5174,7 +5191,7 @@ function init() { cs: 'Nízká glykémie' ,de: 'Tief Alarm' ,es: 'Alarma de glucemia baja' - ,fr: 'Alarme basse' + ,fr: 'Alarme hypoglycémie' ,el: 'Ειδοποίηση χαμηλής γλυκόζης' ,pt: 'Alarme de glicemia baixa' ,sv: 'Lågt larmvärde' @@ -5198,7 +5215,7 @@ function init() { cs: 'Urgentní nízká glykémie' ,de: 'Achtung Tief Alarm' ,es: 'Alarma de glucemia baja urgente' - ,fr: 'Alarme basse urgente' + ,fr: 'Alarme hypoglycémie urgente' ,el: 'Ειδοποίηση επικίνδυνα χαμηλής γλυκόζης' ,pt: 'URGENTE: Alarme de glicemia baixa' ,sv: 'Brådskande lågt larmvärde' @@ -5222,7 +5239,7 @@ function init() { cs: 'Zastaralá data' ,de: 'Warnung: Daten nicht mehr gültig' ,es: 'Datos obsoletos: aviso' - ,fr: 'Données dépassées: avis' + ,fr: 'Données échues: avertissement' ,el: 'Έλλειψη πρόσφατων δεδομένων: Προειδοποίηση' ,pt: 'Dados antigos: alerta' ,sv: 'Förfluten data: Varning!' @@ -5245,7 +5262,7 @@ function init() { cs: 'Zastaralá data urgentní' ,de: 'Achtung: Daten nicht mehr gültig' ,es: 'Datos obsoletos: Urgente' - ,fr: 'Données dépassées urgentes' + ,fr: 'Données échues: avertissement urgent' ,el: 'Έλλειψη πρόσφατων δεδομένων: ΕΠΕΙΓΟΝ' ,pt: 'Dados antigos: Urgente' ,sv: 'Brådskande varning, inaktuell data' @@ -5314,7 +5331,7 @@ function init() { cs: 'Když je povoleno, obrazovka je ztlumena 22:00 - 6:00' ,de: 'Sofern aktiviert wird die Anzeige von 22h - 6h gedimmt' ,es: 'Cuando esté activo, el brillo de la página bajará de 10pm a 6am.' - ,fr: 'Si activé, la page sera assombire de 22:00 à 6:00' + ,fr: 'Si activé, la page sera assombrie de 22:00 à 6:00' ,el: 'Όταν ενεργοποιηθεί, η φωτεινότητα της οθόνης θα μειωθεί μεταξύ 22.00 - 6.00' ,pt: 'Se ativado, a página será escurecida entre 22h e 6h' ,sv: 'När aktiverad dimmas sidan mellan 22:00 - 06:00' @@ -5466,7 +5483,7 @@ function init() { ,pl: 'Gdy funkcja jest włączona, małe białe kropki pojawią się na surowych danych BG' ,ru: 'При активации данные RAW будут видны как мелкие белые точки' ,sk: 'Keď je povolené, malé bodky budú zobrazovať RAW dáta.' - ,nl: 'Indien geactiveerd is ruwe data zichtbaar als witte punten ' + ,nl: 'Indien geactiveerd is ruwe data zichtbaar als witte punten' ,ko: '활성화 하면 작은 흰점들이 raw 혈당 데이터를 표시하게 될 것이다.' ,zh_cn: '启用后将使用小白点标注原始血糖数据' ,zh_tw: '啟用後將使用小白點標註原始血糖數據' @@ -5475,7 +5492,7 @@ function init() { cs: 'Vlastní název stránky' ,de: 'Benutzerdefinierter Titel' ,es: 'Título personalizado' - ,fr: 'Titre sur mesure' + ,fr: 'Titre personalisé' ,el: 'Επιθυμητός τίτλος σελίδας' ,pt: 'Customizar Título' ,sv: 'Egen titel' @@ -5566,6 +5583,8 @@ function init() { ,'Colorblind-friendly colors' : { cs: 'Pro barvoslepé' ,de: 'Farbenblind-freundliche Darstellung' + ,es: 'Colores para Daltónicos' + ,fr: 'Couleurs pour daltoniens' ,dk: 'Farveblindvenlige farver' ,nb: 'Fargeblindvennlige farger' ,el: 'Χρώματα συμβατά για αχρωματοψία' @@ -5585,7 +5604,7 @@ function init() { cs: 'Vymaž a nastav výchozí hodnoty' ,de: 'Zurücksetzen und Voreinstellungen verwenden' ,es: 'Inicializar y utilizar los valores por defecto' - ,fr: 'Remise à zéro et utiliser des valeurs par défaut' + ,fr: 'Remettre à zéro et utiliser les valeurs par défaut' ,el: 'Αρχικοποίηση και χρήση των προκαθορισμένων ρυθμίσεων' ,pt: 'Zerar e usar padrões' ,sv: 'Återställ standardvärden' @@ -5652,7 +5671,7 @@ function init() { ,'Bolus Wizard' : { cs: 'Bolusový kalkulátor' ,de: 'Bolus-Kalkulator' - ,es: 'Bolus Wizard' + ,es: 'Calculo Bolos sugeridos' ,fr: 'Calculateur de bolus' ,el: 'Εργαλείο υπολογισμού ινσουλίνης' ,pt: 'Ajuda de bolus' @@ -5744,7 +5763,7 @@ function init() { ,'hrs ago' : { cs: 'hod zpět' ,de: 'Stunden her' - ,es: 'hr atrás' + ,es: 'hrs atrás' ,fr: 'hrs avant' ,el: 'ώρες πριν' ,pt: 'h atrás' @@ -5790,7 +5809,7 @@ function init() { ,'mins ago' : { cs: 'min zpět' ,de: 'Minuten her' - ,es: 'min atrás' + ,es: 'mins atrás' ,fr: 'mins avant' ,el: 'λεπτά πριν' ,pt: 'min atrás' @@ -5997,7 +6016,7 @@ function init() { cs: 'Glykémie z RAW dat' ,de: 'Roh-BG' ,es: 'Glucemia en crudo' - ,fr: 'Glycémie brut' + ,fr: 'Glycémie brute' ,el: 'Αυτούσιες τιμές γλυκόζης' ,pt: 'Glicemia sem processamento' ,sv: 'RAW-BS' @@ -6087,7 +6106,7 @@ function init() { ,es: 'Mostrar Plugins' ,fr: 'Montrer Plugins' ,el: 'Πρόσθετα Συστήματος' - ,pt: 'Mostrar Plugins' + ,pt: 'Mostrar les Plugins' ,ro: 'Arată plugin-urile' ,bg: 'Покажи добавките' ,hr: 'Prikaži plugine' @@ -6153,7 +6172,7 @@ function init() { cs: 'Čas jídla' ,de: 'Kohlenhydrat Zeit' ,es: 'Momento de la ingesta' - ,fr: 'Moment de Glucide' + ,fr: 'Moment de l\'ingestion de Glucides' ,el: 'Στιγμή χορηγησης υδ/κων' ,pt: 'Hora do carboidrato' ,ro: 'Ora carbohidrați' @@ -6175,6 +6194,8 @@ function init() { ,'Language' : { cs: 'Jazyk' ,de: 'Sprache' + ,es: 'Lenguaje' + ,fr: 'Langue' ,dk: 'Sprog' ,sv: 'Språk' ,nb: 'Språk' @@ -6195,6 +6216,8 @@ function init() { ,'Add new' : { cs: 'Přidat nový' ,de: 'Neu hinzufügen' + ,es: 'Añadir nuevo' + ,fr: 'Ajouter nouveau' ,dk: 'Tilføj ny' ,sv: 'Lägg till ny' ,ro: 'Adaugă nou' @@ -6214,6 +6237,8 @@ function init() { ,'g' : { // grams shortcut cs: 'g' ,de: 'g' + ,es: 'gr' + ,fr: 'g' ,dk: 'g' ,sv: 'g' ,ro: 'g' @@ -6233,6 +6258,8 @@ function init() { ,'ml' : { // milliliters shortcut cs: 'ml' ,de: 'ml' + ,es: 'ml' + ,fr: 'ml' ,dk: 'ml' ,sv: 'ml' ,ro: 'ml' @@ -6252,6 +6279,8 @@ function init() { ,'pcs' : { // pieces shortcut cs: 'ks' ,de: 'Stk.' + ,es: 'pcs' + ,fr: 'pcs' ,dk: 'stk' ,sv: 'st' ,ro: 'buc' @@ -6271,6 +6300,8 @@ function init() { ,'Drag&drop food here' : { cs: 'Sem táhni & pusť jídlo' ,de: 'Mahlzeit hierher verschieben' + ,es: 'Arrastre y suelte aquí alimentos' + ,fr: 'Glisser et déposer repas ici ' ,dk: 'Hiv og slip mad her' ,sv: 'Dra&Släpp mat här' ,ro: 'Drag&drop aliment aici' @@ -6290,8 +6321,10 @@ function init() { ,'Care Portal' : { cs: 'Portál ošetření' ,sv: 'Care Portal' + ,fr: 'Care Portal' ,it: 'Somministrazioni' ,de: 'Behandlungs-Portal' + ,es: 'Portal cuidador' ,dk: 'Omsorgsportal' ,ro: 'Care Portal' ,bg: 'Въвеждане на данни' @@ -6310,6 +6343,8 @@ function init() { cs: 'Střední/Neznámá' ,sv: 'Medium/Okänt' ,de: 'Mittel/Unbekannt' + ,es: 'Medio/Desconocido' + ,fr: 'Moyen/Inconnu' ,dk: 'Medium/Ukendt' ,ro: 'Mediu/Necunoscut' ,el: 'Μέσος/Άγνωστος' @@ -6327,9 +6362,11 @@ function init() { } ,'IN THE FUTURE' : { cs: 'V BUDOUCNOSTI' + ,fr: 'dans le futur' ,sv: 'Framtida' ,ro: 'ÎN VIITOR' ,de: 'IN DER ZUKUNFT' + ,es: 'EN EL FUTURO' ,dk: 'I fremtiden' ,el: 'ΣΤΟ ΜΕΛΛΟΝ' ,bg: 'В БЪДЕШЕТО' @@ -6347,8 +6384,10 @@ function init() { ,'Update' : { // Update button cs: 'Aktualizovat' ,de: 'Aktualisieren' + ,es: 'Actualizar' ,dk: 'Opdater' ,sv: 'Uppdatera' + ,fr: 'Mise à jour' ,nb: 'Oppdater' ,pt: 'Atualizar' ,el: 'Ενημέρωση' @@ -6367,6 +6406,8 @@ function init() { ,'Order' : { cs: 'Pořadí' ,de: 'Reihenfolge' + ,es: 'Ordenar' + ,fr: 'Mise en ordre' ,dk: 'Sorter' ,sv: 'Sortering' ,nb: 'Sortering' @@ -6386,6 +6427,8 @@ function init() { ,'oldest on top' : { cs: 'nejstarší nahoře' ,de: 'älteste oben' + ,es: 'Más antiguo arriba' + ,fr: 'Plus vieux en tête de liste' ,dk: 'ældste øverst' ,sv: 'Äldst först' ,nb: 'Eldste først' @@ -6406,6 +6449,8 @@ function init() { cs: 'nejnovější nahoře' ,sv: 'Nyast först' ,de: 'neueste oben' + ,es: 'Más nuevo arriba' + ,fr: 'Nouveaux en tête de liste' ,dk: 'nyeste øverst' ,nb: 'Nyeste først' ,el: 'τα νεότερα πρώτα' @@ -6426,6 +6471,8 @@ function init() { ,sv: 'Alla sensorhändelser' ,nb: 'Alle sensorhendelser' ,de: 'Alle Sensor-Ereignisse' + ,es: 'Todos los eventos del sensor' + ,fr: 'Tous les événement senseur' ,dl: 'Alle sensor begivenheder' ,el: 'Όλα τα συμβάντα του αισθητήρα' ,ro: 'Evenimente legate de senzor' @@ -6443,8 +6490,10 @@ function init() { ,'Remove future items from mongo database' : { cs: 'Odebrání položek v budoucnosti z Mongo databáze' ,nb: 'Fjern fremtidige elementer fra mongo database' + ,fr: 'Effacer les éléments futurs de la base de données mongo' ,el: 'Αφαίρεση μελλοντικών εγγραφών από τη βάση δεδομένων' ,de: 'Entferne zukünftige Objekte aus Mongo-Datenbank' + ,es: 'Remover elementos futuros desde basedatos Mongo' ,dk: 'Fjern fremtidige værdier fra mongo databasen' ,ro: 'Șterge date din viitor din baza de date mongo' ,sv: 'Ta bort framtida händelser från mongodatabasen' @@ -6463,8 +6512,10 @@ function init() { ,'Find and remove treatments in the future' : { cs: 'Najít a odstranit záznamy ošetření v budoucnosti' ,nb: 'Finn og fjern fremtidige behandlinger' + ,fr: 'Chercher et effacer les élément dont la date est dans le futur' ,el: 'Εύρεση και αφαίρεση μελλοντικών ενεργειών από τη βάση δεδομένων' ,de: 'Finde und entferne zukünftige Behandlungen' + ,es: 'Encontrar y eliminar tratamientos futuros' ,dk: 'Find og fjern fremtidige behandlinger' ,ro: 'Caută și elimină tratamente din viitor' ,sv: 'Hitta och ta bort framtida behandlingar' @@ -6484,6 +6535,8 @@ function init() { cs: 'Tento úkol najde a odstraní ošetření v budoucnosti.' ,nb: 'Finn og fjern fremtidige behandlinger' ,de: 'Finde und entferne Behandlungen in der Zukunft.' + ,es: 'Este comando encuentra y elimina tratamientos futuros.' + ,fr: 'Cette tâche cherche et efface les éléments dont la date est dans le futur' ,dk: 'Denne handling finder og fjerner fremtidige behandlinger.' ,el: 'Αυτή η ενέργεια αφαιρεί μελλοντικές ενέργειες από τη βάση δεδομένων' ,ro: 'Acest instrument curăță tratamentele din viitor.' @@ -6504,6 +6557,8 @@ function init() { cs: 'Odstraň ošetření v budoucnosti' ,nb: 'Fjern fremtidige behandlinger' ,de: 'Entferne Behandlungen in der Zukunft' + ,es: 'Elimina tratamientos futuros' + ,fr: 'Efface les traitements ayant un date dans le futur' ,dk: 'Fjern behandlinger i fremtiden' ,el: 'Αφαίρεση μελλοντικών ενεργειών' ,ro: 'Șterge tratamentele din viitor' @@ -6523,6 +6578,8 @@ function init() { ,'Find and remove entries in the future' : { cs: 'Najít a odstranit CGM data v budoucnosti' ,de: 'Finde und entferne Einträge in der Zukunft' + ,es: 'Encuentra y elimina entradas futuras' + ,fr: 'Cherche et efface les événements dans le futur' ,dk: 'Find og fjern indgange i fremtiden' ,nb: 'Finn og fjern fremtidige hendelser' ,el: 'Εύρεση και αφαίρεση μελλοντικών εγγραφών από τη βάση δεδομένων' @@ -6543,8 +6600,10 @@ function init() { ,'This task find and remove CGM data in the future created by uploader with wrong date/time.' : { cs: 'Tento úkol najde a odstraní CGM data v budoucnosti vzniklé špatně nastaveným datem v uploaderu.' ,nb: 'Finn og fjern fremtidige cgm data lastet opp med feil dato/tid' + ,fr: 'Cet outil cherche et efface les valeurs CGM dont la date est dans le futur' ,el: 'Αυτή η ενέργεια αφαιρεί δεδομένα αιθητήρα τα οποία εισήχθησαν με λάθος ημερομηνία και ώρα, από τη βάση δεδομένων' ,de: 'Finde und entferne CGM Daten in der Zukunft, die vom Uploader mit falschem Datum/Uhrzeit erstellt wurden.' + ,es: 'Este comando encuentra y elimina datos del sensor futuros creados por actualizaciones con errores en fecha/hora' ,dk: 'Denne handling finder og fjerner CGM data i fremtiden forårsaget af indlæsning med forkert dato/tid.' ,bg: 'Тази опция ще намери и премахне данни от сензора в бъдещето, създадени поради грешна дата/време.' ,ro: 'Instrument de căutare și eliminare a datelor din viitor, create de uploader cu ora setată greșit' @@ -6564,6 +6623,8 @@ function init() { cs: 'Odstraň CGM data v budoucnosti' ,nb: 'Fjern fremtidige hendelser' ,de: 'Entferne Einträge in der Zukunft' + ,es: 'Elimina entradas futuras' + ,fr: 'Efface les événement dans le futur' ,dk: 'Fjern indgange i fremtiden' ,el: 'Αφαίρεση μελλοντικών ενεργειών' ,bg: 'Премахни данните от сензора в бъдещето' @@ -6584,6 +6645,8 @@ function init() { cs: 'Nahrávám databázi ...' ,nb: 'Leser database ...' ,de: 'Lade Datenbank' + ,es: 'Cargando base de datos ...' + ,fr: 'Charge la base de données...' ,dk: 'Indlæser database ...' ,el: 'Φόρτωση Βάσης Δεδομένων' ,bg: 'Зареждане на базата с данни ...' @@ -6603,10 +6666,12 @@ function init() { ,'Database contains %1 future records' : { cs: 'Databáze obsahuje %1 záznamů v budoucnosti' ,nb: 'Databasen inneholder %1 fremtidige hendelser' + ,fr: 'La base de données contient %1 valeurs futures' ,el: 'Η Βάση Δεδομένων περιέχει 1% μελλοντικές εγγραφές' ,ro: 'Baza de date conține %1 înregistrări din viitor' ,sv: 'Databas innehåller %1 framtida händelser' ,de: 'Datenbank enthält %1 zukünftige Einträge' + ,es: 'Base de datos contiene %1 registros futuros' ,dk: 'Databasen indeholder %1 fremtidige indgange' ,bg: 'Базата с дани съдържа %1 бъдещи записи' ,it: 'Contiene Database %1 record futuri' @@ -6623,8 +6688,10 @@ function init() { ,'Remove %1 selected records?' : { cs: 'Odstranit %1 vybraných záznamů' ,nb: 'Fjern %1 valgte elementer?' + ,fr: 'Effacer %1 valeurs choisies?' ,el: 'Αφαίρεση των επιλεγμένων εγγραφών?' ,de: 'Lösche ausgewählten %1 Eintrag?' + ,es: 'Eliminar %1 registros seleccionados?' ,dk: 'Fjern %1 valgte indgange?' ,ro: 'Șterg %1 înregistrări selectate?' ,sv: 'Ta bort %1 valda händelser' @@ -6643,7 +6710,9 @@ function init() { ,'Error loading database' : { cs: 'Chyba při nahrávání databáze' ,nb: 'Feil udner lasting av database' + ,fr: 'Erreur chargement de la base de données' ,de: 'Fehler beim Laden der Datenbank' + ,es: 'Error al cargar base de datos' ,dk: 'Fejl ved indlæsning af database' ,el: 'Σφάλμα στη φόρτωση της βάσης δεδομένων' ,ro: 'Eroare la încărcarea bazei de date' @@ -6664,6 +6733,8 @@ function init() { cs: 'Záznam %1 odstraněn ...' ,nb: 'Element %1 fjernet' ,de: 'Eintrag %1 entfernt' + ,es: 'Registro %1 eliminado ...' + ,fr: 'Événement %1 effacé' ,dk: 'Indgang %1 fjernet ...' ,el: 'Οι εγγραφές αφαιρέθηκαν' ,ro: 'Înregistrarea %1 a fost ștearsă...' @@ -6684,6 +6755,8 @@ function init() { cs: 'Chyba při odstaňování záznamu %1' ,nb: 'Feil under fjerning av element %1' ,de: 'Fehler beim Entfernen des Eintrags %1' + ,es: 'Error al eliminar registro %1' + ,fr: 'Echec d\'effacement de l\'événement %1' ,dk: 'Fejl ved fjernelse af indgang %1' ,el: 'Σφάλμα αφαίρεσης εγγραφών' ,ro: 'Eroare la ștergerea înregistrării %1' @@ -6703,9 +6776,11 @@ function init() { ,'Deleting records ...' : { cs: 'Odstraňování záznamů ...' ,nb: 'Fjerner elementer...' + ,fr: 'Effacement d\événements...' ,ro: 'Se șterg înregistrările...' ,el: 'Αφαίρεση Εγγραφών' ,de: 'Entferne Einträge ...' + ,es: 'Eliminando registros ...' ,dk: 'Sletter indgange ...' ,sv: 'Tar bort händelser ...' ,bg: 'Изтриване на записите...' @@ -6725,7 +6800,9 @@ function init() { ,nb: 'Slett Mongo status database' ,ro: 'Curăță tabela despre status din Mongo' ,el: 'Καθαρισμός βάσης δεδομένων Mongo' + ,fr: 'Nettoyage de la base de donées Mongo' ,de: 'Bereinige Mongo Status-Datenbank' + ,es: 'Limpiar estado de la base de datos Mongo' ,dk: 'Slet Mongo status database' ,sv: 'Rensa Mongo status databas' ,bg: 'Изчисти статуса на Монго базата с данни' @@ -6743,6 +6820,8 @@ function init() { cs: 'Odstranění všech záznamů z kolekce devicestatus' ,nb: 'Fjern alle dokumenter fra device status tabell' ,de: 'Lösche alle Dokumente der Gerätestatus-Sammlung' + ,es: 'Borrar todos los documentos desde colección devicesatatus' + ,fr: 'Effacer tous les documents de la collection devicestatus' ,dk: 'Fjerne alle dokumenter fra device status tabellen' ,el: 'Διαγραφή όλων των δεδομένων σχετικών με κατάσταση της συσκευής ανάγνωσης του αισθητήρα' ,ro: 'Șterge toate documentele din colecția de status dispozitiv' @@ -6761,8 +6840,10 @@ function init() { ,'This task removes all documents from devicestatus collection. Useful when uploader battery status is not properly updated.' : { cs: 'Tento úkol odstraní všechny dokumenty z kolekce devicestatus. Je to vhodné udělat, pokud se ukazatel stavu baterie neobnovuje správně.' ,nb: 'Denne funksjonen fjerner alle dokumenter fra device status tabellen. Nyttig når status for opplaster batteri ikke blir opppdatert' + ,fr: 'Efface tous les documents de la collection devicestatus. Utile lorsque l\'indicateur de chargement de la batterie du Smartphone n\'est pas affichée correctement' ,el: 'Αυτή η ενέργεια διαγράφει όλα τα δεδομένα της κατάστασης της συσκευής ανάγνωσης. Χρήσιμη όταν η κατάσταση της συσκευής ανάγνωσης δεν ανανεώνεται σωστά.' ,de: 'Diese Aufgabe entfernt alle Dokumente aus der Gerätestatus-Sammlung. Nützlich wenn der Uploader-Batteriestatus sich nicht aktualisiert.' + ,es: 'Este comando elimina todos los documentos desde la colección devicestatus. Útil cuando el estado de la batería cargadora no se actualiza correctamente' ,dk: 'Denne handling fjerner alle dokumenter fra device status tabellen. Brugbart når uploader betteri status ikke er korrekt opdateret.' ,ro: 'Acest instrument șterge toate documentele din colecția devicestatus. Se folosește când încărcarea bateriei nu se afișează corect.' ,sv: 'Denna uppgift tar bort alla dokument från devicestatuskollektionen. Användbart när batteristatus ej uppdateras' @@ -6779,10 +6860,12 @@ function init() { } ,'Delete all documents' : { cs: 'Odstranit všechny dokumenty' + ,fr: 'Effacer toutes les données' ,nb: 'Fjern alle dokumenter' ,ro: 'Șterge toate documentele' ,el: 'Διαγραφή όλων των δεδομένων' ,de: 'Lösche alle Dokumente' + ,es: 'Borra todos los documentos' ,dk: 'Slet alle dokumenter' ,sv: 'Ta bort alla dokument' ,bg: 'Изтрий всички документи' @@ -6799,8 +6882,10 @@ function init() { ,'Delete all documents from devicestatus collection devicestatus?' : { cs: 'Odstranit všechny dokumenty z kolekce devicestatus?' ,nb: 'Fjern alle dokumenter fra device status tabellen?' + ,fr: 'Effacer toutes les données de la collection devicestatus ?' ,el: 'Διαγραφή όλων των δεδομένων της κατάστασης της συσκευής ανάγνωσης?' ,de: 'Löschen aller Dokumente der Gerätestatus-Sammlung?' + ,es: 'Borrar todos los documentos desde la colección devicestatus?' ,dk: 'Fjern alle dokumenter fra device status tabellen' ,ro: 'Șterg toate documentele din colecția devicestatus?' ,sv: 'Ta bort alla dokument från devicestatuscollektionen' @@ -6819,6 +6904,8 @@ function init() { cs: 'Databáze obsahuje %1 záznamů' ,nb: 'Databasen inneholder %1 elementer' ,de: 'Datenbank enthält %1 Einträge' + ,es: 'La Base de datos contiene %1 registros' + ,fr: 'La base de donées contient %1 événements' ,dk: 'Databasen indeholder %1 indgange' ,el: 'Η βάση δεδομένων περιέχει 1% εγγραφές' ,ro: 'Baza de date conține %1 înregistrări' @@ -6838,6 +6925,8 @@ function init() { cs: 'Všechny záznamy odstraněny ...' ,nb: 'Alle elementer fjernet ...' ,de: 'Alle Einträge entfernt...' + ,es: 'Todos los registros eliminados ...' + ,fr: 'Toutes les valeurs ont été effacées' ,dk: 'Alle indgange fjernet ...' ,el: 'Έγινε διαγραφή όλων των δεδομένων' ,ro: 'Toate înregistrările au fost șterse.' @@ -6858,6 +6947,8 @@ function init() { ,nb: 'Administrasjonsoppgaver' ,ro: 'Instrumente de administrare' ,de: 'Administrator Werkzeuge' + ,es: 'Herramientas Administrativas' + ,fr: 'Outils d\'administration' ,dl: 'Administrator opgaver' ,el: 'Εργαλεία Διαχειριστή' ,sv: 'Adminverktyg' @@ -6877,8 +6968,10 @@ function init() { cs: 'Nightscout - Výkazy' ,nb: 'Nightscout - rapporter' ,ro: 'Rapoarte Nightscout' + ,fr: 'Rapports Nightscout' ,el: 'Αναφορές' ,de: 'Nightscout-Berichte' + ,es: 'Informes - Nightscout' ,dk: 'Nightscout - rapporter' ,sv: 'Nightscout - Statistik' ,bg: 'Найтскаут статистика' @@ -6895,6 +6988,8 @@ function init() { ,'Cancel' : { cs: 'Zrušit' ,de: 'Abbruch' + ,es: 'Cancelar' + ,fr: 'Interrompre' ,dk: 'Annuller' ,nb: 'Avbryt' ,el: 'Ακύρωση' @@ -6916,6 +7011,8 @@ function init() { ,nb: 'Editer behandling' ,ro: 'Modifică înregistrarea' ,de: 'Bearbeite Behandlung' + ,es: 'Editar tratamiento' + ,fr: 'Modifier un traitement' ,dk: 'Rediger indgang' ,el: 'Επεξεργασία Εγγραφής' ,sv: 'Redigera behandling' @@ -6934,6 +7031,8 @@ function init() { cs: 'Doba trvání' ,ro: 'Durata' ,de: 'Dauer' + ,es: 'Duración' + ,fr: 'Durée' ,dk: 'Varighed' ,el: 'Διάρκεια' ,sv: 'Varaktighet' @@ -6952,6 +7051,8 @@ function init() { ,'Duration in minutes' : { cs: 'Doba trvání v minutách' ,de: 'Dauer in Minuten' + ,es: 'Duración en minutos' + ,fr: 'Durée en minutes' ,dk: 'Varighed i minutter' ,ro: 'Durata în minute' ,el: 'Διάρκεια σε λεπτά' @@ -6971,6 +7072,8 @@ function init() { ,'Temp Basal' : { cs: 'Dočasný bazál' ,de: 'Temporäre Basalrate' + ,es: 'Tasa basal temporal' + ,fr: 'Débit basal temporaire' ,dk: 'Midlertidig basal' ,ro: 'Bazală temporară' ,sv: 'Temporär basal' @@ -6991,6 +7094,8 @@ function init() { ,ro: 'Start bazală temporară' ,sv: 'Temporär basalstart' ,de: 'Start Temporäre Basalrate' + ,es: 'Inicio Tasa Basal temporal' + ,fr: 'Début du débit basal temporaire' ,dk: 'Midlertidig basal start' ,bg: 'Начало на временен базал' ,it: 'Inizio Basale Temp' @@ -7007,10 +7112,12 @@ function init() { ,'Temp Basal End' : { cs: 'Dočasný bazál konec' ,ro: 'Sfârșit bazală temporară' + ,fr: 'Fin du débit basal temporaire' ,sv: 'Temporär basalavslut' ,bg: 'Край на временен базал' ,it: 'Fine Basale Temp' ,de: 'Ende Temporäre Basalrate' + ,es: 'Fin Tasa Basal temporal' ,dk: 'Midlertidig basal slut' ,nb: 'Midlertidig basal stopp' ,fi: 'Tilapäinen basaali loppu' @@ -7026,6 +7133,8 @@ function init() { cs: 'Procenta' ,ro: 'Procent' ,de: 'Prozent' + ,es: 'Porcentaje' + ,fr: 'Pourcent' ,dk: 'Procent' ,el: 'Επι τοις εκατό' ,sv: 'Procent' @@ -7044,9 +7153,11 @@ function init() { ,'Basal change in %' : { cs: 'Změna bazálu v %' ,ro: 'Bazală schimbată în %' + ,fr: 'Changement du débit basal en %' ,sv: 'Basaländring i %' ,bg: 'Промяна на базала с %' ,de: 'Basalratenänderung in %' + ,es: 'Basal modificado en %' ,dk: 'Basal ændring i %' ,it: 'Variazione basale in %' ,nb: 'Basal endring i %' @@ -7062,8 +7173,10 @@ function init() { ,'Basal value' : { // absolute value for temp basal cs: 'Hodnota bazálu' ,ro: 'Valoare bazală' + ,fr: 'Valeur du débit basal' ,sv: 'Basalvärde' ,de: 'Basalrate' + ,es: 'Valor basal' ,dk: 'Basalværdi' ,bg: 'Временен базал' ,it: 'Valore Basale' @@ -7081,7 +7194,9 @@ function init() { cs: 'Hodnota bazálu' ,bg: 'Базална стойност' ,it: 'Valore Basale Assoluto' + ,fr: 'Débit basal absolu' ,de: 'Absoluter Basalratenwert' + ,es: 'Valor basal absoluto' ,dk: 'Absolut basalværdi' ,nb: 'Absolutt basalverdi' ,ro: 'Valoare absolută bazală' @@ -7099,6 +7214,8 @@ function init() { cs: 'Oznámení' ,bg: 'Известяване' ,de: 'Ankündigung' + ,es: 'Aviso' + ,fr: 'Annonce' ,dk: 'Meddelelse' ,ro: 'Anunț' ,el: 'Ανακοίνωση' @@ -7106,7 +7223,7 @@ function init() { ,he: 'הודעה' ,it: 'Annuncio' ,nb: 'Kunngjøring' - ,fi: 'Tiedoite' + ,fi: 'Tiedote' ,pl: 'Powiadomienie' ,pt: 'Aviso' ,ru: 'Оповещение' @@ -7118,9 +7235,11 @@ function init() { ,'Loading temp basal data' : { cs: 'Nahrávám dočasné bazály' ,it: 'Caricamento basale temp' + ,fr: 'Chargement des données de débit basal' ,ro: 'Se încarcă date bazală temporară' ,sv: 'Laddar temporär basaldata' ,de: 'Lade temporäre Basaldaten' + ,es: 'Cargando datos tasa basal temporal' ,dk: 'Indlæser midlertidig basal data' ,nb: 'Laster verdier for midlertidig basal' ,fi: 'Lataan tilapäisten basaalien tietoja' @@ -7137,9 +7256,11 @@ function init() { cs: 'Uložit současný záznam před změnou na nový?' ,ro: 'Salvez înregistrarea curentă înainte de a trece mai departe?' ,sv: 'Spara aktuell data innan skifte till ny?' + ,fr: 'Sauvegarder l\'événement actuel avant d\'avancer au suivant ?' ,nb: 'Lagre før bytte til ny?' ,el: 'Αποθήκευση τρεχουσας εγγραφής πριν δημιουργήσουμε νέα?' ,de: 'Aktuelle Einträge speichern?' + ,es: 'Grabar datos actuales antes de cambiar por nuevos?' ,dk: 'Gem aktuelle indgang før der skiftes til ny?' ,fi: 'Tallenna nykyinen merkintä ennen vaihtoa uuteen?' ,bg: 'Запази текущият запис преди да промениш новия ' @@ -7156,8 +7277,10 @@ function init() { cs: 'Přepnutí profilu' ,ro: 'Schimbă profilul' ,sv: 'Ny profil' + ,fr: 'Changement de profil' ,el: 'Εναλλαγή προφίλ' ,de: 'Profil wechseln' + ,es: 'Cambiar Perfil' ,dk: 'Byt profil' ,nb: 'Bytt profil' ,fi: 'Vaihda profiilia' @@ -7174,8 +7297,10 @@ function init() { ,'Profile' : { cs: 'Profil' ,de: 'Profil' + ,es: 'Perfil' ,dk: 'Profil' ,el: 'Προφίλ' + ,fr: 'Profil' ,it: 'Profilo' ,ro: 'Profil' ,sv: 'Profil' @@ -7193,6 +7318,8 @@ function init() { ,'General profile settings' : { cs: 'Obecná nastavení profilu' ,de: 'Allgemeine Profileinstellungen' + ,es: 'Configuración perfil genérico' + ,fr: 'Réglages principaus du profil' ,dk: 'Generelle profil indstillinger' ,el: 'Γενικές Ρυθμίσεις Προφίλ' ,ro: 'Setări generale profil' @@ -7213,8 +7340,10 @@ function init() { cs: 'Název' ,ro: 'Titlu' ,sv: 'Titel' + ,fr: 'Titre' ,el: 'Τίτλος' ,de: 'Überschrift' + ,es: 'Titulo' ,dk: 'Overskrift' ,nb: 'Tittel' ,fi: 'Otsikko' @@ -7231,10 +7360,12 @@ function init() { ,'Database records' : { cs: 'Záznamy v databázi' ,ro: 'Înregistrări' + ,fr: 'Entrées de la base de données' ,sv: 'Databashändelser' ,el: 'Εγραφές Βάσης Δεδομένων' ,nb: 'Databaseverdier' ,de: 'Datenbankeinträge' + ,es: 'Registros grabados en base datos' ,dk: 'Database indgange' ,fi: 'Tietokantamerkintöjä' ,bg: 'Записи в базата с данни' @@ -7250,10 +7381,12 @@ function init() { ,'Add new record' : { cs: 'Přidat nový záznam' ,ro: 'Adaugă înregistrare nouă' + ,fr: 'Ajouter une nouvelle entrée' ,sv: 'Lägg till ny händelse' ,el: 'Προσθήκη νέας εγγραφής' ,nb: 'Legg til ny rad' ,de: 'Neuen Eintrag hinzufügen' + ,es: 'Añadir nuevo registro' ,dk: 'Tilføj ny indgang' ,fi: 'Lisää uusi merkintä' ,bg: 'Добави нов запис' @@ -7269,10 +7402,12 @@ function init() { ,'Remove this record' : { cs: 'Vymazat tento záznam' ,ro: 'Șterge această înregistrare' + ,fr: 'Supprimer cette entrée' ,sv: 'Ta bort denna händelse' ,el: 'Αφαίρεση εγγραφής' ,nb: 'Fjern denne raden' ,de: 'Diesen Eintrag löschen' + ,es: 'Eliminar este registro' ,fk: 'Fjern denne indgang' ,fi: 'Poista tämä merkintä' ,bg: 'Премахни този запис' @@ -7288,8 +7423,10 @@ function init() { ,'Clone this record to new' : { cs: 'Zkopíruj tento záznam do nového' ,ro: 'Duplică această înregistrare' + ,fr: 'Dupliquer cette entrée' ,el: 'Αντιγραφή σε νέα' ,sv: 'Kopiera denna händelse till ny' + ,es: 'Duplicar este registro como nuevo' ,nb: 'Kopier til ny rad' ,de: 'Diesen Eintrag duplizieren' ,dk: 'Dupliker denne indgang' @@ -7307,9 +7444,11 @@ function init() { ,'Record valid from' : { cs: 'Záznam platný od' ,ro: 'Înregistare validă de la' + ,fr: 'Entrée valide à partir de' ,sv: 'Händelse giltig från' ,el: 'Ισχύει από' ,de: 'Eintrag gültig ab' + ,es: 'Registro válido desde' ,dk: 'Indgang gyldig fra' ,nb: 'Rad gyldig fra' ,fi: 'Merkintä voimassa alkaen' @@ -7325,10 +7464,12 @@ function init() { } ,'Stored profiles' : { cs: 'Uložené profily' + ,fr: 'Profils sauvegardés' ,ro: 'Profile salvate' ,sv: 'Lagrad profil' ,el: 'Αποθηκευμένα προφίλ' ,de: 'Gesicherte Profile' + ,es: 'Perfiles guardados' ,dk: 'Gemte profiler' ,nb: 'Lagrede profiler' ,fi: 'Tallennetut profiilit' @@ -7345,6 +7486,8 @@ function init() { ,'Timezone' : { cs: 'Časová zóna' ,de: 'Zeitzone' + ,es: 'Zona horaria' + ,fr: 'Zone horaire' ,dk: 'Tidszone' ,ro: 'Fus orar' ,el: 'Ζώνη Ώρας' @@ -7364,10 +7507,12 @@ function init() { ,'Duration of Insulin Activity (DIA)' : { cs: 'Doba působnosti inzulínu (DIA)' ,ro: 'Durata de acțiune a insulinei' + ,fr: 'Durée d\'action de l\'insuline' ,el: 'Διάρκεια Δράσης Ινσουλίνης(DIA)' ,sv: 'verkningstid för insulin (DIA)' ,nb: 'Insulin varighet' ,de: 'Dauer der Insulinaktivität (DIA)' + ,es: 'Duración Insulina Activa (DIA)' ,dk: 'Varighed af insulin aktivitet (DIA)' ,fi: 'Insuliinin vaikutusaika (DIA)' ,bg: 'Продължителност на инсулиновата активност DIA' @@ -7384,6 +7529,8 @@ function init() { cs: 'Představuje typickou dobu, po kterou inzulín působí. Bývá různá podle pacienta a inzulínu. Typicky 3-4 hodiny pro pacienty s pumpou.' ,ro: 'Reprezintă durata tipică pentru care insulina are efect. Este diferită la fiecare pacient și pentru fiecare tip de insulină' ,el: 'Αντιπροσωπευει την τυπική διάρκεια δράσης της χορηγηθείσας ινσουλίνης.' + ,es: 'Representa la duración típica durante la cual la insulina tiene efecto. Varía por paciente y por tipo de insulina. Típicamente 3-4 horas para la mayoría de la insulina bombeada y la mayoría de los pacientes. A veces también se llama insulina de por vida ' + ,fr: 'Représente la durée d\'action typique de l\'insuline. Varie individuellement et selon le type d\'insuline. Typiquement 3-4 heures pour les insulines utilisées dans les pompes.' ,de: 'Entspricht der typischen Dauer in der das Insulin wirkt. Variiert je Patient und Insulintyp. Häufig 3-4 Stunden für die meisten Pumpeninsuline und die meisten Patienten. Manchmal auch Insulin-Wirkungsdauer genannt.' ,dk: 'Representerer den typiske tid hvor insulinen virker. Varierer per patient og per insulin type. Typisk 3-4 timer for de fleste pumpe insulin og for de fleste patienter. Nogle gange kaldes dette også insulin-livs-tid.' ,sv: 'Beskriver under hur lång tid insulinet verkar. Varierar mellan patienter. Typisk varaktighet 3-4 timmar.' @@ -7403,9 +7550,11 @@ function init() { cs: 'Inzulíno-sacharidový poměr (I:C).' ,ro: 'Rată insulină la carbohidrați (ICR)' ,sv: 'Insulin-Kolhydratskvot' + ,fr: 'Rapport Insuline-Glucides (I:C)' ,el: 'Αναλογία Ινσουλίνης/Υδατάνθρακα (I:C)' ,nb: 'IKH forhold' ,de: 'Insulin/Kohlenhydrate-Verhältnis (I:KH)' + ,es: 'Relación Insulina/Carbohidratos (I:C)' ,dk: 'Insulin til kulhydrat forhold (I:C)' ,fi: 'Insuliiniannoksen hiilihydraattisuhde (I:HH)' ,bg: 'Съотношение инсулин/въглехидратите ICR I:C И:ВХ' @@ -7422,7 +7571,9 @@ function init() { cs: 'hodin' ,ro: 'ore' ,el: 'ώρες' + ,fr: 'heures' ,de: 'Stunden' + ,es: 'horas' ,dk: 'timer' ,sv: 'timmar' ,nb: 'timer' @@ -7440,9 +7591,11 @@ function init() { ,'g/hour' : { cs: 'g/hod' ,ro: 'g/oră' + ,fr: 'g/heure' ,sv: 'g/timme' ,nb: 'g/t' ,de: 'g/Std' + ,es: 'gr/hora' ,dk: 'g/time' ,fi: 'g/tunti' ,bg: 'гр/час' @@ -7458,8 +7611,10 @@ function init() { ,'g carbs per U insulin. The ratio of how many grams of carbohydrates are offset by each U of insulin.' : { cs: 'gramy na jednotku inzulínu. Poměr, jaké množství sacharidů pokryje jednotku inzulínu.' ,ro: 'g carbohidrați pentru o unitate de insulină. Câte grame de carbohidrați sunt acoperite de 1U insulină.' + ,fr: 'g de glucides par Uninté d\'insuline. Le rapport représentant la quantité de glucides compensée par une unité d\'insuline.' ,el: 'Γραμμάρια (g) υδατάνθρακα ανά μονάδα (U) ινσουλίνης. Πόσα γραμμάρια υδατάνθρακα αντιστοιχούν σε μία μονάδα ινσουλίνης' ,sv: 'gram kolhydrater per enhet insulin. Antal gram kolhydrater varje enhet insulin sänker' + ,es: 'gr. de carbohidratos por unidad de insulina. La proporción de cuántos gramos de carbohidratos se consumen por unidad de insulina.' ,de: 'g Kohlenhydrate pro Einheit Insulin. Das Verhältnis wie viele Gramm Kohlenhydrate je Einheit Insulin verbraucht werden.' ,nb: 'g karbohydrater per enhet insulin. Beskriver hvor mange gram karbohydrater som hånderes av en enhet insulin.' ,fi: 'g hiilihydraattia / yksikkö insuliinia. Suhde, joka kertoo montako grammaa hiilihydraattia vastaa yhtä yksikköä insuliinia.' @@ -7477,6 +7632,8 @@ function init() { cs: 'Citlivost inzulínu (ISF)' ,ro: 'Factor de sensilibtate la insulină (ISF)' ,de: 'Insulinsensibilitätsfaktor (ISF)' + ,es: 'Factor Sensibilidad a la Insulina (ISF)' + ,fr: 'Facteur de sensibilité à l\'insuline (ISF)' ,el: 'Ευαισθησία στην Ινοσυλίνη (ISF)' ,sv: 'Insulinkänslighetsfaktor (ISF)' ,nb: 'Insulinfølsomhetsfaktor' @@ -7494,8 +7651,10 @@ function init() { ,'mg/dL or mmol/L per U insulin. The ratio of how much BG changes with each U of corrective insulin.' : { cs: 'mg/dL nebo mmol/L na jednotku inzulínu. Poměr, jak se změní glykémie po podaní jednotky inzulínu' ,ro: 'mg/dL sau mmol/L pentru 1U insulină. Cât de mult influențează glicemia o corecție de o unitate de insulină.' + ,fr: 'mg/dL ou mmol/l par unité d\'insuline. Le rapport représentant la modification de la glycémie résultant de l\'administration d\'une unité d\'insuline.' ,el: 'mg/dl ή mmol/L ανά μονάδα U ινσουλίνης. Το πόσες μονάδες ρίχνει τη γλυκόζη αίματος μία μονάδα U ινσουλίνης' ,de: 'mg/dL oder mmol/L pro Einheit Insulin. Verhältnis von BG-Veränderung je Einheit Korrekturinsulin.' + ,es: 'mg/dl o mmol/L por unidad Insulina. La relación de la caída de glucosa y cada unidad de insulina de corrección administrada.' ,sv: 'mg/dl eller mmol per enhet insulin. Hur varje enhet insulin sänker blodsockret' ,nb: 'mg/dl eller mmol/l per enhet insulin. Beskriver hvor mye blodsukkeret senkes per enhet insulin.' ,fi: 'mg/dL tai mmol/L / 1 yksikkö insuliinia. Suhde, joka kertoo montako yksikköä verensokeria yksi yksikkö insuliinia laskee.' @@ -7513,7 +7672,9 @@ function init() { cs: 'Rychlost absorbce sacharidů' ,ro: 'Rata de absorbție' ,el: 'Ρυθμός απορρόφησης υδατανθράκων' + ,fr: 'Activité glucidique / vitesse d\'absorption' ,de: 'Kohlenhydrataktivität / Aufnahme Kohlenhydrate' + ,es: 'Actividad de carbohidratos / tasa de absorción' ,sv: 'Kolhydratstid' ,nb: 'Karbohydrattid' ,fi: 'Hiilihydraattiaktiivisuus / imeytymisnopeus' @@ -7527,12 +7688,14 @@ function init() { ,it: 'Attività carboidrati / Velocità di assorbimento' ,zh_cn: '碳水化合物活性/吸收率' } - ,'grams per unit time. Represents both the change in COB per unit of time, as well as the amount of carbs that should take effect over that time. Carb absorption / activity curves are less well understood than insulin activity, but can be approximated using an initial delay followed by a constant rate of absorption (g/hr).' : { + ,'grams peUr unit time. Represents both the change in COB per unit of time, as well as the amount of carbs that should take effect over that time. Carb absorption / activity curves are less well understood than insulin activity, but can be approximated using an initial delay followed by a constant rate of absorption (g/hr).' : { cs: 'gramy za jednotku času. Reprezentuje jak změnu COB za jednoku času, tak množství sacharidů, které se za tu dobu projevily. Křivka absorbce sacharidů je mnohem méně pochopitelná než IOB, ale může být aproximována počáteční pauzou následovanou konstantní hodnotou absorbce (g/hod).' ,el: 'Γραμμάρια ανά μονάδα χρόνου. Αναπαριστά τόσο την μεταβολή του COB στη μονάδα του χρόνου. Οι καμπύλες της απορρόφησης υδατανθράκων και της άσκησης δεν έχουν κατανοηθεί πλήρως από την επιστημονική κοινότητα, αλλά μπορούν να προσεγγιστούν βάζοντας μία αρχική καθυστέρηση ακολουθούμενη από έναν σταθερό ρυθμό απορρόφησης (g/hr).' + ,fr: 'grammes par unité de temps. Représente l\'augmentation de COB par unité de temps et la quantité de glucides agissant durant cette période. L\'absorption des glucides est imprécise et est évaluée en moyenne. L\'unité est grammes par heure (g/h).' ,ro: 'grame pe unitatea de timp. Reprezintă atât schimbarea COB pe unitatea de timp, cât și cantitatea de carbohidrați care ar influența în perioada de timp. Graficele ratei de absorbție sunt mai puțin înțelese decât senzitivitatea la insulină, dar se poate aproxima folosind o întârziere implicită și apoi o rată constantă de aborbție (g/h).' ,sv: 'gram per tidsenhet. Representerar både ändring i aktiva kolhydrater per tidsenhet som mängden kolhydrater som tas upp under denna tid. Kolhydratsupptag / aktivitetskurvor är svårare att förutspå än aktivt insulin men kan beräknas genom att använda en startfördröjning följd av en konstant absorbtionsgrad (g/timme) ' ,de: 'Gramm pro Zeiteinheit. Bedeutet sowohl die Änderung in COB je Zeiteinheit, als auch die Menge an Kohlenhydraten die über diese Zeit wirken sollten. Kohlenhydrat-Absorption / Aktivitätskurven werden weniger genau verstanden als Insulinaktivität, aber sie können angenähert werden indem eine Anfangsverzögerung mit konstanter Aufnahme (g/Std.) verwendet wird.' + ,es: 'gramos por unidad de tiempo. Representa tanto el cambio en carbohidratos activos por unidad de tiempo como la cantidad de carbohidratos absorbidos durante este tiempo. Las curvas de captación / actividad de carbohidratos son más difíciles de predecir que la insulina activa, pero se pueden calcular utilizando un retraso de inicio seguido de una tasa de absorción constante (gr/h)' ,nb: 'gram per tidsenhet. Representerer både endringen i COB per tidsenhet, såvel som mengden av karbohydrater som blir tatt opp i løpet av den tiden. Carb absorpsjon / virkningskurver er mindre forstått enn insulinaktivitet, men kan tilnærmes ved hjelp av en forsinkelse fulgt av en konstant hastighet av absorpsjon ( g / time ) .' ,fi: 'grammaa / aika. Kertoo tyypillisen nopeuden, jolla hiilihydraatit imeytyvät syömisen jälkeen. Imeytyminen tunnetaan jokseenkin huonosti, mutta voidaan arvioida keskimääräisesti. Yksikkönä grammaa tunnissa (g/h).' ,bg: 'грам за единица време. Представлява както промяната в COB за единица време, така и количеството ВХ които биха се усвоили за това време.' @@ -7550,6 +7713,8 @@ function init() { ,ro: 'Rata bazală [unitate/oră]' ,el: 'Ρυθμός Βασικ΄ς ινσουλίνης [U/hour]' ,de: 'Basalraten [Einheit/h]' + ,es: 'Tasas basales [Unidad/hora]' + ,fr: 'Débit basal (Unités/ heure)' ,sv: 'Basal [enhet/t]' ,nb: 'Basal [enhet/t]' ,fi: 'Basaali [yksikköä/tunti]' @@ -7568,6 +7733,8 @@ function init() { ,ro: 'Intervalul țintă al glicemiei [mg/dL, mmol/L]' ,el: 'Στόχος Γλυκόζης Αίματος [mg/dl , mmol/l]' ,de: 'Blutzucker-Zielbereich [mg/dL, mmol/L]' + ,es: 'Intervalo glucemia dentro del objetivo [mg/dL,mmol/L]' + ,fr: 'Cible d\'intervalle de glycémie' ,sv: 'Önskvärt blodsockerintervall [mg/dl,mmol]' ,nb: 'Ønsket blodsukkerintervall [mg/dl,mmmol/l]' ,fi: 'Tavoitealue [mg/dL tai mmol/L]' @@ -7584,9 +7751,11 @@ function init() { ,'Start of record validity' : { cs: 'Začátek platnosti záznamu' ,ro: 'De când este valabilă înregistrarea' + ,fr: 'Début de validité des données' ,el: 'Ισχύει από' ,sv: 'Starttid för händelse' ,de: 'Beginn der Aufzeichnungsgültigkeit' + ,es: 'Inicio de validez de datos' ,nb: 'Starttidspunkt for gyldighet' ,fi: 'Merkinnän alkupäivämäärä' ,bg: 'Начало на записа' @@ -7602,7 +7771,9 @@ function init() { ,'Icicle' : { cs: 'Rampouch' ,it: 'Inverso' + ,fr: 'Stalactite' ,de: 'Eiszapfen' + ,es: 'Inverso' ,ro: 'Țurțure' ,sv: 'Istapp' ,nb: 'Isfjell' @@ -7610,6 +7781,7 @@ function init() { ,bg: 'Висящ' ,pl: 'Odwrotność' ,pt: 'Inverso' + ,nl: 'Ijspegel' ,ru: 'Силуэт сосульки' ,sk: 'Inverzne' ,ko: '고드름 방향' @@ -7619,10 +7791,12 @@ function init() { ,'Render Basal' : { cs: 'Zobrazení bazálu' ,it: 'Grafico Basale' + ,fr: 'Afficher le débit basal' ,el: 'Απεικόνιση Βασικής Ινσουλίνης' ,ro: 'Afișează bazala' ,sv: 'Generera Basal' ,de: 'Basalraten-Darstellung' + ,es: 'Representación Basal' ,nb: 'Basalgraf' ,fi: 'Näytä basaali' ,bg: 'Базал' @@ -7639,6 +7813,8 @@ function init() { cs: 'Použitý profil' ,ro: 'Profil folosit' ,de: 'Verwendetes Profil' + ,es: 'Perfil utilizado' + ,fr: 'Profil utilisé' ,el: 'Προφίλ σε χρήση' ,sv: 'Vald profil' ,nb: 'Brukt profil' @@ -7656,8 +7832,10 @@ function init() { ,'Calculation is in target range.' : { cs: 'Kalkulace je v cílovém rozsahu.' ,ro: 'Calculul dă o valoare în intervalul țintă.' + ,fr: 'La valeur calculée est dans l\'intervalle cible' ,el: 'Ο υπολογισμός είναι εντός στόχου' ,de: 'Berechnung ist innerhalb des Zielbereichs' + ,es: 'El cálculo está dentro del rango objetivo' ,sv: 'Inom intervallområde' ,nb: 'Innenfor målområde' ,fi: 'Laskettu arvo on tavoitealueella' @@ -7674,8 +7852,10 @@ function init() { ,'Loading profile records ...' : { cs: 'Nahrávám profily ...' ,nb: 'Leser profiler' + ,fr: 'Chargement des profils...' ,el: 'Φόρτωση δεδομένων προφίλ' ,de: 'Lade Profilaufzeichnungen ...' + ,es: 'Cargando datos perfil ....' ,ro: 'Se încarcă datele profilului...' ,sv: 'Laddar profildata ...' ,fi: 'Ladataan profiileja ...' @@ -7692,8 +7872,10 @@ function init() { ,'Values loaded.' : { cs: 'Data nahrána.' ,nb: 'Verdier lastet' + ,fr: 'Valeurs chargées' ,el: 'Δεδομένα φορτώθηκαν' ,de: 'Werte geladen.' + ,es: 'Valores cargados' ,ro: 'Valorile au fost încărcate.' ,sv: 'Värden laddadr' ,fi: 'Arvot ladattu' @@ -7711,7 +7893,9 @@ function init() { cs: 'Použity výchozí hodnoty.' ,nb: 'Standardverdier brukt' ,el: 'Χρήση προκαθορισμένων τιμών' + ,fr: 'Valeurs par défault utilisées' ,de: 'Standardwerte werden verwendet.' + ,es: 'Se usan valores predeterminados' ,ro: 'Se folosesc valorile implicite.' ,sv: 'Standardvärden valda' ,fi: 'Oletusarvot ladattu' @@ -7728,8 +7912,10 @@ function init() { ,'Error. Default values used.' : { cs: 'CHYBA: Použity výchozí hodnoty.' ,nb: 'Feil. Standardverdier brukt.' + ,fr: 'Erreur! Valeurs par défault utilisées.' ,el: 'Σφάλμα: Χρήση προκαθορισμένων τιμών' ,de: 'Fehler. Standardwerte werden verwendet.' + ,es: 'Error. Se usan valores predeterminados.' ,ro: 'Eroare. Se folosesc valorile implicite.' ,sv: 'Error. Standardvärden valda.' ,fi: 'Virhe! Käytetään oletusarvoja.' @@ -7746,8 +7932,10 @@ function init() { ,'Time ranges of target_low and target_high don\'t match. Values are restored to defaults.' : { cs: 'Rozsahy časů pro limity glykémií si neodpovídají. Budou nastaveny výchozí hodnoty.' ,nb: 'Tidsintervall for målområde lav og høy stemmer ikke. Standardverdier er brukt.' + ,fr: 'Les intervalles de temps pour la cible glycémique supérieure et inférieure diffèrent. Les valeurs par défault sont restaurées.' ,el: 'Το χρονικό διάστημα του χαμηλού ορίου/στόχου και του υψηλού, δεν συμπίπτουν. Γίνεται επαναφορά στις προκαθορισμένες τιμές.' ,de: 'Zeitspanne vom untersten und obersten Wert wird nicht berücksichtigt. Werte auf Standard zurückgesetzt.' + ,es: 'Los marcos temporales para objetivo inferior y objetivo superior no coinciden. Los valores predeterminados son usados.' ,ro: 'Intervalele temporale pentru țintă_inferioară și țintă_superioară nu se potrivesc. Se folosesc valorile implicite.' ,sv: 'Tidsintervall för målområde låg och hög stämmer ej' ,fi: 'Matalan ja korkean tavoitteen aikarajat eivät täsmää. Arvot on vaihdettu oletuksiin.' @@ -7764,6 +7952,8 @@ function init() { ,'Valid from:' : { cs: 'Platné od:' ,de: 'Gültig ab:' + ,es: 'Válido desde:' + ,fr: 'Valide à partir de:' ,nb: 'Gyldig fra:' ,el: 'Ισχύει από:' ,ro: 'Valid de la:' @@ -7782,8 +7972,10 @@ function init() { ,'Save current record before switching to new?' : { cs: 'Uložit současný záznam před přepnutím na nový?' ,nb: 'Lagre før nytte til ny?' + ,fr: 'Sauvegarder cetter entrée avant de procéder à l\'entrée suivante?' ,el: 'Αποθήκευση αλλαγών πριν γίνει εναλλαγή στο νέο προφίλ? ' ,de: 'Aktuellen Datensatz speichern?' + ,es: 'Grabar datos actuales antes cambiar a uno nuevo?' ,ro: 'Salvez valoarea curentă înainte de a trece la una nouă?' ,sv: 'Spara före byte till nytt?' ,fi: 'Tallenna nykyinen merkintä ennen vaihtamista uuteen?' @@ -7800,8 +7992,10 @@ function init() { ,'Add new interval before' : { cs: 'Přidat nový interval před' ,nb: 'Legg til nytt intervall før' + ,fr: 'Ajouter un intervalle de temps avant' ,el: 'Προσθήκη νέου διαστήματος, πριν' ,de: 'Neues Intervall vorher hinzufügen' + ,es: 'Agregar nuevo intervalo antes' ,ro: 'Adaugă un nou interval înainte' ,sv: 'Lägg till nytt intervall före' ,fi: 'Lisää uusi aikaväli ennen' @@ -7818,8 +8012,10 @@ function init() { ,'Delete interval' : { cs: 'Smazat interval' ,nb: 'Slett intervall' + ,fr: 'Effacer l\'intervalle' ,el: 'Διαγραφή διαστήματος' ,de: 'Intervall löschen' + ,es: 'Borrar intervalo' ,ro: 'Șterge interval' ,sv: 'Ta bort intervall' ,fi: 'Poista aikaväli' @@ -7836,8 +8032,10 @@ function init() { ,'I:C' : { cs: 'I:C' ,nb: 'IKH' + ,fr: 'I:C' ,ro: 'ICR' ,de: 'I:KH' + ,es: 'I:C' ,sv: 'I:C' ,fi: 'I:HH' ,bg: 'И:ВХ' @@ -7845,6 +8043,7 @@ function init() { ,pt: 'I:C' ,ru: 'Инс:Углев' ,sk: 'I:C' + ,nl: 'I:C' ,ko: 'I:C' ,it: 'I:C' ,zh_cn: 'ICR' @@ -7854,11 +8053,14 @@ function init() { ,nb: 'ISF' ,ro: 'ISF' ,de: 'ISF' + ,es: 'ISF' + ,fr: 'ISF' ,sv: 'ISF' ,fi: 'ISF' ,bg: 'Инсулинова чувствителност' ,pl: 'ISF' ,pt: 'ISF' + ,nl: 'ISF' ,ru: 'Чувствительность к инсулину' ,sk: 'ISF' ,ko: 'ISF' @@ -7869,6 +8071,8 @@ function init() { cs: 'Kombinovaný bolus' ,pl: 'Bolus złożony' ,de: 'Verzögerter Bolus' + ,es: 'Combo-Bolo' + ,fr: 'Bolus Duo/Combo' ,el: '' ,ro: 'Bolus extins' ,sv: 'Combo-bolus' @@ -7886,6 +8090,8 @@ function init() { ,'Difference' : { cs: 'Rozdíl' ,de: 'Unterschied' + ,es: 'Diferencia' + ,fr: 'Différence' ,ro: 'Diferență' ,el: 'Διαφορά' ,sv: 'Skillnad' @@ -7904,6 +8110,8 @@ function init() { ,'New time' : { cs: 'Nový čas' ,de: 'Neue Zeit' + ,es: 'Nueva hora' + ,fr: 'Nouveau temps' ,ro: 'Oră nouă' ,el: 'Νέα ώρα' ,sv: 'Ny tid' @@ -7922,7 +8130,9 @@ function init() { ,'Edit Mode' : { cs: 'Editační mód' ,ro: 'Mod editare' + ,fr: 'Mode Édition' ,de: 'Bearbeitungsmodus' + ,es: 'Modo edición' ,sv: 'Editeringsläge' ,el: 'Λειτουργία Επεξεργασίας' ,nb: 'Editeringsmodus' @@ -7941,8 +8151,10 @@ function init() { ,'When enabled icon to start edit mode is visible' : { cs: 'Pokud je povoleno, ikona pro vstup do editačního módu je zobrazena' ,ro: 'La activare, butonul de editare este vizibil' + ,fr: 'Lorsqu\'activé, l\'icône du Mode Édition devient visible' ,el: 'Όταν ενεργοποιηθεί, το εικονίδιο της λειτουργίας επεξεργασίας είναι ορατό' ,de: 'Wenn aktiviert wird das Icons zum Start des Bearbeitungsmodus sichtbar' + ,es: 'Si está activado, el icono estará visible al inicio del modo de edición' ,sv: 'Ikon visas när editeringsläge är aktivt' ,nb: 'Ikon vises når editeringsmodus er aktivert' ,bg: 'Когато е активно ,иконката за редактиране ще се вижда' @@ -7960,7 +8172,9 @@ function init() { ,'Operation' : { cs: 'Operace' ,ro: 'Operațiune' + ,fr: 'Opération' ,de: 'Operation' + ,es: 'Operación' ,el: 'Λειτουργία' ,sv: 'Operation' ,nb: 'Operasjon' @@ -7970,6 +8184,7 @@ function init() { ,sk: 'Operácia' ,pl: 'Operacja' ,pt: 'Operação' + ,nl: 'Operatie' ,ko: '동작' ,it: 'Operazione' ,zh_cn: '操作' @@ -7977,7 +8192,9 @@ function init() { ,'Move' : { cs: 'Přesunout' ,ro: 'Mutați' + ,fr: 'Déplacer' ,de: 'Verschieben' + ,es: 'Mover' ,el: 'Μετακίνηση' ,sv: 'Flytta' ,nb: 'Flytt' @@ -7995,6 +8212,8 @@ function init() { ,'Delete' : { cs: 'Odstranit' ,de: 'Löschen' + ,es: 'Borrar' + ,fr: 'Effacer' ,el: 'Διαγραφή' ,ro: 'Ștergeți' ,sv: 'Ta bort' @@ -8013,7 +8232,9 @@ function init() { ,'Move insulin' : { cs: 'Přesunout inzulín' ,ro: 'Mutați insulina' + ,fr: 'Déplacer l\'insuline' ,de: 'Insulin verschieben' + ,es: 'Mover insulina' ,el: 'Μετακίνηση ινσουλίνης' ,sv: 'Flytta insulin' ,nb: 'Flytt insulin' @@ -8032,6 +8253,8 @@ function init() { cs: 'Přesunout sacharidy' ,ro: 'Mutați carbohidrații' ,de: 'Kohlenhydrate verschieben' + ,es: 'Mover carbohidratos' + ,fr: 'Déplacer les glucides' ,el: 'Μετακίνηση υδατανθράκων' ,sv: 'Flytta kolhydrater' ,nb: 'Flytt karbohydrater' @@ -8050,6 +8273,8 @@ function init() { cs: 'Odstranit inzulín' ,ro: 'Ștergeți insulina' ,de: 'Insulin löschen' + ,es: 'Eliminar insulina' + ,fr: 'Effacer l\'insuline' ,el: 'Αφαίρεση ινσουλίνης' ,sv: 'Ta bort insulin' ,nb: 'Fjern insulin' @@ -8067,7 +8292,9 @@ function init() { ,'Remove carbs' : { cs: 'Odstranit sacharidy' ,ro: 'Ștergeți carbohidrații' + ,fr: 'Effacer les glucides' ,de: 'Kohlenhydrate löschen' + ,es: 'Eliminar carbohidratos' ,el: 'Αφαίρεση υδατανθράκων' ,sv: 'Ta bort kolhydrater' ,nb: 'Fjern karbohydrater' @@ -8085,7 +8312,9 @@ function init() { ,'Change treatment time to %1 ?' : { cs: 'Změnit čas ošetření na %1 ?' ,ro: 'Schimbați ora acțiunii cu %1 ?' + ,fr: 'Modifier l\'horaire du traitment? Nouveau: %1' ,de: 'Behandlungsdauer ändern in %1 ?' + ,es: 'Cambiar horario tratamiento a %1 ?' ,el: 'Αλλαγή του χρόνου της ενέργειας σε %1?' ,sv: 'Ändra behandlingstid till %1 ?' ,nb: 'Endre behandlingstid til %1 ?' @@ -8104,6 +8333,8 @@ function init() { cs: 'Změnit čas sacharidů na %1 ?' ,ro: 'Schimbați ora carbohidraților cu %1 ?' ,de: 'Kohlenhydrat-Zeit ändern zu %1 ?' + ,es: 'Cambiar horario carbohidratos a %1 ?' + ,fr: 'Modifier l\'horaire des glucides? Nouveau: %1' ,el: 'Αλλαγή του χρόνου πρόσληψης υδατανθράκων σε %1?' ,sv: 'Ändra kolhydratstid till %1 ?' ,nb: 'Endre Karbohydrattid til %1 ?' @@ -8122,6 +8353,8 @@ function init() { cs: 'Změnit čas inzulínu na %1 ?' ,ro: 'Schimbați ora insulinei cu %1 ?' ,el: 'Αλλαγή του χρόνου χορήγησης ινσουλίνης σε %1 ?' + ,es: 'Cambiar horario insulina a %1 ?' + ,fr: 'Modifier l\'horaire de l\'insuline? Nouveau: %1' ,de: 'Insulinzeit ändern zu %1 ?' ,sv: 'Ändra insulintid till %1 ?' ,nb: 'Endre insulintid til %1 ?' @@ -8140,6 +8373,8 @@ function init() { cs: 'Odstranit ošetření ?' ,ro: 'Ștergeți acțiunea?' ,de: 'Behandlung löschen?' + ,es: 'Eliminar tratamiento?' + ,fr: 'Effacer le traitment?' ,el: 'Διαγραφή ενέργειας ?' ,sv: 'Ta bort behandling ?' ,nb: 'Fjern behandling ?' @@ -8157,6 +8392,8 @@ function init() { ,'Remove insulin from treatment ?' : { cs: 'Odstranit inzulín z ošetření ?' ,de: 'Insulin der Behandlung löschen?' + ,es: 'Eliminar insulina del tratamiento?' + ,fr: 'Effacer l\'insuline du traitement?' ,ro: 'Ștergeți insulina din acțiune?' ,el: 'Διαγραφή ινσουλίνης από την ενέργεια?' ,sv: 'Ta bort insulin från behandling ?' @@ -8176,6 +8413,8 @@ function init() { cs: 'Odstranit sacharidy z ošetření ?' ,ro: 'Ștergeți carbohidrații din acțiune?' ,de: 'Kohlenhydrate der Behandlung löschen?' + ,es: 'Eliminar carbohidratos del tratamiento?' + ,fr: 'Effacer les glucides du traitement?' ,el: 'Διαγραφή των υδατανθράκων από την ενέργεια?' ,sv: 'Ta bort kolhydrater från behandling ?' ,nb: 'Fjern karbohydrater fra behandling ?' @@ -8193,7 +8432,9 @@ function init() { ,'Rendering' : { cs: 'Vykresluji' ,ro: 'Se desenează' + ,fr: 'Représentation graphique' ,de: 'Darstellung' + ,es: 'Gráfica' ,el: 'Απεικόνιση' ,sv: 'Rendering' ,nb: 'Rendering' @@ -8211,6 +8452,8 @@ function init() { ,'Loading OpenAPS data of' : { cs: 'Nahrávám OpenAPS data z' ,de: 'Lade OpenAPS Daten von' + ,es: 'Cargando datos OpenAPS de' + ,fr: 'Chargement des données OpenAPS de' ,ro: 'Se încarcă datele OpenAPS pentru' ,el: 'Φόρτωση δεδομένων OpenAPS' ,sv: 'Laddar OpenAPS data för' @@ -8229,6 +8472,8 @@ function init() { ,'Loading profile switch data' : { cs: 'Nahrávám data přepnutí profilu' ,de: 'Lade Daten Profil-Wechsel' + ,es: 'Cargando el cambio de perfil de datos' + ,fr: 'Chargement de données de changement de profil' ,el: 'Φόρτωση δεδομένων νέου προφίλ σε ισχύ' ,ro: 'Se încarcă datele de schimbare profil' ,sv: 'Laddar ny profildata' @@ -8247,8 +8492,10 @@ function init() { ,'Profile is going to be saved in newer format used in Nightscout 0.9.0 and above and will not be usable in older versions anymore.\nAre you sure?' : { cs: 'Profil bude uložen v novějším formátu používaném v Nightscoutu 0.9.0 a novějších. Již nebude použitelný se starší verzí.\nJste si jistý?' ,el: 'Το προφίλ πρόκειται να αποθηκευτεί με τη νέα του μορφή (έκδοση Nighscout 0.9.0 και πάνω) και δεν πρόκειται να μπορεί να χρησιμοποιηθεί σε παλαιότερες εκδόσεις. \nΕίστε σίγουροι?' + ,fr: 'Le profil va être sauvegardé dans un nouveau format utilisé par Nightscout 0.9.0 et suivants, et il ne pourra plus être utilisé par les versions antérieures. \nÊtes-vous sûr?' ,ro: 'Profilul va fi salvat într-un format nou, folosit în Nightscout 0.9.0 și superior și nu va mai fi posibilă folosirea pentru versiunile mai vechi.\nSunteți de acord?' ,de: 'Profil wird in einem neuem Format für Nightscout 0.9.0 und höher gespeichert und ist in älteren Versionen nicht mehr nutzbar. Sind Sie sicher?' + ,es: 'El perfil se guarda en un nuevo formato para Nightscout 0.9.0 y superior y ya no se puede usar en versiones anteriores. Estas seguro?' ,sv: 'Profilen sparas i ett nyare format som ej kommer fungera i tidigare versioner av Nightscout (<0.9.0). \nÄr du säker?' ,nb: 'Profilen lagres i ett nyere format som ikke kommer til å fungera i tidigere versioner av Nightscout (<0.9.0). \nEr du sikker?' ,bg: 'Профилът ще бъде запаметен в нов формат, който се ползва от Nightscout 0.9.0 и нагоре и няма да бъде съвместим с по-стари версии. \nСигурен ли си ?' @@ -8265,7 +8512,9 @@ function init() { ,'Wrong profile setting.\nNo profile defined to displayed time.\nRedirecting to profile editor to create new profile.' : { cs: 'Chybě nastavený profil.\nNení definovaný žádný platný profil k času zobrazení.\nProvádím přesměrování na editor profilu.' ,el: 'Λάθος προφίλ. Παρακαλώ δημιουργήστε ένα νέο προφίλ' + ,fr: 'Erreur de réglage de profil. \nAucun profil défini pour indiquer l\'heure. \nRedirection vers la création d\'un nouveau profil. ' ,de: 'Falsche Profileinstellung.\nKein Profil festgelegt zur angezeigten Zeit.\n Weiter zum Profileditor um ein neues Profil zu erstellen.' + ,es: 'Configuración incorrecta del perfil. \n No establecido ningún perfil en el tiempo mostrado. \n Continuar en editor de perfil para crear perfil nuevo.' ,bg: 'Грешни настройки на профила. \nНяма определен профил към избраното време. \nПрепращане към редактора на профила, за създаване на нов профил.' ,ro: 'Setare de profil eronată.\nNu este definit niciun profil pentru perioada afișată.\nMergeți la editorul de profiluri pentru a defini unul nou.' ,sv: 'Fel profilinställning.\nIngen profil vald för vald tid.\nOmdirigerar för att skapa ny profil.' @@ -8283,10 +8532,12 @@ function init() { ,'Pump' : { cs: 'Pumpa' ,sk: 'Pumpa' + ,fr: 'Pompe' ,sv: 'Pump' ,el: 'Αντλία' ,nb: 'Pumpe' ,de: 'Pumpe' + ,es: 'Bomba' ,bg: 'Помпа' ,ro: 'Pompă' ,ru: 'Помпа' @@ -8301,9 +8552,11 @@ function init() { cs: 'Stáří senzoru (SAGE)' ,sk: 'Zavedenie senzoru (SAGE)' ,sv: 'Sensorålder (SAGE)' + ,fr: 'Âge du senseur (SAGE)' ,el: 'Ημέρες χρήσης αισθητήρα (SAGE)' ,nb: 'Sensoralder (SAGE)' ,de: 'Sensor-Alter' + ,es: 'Días uso del sensor' ,bg: 'Възраст на сензора (ВС)' ,ro: 'Vechimea senzorului' ,ru: 'Возраст сенсора' @@ -8318,10 +8571,12 @@ function init() { ,'Insulin Age' : { cs: 'Stáří inzulínu (IAGE)' ,sk: 'Výmena inzulínu (IAGE)' + ,fr: 'Âge de l\'insuline (IAGE)' ,el: 'Ημέρες χρήσης αμπούλας ινσουλίνης (IAGE)' ,sv: 'Insulinålder (IAGE)' ,nb: 'Insulinalder (IAGE)' ,de: 'Insulin-Alter' + ,es: 'Días uso cartucho insulina' ,bg: 'Възраст на инсулина (ВИ)' ,ro: 'Vechimea insulinei' ,ru: 'инсулин проработал' @@ -8336,6 +8591,8 @@ function init() { ,'Temporary target' : { cs: 'Dočasný cíl' ,de: 'Temporäres Ziel' + ,es: 'Objetivo temporal' + ,fr: 'Cible temporaire' ,sk: 'Dočasný cieľ' ,el: 'Προσωρινός στόχος' ,sv: 'Tillfälligt mål' @@ -8353,10 +8610,12 @@ function init() { ,'Reason' : { cs: 'Důvod' ,sk: 'Dôvod' + ,fr: 'Raison' ,sv: 'Orsak' ,el: 'Αιτία' ,nb: 'Årsak' ,de: 'Begründung' + ,es: 'Razonamiento' ,bg: 'Причина' ,nl: 'Reden' ,ro: 'Motiv' @@ -8370,9 +8629,11 @@ function init() { ,'Eating soon' : { cs: 'Následuje jídlo' ,sk: 'Jesť čoskoro' + ,fr: 'Repas sous peu' ,sv: 'Snart matdags' ,nb: 'Snart tid for mat' ,de: 'Bald essend' + ,es: 'Comer pronto' ,bg: 'Ядене скоро' ,ro: 'Mâncare în curând' ,ru: 'Скоро еда' @@ -8386,10 +8647,12 @@ function init() { ,'Top' : { cs: 'Horní' ,sk: 'Vrchná' + ,fr: 'Haut' ,sv: 'Toppen' ,el: 'Πάνω' ,nb: 'Øverst' ,de: 'Oben' + ,es: 'Superior' ,bg: 'Горе' ,ro: 'Deasupra' ,ru: 'Верх' @@ -8404,9 +8667,11 @@ function init() { cs: 'Dolní' ,sk: 'Spodná' ,sv: 'Botten' + ,fr: 'Bas' ,el: 'Κάτω' ,nb: 'Nederst' ,de: 'Unten' + ,es: 'Inferior' ,bg: 'Долу' ,ro: 'Sub' ,ru: 'Низ' @@ -8420,10 +8685,12 @@ function init() { ,'Activity' : { cs: 'Aktivita' ,sk: 'Aktivita' + ,fr: 'Activité' ,sv: 'Aktivitet' ,el: 'Δραστηριότητα' ,nb: 'Aktivitet' ,de: 'Aktivität' + ,es: 'Actividad' ,bg: 'Активност' ,ro: 'Activitate' ,ru: 'Активность' @@ -8437,8 +8704,10 @@ function init() { ,'Targets' : { cs: 'Cíl' ,sk: 'Ciele' + ,fr: 'Cibles' ,el: 'Στόχοι' ,de: 'Ziele' + ,es: 'Objetivos' ,sv: 'Mål' ,nb: 'Mål' ,bg: 'Граници' @@ -8454,8 +8723,10 @@ function init() { ,'Bolus insulin:' : { cs: 'Bolusový inzulín:' ,bg: 'Болус инсулин' + ,fr: 'Bolus d\'Insuline' ,ro: 'Insulină bolusată:' ,el: 'Ινσουλίνη' + ,es: 'Bolo de Insulina' ,ru: 'Болюс инсулин' ,sv: 'Bolusinsulin:' ,nb: 'Bolusinsulin:' @@ -8471,8 +8742,10 @@ function init() { ,'Base basal insulin:' : { cs: 'Základní bazální inzulín:' ,bg: 'Основен базален инсулин' + ,fr: 'Débit basal de base' ,ro: 'Bazala obișnuită:' ,el: 'Βασική Ινσουλίνη' + ,es: 'Insulina basal básica' ,ru: 'Основной базал инсулин' ,sv: 'Basalinsulin:' ,nb: 'Basalinsulin:' @@ -8488,7 +8761,9 @@ function init() { ,'Positive temp basal insulin:' : { cs: 'Pozitivní dočasný bazální inzulín:' ,bg: 'Положителен временен базален инсулин' + ,fr: 'Débit basal temporaire positif' ,ro: 'Bazala temporară marită:' + ,es: 'Insulina Basal temporal positiva:' ,el: 'Θετική βασική ινσουλίνη' ,ru: 'Положит знач временн базал инс ' ,sv: 'Positiv tempbasal insulin:' @@ -8505,10 +8780,12 @@ function init() { ,'Negative temp basal insulin:' : { cs:'Negativní dočasný bazální inzulín:' ,bg: 'Отрицателен временен базален инсулин' + ,fr: 'Débit basal temporaire négatif' ,ro: 'Bazala temporară micșorată:' ,el: 'Αρνητική βασική ινσουλίνη' ,ru: 'Отриц знач временн базал инс' ,sv: 'Negativ tempbasal för insulin:' + ,es: 'Insulina basal temporal negativa:' ,nb: 'Negativ midlertidig basalinsulin:' ,ko: '남은 임시 basal 인슐린' ,fi: 'Negatiivinen tilapäisbasaali:' @@ -8522,7 +8799,9 @@ function init() { ,'Total basal insulin:' : { cs: 'Celkový bazální inzulín:' ,bg: 'Общо базален инсулин' + ,fr: 'Insuline basale au total:' ,ro: 'Bazala totală:' + ,es: 'Total Insulina basal:' ,el: 'Συνολική Βασική Ινσουλίνη (BASAL)' ,ru: 'Всего базал инсулина' ,sv: 'Total dagsdos basinsulin:' @@ -8539,6 +8818,7 @@ function init() { ,'Total daily insulin:' : { cs:'Celkový denní inzulín:' ,bg: 'Общо инсулин за деня' + ,fr: 'Insuline totale journalière' ,ro: 'Insulina totală zilnică:' ,el: 'Συνολική Ημερήσια Ινσουλίνη' ,ru: 'Всего ежедн базал инсулина' @@ -8547,6 +8827,7 @@ function init() { ,ko: '하루 인슐린 총량' ,fi: 'Päivän kokonaisinsuliiniannos' ,de: 'Gesamtes tägliches Insulin:' + ,es: 'Total Insulina diaria:' ,pt: 'Insulina diária total:' ,sk: 'Celkový denný inzulín:' ,it: 'Totale giornaliero d\'insulina:' @@ -8556,7 +8837,9 @@ function init() { ,'Unable to %1 Role' : { // PUT or POST cs: 'Chyba volání %1 Role:' ,bg: 'Невъзможно да %1 Роля' + ,fr: 'Incapable de %1 rôle' ,ro: 'Imposibil de %1 Rolul' + ,es: 'Incapaz de %1 Rol' ,ru: 'Невозможно %1 Роль' ,sv: 'Kan inte ta bort roll %1' ,nb: 'Kan ikke %1 rolle' @@ -8573,8 +8856,10 @@ function init() { cs: 'Nelze odstranit Roli:' ,bg: 'Невъзможно изтриването на Роля' ,ro: 'Imposibil de șters Rolul' + ,fr: 'Effacement de rôle impossible' ,ru: 'Невозможно удалить Роль' ,sv: 'Kan ej ta bort roll' + ,es: 'Imposible elimar Rol' ,nb: 'Kan ikke ta bort rolle' ,fi: 'Roolin poistaminen epäonnistui' ,de: 'Rolle nicht löschbar' @@ -8589,8 +8874,10 @@ function init() { cs: 'Databáze obsahuje %1 rolí' ,bg: 'Базата данни съдържа %1 роли' ,ro: 'Baza de date conține %1 rol(uri)' + ,fr: 'La base de données contient %1 rôles' ,ru: 'База данных содержит %1 Ролей' ,sv: 'Databasen innehåller %1 roller' + ,es: 'Base de datos contiene %1 Roles' ,nb: 'Databasen inneholder %1 roller' ,fi: 'Tietokanta sisältää %1 roolia' ,de: 'Datenbank enthält %1 Rollen' @@ -8605,11 +8892,13 @@ function init() { cs:'Editovat roli' ,bg: 'Промени Роля' ,ro: 'Editează Rolul' + ,fr: 'Éditer le rôle' ,ru: 'Редактировать Роль' ,sv: 'Editera roll' ,nb: 'Editer rolle' ,fi: 'Muokkaa roolia' ,de: 'Rolle editieren' + ,es: 'Editar Rol' ,pt: 'Editar Função' ,sk: 'Editovať rolu' ,ko: '편집 모드' @@ -8620,8 +8909,10 @@ function init() { ,'admin, school, family, etc' : { cs: 'administrátor, škola, rodina atd...' ,bg: 'администратор,училище,семейство и т.н.' + ,fr: 'Administrateur, école, famille, etc' ,ro: 'administrator, școală, familie, etc' ,ru: 'админ, школа, семья и т д' + ,es: 'Adminitrador, escuela, família, etc' ,sv: 'Administratör, skola, familj, etc' ,nb: 'Administrator, skole, familie osv' ,fi: 'ylläpitäjä, koulu, perhe jne' @@ -8637,11 +8928,13 @@ function init() { cs: 'Oprávnění' ,bg: 'Права' ,ro: 'Permisiuni' + ,fr: 'Permissions' ,ru: 'Разрешения' ,sv: 'Rättigheter' ,nb: 'Rettigheter' ,fi: 'Oikeudet' ,de: 'Berechtigungen' + ,es: 'Permisos' ,pt: 'Permissões' ,sk: 'Oprávnenia' ,ko: '허가' @@ -8653,11 +8946,13 @@ function init() { cs: 'Opravdu vymazat: ' ,bg: 'Потвърдете изтриването' ,ro: 'Confirmați ștergerea: ' + ,fr: 'Êtes-vous sûr de vouloir effacer:' ,ru: 'Вы уверены, что хотите удалить' ,sv: 'Är du säker att du vill ta bort:' ,nb: 'Er du sikker på at du vil slette:' ,fi: 'Oletko varmat että haluat tuhota: ' ,de: ' Sind sie sicher, das Sie löschen wollen:' + ,es: 'Seguro que quieres eliminarlo:' ,pt: 'Tem certeza de que deseja apagar:' ,sk: 'Naozaj zmazať:' ,ko: '정말로 삭제하시겠습니까: ' @@ -8668,12 +8963,14 @@ function init() { ,'Each role will have a 1 or more permissions. The * permission is a wildcard, permissions are a hierarchy using : as a separator.' : { cs: 'Každá role má 1 nebo více oprávnění. Oprávnění * je zástupný znak, oprávnění jsou hiearchie používající : jako oddělovač.' ,bg: 'Всяка роля ще има 1 или повече права. В * правото е маска, правата са йерархия използвайки : като разделител' + ,fr: 'Chaque rôle aura une ou plusieurs permissions. La permission * est un joker (permission universelle), les permissions sont une hierarchie utilisant : comme séparatuer' ,ro: 'Fiecare rol va avea cel puțin o permisiune. Permisiunea * este totală, permisiunile sunt ierarhice utilizând : pe post de separator.' ,ru: 'Каждая роль имеет 1 или более разрешений. Разрешение * это подстановочный символ, разрешения это иерархия, использующая : как разделитель.' ,sv: 'Varje roll kommer få en eller flera rättigheter. * är en wildcard, rättigheter sätts hirarkiskt med : som avgränsare.' ,nb: 'Hver enkelt rolle vil ha en eller flere rettigheter. *-rettigheten er wildcard. Rettigheter settes hierarkisk med : som separator.' - ,fi: 'Jokaisella roolilla on yksi tai useampia oikeuksia. + on jokeri (tunnistuu kaikkina oikeuksina), oikeudet ovat hierarkia joka käyttää : merkkiä erottimena.' + ,fi: 'Jokaisella roolilla on yksi tai useampia oikeuksia. * on jokeri (tunnistuu kaikkina oikeuksina), oikeudet ovat hierarkia joka käyttää : merkkiä erottimena.' ,de: 'Jede Rolle hat eine oder mehrere Berechtigungen. Die * Berechtigung ist ein Platzhalter, Berechtigungen sind hierachrchisch mit : als Separator.' + ,es: 'Cada Rol tiene uno o más permisos. El permiso * es un marcador de posición y los permisos son jerárquicos con : como separador.' ,pt: 'Cada função terá uma ou mais permissões. A permissão * é um wildcard, permissões são uma hierarquia utilizando * como um separador.' ,sk: 'Každá rola má 1 alebo viac oprávnení. Oprávnenie * je zástupný znak, oprávnenia sú hierarchie používajúce : ako oddelovač.' ,ko: '각각은 1 또는 그 이상의 허가를 가지고 있습니다. 허가는 예측이 안되고 구분자로 : 사용한 계층이 있습니다' @@ -8684,8 +8981,10 @@ function init() { ,'Add new Role' : { cs: 'Přidat novou roli' ,bg: 'Добавете нова роля' + ,fr: 'Ajouter un nouveau rôle' ,ro: 'Adaugă un Rol nou' ,ru: 'Добавить новую Роль' + ,es: 'Añadir nuevo Rol' ,sv: 'Lägg till roll' ,nb: 'Legg til ny rolle' ,fi: 'Lisää uusi rooli' @@ -8700,7 +8999,9 @@ function init() { ,'Roles - Groups of People, Devices, etc' : { cs: 'Role - Skupiny lidí, zařízení atd.' ,bg: 'Роли - Група хора,устройства,т.н.' + ,fr: 'Rôles - Groupe de Personnes ou d\'appareils' ,ro: 'Roluri - Grupuri de persoane, dispozitive, etc' + ,es: 'Roles - Grupos de Gente, Dispositivos, etc.' ,ru: 'Роли- группы людей, устройств и т п' ,sv: 'Roller - Grupp av användare, Enheter, etc' ,nb: 'Roller - Grupper av brukere, enheter osv' @@ -8716,8 +9017,10 @@ function init() { ,'Edit this role' : { cs: 'Editovat tuto roli' ,bg: 'Промени тази роля' + ,fr: 'Editer ce rôle' ,ro: 'Editează acest rol' ,ru: 'Редактировать эту роль' + ,es: 'Editar este Rol' ,sv: 'Editera denna roll' ,nb: 'Editer denne rollen' ,fi: 'Muokkaa tätä roolia' @@ -8732,7 +9035,9 @@ function init() { ,'Admin authorized' : { cs: 'Admin autorizován' ,bg: 'Оторизиран като администратор' + ,fr: 'Administrateur autorisé' ,ro: 'Autorizat de admin' + ,es: 'Administrador autorizado' ,ru: 'Разрешено администратором' ,sv: 'Administratorgodkänt' ,nb: 'Administratorgodkjent' @@ -8749,7 +9054,9 @@ function init() { ,'Subjects - People, Devices, etc' : { cs: 'Subjekty - Lidé, zařízení atd.' ,bg: 'Субекти - Хора,Устройства,т.н.' + ,fr: 'Utilisateurs - Personnes, Appareils, etc' ,ro: 'Subiecte - Persoane, dispozitive, etc' + ,es: 'Sujetos - Personas, Dispositivos, etc' ,ru: 'Субъекты - Люди, устройства и т п' ,sv: 'Ämnen - Användare, Enheter, etc' ,nb: 'Ressurser - Brukere, enheter osv' @@ -8765,8 +9072,10 @@ function init() { ,'Each subject will have a unique access token and 1 or more roles. Click on the access token to open a new view with the selected subject, this secret link can then be shared.' : { cs: 'Každý subjekt má svůj unikátní token a 1 nebo více rolí. Klikem na přístupový token se otevře nové okno pro tento subjekt. Tento link je možné sdílet.' ,bg: 'Всеки обект ще има уникален ключ за достъп и 1 или повече роли. Кликнете върху ключа за достъп, за да отворите нов изглед с избрания обект, тази секретна връзка може след това да се споделя' + ,fr: 'Chaque utilisateur aura un identificateur unique et un ou plusieurs rôles. Cliquez sur l\'identificateur pour révéler l\'utilisateur, ce lien secret peut être partagé.' ,ro: 'Fiecare subiect va avea o cheie unică de acces și unul sau mai multe roluri. Apăsați pe cheia de acces pentru a vizualiza subiectul selectat, acest link poate fi distribuit.' ,ru: 'Каждый субъект получает уникальный код доступа и 1 или более ролей. Нажмите на иконку кода доступа чтобы открыть новое окно с выбранным субъектом, эту секретную ссылку можно переслать.' + ,es: 'Cada sujeto tendrá un identificador de acceso único y 1 o más roles. Haga clic en el identificador de acceso para abrir una nueva vista con el tema seleccionado, este enlace secreto puede ser compartido.' ,sv: 'Varje ämne får en unik säkerhetsnyckel och en eller flera roller. Klicka på accessnyckeln för att öppna en ny vy med det valda ämnet, denna hemliga länk kan sedan delas.' ,nb: 'Hver enkelt ressurs får en unik sikkerhetsnøkkel og en eller flere roller. Klikk på sikkerhetsnøkkelen for å åpne valgte ressurs, den hemmelige lenken kan så deles.' ,fi: 'Jokaisella käyttäjällä on uniikki pääsytunniste ja yksi tai useampi rooli. Klikkaa pääsytunnistetta nähdäksesi käyttäjän, jolloin saat jaettavan osoitteen tämän käyttäjän oikeuksilla.' @@ -8781,12 +9090,14 @@ function init() { ,'Add new Subject' : { cs: 'Přidat nový subjekt' ,bg: 'Добави нов субект' + ,fr: 'Ajouter un nouvel Utilisateur' ,ro: 'Adaugă un Subiect nou' ,ru: 'Добавить нового субъекта' ,sv: 'Lägg till nytt ämne' ,nb: 'Legg til ny ressurs' ,fi: 'Lisää uusi käyttäjä' ,de: 'Füge ein neues Subjekt hinzu' + ,es: 'Añadir nuevo Sujeto' ,pt: 'Adicionar novo assunto' ,sk: 'Pridať nový subjekt' ,ko: '새 주제 추가' @@ -8798,11 +9109,13 @@ function init() { cs: 'Chyba volání %1 Subjektu:' ,bg: 'Невъзможно %1 субект' ,ro: 'Imposibil de %1 Subiectul' + ,fr: 'Impossible de créer l\'Utilisateur %1' ,ru: 'Невозможно %1 субъекта' ,sv: 'Kan ej %1 ämne' ,nb: 'Kan ikke %1 ressurs' ,fi: '%1 operaatio käyttäjälle epäonnistui' ,de: 'Unpassend zum %1 Subjekt' + ,es: 'Imposible poner %1 Sujeto' ,pt: 'Impossível postar %1 assunto' ,sk: 'Chyba volania %1 subjektu' ,ko: '%1 주제 비활성화' @@ -8814,11 +9127,13 @@ function init() { cs: 'Nelze odstranit Subjekt:' ,bg: 'Невъзможно изтриването на субекта' ,ro: 'Imposibil de șters Subiectul' + ,fr: 'Impossible d\'effacer l\'Utilisateur' ,ru: 'Невозможно удалить ' ,sv: 'Kan ej ta bort ämne' ,nb: 'Kan ikke slette ressurs' ,fi: 'Käyttäjän poistaminen epäonnistui' ,de: 'Kann Subjekt nicht löschen' + ,es: 'Imposible eliminar sujeto' ,pt: 'Impossível apagar assunto' ,sk: 'Subjekt sa nedá odstrániť' ,ko: '주제를 지우기 위해 비활성화' @@ -8829,12 +9144,14 @@ function init() { ,'Database contains %1 subjects' : { cs: 'Databáze obsahuje %1 subjektů' ,bg: 'Базата данни съдържа %1 субекти' + ,fr: 'La base de données contient %1 utilisateurs' ,fi: 'Tietokanta sisältää %1 käyttäjää' ,ru: 'База данных содержит %1 субъект(а/ов)' ,ro: 'Baza de date are %1 subiecți' ,sv: 'Databasen innehåller %1 ämnen' ,nb: 'Databasen inneholder %1 ressurser' ,de: 'Datenbank enthält %1 Subjekte' + ,es: 'Base de datos contiene %1 sujetos' ,pt: 'Banco de dados contém %1 assuntos' ,sk: 'Databáza obsahuje %1 subjektov' ,ko: '데이터베이스는 %1 주제를 포함' @@ -8846,6 +9163,8 @@ function init() { cs:'Editovat subjekt' ,bg: 'Промени субект' ,ro: 'Editează Subiectul' + ,es: 'Editar sujeto' + ,fr: 'Éditer l\'Utilisateur' ,ru: 'Редактировать субъекта' ,sv: 'Editera ämne' ,nb: 'Editer ressurs' @@ -8862,11 +9181,13 @@ function init() { cs:'osoba, zařízeni atd.' ,bg: 'човек,устройство,т.н.' ,ro: 'persoană, dispozitiv, etc' + ,fr: 'personne, appareil, etc' ,ru: 'лицо, устройство и т п' ,sv: 'person,enhet,etc' ,nb: 'person, enhet osv' ,fi: 'henkilö, laite jne' ,de: 'Person, Gerät, etc' + ,es: 'Persona, dispositivo, etc' ,pt: 'Pessoa, dispositivo, etc' ,sk: 'osoba, zariadenie atď...' ,ko: '사람, 기기 등' @@ -8878,12 +9199,14 @@ function init() { cs:'role1, role2' ,bg: 'Роля1, Роля2' ,ro: 'Rol1, Rol2' + ,fr: 'rôle1, rôle2' ,ru: 'Роль1, Роль2' ,sv: 'Roll1, Roll2' ,nb: 'rolle1, rolle2' ,fi: 'rooli1, rooli2' ,de: 'Rolle1, Rolle2' ,pt: 'papel1, papel2' + ,es: 'Rol1, Rol2' ,sk: 'rola1, rola2' ,ko: '역할1, 역할2' ,it: 'ruolo1, ruolo2' @@ -8894,8 +9217,10 @@ function init() { cs:'Editovat tento subjekt' ,bg: 'Промени този субект' ,ro: 'Editează acest subiect' + ,fr: 'Éditer cet utilisateur' ,ru: 'Редактировать этого субъекта' ,sv: 'Editera ämnet' + ,es: 'Editar este sujeto' ,nb: 'Editer ressurs' ,fi: 'Muokkaa tätä käyttäjää' ,de: 'Editiere dieses Subjekt' @@ -8910,11 +9235,13 @@ function init() { cs:'Smazat tento subjekt' ,bg: 'Изтрий този субект' ,ro: 'Șterge acest subiect' + ,fr: 'Effacer cet utilisateur:' ,ru: 'Удалить этого субъекта' ,sv: 'Ta bort ämnet' ,nb: 'Slett ressurs' ,fi: 'Poista tämä käyttäjä' ,de: 'Lösche dieses Subjekt' + ,es: 'Eliminar este sujeto' ,pt: 'Apagar esse assunto' ,sk: 'Zmazať tento subjekt' ,ko: '이 주제 삭제' @@ -8926,9 +9253,11 @@ function init() { cs:'Role' ,bg: 'Роли' ,ro: 'Roluri' + ,fr: 'Rôles' ,ru: 'Роли' ,sv: 'Roller' ,nb: 'Roller' + ,es: 'Roles' ,fi: 'Rooli' ,de: 'Rollen' ,pt: 'Papéis' @@ -8942,12 +9271,14 @@ function init() { cs:'Přístupový token' ,bg: 'Ключ за достъп' ,ro: 'Cheie de acces' + ,fr: 'Identificateur unique' ,ru: 'Код доступа' ,sv: 'Åtkomstnyckel' ,nb: 'Tilgangsnøkkel' ,fi: 'Pääsytunniste' ,de: 'Zugriffsschlüssel' ,pt: 'Token de acesso' + ,es: 'Acceso Identificador' ,sk: 'Prístupový Token' ,ko: 'Access Token' ,it: 'Gettone d\'accesso' @@ -8957,12 +9288,14 @@ function init() { ,'hour ago' : { cs:'hodina zpět' ,bg: 'Преди час' + ,fr: 'heure avant' ,ro: 'oră în trecut' ,ru: 'час назад' ,sv: 'timme sedan' ,nb: 'time siden' ,fi: 'tunti sitten' ,de: 'vor einer Stunde' + ,es: 'hora atrás' ,pt: 'hora atrás' ,sk: 'pred hodinou' ,ko: '시간 후' @@ -8973,12 +9306,14 @@ function init() { ,'hours ago' : { cs:'hodin zpět' ,bg: 'Преди часове' + ,fr: 'heures avant' ,ro: 'ore în trecut' ,ru: 'часов назад' ,sv: 'timmar sedan' ,nb: 'timer siden' ,fi: 'tuntia sitten' ,de: 'vor mehreren Stunden' + ,es: 'horas atrás' ,pt: 'horas atrás' ,sk: 'hodín pred' ,ko: '시간 후' @@ -8990,12 +9325,14 @@ function init() { cs:'Ztlumit na %1 minut' ,bg: 'Заглушаване за %1 минути' ,ro: 'Liniște pentru %1 minute' + ,fr: 'Silence pour %1 minutes' ,ru: 'Молчание %1 минут' ,sv: 'Tyst i %1 minuter' ,nb: 'Stille i %1 minutter' ,fi: 'Hiljennä %1 minuutiksi' ,de: 'Inaktivität für %1 Minuten' ,pt: 'Silencir por %1 minutos' + ,es: 'Silenciado por %1 minutos' ,sk: 'Stíšiť na %1 minút' ,ko: '%1 분 동안 무음' ,it: 'Silenzio per %1 minuti' @@ -9007,6 +9344,8 @@ function init() { cs:'Zkontrolovat glykémii' ,de: 'BZ kontrollieren' ,ro: 'Verificați glicemia' + ,es: 'Verificar glucemia' + ,fr: 'Vérifier la glycémie' ,ru: 'Проверьте гликемию' ,sv: 'Kontrollera blodglukos' ,nb: 'Sjekk blodsukker' @@ -9023,6 +9362,7 @@ function init() { cs:'BAZÁL' ,ro: 'Bazală' ,ru: 'Базал' + ,fr: 'Basale' ,sk: 'BAZÁL' ,sv: 'BASAL' ,nb: 'BASAL' @@ -9030,6 +9370,7 @@ function init() { ,pt: 'BASAL' ,bg: 'Базал' ,ko: 'BASAL' + ,es: 'BASAL' ,it: 'BASALE' ,nl: 'Basaal' ,zh_cn: '基础率' @@ -9039,12 +9380,14 @@ function init() { cs:'Současný bazál' ,de: 'Aktuelle Basalrate' ,ro: 'Bazala curentă' + ,fr: 'Débit basal actuel' ,ru: 'Актуальный базал' ,sk: 'Aktuálny bazál' ,sv: 'Nuvarande basal' ,nb: 'Gjeldende basal' ,fi: 'Nykyinen basaali' ,pt: 'Basal atual' + ,es: 'Basal actual' ,bg: 'Актуален базал' ,ko: '현재 basal' ,it: 'Basale corrente' @@ -9055,11 +9398,13 @@ function init() { cs:'Citlivost (ISF)' ,de: 'Sensitivität' ,ro: 'Sensibilitate la insulină (ISF)' + ,fr: 'Sensibilité à l\'insuline (ISF)' ,ru: 'Чуствительность к инсулину' ,sk: 'Citlivosť (ISF)' ,sv: 'Insulinkönslighet (ISF)' ,nb: 'Insulinsensitivitet (ISF)' ,fi: 'Herkkyys' + ,es: 'Sensibilidad' ,pt: 'Fator de sensibilidade' ,bg: 'Инсулинова чувствителност (ISF)' ,ko: '인슐린 민감도(ISF)' @@ -9070,11 +9415,13 @@ function init() { ,'Current Carb Ratio' : { cs:'Sacharidový poměr (I:C)' ,de: 'Aktuelles KH-Verhältnis' + ,fr: 'Rapport Insuline-glucides actuel (I:C)' ,ro: 'Raport Insulină:Carbohidrați (ICR)' ,ru: 'Актуальное соотношение инсулин:углеводы' ,sk: 'Aktuálny sacharidový pomer (I"C)' ,sv: 'Gällande kolhydratkvot' ,nb: 'Gjeldende karbohydratforhold' + ,es: 'Relación actual Insulina:Carbohidratos' ,pt: 'Relação insulina:carboidrato atual' ,fi: 'Nykyinen hiilihydraattiherkkyys' ,bg: 'Актуално Въглехидратно Съотношение' @@ -9087,6 +9434,8 @@ function init() { cs:'Časová zóna' ,de: 'Basal Zeitzone' ,ro: 'Fus orar pentru bazală' + ,es: 'Zona horaria basal' + ,fr: 'Fuseau horaire' ,ru: 'Временная зона базала' ,sk: 'Časová zóna pre bazál' ,sv: 'Basal tidszon' @@ -9103,11 +9452,13 @@ function init() { cs:'Aktivní profil' ,de: 'Aktives Profil' ,ro: 'Profilul activ' + ,fr: 'Profil actif' ,ru: 'Действующий профиль' ,sk: 'Aktívny profil' ,sv: 'Aktiv profil' ,nb: 'Aktiv profil' ,pt: 'Perfil ativo' + ,es: 'Perfil activo' ,fi: 'Aktiivinen profiili' ,bg: 'Активен профил' ,ko: '활성 프로파일' @@ -9119,11 +9470,13 @@ function init() { cs:'Aktivní dočasný bazál' ,de: 'Aktive temp. Basalrate' ,ro: 'Bazală temporară activă' + ,fr: 'Débit basal temporaire actif' ,ru: 'Активный временный базал' ,sk: 'Aktívny dočasný bazál' ,sv: 'Aktiv tempbasal' ,nb: 'Aktiv midlertidig basal' ,pt: 'Basal temporária ativa' + ,es: 'Basal temporal activa' ,fi: 'Aktiivinen tilapäisbasaali' ,bg: 'Активен временен базал' ,ko: '활성 임시 basal' @@ -9135,11 +9488,13 @@ function init() { cs:'Začátek dočasného bazálu' ,de: 'Start aktive temp. Basalrate' ,ro: 'Start bazală temporară activă' + ,fr: 'Début du débit basal temporaire' ,ru: 'Старт активного временного базала' ,sk: 'Štart dočasného bazálu' ,sv: 'Aktiv tempbasal start' ,nb: 'Aktiv midlertidig basal start' ,pt: 'Início da basal temporária ativa' + ,es: 'Inicio Basal temporal activa' ,fi: 'Aktiivisen tilapäisbasaalin aloitus' ,bg: 'Старт на активен временен базал' ,ko: '활성 임시 basal 시작' @@ -9151,11 +9506,13 @@ function init() { cs:'Trvání dočasného bazálu' ,de: 'Dauer aktive temp. Basalrate' ,ro: 'Durata bazalei temporare active' + ,fr: 'Durée du débit basal temporaire' ,ru: 'Длительность активного временного базала' ,sk: 'Trvanie dočasného bazálu' ,sv: 'Aktiv tempbasal varaktighetstid' ,nb: 'Aktiv midlertidig basal varighet' ,pt: 'Duração de basal temporária ativa' + ,es: 'Duración Basal Temporal activa' ,fi: 'Aktiivisen tilapäisbasaalin kesto' ,bg: 'Продължителност на Активен временен базал' ,ko: '활성 임시 basal 시간' @@ -9167,11 +9524,13 @@ function init() { cs:'Zbývající dočasný bazál' ,de: 'Verbleibene Dauer temp. Basalrate' ,ro: 'Rest de bazală temporară activă' + ,fr: 'Durée restante de débit basal temporaire' ,ru: 'Остаток акивного временного базала' ,sk: 'Zostatok dočasného bazálu' ,sv: 'Återstående tempbasaltid' ,nb: 'Gjenstående midlertidig basal tid' ,pt: 'Basal temporária ativa restante' + ,es: 'Basal temporal activa restante' ,fi: 'Aktiivista tilapäisbasaalia jäljellä' ,bg: 'Оставащ Активен временен базал' ,ko: '남아 있는 활성 임시 basal' @@ -9183,7 +9542,9 @@ function init() { cs:'Základní hodnota bazálu' ,ro: 'Valoarea profilului bazalei' ,ru: 'Значение профайла базала' + ,fr: 'Valeur du débit basal' ,sv: 'Basalprofil värde' + ,es: 'Valor perfil Basal' ,nb: 'Basalprofil verdi' ,fi: 'Basaaliprofiilin arvo' ,pt: 'Valor do perfil basal' @@ -9197,11 +9558,13 @@ function init() { ,'Active combo bolus' : { cs:'Aktivní kombinovaný bolus' ,ro: 'Bolus combinat activ' + ,fr: 'Bolus Duo/Combo actif' ,ru: 'Активный комбинированный болюс' ,sv: 'Aktiv kombobolus' ,nb: 'Kombinasjonsbolus' ,fi: 'Aktiivinen yhdistelmäbolus' ,pt: 'Bolus duplo em atividade' + ,es: 'Activo combo-bolo' ,sk: 'Aktívny kombinovaný bolus' ,bg: '' ,ko: '활성 콤보 bolus' @@ -9212,11 +9575,13 @@ function init() { ,'Active combo bolus start' : { cs:'Začátek kombinovaného bolusu' ,ro: 'Start bolus combinat activ' + ,fr: 'Début de Bolus Duo/Combo' ,ru: 'Старт активного комбо болюса' ,sv: 'Aktiv kombobolus start' ,nb: 'Kombinasjonsbolus start' ,fi: 'Aktiivisen yhdistelmäboluksen alku' ,pt: 'Início do bolus duplo em atividade' + ,es: 'Inicio del combo-bolo activo' ,sk: 'Štart kombinovaného bolusu' ,bg: 'Активен комбиниран болус' ,ko: '활성 콤보 bolus 시작' @@ -9227,8 +9592,10 @@ function init() { ,'Active combo bolus duration' : { cs:'Trvání kombinovaného bolusu' ,ro: 'Durată bolus combinat activ' + ,fr: 'Durée du Bolus Duo/Combo' ,ru: 'Длительность активного комбо болюса' ,sv: 'Aktiv kombibolus varaktighet' + ,es: 'Duración del Combo-Bolo activo' ,nb: 'Kombinasjonsbolus varighet' ,fi: 'Aktiivisen yhdistelmäboluksen kesto' ,pt: 'Duração de bolus duplo em atividade' @@ -9242,8 +9609,10 @@ function init() { ,'Active combo bolus remaining' : { cs:'Zbývající kombinovaný bolus' ,ro: 'Rest de bolus combinat activ' + ,fr: 'Activité restante du Bolus Duo/Combo' ,ru: 'Остаток активного комбо болюса' ,sv: 'Återstående aktiv kombibolus' + ,es: 'Restante Combo-Bolo activo' ,nb: 'Gjenstående kombinasjonsbolus' ,fi: 'Aktiivista yhdistelmäbolusta jäljellä' ,pt: 'Restante de bolus duplo em atividade' @@ -9258,11 +9627,13 @@ function init() { cs:'Změna glykémie' ,de: 'BZ Differenz' ,ro: 'Diferență glicemie' + ,fr: 'Différence de glycémie' ,ru: 'Изменение гликемии' ,sv: 'BS deltavärde' ,nb: 'BS forskjell' ,fi: 'VS muutos' ,pt: 'Diferença de glicemia' + ,es: 'Diferencia de glucemia' ,sk: 'Zmena glykémie' ,bg: 'Изменение КЗ' ,ko: '혈당 차이' @@ -9275,11 +9646,13 @@ function init() { cs:'Dosažený čas' ,de: 'Vergangene Zeit' ,ro: 'Timp scurs' + ,fr: 'Temps écoulé' ,ru: 'Прошло времени' ,sv: 'Förfluten tid' ,nb: 'Forløpt tid' ,fi: 'Kulunut aika' ,pt: 'Tempo transcorrido' + ,es: 'Tiempo transcurrido' ,sk: 'Uplynutý čas' ,bg: 'Изминало време' ,ko: '경과 시간' @@ -9292,11 +9665,13 @@ function init() { cs:'Absolutní rozdíl' ,de: 'Absolute Differenz' ,ro: 'Diferență absolută' + ,fr: 'Différence absolue' ,ru: 'Абсолютное изменение' ,sv: 'Absolut deltavärde' ,nb: 'Absolutt forskjell' ,fi: 'Absoluuttinen muutos' ,pt: 'Diferença absoluta' + ,es: 'Diferencia absoluta' ,sk: 'Absolútny rozdiel' ,bg: 'Абсолютно изменение' ,ko: '절대적인 차이' @@ -9309,11 +9684,13 @@ function init() { cs:'Interpolováno' ,de: 'Interpoliert' ,ro: 'Interpolat' + ,fr: 'Interpolé' ,ru: 'Интерполировано' ,sv: 'Interpolerad' ,nb: 'Interpolert' ,fi: 'Laskettu' ,pt: 'Interpolado' + ,es: 'Interpolado' ,sk: 'Interpolované' ,bg: 'Интерполирано' ,ko: '삽입됨' @@ -9326,7 +9703,9 @@ function init() { cs:'KALK' ,ro: 'Ajutor bolusare (BWP)' ,ru: 'Предпросмотр калькулятора болюса' + ,fr: 'Calculateur de bolus (BWP)' ,sv: 'Boluskalkylator' + ,es: 'VistaPreviaCalculoBolo (BWP)' ,nb: 'Boluskalkulator' ,fi: 'Annoslaskuri' ,pt: 'Ajuda de bolus' @@ -9342,7 +9721,9 @@ function init() { cs:'Urgentní' ,de: 'Akut' ,ro: 'Urgent' + ,fr: 'Urgent' ,ru: 'Срочно' + ,es: 'Urgente' ,sv: 'Akut' ,nb: 'Akutt' ,fi: 'Kiireellinen' @@ -9359,11 +9740,13 @@ function init() { cs:'Varování' ,de: 'Warnung' ,ro: 'Atenție' + ,fr: 'Attention' ,ru: 'Осторожно' ,sv: 'Varning' ,nb: 'Advarsel' ,fi: 'Varoitus' ,pt: 'Aviso' + ,es: 'Aviso' ,sk: 'Varovanie' ,bg: 'Предупреждение' ,ko: '경고' @@ -9375,11 +9758,13 @@ function init() { ,'Info' : { cs:'Informativní' ,ro: 'Informație' + ,fr: 'Information' ,ru: 'Информация' ,sv: 'Information' ,nb: 'Informasjon' ,fi: 'Info' ,pt: 'Informações' + ,es: 'Información' ,sk: 'Info' ,bg: 'Информация' ,ko: '정보' @@ -9392,8 +9777,10 @@ function init() { cs:'Nejnižší' ,ro: 'Cea mai mică' ,ru: 'Самое нижнее' + ,fr: 'Valeur la plus basse' ,sv: 'Lägsta' ,nb: 'Laveste' + ,es: 'Más bajo' ,fi: 'Matalin' ,pt: 'Mais baixo' ,sk: 'Najnižsie' @@ -9407,7 +9794,9 @@ function init() { ,'Snoozing high alarm since there is enough IOB' : { cs:'Vypínání alarmu vyskoké glykémie, protože je dostatek IOB' ,ro: 'Ignoră alarma de hiper deoarece este suficientă insulină activă IOB' + ,fr: 'Alarme haute ignorée car suffisamment d\'insuline à bord (IOB)' ,bg: 'Изключване на аларма за висока КЗ, тъй като има достатъчно IOB' + ,es: 'Ignorar alarma de Hiperglucemia al tener suficiente insulina activa' ,ru: 'Отключение предупреждение о высоком СК ввиду достаточности инсулина в организме' ,sv: 'Snoozar höglarm då aktivt insulin är tillräckligt' ,nb: 'Utsetter høyalarm siden det er nok aktivt insulin' @@ -9422,12 +9811,14 @@ function init() { cs:'Zkontrolovat glykémii, čas na bolus?' ,de: 'BZ kontrollieren, ggf. Bolus abgeben?' ,ro: 'Verifică glicemia, poate este necesar un bolus?' + ,fr: 'Vérifier la glycémie, bolus nécessaire ?' ,bg: 'Провери КЗ, не е ли време за болус?' ,ru: 'Проверьте СК, не пора ли ввести болюс?' ,sv: 'Kontrollera BS, dags att ge bolus?' ,nb: 'Sjekk blodsukker, på tide med bolus?' ,fi: 'Tarkista VS, aika bolustaa?' ,pt: 'Meça a glicemia, hora de bolus de correção?' + ,es: 'Controle su glucemia, ¿quizás un bolo Insulina?' ,sk: 'Skontrolovať glykémiu, čas na bolus?' ,it: 'Controllare BG, il tempo del bolo?' ,nl: 'Controleer BG, tijd om te bolussen?' @@ -9437,10 +9828,13 @@ function init() { cs:'Poznámka' ,ro: 'Notificare' ,ru: 'Заметка' + ,fr: 'Notification' ,bg: 'Известие' ,sv: 'Notering' + ,es: 'Nota' ,nb: 'NB' ,fi: 'Huomio' + ,nl: 'Notitie' ,pt: 'Nota' ,sk: 'Poznámka' ,it: 'Preavviso' @@ -9450,9 +9844,11 @@ function init() { cs:'chybějící informace' ,de: 'Benötigte Information fehlt' ,ro: 'Informații importante lipsă' + ,fr: 'Information nécessaire manquante' ,ru: 'Отсутствует необходимая информация' ,bg: 'Липсва необходима информация' ,nb: 'Nødvendig informasjon mangler' + ,es: 'Falta información requerida' ,fi: 'tarvittava tieto puuttuu' ,pt: 'Informação essencial faltando' ,sk: 'chýbajúca informácia' @@ -9464,12 +9860,14 @@ function init() { cs:'Aktivní inzulín' ,de: 'Aktives Insulin' ,ro: 'Insulină activă (IOB)' + ,fr: 'Insuline à bord (IOB)' ,ru: 'Активный инсулин (IOB)' ,bg: 'Активен Инсулин (IOB)' ,sv: 'Aktivt insulin (IOB)' ,nb: 'Aktivt insulin (IOB)' ,fi: 'Aktiivinen insuliini' ,pt: 'Insulina ativa' + ,es: 'Insulina activa (IOB)' ,sk: 'Aktívny inzulín (IOB)' ,it: 'IOB - Insulina Attiva' ,nl: 'IOB - Inuline on board' @@ -9479,11 +9877,13 @@ function init() { cs:'Aktuální cílová hodnota' ,de: 'Aktueller Zielbereich' ,ro: 'Țintă curentă' + ,fr: 'Cible actuelle' ,ru: 'Актуальное целевое значение' ,bg: 'Настояща целева КЗ' ,sv: 'Aktuellt mål' ,nb: 'Gjeldende mål' ,fi: 'Tämänhetkinen tavoite' + ,es: 'Objetivo actual' ,pt: 'Meta atual' ,sk: 'Aktuálny cieľ' ,it: 'Obiettivo attuale' @@ -9494,12 +9894,14 @@ function init() { cs:'Očekávaný efekt' ,de: 'Erwarteter Effekt' ,ro: 'Efect presupus' + ,fr: 'Effect escompté' ,ru: 'Ожидаемый эффект' ,bg: 'Очакван ефект' ,sv: 'Förväntad effekt' ,nb: 'Forventet effekt' ,fi: 'Oletettu vaikutus' ,pt: 'Efeito esperado' + ,es: 'Efecto previsto' ,sk: 'Očakávaný efekt' ,it: 'Effetto Previsto' ,nl: 'verwacht effect' @@ -9509,12 +9911,14 @@ function init() { cs:'Očekávaný výsledek' ,de: 'Erwartetes Ergebnis' ,ro: 'Rezultat așteptat' + ,fr: 'Résultat escompté' ,ru: 'Ожидаемый результат' ,bg: 'Очакван резултат' ,sv: 'Förvöntat resultat' ,nb: 'Forventet resultat' ,fi: 'Oletettu lopputulos' ,pt: 'Resultado esperado' + ,es: 'Resultado previsto' ,sk: 'Očakávaný výsledok' ,it: 'Risultato previsto' ,nl: 'Veracht resultaat' @@ -9524,11 +9928,14 @@ function init() { cs:'Ekvivalent v sacharidech' ,de: 'Kohlenhydrat-Äquivalent' ,ro: 'Echivalență în carbohidrați' + ,fr: 'Equivalent glucidique' ,ru: 'Эквивалент в углеводах' ,bg: 'Равностойност във ВХ' ,sv: 'Kolhydratsinnehåll' ,nb: 'Karbohydratekvivalent' + ,nl: 'Koolhydraat equivalent' ,fi: 'Hiilihydraattivastaavuus' + ,es: 'Equivalencia en Carbohidratos' ,pt: 'Equivalente em carboidratos' ,sk: 'Sacharidový ekvivalent' ,it: 'Carb equivalenti' @@ -9537,7 +9944,9 @@ function init() { ,'Excess insulin equivalent %1U more than needed to reach low target, not accounting for carbs' : { cs:'Nadbytek inzulínu: o %1U více, než na dosažení spodní hranice cíle. Nepočítáno se sacharidy.' ,de: 'Überschüssiges Insulin: %1U mehr als zum Erreichen der Untergrenze notwendig, Kohlenhydrate sind unberücksichtigt' + ,es: 'Exceso de insulina en %1U más de lo necesario para alcanzar un objetivo bajo, sin tener en cuenta los carbohidratos' ,ro: 'Insulină în exces: %1U mai mult decât este necesar pentru a atinge ținta inferioară, fără a ține cont de carbohidrați' + ,fr: 'Insuline en excès: %1U de plus que nécessaire pour atteindre la cible inférieure, sans prendre en compte les glucides' ,bg: 'Излишният инсулин %1U е повече от необходимия за достигане до долната граница, ВХ не се вземат под внимание' ,ru: 'Избыток инсулина равного %1U, необходимого для достижения нижнего целевого значения, углеводы не будут учтены' ,sv: 'Överskott av insulin motsvarande %1U mer än nödvändigt för att nå lågt målvärde, kolhydrater ej medräknade' @@ -9553,9 +9962,11 @@ function init() { cs:'Nadbytek inzulínu: o %1U více, než na dosažení spodní hranice cíle. UJISTĚTE SE, ŽE JE TO POKRYTO SACHARIDY' ,de: 'Überschüssiges Insulin: %1U mehr als zum Erreichen der Untergrenze notwendig. SICHERSTELLEN, DASS IOB DURCH KOHLENHYDRATE ABGEDECKT WIRD' ,ro: 'Insulină în exces: %1U mai mult decât este necesar pentru a atinge ținta inferioară, ASIGURAȚI-VĂ CĂ INSULINA ESTE ACOPERITĂ DE CARBOHIDRAȚI' + ,fr: 'Insuline en excès: %1U de plus que nécessaire pour atteindre la cible inférieure, ASSUREZ UN APPORT SUFFISANT DE GLUCIDES' ,bg: 'Излишният инсулин %1U е повече от необходимия за достигане до долната граница, ПРОВЕРИ ДАЛИ IOB СЕ ПОКРИВА ОТ ВЪГЛЕХИДРАТИТЕ' ,ru: 'Избыток инсулина, равного %1U, необходимого для достижения нижнего целевого значения, ПОКРОЙТЕ IOB ИНСУЛИН В ОРГАНИЗМЕ УГЛЕВОДАМИ' ,sv: 'Överskott av insulin motsvarande %1U mer än nödvändigt för att nå lågt målvärde, SÄKERSTÄLL ATT IOB TÄCKS AV KOLHYDRATER' + ,es: 'Exceso de insulina en %1U más de la necesaria para alcanzar objetivo inferior. ASEGÚRESE QUE LA INSULINA ACTIVA IOB ESTA CUBIERTA POR CARBOHIDRATOS' ,nb: 'Insulin tilsvarende %1U mer enn det trengs for å nå lavt mål, PASS PÅ AT AKTIVT INSULIN ER DEKKET OPP MED KARBOHYDRATER' ,fi: 'Liikaa insuliinia: %1U enemmän kuin tarvitaan tavoitteeseen pääsyyn, VARMISTA RIITTÄVÄ HIILIHYDRAATTIEN SAANTI' ,pt: 'Excesso de insulina equivalente a %1U além do necessário para atingir a meta inferior. ASSEGURE-SE DE QUE A IOB ESTEJA COBERTA POR CARBOIDRATOS' @@ -9567,12 +9978,15 @@ function init() { cs:'Nutné snížení aktivního inzulínu o %1U k dosažení spodního cíle. Příliž mnoho bazálu?' ,de: 'Aktives Insulins um %1U reduzieren, um Untergrenze zu erreichen. Basal zu hoch?' ,ro: '%1U sunt în plus ca insulină activă pentru a atinge ținta inferioară, bazala este prea mare?' + ,fr: 'Réduction d\'insuline active nécessaire pour atteindre la cible inférieure. Débit basal trop élevé ?' ,bg: '%1U намаляне е необходимо в активния инсулин до достигане до долната граница, прекалено висок базал?' ,ru: 'Для достижения нижнего целевого значения необходимо понизить величину активного инсулина на %1U, велика база?' ,sv: '%1U minskning nödvändig i aktivt insulin för att nå lågt målvärde, för hög basal?' ,nb: '%1U reduksjon trengs i aktivt insulin for å nå lavt mål, for høy basal?' ,fi: 'Pääset tavoitteesen vähentämällä %1U aktiivista insuliinia, liikaa basaalia?' + ,es: 'Se necesita una reducción del %1U insulina activa para objetivo inferior, exceso en basal?' ,pt: 'Necessária redução de %1U na insulina ativa para atingir a meta inferior, excesso de basal?' + ,nl: '%1U reductie vereist in actieve insuline om laag doel te bereiken, teveel basaal?' ,sk: 'Nutné zníženie aktívneho inzulínu o %1U pre dosiahnutie spodnej cieľovej hranice. Príliš veľa bazálu?' ,it: 'Riduzione 1U% necessaria d\'insulina attiva per raggiungere l\'obiettivo basso, troppa basale?' ,zh_cn: '活性胰岛素已可至血糖下限目标，需减少%1单位，基础率过高？' @@ -9581,9 +9995,11 @@ function init() { cs:'úprava změnou bazálu není možná. Podat sacharidy?' ,de: 'Basalrate geht außerhalb des Zielbereiches. Kohlenhydrate nehmen?' ,ro: 'ajustarea bazalei duce în afara intervalului țintă. Suplimentați carbohirații?' + ,fr: 'ajustement de débit basal hors de limites, prenez des glucides?' ,bg: 'Корекция на базала не е възможна, добавка на въглехидрати? ' ,ru: 'Корректировка базы вне диапазона, добавить углеводов?' ,sv: 'basaländring utanför gräns, ge kolhydrater?' + ,es: 'ajuste basal fuera de rango, dar carbohidratos?' ,nb: 'basaljustering utenfor tillatt område, gi karbohydrater?' ,fi: 'säätö liian suuri, anna hiilihydraatteja?' ,pt: 'ajuste de basal fora da meta, dar carboidrato?' @@ -9596,11 +10012,13 @@ function init() { cs:'úprava změnou bazálu není možná. Podat bolus?' ,de: 'Basalrate geht außerhalb des Zielbereiches. Bolus abgeben?' ,ro: 'ajustarea bazalei duce în afara intervalului țintă. Suplimentați insulina?' + ,fr: 'ajustement de débit basal hors de limites, prenez un bolus?' ,bg: 'Корекция на базала не е възможна, добавка на болус? ' ,ru: 'Корректировка базы вне диапазона, добавить болюс?' ,sv: 'basaländring utanför gräns, ge bolus?' ,nb: 'basaljustering utenfor tillatt område, gi bolus?' ,fi: 'säätö liian suuri, anna bolus?' + ,es: 'Ajuste de basal fuera de rango, corregir con insulina?' ,pt: 'ajuste de basal fora da meta, dar bolus de correção?' ,sk: 'úprava pomocou zmeny bazálu nie je možná. Podať bolus?' ,it: 'regolazione basale fuori campo, dare bolo?' @@ -9611,6 +10029,7 @@ function init() { cs:'nad horním' ,de: 'überhalb Obergrenze' ,ro: 'peste ținta superioară' + ,fr: 'plus haut que la limite supérieure' ,ru: 'Выше верхнего' ,bg: 'над горната' ,sv: 'över hög nivå' @@ -9618,6 +10037,7 @@ function init() { ,fi: 'yli korkean' ,pt: 'acima do limite superior' ,sk: 'nad horným' + ,es: 'por encima límite superior' ,it: 'sopra alto' ,nl: 'boven hoog' ,zh_cn: '血糖过高' @@ -9627,11 +10047,13 @@ function init() { cs:'pod spodním' ,de: 'unterhalb Untergrenze' ,ro: 'sub ținta inferioară' + ,fr: 'plus bas que la limite inférieure' ,bg: 'под долната' ,ru: 'Ниже нижнего' ,sv: 'under låg nivå' ,nb: 'under lav grense' ,fi: 'alle matalan' + ,es: 'por debajo límite inferior' ,pt: 'abaixo do limite inferior' ,sk: 'pod spodným' ,it: 'sotto bassa' @@ -9643,6 +10065,7 @@ function init() { cs:'Předpokládaná glykémie %1 cílem' ,de: 'Erwarteter BZ %1' ,ro: 'Glicemie estimată %1 în țintă' + ,fr: 'Glycémie cible projetée %1 ' ,bg: 'Предполагаемата КЗ %1 в граници' ,ru: 'Расчетная гликемия %1' ,sv: 'Önskat BS %1 mål' @@ -9651,18 +10074,21 @@ function init() { ,pt: 'Meta de glicemia estimada %1' ,sk: 'Predpokladaná glykémia %1 cieľ' ,it: 'Proiezione BG %1 obiettivo' + ,es: 'Glucemia estimada %1 en objetivo' ,nl: 'Verwachte BG %1 doel' ,zh_cn: '预计血糖%1目标' } ,'aiming at' : { cs:'s cílem' ,de: 'angestrebt werden' + ,fr: 'visant' ,ro: 'ținta este' ,ru: 'цель на' ,bg: 'цел към' ,sv: 'önskad utgång' ,nb: 'sikter på' ,fi: 'tavoitellaan' + ,es: 'resultado deseado' ,pt: 'meta' ,sk: 'cieľom' ,it: 'puntare a' @@ -9673,12 +10099,14 @@ function init() { cs:'Bolus %1 jednotek' ,de: 'Bolus von %1 Einheiten' ,ro: 'Bolus de %1 unități' + ,fr: 'Bolus %1 unités' ,bg: 'Болус %1 единици' ,ru: 'Болюс %1 единиц' ,sv: 'Bolus %1 enheter' ,nb: 'Bolus %1 enheter' ,fi: 'Bolusta %1 yksikköä' ,pt: 'Bolus %1 unidades' + ,es: 'Bolus %1 unidades' ,sk: 'Bolus %1 jednotiek' ,it: 'Bolo %1 unità' ,nl: 'Bolus %1 eenheden' @@ -9688,12 +10116,14 @@ function init() { cs:'nebo úprava bazálu' ,de: 'oder Basal anpassen' ,ro: 'sau ajustează bazala' + ,fr: 'ou ajuster le débit basal' ,bg: 'или корекция на базала' ,ru: 'или корректировать базу' ,sv: 'eller justera basal' ,nb: 'eller justere basal' ,fi: 'tai säädä basaalia' ,pt: 'ou ajuste basal' + ,es: 'o ajustar basal' ,sk: 'alebo úprava bazálu' ,it: 'o regolare basale' ,nl: 'of pas basaal aan' @@ -9703,12 +10133,14 @@ function init() { cs:'Před korekcí zkontrolujte glukometrem glykémii!' ,de: 'Überprüfe deinen BZ mit dem Messgerät, bevor du eine Korrektur vornimmst!' ,ro: 'Verifică glicemia cu glucometrul înainte de a face o corecție!' + ,fr: 'Vérifier la glycémie avec un glucomètre avant de corriger!' ,bg: 'Провери КЗ с глюкомер, преди кореция!' ,ru: 'Перед корректировкой сверьте СК с глюкометром' ,sv: 'Kontrollera blodglukos med fingerstick före korrigering!ß' ,nb: 'Sjekk blodsukker før korrigering!' ,fi: 'Tarkista VS mittarilla ennen korjaamista!' ,pt: 'Verifique glicemia de ponta de dedo antes de corrigir!' + ,es: 'Verifique glucemia antes de corregir!' ,sk: 'Pred korekciou skontrolujte glykémiu glukometrom!' ,it: 'Controllare BG utilizzando glucometro prima di correggere!' ,nl: 'Controleer BG met bloeddruppel voor correctie!' @@ -9717,12 +10149,14 @@ function init() { ,'Basal reduction to account %1 units:' : { cs:'Úprava bazálu pro náhradu bolusu %1 U ' ,ro: 'Reducere bazală pentru a compensa %1 unități:' + ,fr: 'Réduction du débit basal pour obtenir l\'effet d\' %1 unité' ,bg: 'Намаляне на базала с %1 единици' ,ru: 'Снижение базы на %1 единиц' ,sv: 'Basalsänkning för att nå %1 enheter' ,nb: 'Basalredusering for å nå %1 enheter' ,fi: 'Basaalin vähennys saadaksesi %1 yksikön vaikutuksen:' ,pt: 'Redução de basal para compensar %1 unidades:' + ,es: 'Reducir basal para compesar %1 unidades:' ,sk: 'Úprava bazálu pre výpočet %1 jednotiek:' ,it: 'Riduzione basale per conto %1 unità:' ,nl: 'Basaal verlaagd voor %1 eenheden' @@ -9732,12 +10166,14 @@ function init() { cs:'30ti minutový dočasný bazál' ,de: '30min temporäres Basal' ,ro: 'bazală temporară de 30 minute' + ,fr: 'débit basal temporaire de 30 min' ,bg: '30м временен базал' ,ru: '30 мин врем базал' ,sv: '30 minuters temporär basal' ,nb: '30 minutters midlertidig basal' ,fi: '30m tilapäinen basaali' ,pt: 'Basal temp 30m' + ,es: '30 min. temporal basal' ,sk: '30 minutový dočasný bazál' ,it: '30m basale temp' ,nl: '30 minuten tijdelijke basaal' @@ -9747,11 +10183,13 @@ function init() { cs:'hodinový dočasný bazál' ,de: '1h temporäres Basal' ,ro: 'bazală temporară de 1 oră' + ,fr: 'débit basal temporaire de 1 heure' ,bg: '1 час временен базал' ,ru: '1 час врем базал' ,sv: '60 minuters temporär basal' ,nb: '60 minutters midlertidig basal' ,fi: '1h tilapäinen basaali' + ,es: '1h temporal Basasl' ,pt: 'Basal temp 1h' ,sk: 'hodinový dočasný bazál' ,it: '1h basale temp' @@ -9763,11 +10201,13 @@ function init() { ,de: 'Kanülenwechsel überfällig!' ,ro: 'Depășire termen schimbare canulă!' ,bg: 'Времето за смяна на сет просрочено' + ,fr: 'Dépassement de date de changement de canule!' ,ru: 'С' ,sv: 'Infusionsset, bytestid överskriden' ,nb: 'Byttetid for infusjonssett overskredet' ,fi: 'Kanyylin ikä yli määräajan!' ,pt: 'Substituição de catéter vencida!' + ,es: '¡Cambio de agujas vencido!' ,sk: 'Výmena kanyli po lehote!' ,it: 'Cambio Cannula in ritardo!' ,nl: 'Cannule te oud!' @@ -9776,12 +10216,14 @@ function init() { ,'Time to change cannula' : { cs:'Čas na výměnu setu' ,de: 'Es ist Zeit, die Kanüle zu wechseln' + ,fr: 'Le moment est venu de changer de canule' ,ro: 'Este vremea să schimbați canula' ,bg: 'Време за смяна на сет' ,ru: 'Пора заменить канюлю' ,sv: 'Dags att byta infusionsset' ,nb: 'På tide å bytte infusjonssett' ,fi: 'Aika vaihtaa kanyyli' + ,es:' Hora sustituir cánula' ,pt: 'Hora de subistituir catéter' ,sk: 'Čas na výmenu kanyli' ,it: 'Tempo di cambiare la cannula' @@ -9792,6 +10234,7 @@ function init() { cs:'Blíží se čas na výměnu setu' ,de: 'Kanüle bald wechseln' ,ro: 'Schimbați canula în curând' + ,fr: 'Changement de canule bientòt' ,bg: 'Смени сета скоро' ,ru: 'Подходит время замены канюли' ,sv: 'Byt infusionsset snart' @@ -9806,6 +10249,7 @@ function init() { ,'Cannula age %1 hours' : { cs:'Stáří setu %1 hodin' ,de: 'Kanülen Alter %1 Stunden' + ,fr: 'âge de la canule %1 heures' ,ro: 'Vechimea canulei în ore: %1' ,bg: 'Сетът е на %1 часове' ,ru: 'Возраст канюли %1 час' @@ -9813,6 +10257,7 @@ function init() { ,nb: 'infusjonssett alder %1 timer' ,fi: 'Kanyylin ikä %1 tuntia' ,pt: 'Idade do catéter %1 horas' + ,es: 'Cánula usada %1 horas' ,sk: 'Vek kanyli %1 hodín' ,it: 'Durata Cannula %1 ore' ,nl: 'Canule leeftijd %1 uren' @@ -9822,11 +10267,13 @@ function init() { cs:'Nasazený' ,de: 'Eingesetzt' ,ro: 'Inserat' + ,fr: 'Insérée' ,bg: 'Поставен' ,ru: 'Введено' ,sv: 'Applicerad' ,nb: 'Satt inn' ,fi: 'Asetettu' + ,es: 'Insertar' ,pt: 'Inserido' ,sk: 'Zavedený' ,it: 'Inserito' @@ -9838,11 +10285,13 @@ function init() { cs:'SET' ,ro: 'VC' ,bg: 'ВС' + ,fr: 'CAGE' ,ru: 'ВКан' ,sv: 'Nål' ,nb: 'Nål alder' ,fi: 'KIKÄ' ,pt: 'ICAT' + ,es: 'Carb.desde' ,sk: 'SET' ,it: 'CAGE' ,nl: 'CAGE' @@ -9852,12 +10301,14 @@ function init() { ,'COB' : { cs:'SACH' ,ro: 'COB' - ,bg: 'АВХ' + ,bg: 'АВХ' + ,fr: 'COB' ,ru: 'Активн углеводы' ,sv: 'COB' ,nb: 'Aktive katbohydrater' ,fi: 'AH' ,pt: 'COB' + ,es: 'Carbohidratos activos' ,sk: 'SACH' ,it: 'COB' ,nl: 'COB' @@ -9867,12 +10318,14 @@ function init() { cs:'Poslední sacharidy' ,de: 'Letzte Kohlenhydrate' ,ro: 'Ultimii carbohidrați' - ,bg: 'Последни ВХ' + ,fr: 'Derniers glucides' + ,bg: 'Последни ВХ' ,ru: 'Новые углеводы' ,sv: 'Senaste kolhydrater' ,nb: 'Siste karbohydrater' ,fi: 'Viimeisimmät hiilihydraatit' ,pt: 'Último carboidrato' + ,es: 'último carbohidrato' ,sk: 'Posledné sacharidy' ,it: 'Ultimi carboidrati' ,nl: 'Laatse KH' @@ -9881,12 +10334,14 @@ function init() { ,'IAGE' : { cs:'INZ' ,ro: 'VI' + ,fr: 'IAGE' ,bg: 'ВИнс' ,ru: 'ВозрИнс' ,sv: 'Insulinålder' ,nb: 'Insulinalder' ,fi: 'IIKÄ' ,pt: 'IddI' + ,es: 'Insul.desde' ,sk: 'INZ' ,it: 'IAGE' ,nl: 'IAGE' @@ -9896,6 +10351,7 @@ function init() { ,'Insulin reservoir change overdue!' : { cs:'Čas na výměnu zásobníku vypršel!' ,de: 'Ampullenwechsel überfällig!' + ,fr: 'Dépassement de date de changement de réservoir d\'insuline!' ,ro: 'Termenul de schimbare a rezervorului de insulină a fost depășit' ,bg: 'Смянатата на резервоара просрочена' ,ru: 'Срок замены тубы инсулина истек' @@ -9903,6 +10359,7 @@ function init() { ,nb: 'Insulinbytestid overskrevet' ,fi: 'Insuliinisäiliö vanhempi kuin määräaika!' ,pt: 'Substituição de reservatório vencida!' + ,es: 'Excedido plazo del cambio depósito de insulina!' ,sk: 'Čas na výmenu inzulínu po lehote!' ,it: 'Cambio serbatoio d\'insulina in ritardo!' ,nl: 'Verwissel insulinereservoir nu!' @@ -9912,12 +10369,14 @@ function init() { cs:'Čas na výměnu zásobníku' ,de: 'Es ist Zeit, die Ampulle zu wechseln' ,ro: 'Este timpul pentru schimbarea rezervorului de insulină' + ,fr: 'Le moment est venu de changer de réservoir d\'insuline' ,bg: 'Време е за смяна на резервоара' ,ru: 'Наступил срок замены тубы инсулина' ,sv: 'Dags att byta insulinreservoar' ,nb: 'På tide å bytte insulinreservoar' ,fi: 'Aika vaihtaa insuliinisäiliö' ,pt: 'Hora de substituir reservatório' + ,es: 'Hora de sustituir depósito insulina' ,sk: 'Čas na výmenu inzulínu' ,it: 'Momento di cambiare serbatoio d\'insulina' ,nl: 'Verwissel insuline reservoir' @@ -9927,12 +10386,14 @@ function init() { cs:'Blíží se čas na výměnu zásobníku' ,de: 'Ampulle bald wechseln' ,ro: 'Rezervorul de insulină trebuie schimbat în curând' + ,fr: 'Changement de réservoir d\'insuline bientôt' ,bg: 'Смени резервоара скоро' ,ru: 'Наступает срок замены тубы инсулина' ,sv: 'Byt insulinreservoar snart' ,nb: 'Bytt insulinreservoar snart' ,fi: 'Vaihda insuliinisäiliö pian' ,pt: 'Substituir reservatório em brave' + ,es: 'Sustituir depósito insulina en breve' ,sk: 'Čoskoro bude potrebné vymeniť inzulín' ,it: 'Cambiare serbatoio d\'insulina prossimamente' ,nl: 'Verwissel insuline reservoir binnenkort' @@ -9941,6 +10402,7 @@ function init() { ,'Insulin reservoir age %1 hours' : { cs:'Stáří zásobníku %1 hodin' ,de: 'Ampullen Alter %1 Stunden' + ,fr: 'Âge du réservoir d\'insuline %1 heures' ,ro: 'Vârsta reservorului de insulină %1 ore' ,ru: 'Картридж инсулина отработал %1часов' ,bg: 'Резервоарът е на %1 часа' @@ -9949,6 +10411,7 @@ function init() { ,fi: 'Insuliinisäiliön ikä %1 tuntia' ,pt: 'Idade do reservatório %1 horas' ,sk: 'Vek inzulínu %1 hodín' + ,es: 'Depósito insulina desde %1 horas' ,it: 'IAGE - Durata Serbatoio d\'insulina %1 ore' ,nl: 'Insuline reservoir leeftijd %1 uren' ,zh_cn: '胰岛素储液器已使用%1小时' @@ -9956,6 +10419,7 @@ function init() { ,'Changed' : { cs:'Vyměněno' ,de: 'Gewechselt' + ,fr: 'Changé' ,ro: 'Schimbat' ,ru: 'Замена произведена' ,bg: 'Сменен' @@ -9963,6 +10427,7 @@ function init() { ,nb: 'Byttet' ,fi: 'Vaihdettu' ,pt: 'Substituído' + ,es: 'Cambiado' ,sk: 'Vymenený' ,it: 'Cambiato' ,nl: 'veranderd' @@ -9972,9 +10437,11 @@ function init() { cs:'IOB' ,ro: 'IOB' ,ru: 'Активный Инсулин' + ,fr: 'IOB' ,bg: 'АИ' ,sv: 'IOB' ,nb: 'Aktivt insulin' + ,es: 'Insulina Activa IOB' ,fi: 'IOB' ,pt: 'IOB' ,sk: 'IOB' @@ -9986,10 +10453,12 @@ function init() { cs:'IOB z ošetření' ,ro: 'IOB în Careportal' ,ru: 'Активн Инс на портале назначений' + ,fr: 'Careportal IOB' ,bg: 'АИ от Кеърпортал' ,sv: 'IOB i Careportal' ,nb: 'Aktivt insulin i Careportal' ,fi: 'Careportal IOB' + ,es: 'Insulina activa en Careportal' ,pt: 'IOB do Careportal' ,sk: 'IOB z portálu starostlivosti' ,it: 'IOB Somministrazioni' @@ -9999,6 +10468,7 @@ function init() { ,'Last Bolus' : { cs:'Poslední bolus' ,de: 'Letzter Bolus' + ,fr: 'Dernier Bolus' ,ro: 'Ultimul bolus' ,ru: 'Прошлый болюс' ,bg: 'Последен болус' @@ -10006,6 +10476,7 @@ function init() { ,nb: 'Siste Bolus' ,fi: 'Viimeisin bolus' ,pt: 'Último bolus' + ,es: 'Último bolo' ,sk: 'Posledný bolus' ,it: 'Ultimo bolo' ,nl: 'Laatste bolus' @@ -10015,11 +10486,13 @@ function init() { cs:'IOB z bazálů' ,ro: 'IOB bazală' ,ru: 'Активн Базал' + ,fr: 'IOB du débit basal' ,bg: 'Базален АИ' ,sv: 'Basal IOB' ,nb: 'Basal Aktivt Insulin' ,fi: 'Basaalin IOB' ,pt: 'IOB basal' + ,es: 'Basal Insulina activa' ,sk: 'Bazálny IOB' ,it: 'Basale IOB' ,nl: 'Basaal IOB' @@ -10029,12 +10502,14 @@ function init() { cs:'Zdroj' ,de: 'Quelle' ,ro: 'Sursă' + ,fr: 'Source' ,ru: 'Источник' ,bg: 'Източник' ,sv: 'Källa' ,nb: 'Kilde' ,fi: 'Lähde' ,pt: 'Fonte' + ,es: 'Fuente' ,sk: 'Zdroj' ,it: 'Fonte' ,nl: 'bron' @@ -10044,8 +10519,10 @@ function init() { cs:'Zastaralá data, zkontrolovat mobil?' ,de: 'Daten sind veraltet, Übertragungsgerät prüfen?' ,ro: 'Date învechite, verificați uploaderul!' + ,fr: 'Valeurs trop anciennes, vérifier l\'uploadeur' ,ru: 'Устаревшие данные, проверьте загрузчик' ,bg: 'Стари данни, провери телефона' + ,es: 'Datos desactualizados, controlar la subida?' ,sv: 'Gammal data, kontrollera rigg?' ,nb: 'Gamle data, sjekk rigg?' ,fi: 'Tiedot vanhoja, tarkista lähetin?' @@ -10058,6 +10535,7 @@ function init() { ,'Last received:' : { cs:'Naposledy přijato:' ,de: 'Zuletzt empfangen:' + ,fr: 'Dernière réception:' ,ro: 'Ultimile date:' ,ru: 'Предыдущий полученный' ,bg: 'Последно получени' @@ -10065,6 +10543,7 @@ function init() { ,nb: 'Sist mottatt:' ,fi: 'Viimeksi vastaanotettu:' ,pt: 'Último recebido:' + ,es: 'Último recibido:' ,sk: 'Naposledy prijaté:' ,it: 'Ultime ricevute:' ,nl: 'laatste ontvangen' @@ -10074,11 +10553,13 @@ function init() { cs:'%1m zpět' ,de: 'vor %1m' ,ro: 'acum %1 minute' + ,fr: 'il y a %1 min' ,ru: 'мин назад' ,bg: 'преди %1 мин.' ,sv: '%1m sedan' ,nb: '%1m siden' ,fi: '%1m sitten' + ,es: '%1min. atrás' ,pt: '%1m atrás' ,sk: 'pred %1m' ,it: '%1m fa' @@ -10089,12 +10570,14 @@ function init() { cs:'%1h zpět' ,de: 'vor %1h' ,ro: 'acum %1 ore' + ,fr: '%1 heures plus tôt' ,ru: 'час назад' ,bg: 'преди %1 час' ,sv: '%1h sedan' ,nb: '%1h siden' ,fi: '%1h sitten' ,pt: '%1h atrás' + ,es: '%1h. atrás' ,sk: 'pred %1h' ,it: '%1h fa' ,nl: '%1u geleden' @@ -10104,12 +10587,14 @@ function init() { cs:'%1d zpět' ,de: 'vor 1d' ,ro: 'acum %1 zile' + ,fr: '%1 jours plus tôt' ,ru: 'дн назад' ,bg: 'преди %1 ден' ,sv: '%1d sedan' ,nb: '%1d siden' ,fi: '%1d sitten' ,pt: '%1d atrás' + ,es: '%1d atrás' ,sk: 'pred %1d' ,it: '%1d fa' ,nl: '%1d geleden' @@ -10120,10 +10605,12 @@ function init() { ,ro: 'VECHI' ,ru: 'РЕТРО' ,bg: 'РЕТРО' + ,fr: 'RETRO' ,sv: 'RETRO' ,nb: 'GAMMELT' ,fi: 'RETRO' ,pt: 'RETRO' + ,es: 'RETRO' ,sk: 'RETRO' ,it: 'RETRO' ,nl: 'RETRO' @@ -10133,12 +10620,14 @@ function init() { cs:'SENZ' ,ro: 'VS' ,ru: 'Сенсор проработал' + ,fr: 'SAGE' ,bg: 'ВС' ,sv: 'Sensor' ,nb: 'Sensoralder' ,fi: 'SIKÄ' ,pt: 'IddS' ,sk: 'SENZ' + ,es: 'Sensor desde' ,it: 'SAGE' ,nl: 'SAGE' ,zh_cn: '探头' @@ -10148,12 +10637,14 @@ function init() { cs:'Čas na výměnu senzoru vypršel!' ,de: 'Sensorwechsel/-neustart überfällig!' ,ro: 'Depășire termen schimbare/restart senzor!' + ,fr: 'Changement/Redémarrage du senseur dépassé!' ,ru: 'Рестарт сенсора просрочен' ,bg: 'Смяната/рестартът на сензора са пресрочени' ,sv: 'Sensor byte/omstart överskriden!' ,nb: 'Sensor bytte/omstart overskredet!' ,fi: 'Sensorin vaihto/uudelleenkäynnistys yli määräajan!' ,pt: 'Substituição/reinício de sensor vencido' + ,es: 'Sustituir/reiniciar, sensor vencido' ,sk: 'Čas na výmenu/reštart sensoru uplynul!' ,it: 'Cambio/riavvio del sensore in ritardo!' ,nl: 'Sensor vevang/hertstart tijd gepasseerd' @@ -10164,11 +10655,13 @@ function init() { ,de: 'Es ist Zeit, den Sensor zu wechseln/neuzustarten' ,ro: 'Este timpul pentru schimbarea senzorului' ,ru: 'Время замены/рестарта сенсора' + ,fr: 'C\'est le moment de changer/redémarrer le senseur' ,bg: 'Време за смяна/рестарт на сензора' ,sv: 'Dags att byta/starta om sensorn' ,nb: 'På tide å bytte/restarte sensoren' ,fi: 'Aika vaihtaa / käynnistää sensori uudelleen' ,pt: 'Hora de substituir/reiniciar sensor' + ,es: 'Hora de sustituir/reiniciar sensor' ,sk: 'Čas na výmenu/reštart senzoru' ,it: 'Tempo di cambiare/riavvio sensore' ,nl: 'Sensor vervangen of herstarten' @@ -10178,12 +10671,14 @@ function init() { cs:'Blíží se čas na výměnu senzoru' ,de: 'Sensor bald wechseln/neustarten' ,ro: 'Schimbați/restartați senzorul în curând' + ,fr: 'Changement/Redémarrage du senseur bientôt' ,ru: 'Приближается срок замены/рестарта сенсора' ,bg: 'Смени/рестартирай сензора скоро' ,sv: 'Byt/starta om sensorn snart' ,nb: 'Bytt/restarta sensoren snart' ,fi: 'Vaihda/käynnistä sensori uudelleen pian' ,pt: 'Mudar/reiniciar sensor em breve' + ,es: 'Cambiar/Reiniciar sensor en breve' ,sk: 'Čoskoro bude potrebné vymeniť/reštartovať senzor' ,it: 'Modifica/riavvio sensore prossimamente' ,nl: 'Herstart of vervang sensor binnenkort' @@ -10193,12 +10688,14 @@ function init() { cs:'Stáří senzoru %1 dní %2 hodin' ,de: 'Sensor Alter %1 Tage %2 Stunden' ,ro: 'Senzori vechi de %1 zile și %2 ore' + ,fr: 'Âge su senseur %1 jours et %2 heures' ,ru: 'Сенсор проработал % дн % час' ,bg: 'Сензорът е на %1 дни %2 часа ' ,sv: 'Sensorålder %1 dagar %2 timmar' ,nb: 'Sensoralder %1 dag %2 timer' ,fi: 'Sensorin ikä %1 päivää, %2 tuntia' ,pt: 'Idade do sensor %1 dias %2 horas' + ,es: 'Sensor desde %1 días %2 horas' ,sk: 'Vek senzoru %1 dní %2 hodín' ,it: 'Durata Sensore %1 giorni %2 ore' ,nl: 'Sensor leeftijd %1 dag(en) en %2 uur' @@ -10208,11 +10705,13 @@ function init() { cs: 'Výměna sensoru' ,de: 'Sensor eingesetzt' ,ro: 'Inserția senzorului' + ,fr: 'Insertion du senseur' ,ru: 'Установка сенсора' ,bg: 'Поставяне на сензора' ,sv: 'Sensor insättning' ,nb: 'Sensor satt inn' ,fi: 'Sensorin Vaihto' + ,es: 'Insertar sensor' ,pt: 'Inserção de sensor' ,sk: 'Výmena senzoru' ,it: 'SAGE - inserimento sensore' @@ -10223,11 +10722,13 @@ function init() { cs: 'Znovuspuštění sensoru' ,ro: 'Pornirea senzorului' ,ru: 'Запуск сенсора' + ,fr: 'Démarrage du senseur' ,bg: 'Стартиране на сензора' ,sv: 'Sensorstart' ,nb: 'Sensorstart' ,fi: 'Sensorin Aloitus' ,pt: 'Início de sensor' + ,es: 'Inicio del sensor' ,sk: 'Štart senzoru' ,it: 'SAGE - partenza sensore' ,nl: 'Sensor start' @@ -10237,12 +10738,14 @@ function init() { cs: 'dní' ,de: 'Tage' ,ro: 'zile' + ,fr: 'jours' ,ru: 'дн' ,bg: 'дни' ,sv: 'dagar' ,nb: 'dager' ,fi: 'päivää' ,pt: 'dias' + ,es: 'días' ,sk: 'dní' ,it: 'giorni' ,nl: 'dagen' @@ -10251,25 +10754,31 @@ function init() { ,'Insulin distribution' : { cs: 'Rozložení inzulínu' ,ro: 'Distribuția de insulină' + ,fr: 'Distribution de l\'insuline' ,ru: 'распределение инсулина' ,fi: 'Insuliinijakauma' ,it: 'Distribuzione di insulina' + ,es: 'Distribución de la insulina' ,nl: 'Insuline verdeling' } ,'To see this report, press SHOW while in this view' : { cs: 'Pro zobrazení toho výkazu stiskněte Zobraz na této záložce' ,de: 'Auf ZEIGEN drücken, um den Bericht in dieser Ansicht anzuzeigen' + ,fr: 'Pour voir le rapport, cliquer sur MONTRER dans cette fenêtre' ,ro: 'Pentru a vedea acest raport, apăsați butonul SHOW' ,ru: 'чтобы увидеть отчет, нажмите show/показать' ,fi: 'Nähdäksesi tämän raportin, paina NÄYTÄ tässä näkymässä' ,it: 'Per guardare questo report, premere SHOW all\'interno della finestra' + ,es: 'Presione SHOW para mostrar el informe en esta vista' ,nl: 'Om dit rapport te zien, druk op "Laat zien"' } ,'AR2 Forecast' : { cs: 'AR2 predikci' ,de: 'AR2 Vorhersage' ,ro: 'Predicție AR2' + ,fr: 'Prédiction AR2' ,ru: 'прогноз AR2' + ,es: 'Pronóstico AR2' ,fi: 'AR2 Ennusteet' ,it: 'Previsione AR2' ,nl: 'AR2 Voorspelling' @@ -10278,7 +10787,9 @@ function init() { cs: 'OpenAPS predikci' ,de: 'OpenAPS Vorhersage' ,ro: 'Predicții OpenAPS' + ,fr: 'Prédictions OpenAPS' ,ru: 'прогнозы OpenAPS' + ,es: 'Pronóstico OpenAPS' ,fi: 'OpenAPS Ennusteet' ,it: 'Previsione OpenAPS' ,nl: 'OpenAPS Voorspelling' @@ -10286,105 +10797,133 @@ function init() { ,'Temporary Target' : { cs: 'Dočasný cíl glykémie' ,de: 'Temporäres Ziel' + ,fr: 'Cible temporaire' ,ro: 'Țintă temporară' ,ru: 'промежуточная цель' ,fi: 'Tilapäinen tavoite' + ,es: 'Objetivo temporal' ,it: 'Obbiettivo temporaneo' ,nl: 'Tijdelijk doel' } ,'Temporary Target Cancel' : { cs: 'Dočasný cíl glykémie konec' ,de: 'Temporäres Ziel abbrechen' + ,fr: 'Effacer la cible temporaire' ,ro: 'Renunțare la ținta temporară' ,ru: 'отмена промежуточной цели' ,fi: 'Peruuta tilapäinen tavoite' + ,es: 'Objetivo temporal cancelado' ,it: 'Obbiettivo temporaneo cancellato' ,nl: 'Annuleer tijdelijk doel' } ,'OpenAPS Offline' : { cs: 'OpenAPS vypnuto' ,ro: 'OpenAPS deconectat' + ,fr: 'OpenAPS déconnecté' ,ru: 'OpenAPS вне сети' ,fi: 'OpenAPS poissa verkosta' ,it: 'OpenAPS disconnesso' + ,es: 'OpenAPS desconectado' ,nl: 'OpenAPS Offline' } ,'Profiles' : { cs: 'Profily' ,de: 'Profile' + ,fr: 'Profils' ,ro: 'Profile' ,ru: 'профили' ,fi: 'Profiilit' ,it: 'Profili' + ,es: 'Perfil' ,nl: 'Profielen' } ,'Time in fluctuation' : { fi: 'Aika muutoksessa' + ,fr: 'Temps passé en fluctuation' ,it: 'Tempo in fluttuazione' ,ro: 'Timp în fluctuație' + ,es: 'Tiempo fluctuando' ,ru: 'время флуктуаций' ,nl: 'Tijd met fluctuaties' } ,'Time in rapid fluctuation' : { fi: 'Aika nopeassa muutoksessa' + ,fr: 'Temps passé en fluctuation rapide' ,it: 'Tempo in rapida fluttuazione' ,ro: 'Timp în fluctuație rapidă' + ,es: 'Tiempo fluctuando rápido' ,ru: 'время быстрых флуктуаций' ,nl: 'Tijd met grote fluctuaties' } ,'This is only a rough estimation that can be very inaccurate and does not replace actual blood testing. The formula used is taken from:' : { fi: 'Tämä on epätarkka arvio joka saattaa heittää huomattavasti mittaustuloksesta, eikä korvaa laboratoriotestiä. Laskentakaava on otettu artikkelista: ' + ,fr: 'Ceci est seulement une estimation grossière qui peut être très imprécise et ne remplace pas une mesure sanguine adéquate. La formule est empruntée à l\'article:' ,it: 'Questa è solo un\'approssimazione che può essere molto inaccurata e che non sostituisce la misurazione capillare. La formula usata è presa da:' ,ro: 'Aceasta este doar o aproximare brută, care poate fi foarte imprecisă și nu ține loc de testare capilară. Formula matematică folosită este luată din:' + ,es: 'Esto es sólo una estimación apróximada que puede ser muy inexacta y no reemplaza las pruebas de sangre reales. La fórmula utilizada está tomada de: ' ,ru: 'Это приблизительная оценка не заменяющая фактический анализ крови. Используемая формула взята из:' ,nl: 'Dit is enkel een grove schatting die onjuist kan zijn welke geen bloedtest vervangt. De gebruikte formule is afkomstig van:' } , 'Filter by hours' : { fi: 'Huomioi raportissa seuraavat tunnit' ,it: 'Filtra per ore' + ,fr: 'Filtrer par heures' ,ro: 'Filtrare pe ore' + ,es: 'Filtrar por horas' ,ru: 'почасовой фильтр' ,nl: 'Filter op uren' } , 'Time in fluctuation and Time in rapid fluctuation measure the % of time during the examined period, during which the blood glucose has been changing relatively fast or rapidly. Lower values are better.' : { fi: 'Aika Muutoksessa ja Aika Nopeassa Muutoksessa mittaa osuutta tarkkailtavasta aikaperiodista, jolloin glukoosi on ollut nopeassa tai hyvin nopeassa muutoksessa. Pienempi arvo on parempi.' + ,fr: 'Le Temps passé en fluctuation et le temps passé en fluctuation rapide mesurent la part de temps durant la période examinée, pendant laquelle la glycémie a évolué relativement ou très rapidement. Les valeurs basses sont les meilleures.' ,it: 'Tempo in fluttuazione e Tempo in rapida fluttuazione misurano la % di tempo durante il periodo esaminato, durante il quale la glicemia stà variando velocemente o rapidamente. Bassi valori sono migliori.' ,ro: 'Timpul în fluctuație și timpul în fluctuație rapidă măsoară procentul de timp, din perioada examinată, în care glicemia din sânge a avut o variație relativ rapidă sau rapidă. Valorile mici sunt de preferat.' + ,es: 'Tiempo en fluctuación y Tiempo en fluctuación rápida miden el % de tiempo del período exáminado, durante la cual la glucosa en sangre ha estado cambiando relativamente rápido o rápidamente. Valores más bajos son mejores.' ,ru: 'время флуктуаций и время быстрых флуктуаций означает % времени в рассматриваемый период в течение которого СК менялся относительно быстро или просто быстро. Более низкие значения предпочтительней' ,nl: 'Tijd met fluctuaties of grote fluctuaties in % van de geevalueerde periode, waarbij de bloed glucose relatief snel wijzigde.Lagere waarden zijn beter.' } , 'Mean Total Daily Change is a sum of the absolute value of all glucose excursions for the examined period, divided by the number of days. Lower is better.' : { fi: 'Keskimääräinen Kokonaismuutos kertoo kerkimääräisen päivätason verensokerimuutoksien yhteenlasketun arvon. Pienempi arvo on parempi.' + ,fr: 'La Variation Totale Journalière Moyenne est la somme de toute les excursions glycémiques absolues pour une période analysée, divisée par le nombre de jours. Les valeurs basses sont les meilleures.' ,it: 'Media Totale Giornaliera Variazioni è la somma dei valori assoluti di tutte le escursioni glicemiche per il periodo esaminato, diviso per il numero di giorni. Bassi valori sono migliori.' ,ro: 'Schimbarea medie totală zilnică este suma valorilor absolute ale tuturor excursiilor glicemice din perioada examinată, împărțite la numărul de zile. Valorile mici sunt de preferat.' ,ru: 'усредненное ежедневное изменение это сумма абсолютных величин всех отклонений СК в рассматриваемый период, деленное на количество дней. Меньшая величина предпочтительней' + ,es: 'El cambio medio diario total es la suma de los valores absolutos de todas las glucémias en el período examinado, dividido por el número de días. Mejor valores bajos.' ,nl: 'Gemiddelde veranderingen per dag is een som van alle waardes die uitschieten over de bekeken periode, gedeeld door het aantal dagen in deze periode. Lager is beter.' } , 'Mean Hourly Change is a sum of the absolute value of all glucose excursions for the examined period, divided by the number of hours in the period. Lower is better.' : { - fi: 'Keskimääräinen tunti kertoo kerkimääräisen tuntitason verensokerimuutoksien yhteenlasketun arvon. Pienempi arvo on parempi.' + fi: 'Keskimääräinen tunti kertoo keskimääräisen tuntitason verensokerimuutoksien yhteenlasketun arvon. Pienempi arvo on parempi.' + ,fr: 'La Variation Horaire Moyenne est la somme de toute les excursions glycémiques absolues pour une période analysée, divisée par le nombre d\'heures dans la période. Les valeures basses sont les meilleures.' ,it: 'Media Oraria Variazioni è la somma del valore assoluto di tutte le escursioni glicemiche per il periodo esaminato, diviso per il numero di ore. Bassi valori sono migliori.' ,ro: 'Variația media orară este suma valorilor absolute ale tuturor excursiilor glicemice din perioada examinată, împărțite la numărul de ore din aceeași perioadă. Valorile mici sunt de preferat.' ,ru: 'усредненное часовое изменение это сумма абсолютных величин всех отклонений СК в рассматриваемый период, деленное на количество часов в этот период. Более низкое предпочтительней' + ,es: 'El cambio medio por hora, es la suma del valor absoluto de todas las glucemias para el período examinado, dividido por el número de horas en el período. Más bajo es mejor.' ,nl: 'Gemiddelde veranderingen per uur is een som van alle waardes die uitschieten over de bekeken periode, gedeeld door het aantal uur in deze periode. Lager is beter.' } , 'GVI and PGS are measures developed by Dexcom, detailed here.' : { fi: 'GVI ja PGS ovat Dexcom-yrityksen kehittämiä mittaustapoja, joista voit lukea lisää täällä..' ,it: 'GVI e PGS sono misure sviluppate da Dexcom, dettagliate qui.' - ,ro: 'GVI și PGS sunt caracteristici de măsurare inventate de Dexcom, ale căror detalii le găsiți aici.' + ,es: 'Variabilidad de la glucosa en sangre y el estado glucémico del paciente es un valor diseñado por Dexcom, más detalles en here.' + ,fr: 'GVI et PGS sont des mesures développées par la firme Dexcom, présentées en détail ici.' + ,ro: 'GVI și PGS sunt caracteristici de măsurare inventate de Dexcom, ale căror detalii le găsiți aici.' ,ru: 'вариабельность гликемии и статус гликемии больного это величины, разработанные декскомом, подробнее here.' ,nl: 'GVI en PGS zijn maten ontworpen door Dexcom, gedetaillieerde info here.' } , 'Mean Total Daily Change' : { fi: 'Keskimääräinen Kokonaismuutos' + ,fr: 'Variation Totale Journalière Moyenne' ,it: 'Media Totale Giornaliera Variazioni' ,ro: 'Variația medie totală zilnică' ,ru: 'усредненное изменение за день' + ,es: 'Variación media total diaria' ,nl: 'Gemiddelde veranderingen per dag' } , 'Mean Hourly Change' : { fi: 'Keskimääräinen tuntimuutos' + ,fr: 'Variation Horaire Moyenne' ,it: 'Media Oraria Variazioni' ,ro: 'Variația medie orară' + ,es: 'Variación media total por horas' ,ru: 'усредненное изменение за час' ,nl: 'Gemiddelde veranderingen per uur' } @@ -10395,12 +10934,12 @@ function init() { , dk: 'slightly dropping' , el: 'slightly dropping' , en: 'slightly dropping' - , es: 'slightly dropping' + , es: 'Disminuye lentamente' , fi: 'laskee hitaasti' - , fr: 'slightly dropping' + , fr: 'en chute lente' , he: 'slightly dropping' , hr: 'slightly dropping' - , it: 'slightly dropping' + , it: 'leggera diminuzione' , ko: 'slightly dropping' , nb: 'slightly dropping' , pl: 'slightly dropping' @@ -10420,12 +10959,12 @@ function init() { , dk: 'slightly rising' , el: 'slightly rising' , en: 'slightly rising' - , es: 'slightly rising' + , es: 'Asciende lentamente' , fi: 'nousee hitaasti' - , fr: 'slightly rising' + , fr: 'en montée lente' , he: 'slightly rising' , hr: 'slightly rising' - , it: 'slightly rising' + , it: 'leggero aumento' , ko: 'slightly rising' , nb: 'slightly rising' , pl: 'slightly rising' @@ -10445,12 +10984,12 @@ function init() { , dk: 'holding' , el: 'holding' , en: 'holding' - , es: 'holding' + , es: 'Sin variación' , fi: 'tasainen' - , fr: 'holding' + , fr: 'stable' , he: 'holding' , hr: 'holding' - , it: 'holding' + , it: 'stabile' , ko: 'holding' , nb: 'holding' , pl: 'holding' @@ -10470,12 +11009,12 @@ function init() { , dk: 'rising' , el: 'rising' , en: 'rising' - , es: 'rising' + , es: 'Ascendiendo' , fi: 'nousussa' - , fr: 'rising' + , fr: 'en montée' , he: 'rising' , hr: 'rising' - , it: 'rising' + , it: 'aumento' , ko: 'rising' , nb: 'rising' , pl: 'rising' @@ -10495,12 +11034,12 @@ function init() { , dk: 'dropping' , el: 'dropping' , en: 'dropping' - , es: 'dropping' + , es: 'Bajando' , fi: 'laskussa' - , fr: 'dropping' + , fr: 'en chute' , he: 'dropping' , hr: 'dropping' - , it: 'dropping' + , it: 'diminuzione' , ko: 'dropping' , nb: 'dropping' , pl: 'dropping' @@ -10520,12 +11059,12 @@ function init() { , dk: 'rapidly dropping' , el: 'rapidly dropping' , en: 'rapidly dropping' - , es: 'rapidly dropping' + , es: 'Bajando rápido' , fi: 'laskee nopeasti' - , fr: 'rapidly dropping' + , fr: 'en chute rapide' , he: 'rapidly dropping' , hr: 'rapidly dropping' - , it: 'rapidly dropping' + , it: 'rapida diminuzione' , ko: 'rapidly dropping' , nb: 'rapidly dropping' , pl: 'rapidly dropping' @@ -10545,12 +11084,12 @@ function init() { , dk: 'rapidly rising' , el: 'rapidly rising' , en: 'rapidly rising' - , es: 'rapidly rising' + , es: 'Subiendo rápido' , fi: 'nousee nopeasti' - , fr: 'rapidly rising' + , fr: 'en montée rapide' , he: 'rapidly rising' , hr: 'rapidly rising' - , it: 'rapidly rising' + , it: 'rapido aumento' , ko: 'rapidly rising' , nb: 'rapidly rising' , pl: 'rapidly rising' @@ -10570,12 +11109,12 @@ function init() { , dk: '%1 and %2 as of %3.' , el: '%1 and %2 as of %3.' , en: '%1 and %2 as of %3.' - , es: '%1 and %2 as of %3.' + , es: '%1 y %2 como de %3.' , fi: '%1 ja %2 alkaen %3.' , fr: '%1 and %2 as of %3.' , he: '%1 and %2 as of %3.' , hr: '%1 and %2 as of %3.' - , it: '%1 and %2 as of %3.' + , it: '%1 e %2 come %3.' , ko: '%1 and %2 as of %3.' , nb: '%1 and %2 as of %3.' , pl: '%1 and %2 as of %3.' @@ -10595,12 +11134,12 @@ function init() { , dk: '%1 current basal is %2 units per hour' , el: '%1 current basal is %2 units per hour' , en: '%1 current basal is %2 units per hour' - , es: '%1 current basal is %2 units per hour' + , es: '%1 basal actual es %2 unidades por hora' , fi: '%1 nykyinen basaali on %2 yksikköä tunnissa' , fr: '%1 current basal is %2 units per hour' , he: '%1 current basal is %2 units per hour' , hr: '%1 current basal is %2 units per hour' - , it: '%1 current basal is %2 units per hour' + , it: '%1 basale attuale è %2 unità per ora' , ko: '%1 current basal is %2 units per hour' , nb: '%1 current basal is %2 units per hour' , pl: '%1 current basal is %2 units per hour' @@ -10620,12 +11159,12 @@ function init() { , dk: '%1 temp basal of %2 units per hour will end %3' , el: '%1 temp basal of %2 units per hour will end %3' , en: '%1 temp basal of %2 units per hour will end %3' - , es: '%1 temp basal of %2 units per hour will end %3' + , es: '%1 Basal temporal de %2 unidades por hora hasta el fin %3' , fi: '%1 tilapäinen basaali on %2 tunnissa, päättyy %3' , fr: '%1 temp basal of %2 units per hour will end %3' , he: '%1 temp basal of %2 units per hour will end %3' , hr: '%1 temp basal of %2 units per hour will end %3' - , it: '%1 temp basal of %2 units per hour will end %3' + , it: '%1 basale temporanea di %2 unità per ora finirà %3' , ko: '%1 temp basal of %2 units per hour will end %3' , nb: '%1 temp basal of %2 units per hour will end %3' , pl: '%1 temp basal of %2 units per hour will end %3' @@ -10645,12 +11184,12 @@ function init() { , dk: 'and you have %1 insulin on board.' , el: 'and you have %1 insulin on board.' , en: 'and you have %1 insulin on board.' - , es: 'and you have %1 insulin on board.' + , es: 'y tu tienes %1 insulina activa.' , fi: 'ja sinulla on %1 aktivista insuliinia.' , fr: 'and you have %1 insulin on board.' , he: 'and you have %1 insulin on board.' , hr: 'and you have %1 insulin on board.' - , it: 'and you have %1 insulin on board.' + , it: 'e tu hai %1 insulina attiva.' , ko: 'and you have %1 insulin on board.' , nb: 'and you have %1 insulin on board.' , pl: 'and you have %1 insulin on board.' @@ -10670,12 +11209,12 @@ function init() { , dk: 'You have %1 insulin on board' , el: 'You have %1 insulin on board' , en: 'You have %1 insulin on board' - , es: 'You have %1 insulin on board' + , es: 'Tienes %1 insulina activa' , fi: 'Sinulla on %1 aktiivista insuliinia' , fr: 'You have %1 insulin on board' , he: 'You have %1 insulin on board' , hr: 'You have %1 insulin on board' - , it: 'You have %1 insulin on board' + , it: 'Tu hai %1 insulina attiva' , ko: 'You have %1 insulin on board' , nb: 'You have %1 insulin on board' , pl: 'You have %1 insulin on board' @@ -10695,17 +11234,18 @@ function init() { , dk: '%1 units of' , el: '%1 units of' , en: '%1 units of' - , es: '%1 units of' + , es: '%1 unidades de' , fi: '%1 yksikköä' , fr: '%1 units of' , he: '%1 units of' , hr: '%1 units of' - , it: '%1 units of' + , it: '%1 unità di' , ko: '%1 units of' , nb: '%1 units of' , pl: '%1 units of' , pt: '%1 units of' , ro: '%1 unități' + , nl: '%1 units of' , ru: '%1 единиц' , sk: '%1 units of' , sv: '%1 units of' @@ -10719,16 +11259,17 @@ function init() { , dk: 'Your' , el: 'Your' , en: 'Your' - , es: 'Your' + , es: 'Tú' , fi: 'Sinun' , fr: 'Your' , he: 'Your' , hr: 'Your' - , it: 'Your' + , it: 'Tuo' , ko: 'Your' , nb: 'Your' , pl: 'Your' , pt: 'Your' + , nl: 'Jouw' , ro: '' , ru: 'ваш' , sk: 'Your' @@ -10743,14 +11284,15 @@ function init() { , dk: '%1 has a ' , el: '%1 has a ' , en: '%1 has a ' - , es: '%1 has a ' + , es: '%1 tiene un ' , fi: '%1 on ' , fr: '%1 has a ' , he: '%1 has a ' , hr: '%1 has a ' - , it: '%1 has a ' + , it: '%1 ha un ' , ko: '%1 has a ' , nb: '%1 has a ' + , nl: '%1 heeft een ' , pl: '%1 has a ' , pt: '%1 has a ' , ro: '%1 are ' @@ -10775,6 +11317,7 @@ function init() { , it: 'no' , ko: 'no' , nb: 'no' + , nl: 'geen' , pl: 'no' , pt: 'no' , ro: 'fără' @@ -10787,26 +11330,45 @@ function init() { 'Fat [g]': { cs: 'Tuk [g]' ,de: 'Fett [g]' + ,es: 'Grasas [g]' ,fi: 'Rasva [g]' + ,fr: 'Graisses [g]' + ,nl: 'Vet [g]' ,ro: 'Grăsimi [g]' + ,ru: 'жиры' + ,it: 'Grassi [g]' }, 'Protein [g]': { cs: 'Proteiny [g]' ,de: 'Proteine [g]' + ,es: 'Proteina [g]' ,fi: 'Proteiini [g]' + ,fr: 'Protéines [g]' + ,nl: 'Proteine [g]' ,ro: 'Proteine [g]' - + ,ru: 'белки' + ,it: 'Proteine [g]' }, 'Energy [kJ]': { - cs: 'Energie [kJ]' - ,de: 'Energie [kJ]' - , fi: 'Energia [kJ]' - ,ro: 'Energie [g]' + cs: 'Energie [kJ]' + ,de: 'Energie [kJ]' + , fi: 'Energia [kJ]' + , nl: 'Energie [kJ]' + , es: 'Energía [Kj]' + ,fr: 'Énergie [kJ]' + ,ro: 'Energie [g]' + ,ru: 'энергетика' + ,it: 'Energia [kJ]' } , 'Clock View': { - fi: 'Kellonäkymä' - ,ro: 'Vedere tip ceas' + fi: 'Kellonäkymä' + ,nl: 'Klokweergave' + ,es: 'Vista del reloj' + ,fr: 'Vue Horloge' + ,ro: 'Vedere tip ceas' + ,ru: 'цифры крупно' + ,it: 'Vista orologio' } }; diff --git a/lib/plugins/alexa-plugin.md b/lib/plugins/alexa-plugin.md index 2acfb780b6b..92339b14815 100644 --- a/lib/plugins/alexa-plugin.md +++ b/lib/plugins/alexa-plugin.md @@ -89,7 +89,9 @@ LastLoop When was my last loop * Click "Next" * Enable the skill if it isn't already. -### 7) You should now be able to interact with Nightscout via Alexa. +### 7 ) Click next. For Certificate for DEFAULT Endpoint: Select the middle choice "My development endpoint is a sub-domain of a domain that has a wildcard certificate from a certificate authority" since your end point is similar to something.herokapp.com + +### 8) You should now be able to interact with Nightscout via Alexa. ##Adding alexa support to a plugin diff --git a/lib/plugins/direction.js b/lib/plugins/direction.js index b7d93f7b80e..53dda0e5879 100644 --- a/lib/plugins/direction.js +++ b/lib/plugins/direction.js @@ -1,7 +1,5 @@ 'use strict'; -var _ = require('lodash'); - function init() { var direction = { diff --git a/lib/plugins/iob.js b/lib/plugins/iob.js index dcc0c4504a9..5468ff0700d 100644 --- a/lib/plugins/iob.js +++ b/lib/plugins/iob.js @@ -244,14 +244,6 @@ function init(ctx) { }; function alexaIOBIntentHandler (callback, slots, sbx) { - var preamble = - (slots && slots.pwd && slots.pwd.value) ? - translate('alexaPreamble3person', { - params: [ - slots.pwd.value.replace('\'s', '') - ] - }) : - translate('alexaPreamble'); var message = translate('alexaIobIntent', { params: [ diff --git a/lib/plugins/loop.js b/lib/plugins/loop.js index bf2482cfe3c..6082b6bdc00 100644 --- a/lib/plugins/loop.js +++ b/lib/plugins/loop.js @@ -8,7 +8,6 @@ var levels = require('../levels'); // var ALL_STATUS_FIELDS = ['status-symbol', 'status-label', 'iob', 'freq', 'rssi']; Unused variable function init(ctx) { - var timeago = require('./timeago')(ctx); var utils = require('../utils')(ctx); var loop = { diff --git a/lib/plugins/openaps.js b/lib/plugins/openaps.js index 267ab0b06e1..136e901c888 100644 --- a/lib/plugins/openaps.js +++ b/lib/plugins/openaps.js @@ -8,7 +8,6 @@ var levels = require('../levels'); // var ALL_STATUS_FIELDS = ['status-symbol', 'status-label', 'iob', 'meal-assist', 'freq', 'rssi']; Unused variable function init(ctx) { - var timeago = require('./timeago')(ctx); var utils = require('../utils')(ctx); var openaps = { diff --git a/lib/report_plugins/glucosedistribution.js b/lib/report_plugins/glucosedistribution.js index 38521fa4eb9..93ffc468023 100644 --- a/lib/report_plugins/glucosedistribution.js +++ b/lib/report_plugins/glucosedistribution.js @@ -414,12 +414,10 @@ glucosedistribution.report = function report_glucosedistribution(datastorage, so var timeInT1 = Math.round(100 * t1count / events).toFixed(1); var timeInT2 = Math.round(100 * t2count / events).toFixed(1); - var mac = (total / events).toFixed(1); var unitString = ' mg/dl'; if (client.settings.units == 'mmol') { - mac = (total / events / 18.0).toFixed(2); TDC = TDC / 18.0; TDCHourly = TDCHourly / 18.0; unitString = ' mmol/L'; diff --git a/lib/report_plugins/profiles.js b/lib/report_plugins/profiles.js index df055b525b3..c31b8b2fa9a 100644 --- a/lib/report_plugins/profiles.js +++ b/lib/report_plugins/profiles.js @@ -14,7 +14,6 @@ module.exports = init; profiles.html = function html(client) { var translate = client.translate; - var a = translate('Database records'); var ret = '

' + translate('Profiles') + '

' + '
' + translate('Database records') + ' ' diff --git a/lib/aggregate.js b/lib/server/aggregate.js similarity index 100% rename from lib/aggregate.js rename to lib/server/aggregate.js diff --git a/lib/booterror.js b/lib/server/booterror.js similarity index 100% rename from lib/booterror.js rename to lib/server/booterror.js diff --git a/lib/bootevent.js b/lib/server/bootevent.js similarity index 86% rename from lib/bootevent.js rename to lib/server/bootevent.js index 9806c1e08fe..e5f1e5080b1 100644 --- a/lib/bootevent.js +++ b/lib/server/bootevent.js @@ -59,7 +59,7 @@ function boot (env, language) { try { if (_.startsWith(env.storageURI, 'openaps://')) { - require('./storage/openaps-storage')(env, function ready (err, store) { + require('../storage/openaps-storage')(env, function ready (err, store) { if (err) { throw err; } @@ -70,7 +70,7 @@ function boot (env, language) { }); } else { //TODO assume mongo for now, when there are more storage options add a lookup - require('./storage/mongo-storage')(env, function ready(err, store) { + require('../storage/mongo-storage')(env, function ready(err, store) { // FIXME, error is always null, if there is an error, the storage.js will throw an exception console.log('Mongo Storage system ready'); ctx.store = store; @@ -91,7 +91,7 @@ function boot (env, language) { return next(); } - ctx.authorization = require('./authorization')(env, ctx); + ctx.authorization = require('../authorization')(env, ctx); ctx.authorization.storage.reload(function loaded (err) { if (err) { ctx.bootErrors = ctx.bootErrors || [ ]; @@ -109,13 +109,13 @@ function boot (env, language) { /////////////////////////////////////////////////// // api and json object variables /////////////////////////////////////////////////// - ctx.plugins = require('./plugins')({ + ctx.plugins = require('../plugins')({ settings: env.settings , language: ctx.language }).registerServerDefaults(); - ctx.pushover = require('./plugins/pushover')(env); - ctx.maker = require('./plugins/maker')(env); + ctx.pushover = require('../plugins/pushover')(env); + ctx.maker = require('../plugins/maker')(env); ctx.pushnotify = require('./pushnotify')(env, ctx); ctx.entries = require('./entries')(env, ctx); @@ -124,14 +124,14 @@ function boot (env, language) { ctx.profile = require('./profile')(env.profile_collection, ctx); ctx.food = require('./food')(env, ctx); ctx.pebble = require('./pebble')(env, ctx); - ctx.properties = require('./api/properties')(env, ctx); - ctx.bus = require('./bus')(env.settings, ctx); - ctx.ddata = require('./data/ddata')(); - ctx.dataloader = require('./data/dataloader')(env, ctx); - ctx.notifications = require('./notifications')(env, ctx); + ctx.properties = require('../api/properties')(env, ctx); + ctx.bus = require('../bus')(env.settings, ctx); + ctx.ddata = require('../data/ddata')(); + ctx.dataloader = require('../data/dataloader')(env, ctx); + ctx.notifications = require('../notifications')(env, ctx); if (env.settings.isEnabled('alexa')) { - ctx.alexa = require('./plugins/alexa')(env, ctx); + ctx.alexa = require('../plugins/alexa')(env, ctx); } next( ); @@ -174,7 +174,7 @@ function boot (env, language) { }); ctx.bus.on('data-loaded', function updatePlugins ( ) { - var sbx = require('./sandbox')().serverInit(env, ctx); + var sbx = require('../sandbox')().serverInit(env, ctx); ctx.plugins.setProperties(sbx); ctx.notifications.initRequests(); ctx.plugins.checkNotifications(sbx); @@ -192,7 +192,7 @@ function boot (env, language) { return next(); } - ctx.bridge = require('./plugins/bridge')(env); + ctx.bridge = require('../plugins/bridge')(env); if (ctx.bridge) { ctx.bridge.startEngine(ctx.entries); } @@ -204,7 +204,7 @@ function boot (env, language) { return next(); } - ctx.mmconnect = require('./plugins/mmconnect').init(env, ctx.entries, ctx.devicestatus); + ctx.mmconnect = require('../plugins/mmconnect').init(env, ctx.entries, ctx.devicestatus); if (ctx.mmconnect) { ctx.mmconnect.run(); } diff --git a/lib/devicestatus.js b/lib/server/devicestatus.js similarity index 100% rename from lib/devicestatus.js rename to lib/server/devicestatus.js diff --git a/lib/entries.js b/lib/server/entries.js similarity index 100% rename from lib/entries.js rename to lib/server/entries.js diff --git a/lib/food.js b/lib/server/food.js similarity index 100% rename from lib/food.js rename to lib/server/food.js diff --git a/lib/mqtt.js b/lib/server/mqtt.js similarity index 100% rename from lib/mqtt.js rename to lib/server/mqtt.js diff --git a/lib/pebble.js b/lib/server/pebble.js similarity index 97% rename from lib/pebble.js rename to lib/server/pebble.js index 12ca589553e..544aa878268 100644 --- a/lib/pebble.js +++ b/lib/server/pebble.js @@ -2,8 +2,8 @@ var _ = require('lodash'); -var sandbox = require('./sandbox')(); -var units = require('./units')(); +var sandbox = require('../sandbox')(); +var units = require('../units')(); var DIRECTIONS = { NONE: 0 @@ -169,7 +169,7 @@ function pebble (req, res) { } function configure (env, ctx) { - var wares = require('./middleware/')(env); + var wares = require('../middleware/')(env); function middle (req, res, next) { req.env = env; req.ctx = ctx; diff --git a/lib/profile.js b/lib/server/profile.js similarity index 100% rename from lib/profile.js rename to lib/server/profile.js diff --git a/lib/pushnotify.js b/lib/server/pushnotify.js similarity index 98% rename from lib/pushnotify.js rename to lib/server/pushnotify.js index 7e61fff914a..49748851659 100644 --- a/lib/pushnotify.js +++ b/lib/server/pushnotify.js @@ -4,8 +4,8 @@ var _ = require('lodash'); var crypto = require('crypto'); var NodeCache = require('node-cache'); -var levels = require('./levels'); -var times = require('./times'); +var levels = require('../levels'); +var times = require('../times'); function init(env, ctx) { diff --git a/lib/query.js b/lib/server/query.js similarity index 100% rename from lib/query.js rename to lib/server/query.js diff --git a/lib/treatments.js b/lib/server/treatments.js similarity index 100% rename from lib/treatments.js rename to lib/server/treatments.js diff --git a/lib/websocket.js b/lib/server/websocket.js similarity index 98% rename from lib/websocket.js rename to lib/server/websocket.js index 1c49c82edf9..65c088e1081 100644 --- a/lib/websocket.js +++ b/lib/server/websocket.js @@ -1,10 +1,9 @@ 'use strict'; -var levels = require('./levels'); -var times = require('./times'); -var calcData = require('./data/calcdelta'); +var levels = require('../levels'); +var times = require('../times'); +var calcData = require('../data/calcdelta'); var ObjectID = require('mongodb').ObjectID; -var profilefunctions = require('./profilefunctions')(); function init (env, ctx, server) { @@ -53,7 +52,6 @@ function init (env, ctx, server) { , apiEnabled: apiEnabled , careportalEnabled: apiEnabled && env.settings.enable.indexOf('careportal') > -1 , boluscalcEnabled: apiEnabled && env.settings.enable.indexOf('boluscalc') > -1 - , head: env.head , settings: env.settings , extendedSettings: ctx.plugins && ctx.plugins.extendedClientSettings ? ctx.plugins.extendedClientSettings(env.extendedSettings) : {} }; diff --git a/lib/storage/mongo-storage.js b/lib/storage/mongo-storage.js index 24b1039ead6..622748f2739 100644 --- a/lib/storage/mongo-storage.js +++ b/lib/storage/mongo-storage.js @@ -25,11 +25,12 @@ function init (env, cb, forceNewConnection) { console.log('Setting up new connection to MongoDB'); var timeout = 30 * 1000; - var options = { replset: { socketOptions: { connectTimeoutMS : timeout, socketTimeoutMS : timeout }}}; + var options = { reconnectInterval: 10000, reconnectTries: 500, connectTimeoutMS: timeout, socketTimeoutMS: timeout }; var connect_with_retry = function(i) { - return MongoClient.connect(env.storageURI, options, function connected(err, db) { + return MongoClient.connect(env.storageURI, options, function connected(err, client) { if (err) { + if (err.includes('Invalid schema')) { throw new Error('MongoDB connection string seems invalid'); } if (i>20) { // Abort after retrying for more than 10 minutes throw 'Error connecting to MongoDB, stopping the retry loop and aborting...'; @@ -38,8 +39,12 @@ function init (env, cb, forceNewConnection) { setTimeout(connect_with_retry, i*3000, i+1); } else { console.log('Successfully established a connected to MongoDB'); - connection = db; - mongo.db = connection; + + var dbName = env.storageURI.split('?').pop().split('/'); + dbName = dbName[dbName.length -1]; + mongo.db = client.db(dbName); + connection = mongo.db; + mongo.client = client; // If there is a valid callback, then invoke the function to perform the callback if (cb && cb.call) { diff --git a/lib/utils.js b/lib/utils.js index da53e700294..1d407ccda05 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -26,7 +26,7 @@ function init(ctx) { }; utils.toFixed = function toFixed(value) { - if (value === 0) { + if (value === undefined || value === 0) { return '0'; } else { var fixed = value.toFixed(2); diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 75f0b09c9f4..0263db9d211 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -19,8 +19,7 @@ "abbrev": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", - "dev": true + "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=" }, "accepts": { "version": "1.3.3", @@ -59,9 +58,9 @@ "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=" }, "ajv": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz", - "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=", + "version": "5.5.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.1.tgz", + "integrity": "sha1-s4u4h22ehr7plJVqBOch6IskjrI=", "requires": { "co": "4.6.0", "fast-deep-equal": "1.0.0", @@ -70,9 +69,9 @@ } }, "ajv-keywords": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz", - "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", + "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=" }, "align-text": { "version": "0.1.4", @@ -99,8 +98,7 @@ "amdefine": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, "ansi-regex": { "version": "2.1.1", @@ -121,6 +119,22 @@ "micromatch": "2.3.11" } }, + "aproba": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz", + "integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s=", + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", + "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", + "optional": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.3" + } + }, "argparse": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", @@ -173,15 +187,24 @@ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" }, + "ascli": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", + "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", + "requires": { + "colour": "0.7.1", + "optjs": "3.2.2" + } + }, "asn1": { "version": "0.1.11", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz", "integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc=" }, "asn1.js": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz", - "integrity": "sha1-SLokC0WpKA6UdImQull9IWYX/UA=", + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz", + "integrity": "sha512-b/OsSjvWEo8Pi8H0zsDd2P6Uqo2TK2pH8gNLSJtNLM2Db0v2QaAZ0pBQJXVjAn4gBuugeVDr7s63ZogpUIwWDg==", "requires": { "bn.js": "4.11.8", "inherits": "2.0.3", @@ -228,10 +251,10 @@ "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000726", + "caniuse-db": "1.0.30000804", "normalize-range": "0.1.2", "num2fraction": "1.2.2", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" } }, @@ -355,6 +378,14 @@ "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz", "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=" }, + "block-stream": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", + "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "requires": { + "inherits": "2.0.3" + } + }, "bluebird": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz", @@ -457,6 +488,11 @@ "winston": "0.8.0" } }, + "colors": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", + "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=" + }, "winston": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/winston/-/winston-0.8.0.tgz", @@ -484,9 +520,9 @@ "dev": true }, "browserify-aes": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.8.tgz", - "integrity": "sha512-WYCMOT/PtGTlpOKFht0YJFYcPy6pLCR98CtWfzK13zoynLlBMvAdEMSRGmgnJCw2M2j/5qxBkinZQFobieM8dQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz", + "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==", "requires": { "buffer-xor": "1.0.3", "cipher-base": "1.0.4", @@ -501,7 +537,7 @@ "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz", "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=", "requires": { - "browserify-aes": "1.0.8", + "browserify-aes": "1.1.1", "browserify-des": "1.0.0", "evp_bytestokey": "1.0.3" } @@ -540,11 +576,11 @@ } }, "browserify-zlib": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", - "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", + "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", "requires": { - "pako": "0.2.9" + "pako": "1.0.6" } }, "browserslist": { @@ -552,8 +588,8 @@ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "requires": { - "caniuse-db": "1.0.30000726", - "electron-to-chromium": "1.3.21" + "caniuse-db": "1.0.30000804", + "electron-to-chromium": "1.3.33" } }, "bson": { @@ -576,11 +612,6 @@ "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" }, - "buffer-shims": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=" - }, "buffer-xor": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", @@ -628,26 +659,6 @@ "integrity": "sha1-83odbqEOgp2UchrimpC7T7Uqt2c=", "requires": { "tape": "2.3.3" - }, - "dependencies": { - "deep-equal": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz", - "integrity": "sha1-skbCuApXCkfBG+HZvRBw7IeLh84=" - }, - "tape": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz", - "integrity": "sha1-Lnzgox3wn41oUWZKcYQuDKUFevc=", - "requires": { - "deep-equal": "0.1.2", - "defined": "0.0.0", - "inherits": "2.0.3", - "jsonify": "0.0.0", - "resumer": "0.0.0", - "through": "2.3.8" - } - } } }, "caller-callsite": { @@ -690,15 +701,15 @@ "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=", "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000726", + "caniuse-db": "1.0.30000804", "lodash.memoize": "4.1.2", "lodash.uniq": "4.5.0" } }, "caniuse-db": { - "version": "1.0.30000726", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000726.tgz", - "integrity": "sha1-m7dC+NAmpi34c7wDwGhD0iVbYNc=" + "version": "1.0.30000804", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000804.tgz", + "integrity": "sha1-hP60IBj8ZM9q/2Nx5DEV8pLAAXk=" }, "caseless": { "version": "0.11.0", @@ -767,9 +778,9 @@ } }, "clap": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz", - "integrity": "sha1-WckP4+E3EEdG/xlGmiemNP9oyFc=", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz", + "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==", "requires": { "chalk": "1.1.3" } @@ -819,9 +830,9 @@ } }, "clone": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", + "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=" }, "co": { "version": "4.6.0", @@ -833,7 +844,7 @@ "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz", "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", "requires": { - "q": "1.5.0" + "q": "1.5.1" } }, "code-point-at": { @@ -846,15 +857,15 @@ "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=", "requires": { - "clone": "1.0.2", - "color-convert": "1.9.0", + "clone": "1.0.3", + "color-convert": "1.9.1", "color-string": "0.3.0" } }, "color-convert": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", - "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", "requires": { "color-name": "1.1.3" } @@ -883,9 +894,9 @@ } }, "colors": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", - "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=" }, "colour": { "version": "0.7.1", @@ -901,9 +912,9 @@ } }, "commander": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" + "version": "2.12.2", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz", + "integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==" }, "common": { "version": "0.2.5", @@ -999,6 +1010,11 @@ "date-now": "0.1.4" } }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + }, "constants-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", @@ -1058,7 +1074,7 @@ "cipher-base": "1.0.4", "inherits": "2.0.3", "ripemd160": "2.0.1", - "sha.js": "2.4.8" + "sha.js": "2.4.9" } }, "create-hmac": { @@ -1071,7 +1087,7 @@ "inherits": "2.0.3", "ripemd160": "2.0.1", "safe-buffer": "5.1.1", - "sha.js": "2.4.8" + "sha.js": "2.4.9" } }, "cross-spawn": { @@ -1093,9 +1109,9 @@ } }, "crypto-browserify": { - "version": "3.11.1", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz", - "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==", + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", + "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", "requires": { "browserify-cipher": "1.0.0", "browserify-sign": "4.0.4", @@ -1106,7 +1122,8 @@ "inherits": "2.0.3", "pbkdf2": "3.0.14", "public-encrypt": "4.0.0", - "randombytes": "2.0.5" + "randombytes": "2.0.5", + "randomfill": "1.0.3" } }, "css-color-names": { @@ -1115,9 +1132,9 @@ "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=" }, "css-loader": { - "version": "0.28.7", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.7.tgz", - "integrity": "sha512-GxMpax8a/VgcfRrVy0gXD6yLd5ePYbXX/5zGgTVYp4wXtJklS8Z2VaUArJgc//f6/Dzil7BaJObdSv8eKKCPgg==", + "version": "0.28.9", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.9.tgz", + "integrity": "sha512-r3dgelMm/mkPz5Y7m9SeiGE46i2VsEU/OYbez+1llfxtv8b2y5/b5StaeEvPK3S5tlNQI+tDW/xDIhKJoZgDtw==", "requires": { "babel-code-frame": "6.26.0", "css-selector-tokenizer": "0.7.0", @@ -1126,20 +1143,13 @@ "loader-utils": "1.1.0", "lodash.camelcase": "4.3.0", "object-assign": "4.1.1", - "postcss": "5.2.17", - "postcss-modules-extract-imports": "1.1.0", + "postcss": "5.2.18", + "postcss-modules-extract-imports": "1.2.0", "postcss-modules-local-by-default": "1.2.0", "postcss-modules-scope": "1.1.0", "postcss-modules-values": "1.3.0", "postcss-value-parser": "3.3.0", "source-list-map": "2.0.0" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - } } }, "css-selector-tokenizer": { @@ -1172,7 +1182,7 @@ "defined": "1.0.0", "has": "1.0.1", "object-assign": "4.1.1", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-calc": "5.3.1", "postcss-colormin": "2.2.2", "postcss-convert-values": "2.6.1", @@ -1199,18 +1209,6 @@ "postcss-unique-selectors": "2.0.2", "postcss-value-parser": "3.3.0", "postcss-zindex": "2.2.0" - }, - "dependencies": { - "defined": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", - "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=" - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - } } }, "csso": { @@ -1218,15 +1216,8 @@ "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz", "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=", "requires": { - "clap": "1.2.0", + "clap": "1.2.3", "source-map": "0.5.7" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - } } }, "cssom": { @@ -1259,7 +1250,7 @@ "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "requires": { - "es5-ext": "0.10.30" + "es5-ext": "0.10.37" } }, "d3": { @@ -1291,7 +1282,6 @@ "version": "2.6.7", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz", "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=", - "dev": true, "requires": { "ms": "2.0.0" } @@ -1302,9 +1292,15 @@ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, "deep-equal": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz", - "integrity": "sha1-mWedO70EcVb81FDT0B7rkGhpHoM=" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", + "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=" + }, + "deep-extend": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", + "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", + "optional": true }, "deep-is": { "version": "0.1.3", @@ -1313,15 +1309,21 @@ "dev": true }, "defined": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz", - "integrity": "sha1-817qfXBekzuvE7LwOz+D2SFAOz4=" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", + "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=" }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "optional": true + }, "depd": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", @@ -1341,6 +1343,12 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, + "detect-libc": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.2.tgz", + "integrity": "sha1-ca1dIEvxempsqPRQxhRUBm70YeE=", + "optional": true + }, "diff": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz", @@ -1353,7 +1361,7 @@ "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=", "requires": { "bn.js": "4.11.8", - "miller-rabin": "4.0.0", + "miller-rabin": "4.0.1", "randombytes": "2.0.5" } }, @@ -1401,9 +1409,9 @@ "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=" }, "electron-to-chromium": { - "version": "1.3.21", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.21.tgz", - "integrity": "sha1-qWfr3P6O0Ag/wkTRiUAiqOgRPqI=" + "version": "1.3.33", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.33.tgz", + "integrity": "sha1-vwBwPWKnxlI4E2V4w1LWxcBCpUU=" }, "elliptic": { "version": "6.4.0", @@ -1527,13 +1535,6 @@ "memory-fs": "0.4.1", "object-assign": "4.1.1", "tapable": "0.2.8" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - } } }, "errno": { @@ -1562,21 +1563,21 @@ } }, "es5-ext": { - "version": "0.10.30", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz", - "integrity": "sha1-cUGhaDZpfbq/qq7uQUlc4p9SyTk=", + "version": "0.10.37", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz", + "integrity": "sha1-DudB0Ui4AGm6J9AgOTdWryV978M=", "requires": { - "es6-iterator": "2.0.1", + "es6-iterator": "2.0.3", "es6-symbol": "3.1.1" } }, "es6-iterator": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz", - "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.30", + "es5-ext": "0.10.37", "es6-symbol": "3.1.1" } }, @@ -1586,26 +1587,21 @@ "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.30", - "es6-iterator": "2.0.1", + "es5-ext": "0.10.37", + "es6-iterator": "2.0.3", "es6-set": "0.1.5", "es6-symbol": "3.1.1", "event-emitter": "0.3.5" } }, - "es6-promise": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz", - "integrity": "sha1-7FYjOGgDKQkgcXDDlEjiREndH8Q=" - }, "es6-set": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.30", - "es6-iterator": "2.0.1", + "es5-ext": "0.10.37", + "es6-iterator": "2.0.3", "es6-symbol": "3.1.1", "event-emitter": "0.3.5" } @@ -1616,7 +1612,7 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.30" + "es5-ext": "0.10.37" } }, "es6-weak-map": { @@ -1625,8 +1621,8 @@ "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.30", - "es6-iterator": "2.0.1", + "es5-ext": "0.10.37", + "es6-iterator": "2.0.3", "es6-symbol": "3.1.1" } }, @@ -1640,6 +1636,37 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, + "escodegen": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", + "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", + "dev": true, + "requires": { + "esprima": "2.7.3", + "estraverse": "1.9.3", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.2.0" + }, + "dependencies": { + "estraverse": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", + "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=", + "dev": true + }, + "source-map": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", + "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", + "dev": true, + "optional": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, "escope": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", @@ -1651,6 +1678,11 @@ "estraverse": "4.2.0" } }, + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=" + }, "esrecurse": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", @@ -1658,13 +1690,6 @@ "requires": { "estraverse": "4.2.0", "object-assign": "4.1.1" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - } } }, "estraverse": { @@ -1688,7 +1713,7 @@ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.30" + "es5-ext": "0.10.37" } }, "event-stream": { @@ -1766,9 +1791,9 @@ } }, "expose-loader": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-0.7.3.tgz", - "integrity": "sha1-NfvTZZeJ5PqoH1nei36fw55GbVE=" + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-0.7.4.tgz", + "integrity": "sha512-lweINkewAXcQtNjd7j1gO3cd8O/8lNYijsEwH4YZ+Dv3gT2Kh9/YvJov5Mdp2A75QIhgOvsSyRa/ZG3wYjNZpA==" }, "express": { "version": "4.16.2", @@ -1879,11 +1904,6 @@ "uglify-js": "2.8.29" }, "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - }, "uglify-js": { "version": "2.8.29", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", @@ -1893,17 +1913,6 @@ "uglify-to-browserify": "1.0.2", "yargs": "3.10.0" } - }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", - "window-size": "0.1.0" - } } } }, @@ -1952,11 +1961,22 @@ "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=" }, "file-loader": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz", - "integrity": "sha512-N+uhF3mswIFeziHQjGScJ/yHXYt3DiLBeC+9vWW+WjUBiClMSOlV1YrXQi+7KM2aA3Rn4Bybgv+uXFQbfkzpvg==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.6.tgz", + "integrity": "sha512-873ztuL+/hfvXbLDJ262PGO6XjERnybJu2gW1/5j8HUfxSiFJI9Hj/DhZ50ZGRUxBvuNiazb/cM2rh9pqrxP6Q==", "requires": { - "loader-utils": "1.1.0" + "loader-utils": "1.1.0", + "schema-utils": "0.3.0" + }, + "dependencies": { + "schema-utils": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", + "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", + "requires": { + "ajv": "5.5.1" + } + } } }, "filename-regex": { @@ -2085,7 +2105,7 @@ "integrity": "sha1-d9nX4V/S9RGtnYShEMfdj8js68I=", "requires": { "cliff": "0.1.10", - "clone": "1.0.2", + "clone": "1.0.3", "colors": "0.6.2", "flatiron": "0.4.3", "forever-monitor": "1.7.1", @@ -2101,14 +2121,15 @@ "winston": "0.8.3" }, "dependencies": { - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "requires": { - "minimist": "0.0.10", - "wordwrap": "0.0.3" - } + "colors": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", + "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=" + }, + "object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=" } } }, @@ -2185,504 +2206,72 @@ "node-pre-gyp": "0.6.39" }, "dependencies": { - "abbrev": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", - "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=", - "optional": true - }, "ajv": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", - "optional": true, "requires": { "co": "4.6.0", "json-stable-stringify": "1.0.1" } }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "aproba": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz", - "integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s=", - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", - "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", - "optional": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.2.9" - } - }, "asn1": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", - "optional": true + "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" }, "assert-plus": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", - "optional": true - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "optional": true + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=" }, "aws-sign2": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", - "optional": true - }, - "aws4": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", - "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", - "optional": true + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" }, "balanced-match": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=" }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", - "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "block-stream": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", - "requires": { - "inherits": "2.0.3" - } - }, - "boom": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "requires": { - "hoek": "2.16.3" - } - }, - "brace-expansion": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz", - "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=", - "requires": { - "balanced-match": "0.4.2", - "concat-map": "0.0.1" - } - }, - "buffer-shims": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=" - }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "optional": true - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" - }, - "combined-stream": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", - "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", - "requires": { - "delayed-stream": "1.0.0" - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" - }, - "cryptiles": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", - "requires": { - "boom": "2.10.1" - } - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "optional": true - } - } - }, - "debug": { - "version": "2.6.8", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", - "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", - "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", - "optional": true - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" - }, - "delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "optional": true - }, - "detect-libc": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.2.tgz", - "integrity": "sha1-ca1dIEvxempsqPRQxhRUBm70YeE=", - "optional": true - }, - "ecc-jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", - "optional": true - }, - "extsprintf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", - "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=" - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "optional": true + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "form-data": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", - "optional": true, "requires": { "asynckit": "0.4.0", "combined-stream": "1.0.5", "mime-types": "2.1.15" } }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "har-schema": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=" }, - "fstream": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "har-validator": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.1" + "ajv": "4.11.8", + "har-schema": "1.0.5" } }, - "fstream-ignore": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz", - "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=", - "optional": true, - "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" - } - }, - "gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "optional": true, - "requires": { - "aproba": "1.1.1", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "optional": true - } - } - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" - }, - "har-schema": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", - "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", - "optional": true - }, - "har-validator": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", - "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", - "optional": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - } - }, - "has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "optional": true - }, - "hawk": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "hoek": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" - }, "http-signature": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", - "optional": true, "requires": { "assert-plus": "0.2.0", "jsprim": "1.4.0", - "sshpk": "1.13.0" - } - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - }, - "ini": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", - "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "optional": true - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "optional": true - }, - "jodid25519": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz", - "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=", - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "optional": true - }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "optional": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", - "optional": true, - "requires": { - "jsonify": "0.0.0" - } - }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "optional": true - }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", - "optional": true - }, - "jsprim": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz", - "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=", - "optional": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.0.2", - "json-schema": "0.2.3", - "verror": "1.3.6" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "optional": true - } - } - }, - "mime-db": { - "version": "1.27.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz", - "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=" - }, - "mime-types": { - "version": "2.1.15", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", - "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=", - "requires": { - "mime-db": "1.27.0" - } - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "1.1.7" + "sshpk": "1.13.1" } }, "minimist": { @@ -2690,175 +2279,24 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "optional": true - }, - "node-pre-gyp": { - "version": "0.6.39", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz", - "integrity": "sha512-OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ==", - "optional": true, - "requires": { - "detect-libc": "1.0.2", - "hawk": "3.1.3", - "mkdirp": "0.5.1", - "nopt": "4.0.1", - "npmlog": "4.1.0", - "rc": "1.2.1", - "request": "2.81.0", - "rimraf": "2.6.1", - "semver": "5.3.0", - "tar": "2.2.1", - "tar-pack": "3.4.0" - } - }, "nopt": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", - "optional": true, "requires": { - "abbrev": "1.1.0", + "abbrev": "1.0.9", "osenv": "0.1.4" } }, - "npmlog": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz", - "integrity": "sha512-ocolIkZYZt8UveuiDS0yAkkIjid1o7lPG8cYm05yNYzBn8ykQtaiPMEGp8fY9tKdDgm8okpdKzkvu1y9hUYugA==", - "optional": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" - }, - "oauth-sign": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "optional": true - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "optional": true - }, - "osenv": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", - "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", - "optional": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" - }, "performance-now": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", - "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", - "optional": true - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" - }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "optional": true - }, - "qs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", - "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", - "optional": true - }, - "rc": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", - "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", - "optional": true, - "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.4", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "optional": true - } - } - }, - "readable-stream": { - "version": "2.2.9", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz", - "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=", - "requires": { - "buffer-shims": "1.0.0", - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "1.0.1", - "util-deprecate": "1.0.2" - } + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=" }, "request": { "version": "2.81.0", "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", - "optional": true, "requires": { "aws-sign2": "0.6.0", "aws4": "1.6.0", @@ -2877,84 +2315,17 @@ "oauth-sign": "0.8.2", "performance-now": "0.2.0", "qs": "6.4.0", - "safe-buffer": "5.0.1", + "safe-buffer": "5.1.1", "stringstream": "0.0.5", "tough-cookie": "2.3.2", "tunnel-agent": "0.6.0", - "uuid": "3.0.1" + "uuid": "3.1.0" } }, - "rimraf": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", - "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", - "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=" - }, "semver": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "optional": true - }, - "sntp": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", - "requires": { - "hoek": "2.16.3" - } - }, - "sshpk": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz", - "integrity": "sha1-/yo+T9BEl1Vf7Zezmg/YL6+zozw=", - "optional": true, - "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jodid25519": "1.0.2", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "optional": true - } - } - }, - "string_decoder": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz", - "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=", - "requires": { - "safe-buffer": "5.0.1" - } + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" }, "string-width": { "version": "1.0.2", @@ -2966,123 +2337,80 @@ "strip-ansi": "3.0.1" } }, - "stringstream": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", - "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", - "optional": true - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "optional": true - }, - "tar": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, - "tar-pack": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz", - "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=", - "optional": true, - "requires": { - "debug": "2.6.8", - "fstream": "1.0.11", - "fstream-ignore": "1.0.5", - "once": "1.4.0", - "readable-stream": "2.2.9", - "rimraf": "2.6.1", - "tar": "2.2.1", - "uid-number": "0.0.6" - } - }, - "tough-cookie": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", - "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", - "optional": true, + "string_decoder": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz", + "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=", "requires": { - "punycode": "1.4.1" + "safe-buffer": "5.1.1" } }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "optional": true, "requires": { - "safe-buffer": "5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "optional": true - }, - "uid-number": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz", - "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=", - "optional": true - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "uuid": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz", - "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=", - "optional": true - }, - "verror": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", - "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", - "optional": true, - "requires": { - "extsprintf": "1.0.2" - } - }, - "wide-align": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", - "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", - "optional": true, - "requires": { - "string-width": "1.0.2" + "safe-buffer": "5.1.1" } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" } } }, + "fstream": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", + "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.1" + } + }, + "fstream-ignore": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz", + "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=", + "optional": true, + "requires": { + "fstream": "1.0.11", + "inherits": "2.0.3", + "minimatch": "3.0.4" + } + }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "optional": true, + "requires": { + "aproba": "1.1.1", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "optional": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } + }, "generate-function": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", @@ -3121,9 +2449,6 @@ } } }, - "git-rev": { - "version": "git://github.com/bewest/git-rev.git#cb4a1955728e3534805d3ffcbf17077b87c829cd" - }, "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", @@ -3198,16 +2523,6 @@ "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", "dev": true }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "0.0.10", - "wordwrap": "0.0.3" - } - }, "source-map": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", @@ -3237,19 +2552,6 @@ "optional": true } } - }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "optional": true, - "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", - "window-size": "0.1.0" - } } } }, @@ -3265,7 +2567,7 @@ "requires": { "bluebird": "2.11.0", "chalk": "1.1.3", - "commander": "2.11.0", + "commander": "2.12.2", "is-my-json-valid": "2.16.1" } }, @@ -3310,6 +2612,12 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "optional": true + }, "hash-base": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", @@ -3394,14 +2702,14 @@ } }, "https-browserify": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", - "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", + "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=" }, "i": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/i/-/i-0.3.5.tgz", - "integrity": "sha1-HSuFQVjsgWkRPGy39raAHpniEdU=" + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/i/-/i-0.3.6.tgz", + "integrity": "sha1-2WyScyB28HJxG2sQ/X1PZa2O4j0=" }, "iconv-lite": { "version": "0.4.19", @@ -3418,7 +2726,7 @@ "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz", "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=", "requires": { - "postcss": "6.0.11" + "postcss": "6.0.17" }, "dependencies": { "ansi-styles": { @@ -3426,17 +2734,27 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", "requires": { - "color-convert": "1.9.0" + "color-convert": "1.9.1" } }, "chalk": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", - "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", "requires": { "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", - "supports-color": "4.4.0" + "supports-color": "4.5.0" + }, + "dependencies": { + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "requires": { + "has-flag": "2.0.0" + } + } } }, "has-flag": { @@ -3445,24 +2763,24 @@ "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" }, "postcss": { - "version": "6.0.11", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz", - "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==", + "version": "6.0.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.17.tgz", + "integrity": "sha512-Bl1nybsSzWYbP8O4gAVD8JIjZIul9hLNOPTGBIlVmZNUnNAGL+W0cpYWzVwfImZOwumct4c1SDvSbncVWKtXUw==", "requires": { - "chalk": "2.1.0", - "source-map": "0.5.7", - "supports-color": "4.4.0" + "chalk": "2.3.0", + "source-map": "0.6.1", + "supports-color": "5.1.0" } }, "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "supports-color": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", - "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", + "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", "requires": { "has-flag": "2.0.0" } @@ -3504,9 +2822,9 @@ "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=" }, "interpret": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", - "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", + "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=" }, "invert-kv": { "version": "1.0.0", @@ -3698,30 +3016,10 @@ "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", "dev": true }, - "escodegen": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", - "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", - "dev": true, - "requires": { - "esprima": "2.7.3", - "estraverse": "1.9.3", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.2.0" - } - }, - "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", - "dev": true - }, "estraverse": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", - "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=", - "dev": true + "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=" }, "glob": { "version": "5.0.15", @@ -3736,18 +3034,10 @@ "path-is-absolute": "1.0.1" } }, - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - }, "source-map": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", - "dev": true, - "optional": true, "requires": { "amdefine": "1.0.1" } @@ -3776,7 +3066,7 @@ "requires": { "hoek": "2.16.3", "isemail": "1.2.0", - "moment": "2.19.1", + "moment": "2.19.3", "topo": "1.1.0" } }, @@ -3799,14 +3089,14 @@ } }, "js-base64": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.2.0.tgz", - "integrity": "sha1-XoqNGTqQgZjdI9FwSCbSB7DlqPY=" + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.3.tgz", + "integrity": "sha512-H7ErYLM34CvDMto3GbD6xD0JLUGYXR3QTcH6B/tr4Hi/QpSThnCsIp+Sy5FRTw3B0d6py4HcNkW7nO/wdtGWEw==" }, "js-storage": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/js-storage/-/js-storage-1.0.1.tgz", - "integrity": "sha1-O1t/z0xIDwiVsXKYlL/Ohi+PjN8=" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/js-storage/-/js-storage-1.0.4.tgz", + "integrity": "sha512-ND6iVfDo5r2PSpkzXa+s+S6TzZkRD1EaN4NvtwRWp2rrL1pmS9wdcbmv3eYZYOkBcPiQjyQUWZRcT0aQ4Wuk8g==" }, "js-tokens": { "version": "3.0.2", @@ -3850,7 +3140,7 @@ "content-type-parser": "1.0.1", "cssom": "0.3.2", "cssstyle": "0.2.37", - "escodegen": "1.9.0", + "escodegen": "1.8.1", "html-encoding-sniffer": "1.0.1", "nwmatcher": "1.4.1", "parse5": "3.0.2", @@ -3866,31 +3156,10 @@ "xml-name-validator": "2.0.1" }, "dependencies": { - "escodegen": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz", - "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==", - "dev": true, - "requires": { - "esprima": "3.1.3", - "estraverse": "4.2.0", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.5.7" - } - }, "esprima": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true, - "optional": true + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" } } }, @@ -4254,11 +3523,6 @@ "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" }, - "mfb": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/mfb/-/mfb-0.12.0.tgz", - "integrity": "sha1-E+HUekDyF04sLEcFJKh8BNXKY38=" - }, "micromatch": { "version": "2.3.11", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", @@ -4300,9 +3564,9 @@ } }, "miller-rabin": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz", - "integrity": "sha1-SmL7HUKTPAVYOYL0xxb2+55sbT0=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", + "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", "requires": { "bn.js": "4.11.8", "brorand": "1.1.0" @@ -4363,11 +3627,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" }, - "node-uuid": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz", - "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=" - }, "qs": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz", @@ -4490,48 +3749,30 @@ } }, "moment": { - "version": "2.19.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz", - "integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc=" + "version": "2.19.3", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.3.tgz", + "integrity": "sha1-vbmdJw1tf9p4zA+6zoVeJ/59pp8=" }, "moment-timezone": { "version": "0.5.14", "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz", "integrity": "sha1-TrOP+VOLgBCLpGekWPPtQmjM/LE=", "requires": { - "moment": "2.19.1" + "moment": "2.19.3" } }, "mongodb": { - "version": "2.2.33", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.33.tgz", - "integrity": "sha1-tTfEcdNKZlG0jzb9vyl1A0Dgi1A=", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.0.2.tgz", + "integrity": "sha512-E50FmpSQchZAimn2uPIegoNoH9UQYR1yiGHtQPmmg8/Ekc97w6owHoqaBoz+assnd9V5LxMzmQ/VEWMsQMgZhQ==", "requires": { - "es6-promise": "3.2.1", - "mongodb-core": "2.1.17", - "readable-stream": "2.2.7" - }, - "dependencies": { - "readable-stream": { - "version": "2.2.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz", - "integrity": "sha1-BwV6y+JGeyIELTb5jFrVBwVOlbE=", - "requires": { - "buffer-shims": "1.0.0", - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } - } + "mongodb-core": "3.0.2" } }, "mongodb-core": { - "version": "2.1.17", - "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.17.tgz", - "integrity": "sha1-pBizN6FKFJkPtRC5I97mqBMXPfg=", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.0.2.tgz", + "integrity": "sha512-p1B0qwFQUw6C1OlFJnrOJp8KaX7MuGoogRbTaupRt0y+pPRkMllHWtE9V6i1CDtTvI3/3sy2sQwqWez7zuXEAA==", "requires": { "bson": "1.0.4", "require_optional": "1.0.1" @@ -4645,20 +3886,20 @@ } }, "node-libs-browser": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz", - "integrity": "sha1-o6WeyXAkmFtG6Vg3lkb5bEthZkY=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", + "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", "requires": { "assert": "1.4.1", - "browserify-zlib": "0.1.4", + "browserify-zlib": "0.2.0", "buffer": "4.9.1", "console-browserify": "1.1.0", "constants-browserify": "1.0.0", - "crypto-browserify": "3.11.1", + "crypto-browserify": "3.12.0", "domain-browser": "1.1.7", "events": "1.1.1", - "https-browserify": "0.0.1", - "os-browserify": "0.2.1", + "https-browserify": "1.0.0", + "os-browserify": "0.3.0", "path-browserify": "0.0.0", "process": "0.11.10", "punycode": "1.4.1", @@ -4666,21 +3907,161 @@ "readable-stream": "2.3.3", "stream-browserify": "2.0.1", "stream-http": "2.7.2", - "string_decoder": "0.10.31", + "string_decoder": "1.0.3", "timers-browserify": "2.0.4", "tty-browserify": "0.0.0", "url": "0.11.0", "util": "0.10.3", "vm-browserify": "0.0.4" + } + }, + "node-pre-gyp": { + "version": "0.6.39", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz", + "integrity": "sha512-OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ==", + "optional": true, + "requires": { + "detect-libc": "1.0.2", + "hawk": "3.1.3", + "mkdirp": "0.5.1", + "nopt": "4.0.1", + "npmlog": "4.1.0", + "rc": "1.2.1", + "request": "2.81.0", + "rimraf": "2.6.1", + "semver": "5.4.1", + "tar": "2.2.1", + "tar-pack": "3.4.0" }, "dependencies": { - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "optional": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "assert-plus": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", + "optional": true + }, + "aws-sign2": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", + "optional": true + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "optional": true + }, + "form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "optional": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.15" + } + }, + "har-schema": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", + "optional": true + }, + "har-validator": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "optional": true, + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } + }, + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "optional": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.0", + "sshpk": "1.13.1" + } + }, + "nopt": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", + "optional": true, + "requires": { + "abbrev": "1.0.9", + "osenv": "0.1.4" + } + }, + "performance-now": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", + "optional": true + }, + "request": { + "version": "2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "optional": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.15", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.2", + "tunnel-agent": "0.6.0", + "uuid": "3.1.0" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "optional": true, + "requires": { + "safe-buffer": "5.1.1" + } } } }, + "node-uuid": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz", + "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=" + }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", @@ -4723,13 +4104,6 @@ "prepend-http": "1.0.4", "query-string": "4.3.4", "sort-keys": "1.1.2" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - } } }, "npm-run-path": { @@ -4740,6 +4114,18 @@ "path-key": "2.0.1" } }, + "npmlog": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz", + "integrity": "sha512-ocolIkZYZt8UveuiDS0yAkkIjid1o7lPG8cYm05yNYzBn8ykQtaiPMEGp8fY9tKdDgm8okpdKzkvu1y9hUYugA==", + "optional": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, "nssocket": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/nssocket/-/nssocket-0.5.3.tgz", @@ -4771,9 +4157,9 @@ "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" }, "object-assign": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=" + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "object-component": { "version": "0.0.3", @@ -4816,6 +4202,15 @@ "integrity": "sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=", "dev": true }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "requires": { + "minimist": "0.0.10", + "wordwrap": "0.0.3" + } + }, "optionator": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", @@ -4849,9 +4244,14 @@ "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4=" }, "os-browserify": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz", - "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=" + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", + "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=" + }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" }, "os-locale": { "version": "2.1.0", @@ -4863,6 +4263,20 @@ "mem": "1.1.0" } }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + }, + "osenv": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", + "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", @@ -4882,17 +4296,17 @@ } }, "pako": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", - "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=" + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", + "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==" }, "parse-asn1": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz", "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=", "requires": { - "asn1.js": "4.9.1", - "browserify-aes": "1.0.8", + "asn1.js": "4.9.2", + "browserify-aes": "1.1.1", "create-hash": "1.1.3", "evp_bytestokey": "1.0.3", "pbkdf2": "3.0.14" @@ -4960,15 +4374,6 @@ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=" }, - "path": { - "version": "0.12.7", - "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", - "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=", - "requires": { - "process": "0.11.10", - "util": "0.10.3" - } - }, "path-browserify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", @@ -5019,7 +4424,7 @@ "create-hmac": "1.1.6", "ripemd160": "2.0.1", "safe-buffer": "5.1.1", - "sha.js": "2.4.8" + "sha.js": "2.4.9" } }, "performance-now": { @@ -5044,21 +4449,16 @@ "dev": true }, "postcss": { - "version": "5.2.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", - "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", "requires": { "chalk": "1.1.3", - "js-base64": "2.2.0", + "js-base64": "2.4.3", "source-map": "0.5.7", "supports-color": "3.2.3" }, "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", @@ -5074,7 +4474,7 @@ "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=", "requires": { - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-message-helpers": "2.0.0", "reduce-css-calc": "1.3.0" } @@ -5085,7 +4485,7 @@ "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=", "requires": { "colormin": "1.1.2", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" } }, @@ -5094,7 +4494,7 @@ "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=", "requires": { - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" } }, @@ -5103,7 +4503,7 @@ "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz", "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=", "requires": { - "postcss": "5.2.17" + "postcss": "5.2.18" } }, "postcss-discard-duplicates": { @@ -5111,7 +4511,7 @@ "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz", "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=", "requires": { - "postcss": "5.2.17" + "postcss": "5.2.18" } }, "postcss-discard-empty": { @@ -5119,7 +4519,7 @@ "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz", "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=", "requires": { - "postcss": "5.2.17" + "postcss": "5.2.18" } }, "postcss-discard-overridden": { @@ -5127,7 +4527,7 @@ "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=", "requires": { - "postcss": "5.2.17" + "postcss": "5.2.18" } }, "postcss-discard-unused": { @@ -5135,7 +4535,7 @@ "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz", "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=", "requires": { - "postcss": "5.2.17", + "postcss": "5.2.18", "uniqs": "2.0.0" } }, @@ -5144,7 +4544,7 @@ "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=", "requires": { - "postcss": "5.2.17", + "postcss": "5.2.18", "uniqid": "4.1.1" } }, @@ -5154,7 +4554,7 @@ "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=", "requires": { "has": "1.0.1", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" } }, @@ -5163,7 +4563,7 @@ "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz", "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=", "requires": { - "postcss": "5.2.17" + "postcss": "5.2.18" } }, "postcss-merge-rules": { @@ -5173,7 +4573,7 @@ "requires": { "browserslist": "1.7.7", "caniuse-api": "1.6.1", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-selector-parser": "2.2.3", "vendors": "1.0.1" } @@ -5189,15 +4589,8 @@ "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=", "requires": { "object-assign": "4.1.1", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - } } }, "postcss-minify-gradients": { @@ -5205,7 +4598,7 @@ "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz", "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=", "requires": { - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" } }, @@ -5215,7 +4608,7 @@ "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=", "requires": { "alphanum-sort": "1.0.2", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0", "uniqs": "2.0.0" } @@ -5227,16 +4620,16 @@ "requires": { "alphanum-sort": "1.0.2", "has": "1.0.1", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-selector-parser": "2.2.3" } }, "postcss-modules-extract-imports": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz", - "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz", + "integrity": "sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=", "requires": { - "postcss": "6.0.11" + "postcss": "6.0.17" }, "dependencies": { "ansi-styles": { @@ -5244,17 +4637,27 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", "requires": { - "color-convert": "1.9.0" + "color-convert": "1.9.1" } }, "chalk": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", - "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", "requires": { "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", - "supports-color": "4.4.0" + "supports-color": "4.5.0" + }, + "dependencies": { + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "requires": { + "has-flag": "2.0.0" + } + } } }, "has-flag": { @@ -5263,24 +4666,24 @@ "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" }, "postcss": { - "version": "6.0.11", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz", - "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==", + "version": "6.0.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.17.tgz", + "integrity": "sha512-Bl1nybsSzWYbP8O4gAVD8JIjZIul9hLNOPTGBIlVmZNUnNAGL+W0cpYWzVwfImZOwumct4c1SDvSbncVWKtXUw==", "requires": { - "chalk": "2.1.0", - "source-map": "0.5.7", - "supports-color": "4.4.0" + "chalk": "2.3.0", + "source-map": "0.6.1", + "supports-color": "5.1.0" } }, "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "supports-color": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", - "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", + "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", "requires": { "has-flag": "2.0.0" } @@ -5293,7 +4696,7 @@ "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=", "requires": { "css-selector-tokenizer": "0.7.0", - "postcss": "6.0.11" + "postcss": "6.0.17" }, "dependencies": { "ansi-styles": { @@ -5301,17 +4704,27 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", "requires": { - "color-convert": "1.9.0" + "color-convert": "1.9.1" } }, "chalk": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", - "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", "requires": { "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", - "supports-color": "4.4.0" + "supports-color": "4.5.0" + }, + "dependencies": { + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "requires": { + "has-flag": "2.0.0" + } + } } }, "has-flag": { @@ -5320,24 +4733,24 @@ "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" }, "postcss": { - "version": "6.0.11", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz", - "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==", + "version": "6.0.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.17.tgz", + "integrity": "sha512-Bl1nybsSzWYbP8O4gAVD8JIjZIul9hLNOPTGBIlVmZNUnNAGL+W0cpYWzVwfImZOwumct4c1SDvSbncVWKtXUw==", "requires": { - "chalk": "2.1.0", - "source-map": "0.5.7", - "supports-color": "4.4.0" + "chalk": "2.3.0", + "source-map": "0.6.1", + "supports-color": "5.1.0" } }, "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "supports-color": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", - "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", + "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", "requires": { "has-flag": "2.0.0" } @@ -5350,7 +4763,7 @@ "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=", "requires": { "css-selector-tokenizer": "0.7.0", - "postcss": "6.0.11" + "postcss": "6.0.17" }, "dependencies": { "ansi-styles": { @@ -5358,17 +4771,27 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", "requires": { - "color-convert": "1.9.0" + "color-convert": "1.9.1" } }, "chalk": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", - "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", "requires": { "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", - "supports-color": "4.4.0" + "supports-color": "4.5.0" + }, + "dependencies": { + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "requires": { + "has-flag": "2.0.0" + } + } } }, "has-flag": { @@ -5377,24 +4800,24 @@ "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" }, "postcss": { - "version": "6.0.11", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz", - "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==", + "version": "6.0.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.17.tgz", + "integrity": "sha512-Bl1nybsSzWYbP8O4gAVD8JIjZIul9hLNOPTGBIlVmZNUnNAGL+W0cpYWzVwfImZOwumct4c1SDvSbncVWKtXUw==", "requires": { - "chalk": "2.1.0", - "source-map": "0.5.7", - "supports-color": "4.4.0" + "chalk": "2.3.0", + "source-map": "0.6.1", + "supports-color": "5.1.0" } }, "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "supports-color": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", - "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", + "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", "requires": { "has-flag": "2.0.0" } @@ -5407,7 +4830,7 @@ "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=", "requires": { "icss-replace-symbols": "1.1.0", - "postcss": "6.0.11" + "postcss": "6.0.17" }, "dependencies": { "ansi-styles": { @@ -5415,17 +4838,27 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", "requires": { - "color-convert": "1.9.0" + "color-convert": "1.9.1" } }, "chalk": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", - "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", "requires": { "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", - "supports-color": "4.4.0" + "supports-color": "4.5.0" + }, + "dependencies": { + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "requires": { + "has-flag": "2.0.0" + } + } } }, "has-flag": { @@ -5434,24 +4867,24 @@ "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" }, "postcss": { - "version": "6.0.11", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz", - "integrity": "sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg==", + "version": "6.0.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.17.tgz", + "integrity": "sha512-Bl1nybsSzWYbP8O4gAVD8JIjZIul9hLNOPTGBIlVmZNUnNAGL+W0cpYWzVwfImZOwumct4c1SDvSbncVWKtXUw==", "requires": { - "chalk": "2.1.0", - "source-map": "0.5.7", - "supports-color": "4.4.0" + "chalk": "2.3.0", + "source-map": "0.6.1", + "supports-color": "5.1.0" } }, "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "supports-color": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", - "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", + "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", "requires": { "has-flag": "2.0.0" } @@ -5463,7 +4896,7 @@ "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz", "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=", "requires": { - "postcss": "5.2.17" + "postcss": "5.2.18" } }, "postcss-normalize-url": { @@ -5473,7 +4906,7 @@ "requires": { "is-absolute-url": "2.1.0", "normalize-url": "1.9.1", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" } }, @@ -5482,7 +4915,7 @@ "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=", "requires": { - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" } }, @@ -5491,7 +4924,7 @@ "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=", "requires": { - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" } }, @@ -5500,7 +4933,7 @@ "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz", "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=", "requires": { - "postcss": "5.2.17" + "postcss": "5.2.18" } }, "postcss-reduce-transforms": { @@ -5509,7 +4942,7 @@ "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=", "requires": { "has": "1.0.1", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0" } }, @@ -5529,7 +4962,7 @@ "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=", "requires": { "is-svg": "2.1.0", - "postcss": "5.2.17", + "postcss": "5.2.18", "postcss-value-parser": "3.3.0", "svgo": "0.7.2" } @@ -5540,7 +4973,7 @@ "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=", "requires": { "alphanum-sort": "1.0.2", - "postcss": "5.2.17", + "postcss": "5.2.18", "uniqs": "2.0.0" } }, @@ -5555,7 +4988,7 @@ "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=", "requires": { "has": "1.0.1", - "postcss": "5.2.17", + "postcss": "5.2.18", "uniqs": "2.0.0" } }, @@ -5584,11 +5017,6 @@ "minimist": "1.2.0" }, "dependencies": { - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=" - }, "minimist": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", @@ -5625,17 +5053,6 @@ "requires": { "ascli": "1.0.1", "bytebuffer": "3.1.1" - }, - "dependencies": { - "ascli": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", - "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", - "requires": { - "colour": "0.7.1", - "optjs": "3.2.2" - } - } } }, "proxy-addr": { @@ -5706,15 +5123,14 @@ "integrity": "sha1-icuU+RgsNqpZqaxnROSa2K/00Gc=" }, "q": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", - "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=" + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" }, "qs": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", - "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", - "dev": true + "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=" }, "query-string": { "version": "4.3.4", @@ -5723,13 +5139,6 @@ "requires": { "object-assign": "4.1.1", "strict-uri-encode": "1.1.0" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - } } }, "querystring": { @@ -5792,6 +5201,15 @@ "safe-buffer": "5.1.1" } }, + "randomfill": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz", + "integrity": "sha512-YL6GrhrWoic0Eq8rXVbMptH7dAxCs0J+mh5Y0euNekPPYaxEmdVGim6GdoxoRzKW2yJoU8tueifS7mYxvcFDEQ==", + "requires": { + "randombytes": "2.0.5", + "safe-buffer": "5.1.1" + } + }, "range-parser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", @@ -5808,6 +5226,26 @@ "unpipe": "1.0.0" } }, + "rc": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", + "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", + "optional": true, + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.4", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "optional": true + } + } + }, "read": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", @@ -5893,9 +5331,9 @@ } }, "regenerate": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz", - "integrity": "sha1-0ZQcZ7rUN+G+dkM63Vs4X5WxkmA=" + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz", + "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==" }, "regex-cache": { "version": "0.4.3", @@ -5911,7 +5349,7 @@ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", "requires": { - "regenerate": "1.3.2", + "regenerate": "1.3.3", "regjsgen": "0.2.0", "regjsparser": "0.1.5" } @@ -6029,7 +5467,7 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "requires": { - "ajv": "5.3.0", + "ajv": "5.5.1", "har-schema": "2.0.0" } }, @@ -6123,15 +5561,6 @@ "tough-cookie": "2.3.2" } }, - "require_optional": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", - "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==", - "requires": { - "resolve-from": "2.0.0", - "semver": "5.4.1" - } - }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -6142,6 +5571,21 @@ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" }, + "require_optional": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", + "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==", + "requires": { + "resolve-from": "2.0.0", + "semver": "5.4.1" + } + }, + "resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true + }, "resolve-from": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", @@ -6202,24 +5646,12 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "schema-utils": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", - "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.3.tgz", + "integrity": "sha512-sgv/iF/T4/SewJkaVpldKC4WjSkz0JsOh2eKtxCPpCO1oR05+7MOF+H476HVRbLArkgA7j5TRJJ4p2jdFkUGQQ==", "requires": { - "ajv": "5.2.2" - }, - "dependencies": { - "ajv": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz", - "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=", - "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.0.0", - "json-schema-traverse": "0.3.1", - "json-stable-stringify": "1.0.1" - } - } + "ajv": "5.5.1", + "ajv-keywords": "2.1.1" } }, "semver": { @@ -6330,11 +5762,12 @@ } }, "sha.js": { - "version": "2.4.8", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz", - "integrity": "sha1-NwaMLEdra69ALRSknGf1l5IfY08=", + "version": "2.4.9", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.9.tgz", + "integrity": "sha512-G8zektVqbiPHrylgew9Zg1VRB1L/DtXNUVAM6q4QLy8NE3qtHlFXTf8VLL4k1Yl6c7NMjtZUTdXV+X44nFaT6A==", "requires": { - "inherits": "2.0.3" + "inherits": "2.0.3", + "safe-buffer": "5.1.1" } }, "share2nightscout-bridge": { @@ -6423,11 +5856,6 @@ "mime-db": "1.12.0" } }, - "node-uuid": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz", - "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=" - }, "oauth-sign": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz", @@ -6559,6 +5987,13 @@ "requires": { "caller": "0.0.1", "strip-json-comments": "0.1.3" + }, + "dependencies": { + "strip-json-comments": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz", + "integrity": "sha1-Fkxk43Coo8wAyeAbU55WmCPw7lQ=" + } } }, "signal-exit": { @@ -6719,6 +6154,11 @@ "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==" }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, "spdx-correct": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", @@ -6808,13 +6248,6 @@ "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", "requires": { "duplexer": "0.1.1" - }, - "dependencies": { - "duplexer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=" - } } }, "stream-http": { @@ -6834,14 +6267,6 @@ "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "requires": { - "safe-buffer": "5.1.1" - } - }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -6871,6 +6296,14 @@ } } }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", @@ -6895,24 +6328,20 @@ "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" }, "strip-json-comments": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz", - "integrity": "sha1-Fkxk43Coo8wAyeAbU55WmCPw7lQ=" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "optional": true }, "style-loader": { - "version": "0.18.2", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.18.2.tgz", - "integrity": "sha512-WPpJPZGUxWYHWIUMNNOYqql7zh85zGmr84FdTVWq52WTIkqlW9xSxD3QYWi/T31cqn9UNSsietVEgGn2aaSCzw==", + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.20.1.tgz", + "integrity": "sha512-NtlwQOHQvUgEKuPs4JoUMQUkML8UNMxLbXM2JAZerIQVVVMgO5VVRjYQA8zzkpBu/X2OnTt+5ZKe8IbGk5TjRA==", "requires": { "loader-utils": "1.1.0", - "schema-utils": "0.3.0" + "schema-utils": "0.4.3" } }, - "sugar": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/sugar/-/sugar-1.5.0.tgz", - "integrity": "sha1-2dP7oQ96iH4G5q37B4onrLH8BVY=" - }, "superagent": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/superagent/-/superagent-2.3.0.tgz", @@ -6985,16 +6414,6 @@ "whet.extend": "0.9.9" }, "dependencies": { - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=" - }, - "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=" - }, "js-yaml": { "version": "3.7.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz", @@ -7012,16 +6431,62 @@ "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=", "dev": true }, - "sync-exec": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/sync-exec/-/sync-exec-0.6.2.tgz", - "integrity": "sha1-cX0izFPwzh3vVZQ2LzqJouu5EQU=" - }, "tapable": { "version": "0.2.8", "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz", "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=" }, + "tape": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz", + "integrity": "sha1-Lnzgox3wn41oUWZKcYQuDKUFevc=", + "requires": { + "deep-equal": "0.1.2", + "defined": "0.0.0", + "inherits": "2.0.3", + "jsonify": "0.0.0", + "resumer": "0.0.0", + "through": "2.3.8" + }, + "dependencies": { + "deep-equal": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz", + "integrity": "sha1-skbCuApXCkfBG+HZvRBw7IeLh84=" + }, + "defined": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz", + "integrity": "sha1-817qfXBekzuvE7LwOz+D2SFAOz4=" + } + } + }, + "tar": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "tar-pack": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz", + "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=", + "optional": true, + "requires": { + "debug": "2.6.7", + "fstream": "1.0.11", + "fstream-ignore": "1.0.5", + "once": "1.4.0", + "readable-stream": "2.3.3", + "rimraf": "2.6.1", + "tar": "2.2.1", + "uid-number": "0.0.6" + } + }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -7064,13 +6529,6 @@ "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", "requires": { "punycode": "1.4.1" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" - } } }, "tr46": { @@ -7119,11 +6577,11 @@ } }, "uglify-js": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.8.tgz", - "integrity": "sha512-1lnTkrJWw6LJ7n43ZyYVXx0eN2PQh0c3Inb0nY/vj5fNfwykXQFif2kvNgm/Bf0ClLA8R6SKaMHFzo9io4Q+vg==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.2.1.tgz", + "integrity": "sha512-BhZTJPmOKPSUcjnx2nlfaOQKHLyjjT4HFyzFWF1BUErx9knJNpdW94ql5o8qVxeNL+8IAWjEjnPvASH2yZnkMg==", "requires": { - "commander": "2.11.0", + "commander": "2.12.2", "source-map": "0.6.1" }, "dependencies": { @@ -7147,14 +6605,9 @@ "requires": { "source-map": "0.5.7", "uglify-js": "2.8.29", - "webpack-sources": "1.0.1" + "webpack-sources": "1.1.0" }, "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - }, "uglify-js": { "version": "2.8.29", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", @@ -7164,20 +6617,15 @@ "uglify-to-browserify": "1.0.2", "yargs": "3.10.0" } - }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", - "window-size": "0.1.0" - } } } }, + "uid-number": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz", + "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=", + "optional": true + }, "ultron": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz", @@ -7248,8 +6696,8 @@ "integrity": "sha1-kwyI6ZCY1iIINMNWy9mncFItkNc=", "requires": { "async": "0.2.10", - "deep-equal": "0.0.0", - "i": "0.3.5", + "deep-equal": "1.0.1", + "i": "0.3.6", "mkdirp": "0.5.1", "ncp": "0.4.2", "rimraf": "2.6.1" @@ -7312,15 +6760,15 @@ "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz", "integrity": "sha1-ShRyvLuVK9Cpu0A2gB+VTfs5+qw=", "requires": { - "async": "2.5.0", + "async": "2.6.0", "chokidar": "1.7.0", "graceful-fs": "4.1.11" }, "dependencies": { "async": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", - "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", + "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", "requires": { "lodash": "4.17.4" } @@ -7334,31 +6782,31 @@ "dev": true }, "webpack": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.8.1.tgz", - "integrity": "sha512-5ZXLWWsMqHKFr5y0N3Eo5IIisxeEeRAajNq4mELb/WELOR7srdbQk2N5XiyNy2A/AgvlR3AmeBCZJW8lHrolbw==", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz", + "integrity": "sha512-fxxKXoicjdXNUMY7LIdY89tkJJJ0m1Oo8PQutZ5rLgWbV5QVKI15Cn7+/IHnRTd3vfKfiwBx6SBqlorAuNA8LA==", "requires": { "acorn": "5.2.1", "acorn-dynamic-import": "2.0.2", - "ajv": "5.3.0", - "ajv-keywords": "2.1.0", + "ajv": "5.5.1", + "ajv-keywords": "2.1.1", "async": "2.6.0", "enhanced-resolve": "3.4.1", "escope": "3.6.0", - "interpret": "1.0.3", + "interpret": "1.1.0", "json-loader": "0.5.7", "json5": "0.5.1", "loader-runner": "2.3.0", "loader-utils": "1.1.0", "memory-fs": "0.4.1", "mkdirp": "0.5.1", - "node-libs-browser": "2.0.0", + "node-libs-browser": "2.1.0", "source-map": "0.5.7", "supports-color": "4.5.0", "tapable": "0.2.8", "uglifyjs-webpack-plugin": "0.4.6", "watchpack": "1.4.0", - "webpack-sources": "1.0.1", + "webpack-sources": "1.1.0", "yargs": "8.0.2" }, "dependencies": { @@ -7375,16 +6823,38 @@ "lodash": "4.17.4" } }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } + }, "has-flag": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - }, "supports-color": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", @@ -7392,6 +6862,26 @@ "requires": { "has-flag": "2.0.0" } + }, + "yargs": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", + "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", + "requires": { + "camelcase": "4.1.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "read-pkg-up": "2.0.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "7.0.0" + } } } }, @@ -7403,7 +6893,7 @@ "requires": { "acorn": "5.2.1", "chalk": "1.1.3", - "commander": "2.11.0", + "commander": "2.12.2", "ejs": "2.5.7", "express": "4.16.2", "filesize": "3.5.11", @@ -7440,18 +6930,18 @@ } }, "webpack-sources": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz", - "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz", + "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==", "requires": { "source-list-map": "2.0.0", - "source-map": "0.5.7" + "source-map": "0.6.1" }, "dependencies": { "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, @@ -7501,6 +6991,28 @@ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, + "wide-align": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", + "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "optional": true, + "requires": { + "string-width": "1.0.2" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "optional": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } + }, "window-size": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", @@ -7524,6 +7036,11 @@ "version": "0.2.10", "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" + }, + "colors": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", + "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=" } } }, @@ -7599,52 +7116,14 @@ "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" }, "yargs": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", - "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "requires": { - "camelcase": "4.1.0", - "cliui": "3.2.0", + "camelcase": "1.2.1", + "cliui": "2.1.0", "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "read-pkg-up": "2.0.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "7.0.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" - }, - "dependencies": { - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - } - } - } + "window-size": "0.1.0" } }, "yargs-parser": { diff --git a/package.json b/package.json index 4a9dc335515..0be3f5d80c6 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "env": "env", "postinstall": "webpack --config webpack.config.js && npm run-script update-buster", "bundle": "webpack --config webpack.config.js && npm run-script update-buster", - "bower": "node node_modules/bower/bin/bower --allow-root install && ", "update-buster": "node bin/generateCacheBuster.js >tmp/cacheBusterToken" }, "config": { @@ -48,46 +47,42 @@ }, "engines": { "node": "8.9.x", - "npm": "5.2.0 || 5.3.0 || 5.0.3" + "npm": "5.6.x || 5.2.0 || 5.3.0 || 5.0.3" }, "dependencies": { - "ajv": "^5.3.0", "async": "^0.9.2", "body-parser": "^1.18.2", "bootevent": "0.0.1", "compression": "^1.7.1", - "css-loader": "^0.28.7", + "css-loader": "^0.28.9", "cssmin": "^0.4.3", "d3": "^3.5.17", "ejs": "^2.5.7", "errorhandler": "^1.5.0", "event-stream": "^3.3.4", "expand-braces": "^0.1.2", - "expose-loader": "^0.7.3", + "expose-loader": "^0.7.4", "express": "^4.16.2", "express-extension-to-accept": "0.0.2", "express-minify": "^0.2.0", - "file-loader": "^0.11.2", + "file-loader": "^1.1.6", "flot": "^0.8.0-alpha", "forever": "^0.15.3", - "git-rev": "git://github.com/bewest/git-rev.git", "jquery": "^2.2.4", "jquery-ui-bundle": "^1.12.1", "jquery.tipsy": "^1.0.3", - "js-storage": "^1.0.1", + "js-storage": "^1.0.4", "jsonwebtoken": "^7.4.3", "lodash": "^4.17.4", "long": "^3.2.0", - "mfb": "^0.12.0", "minimed-connect-to-nightscout": "git://github.com/mddub/minimed-connect-to-nightscout.git#v1.1.0", - "moment": "^2.19.1", + "moment": "^2.19.3", "moment-timezone": "^0.5.14", - "mongodb": "^2.2.33", + "mongodb": "^3.0.2", "mongomock": "^0.1.2", "mqtt": "^0.3.13", "node-cache": "^4.1.1", "parse-duration": "^0.1.1", - "path": "^0.12.7", "prettyjson": "^1.2.1", "pushover-notifications": "^0.2.4", "random-token": "0.0.8", @@ -97,13 +92,10 @@ "shiro-trie": "^0.3.13", "simple-statistics": "^0.7.0", "socket.io": "^1.7.4", - "style-loader": "^0.18.2", - "sugar": "^1.5.0", - "sync-exec": "^0.6.2", + "style-loader": "^0.20.1", "traverse": "^0.6.6", - "uglify-js": "^3.1.8", - "uuid": "^3.1.0", - "webpack": "^3.8.1" + "uglify-js": "^3.2.1", + "webpack": "^3.10.0" }, "devDependencies": { "benv": "3.3.0", diff --git a/server.js b/server.js index 642fe1ed73e..27d629034a2 100644 --- a/server.js +++ b/server.js @@ -45,7 +45,7 @@ function create (app) { return transport.createServer(app); } -require('./lib/bootevent')(env, language).boot(function booted (ctx) { +require('./lib/server/bootevent')(env, language).boot(function booted (ctx) { var app = require('./app')(env, ctx); var server = create(app).listen(PORT, HOSTNAME); console.log(translate('Listening on port'), PORT, HOSTNAME); @@ -55,7 +55,7 @@ require('./lib/bootevent')(env, language).boot(function booted (ctx) { } if (env.MQTT_MONITOR) { - ctx.mqtt = require('./lib/mqtt')(env, ctx); + ctx.mqtt = require('./lib/server/mqtt')(env, ctx); var es = require('event-stream'); es.pipeline(ctx.mqtt.entries, ctx.entries.map( ), ctx.mqtt.every(ctx.entries)); } @@ -63,7 +63,7 @@ require('./lib/bootevent')(env, language).boot(function booted (ctx) { /////////////////////////////////////////////////// // setup socket io for data and message transmission /////////////////////////////////////////////////// - var websocket = require('./lib/websocket')(env, ctx, server); + var websocket = require('./lib/server/websocket')(env, ctx, server); ctx.bus.on('data-processed', function() { websocket.update(); diff --git a/static/profile/js/profileeditor.js b/static/profile/js/profileeditor.js index bcb26425414..94a8671e40f 100644 --- a/static/profile/js/profileeditor.js +++ b/static/profile/js/profileeditor.js @@ -327,6 +327,8 @@ GUIToObject(); var newname = $('#pe_profile_name').val(); + if (!isNaN(newname)) newname = 'Profile' + newname; + if (currentprofile !== newname) { // rename if already exists while (record.store[newname]) { diff --git a/static/report/compare.html b/static/report/compare.html deleted file mode 100644 index 76fdcd7e528..00000000000 --- a/static/report/compare.html +++ /dev/null @@ -1,161 +0,0 @@ - - - - Nightscout performance comparison - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Nightscout performance comparison

- -
- - - - - - - - - - - - -
-
-
-
-
-
- -
-
-
-
- - from - -
-
-
-
-
-
-
- - -
- Authentication status: - - - - - - - - - - - - - diff --git a/static/report/js/compare.js b/static/report/js/compare.js deleted file mode 100644 index bfa608c0358..00000000000 --- a/static/report/js/compare.js +++ /dev/null @@ -1,639 +0,0 @@ - - - -function slippy (dom, opt) { - - var svg = { }; - var chart; - var container; - var scales = { x: { }, y: { } }; - var dom_width, dom_height, width, height; - var scaleExtent = [ 0, 200 ]; - var zoomer; - - var margin = {top: 20, right: 50, bottom: 20, left: 50}; - // get_dimensions( ); - - - function frame ( ) { - get_dimensions( ); - var range = frame.getRange( ); - // var width = dom.width( ); - // var height = dom.height( ); - svg.attr('width', dom_width) - // .attr('height', height - margin.right - margin.left) - ; - var begin = scales.x.invert(0); - var end = scales.x.invert(width); - range = frame.setRange(begin, end); - var delta = moment(begin).from(moment(end)); - // .replace(' ago', ''); - opt.controls.find('.begin-input').val(delta); - opt.controls.find('.end-input').val(end.format(Date.ISO8601_DATETIME)); - opt.controls.data('range', {begin: begin, end: end}); - // console.log(width, height, delta) - - // console.log(opt); - chart.select(".x.axis").call(frame.xAxis); - dom.trigger('refocus', [range, frame]); - - } - - frame.getRange = function _getRange ( ) { - return [frame.begin, frame.end]; - } - - frame.setRange = function _setRange (begin, end) { - frame.begin = Date.create(begin); - frame.end = Date.create(end); - return frame.getRange( ); - } - - function get_dimensions( ) { - dom_width = dom.width( ); - margin = {top: 20, right: 50, bottom: 20, left: 50}; - width = dom_width - margin.left - margin.right; - dom_height = dom.height( ); - height = dom_height - margin.top - margin.bottom; - } - - function init ( ) { - get_dimensions( ); - var begin = opt.begin || opt.controls.find('INPUT.begin-input').val( ); - var end = opt.end || opt.controls.find('INPUT.end-input').val( ); - var range = frame.setRange(begin, end); - // var width = dom.width( ); - // var height = dom.height( ); - svg = d3.select(dom.get(0)).append('svg') - .attr('class', 'slippy-chart') - ; - ; - chart = svg.append('g') - .attr('class', 'widget') - .attr("tranform", "translate(" + 0 + ", " + margin.top + ")") - ; - scales.x = d3.time.scale( ) - .domain(range) - .nice(d3.time.week) - .rangeRound([0, dom.width( )]) - ; - scales.y = d3.scale.log( ) - .domain([ 40, 400 ]) - .rangeRound([1, dom.height( )]) - ; - frame.xAxis = d3.svg.axis( ) - .scale(scales.x) - .ticks(7) - .tickSize(12, 1, 1) - ; - chart.append("g") - .attr("transform", "translate(" + 0 + ", " + (height / 2) + ")") - .attr("class", "x axis") - .call(frame.xAxis) - ; - - zoomer = d3.behavior.zoom( ) - .x(scales.x) - .scaleExtent(scaleExtent) - .on('zoom', frame); - ; - svg.call(zoomer); - - // frame.setRange(begin, end); - opt.controls.on('change', 'INPUT', refocus); - frame( ); - $(window).on('resize', resize); - return frame; - } - - function adjust_sizes (ev) { - get_dimensions( ); - scales.x - .rangeRound([0, dom.width( )]) - ; - scales.y - .rangeRound([1, dom.height( )]) - ; - chart.selectAll('.x.axis') - .call(frame.xAxis) - } - - function resize (ev) { - adjust_sizes(ev); - frame( ); - } - - function refocus (ev) { - var target = $(ev.target); - if (target.is('INPUT')) { - var begin = opt.controls.find('INPUT.begin-input').val( ); - var end = opt.controls.find('INPUT.end-input').val( ); - var range = frame.setRange(begin, end); - } - scales.x.domain(range) - .nice(d3.time.week) - ; - frame( ); - } - - return init( ); - // return frame; -} - -function cached (opts) { - var storage = opts.storage || crossfilter([ ]); - var dims = { - byDate: storage.dimension(dateStringDate) - }; - function api ( ) { - } - - function within (start, end) { - start = Date.create(start); - end = Date.create(end); - return dims.byDate.filterRange([start, end]).top(Infinity); - } - - function cx ( ) { - return storage; - } - - function get ( ) { - } - - function add (records) { - storage.add(records); - } - - function dateString (d) { return d.dateString; } - function dateStringDate (d) { return Date.create(d.dateString); } - function sgv (d) { return d.sgv; } - function is_clean (d) { return sgv(d) > 39; } - function is_in_range (d) { return sgv(d) >= range.low && sgv(d) <= range.high; } - function is_high (d) { return sgv(d) > range.high; } - function is_low (d) { return sgv(d) < range.low; } - - api.dims = dims; - api.get = get; - api.add = add; - api.within = within; - api.cx = cx; - return api; -} - -function manager (view, data, opts) { - - // var colorize = d3.scale.category20b( ); - var colorize = d3.scale.ordinal( ) - .domain([0, 10]) - .range(colorbrewer.Set3[10]); - var templates = opts.templates; - var item_opts = opts.item_opts || { }; - var pools = [ ]; - var master = { }; - var cache = opts.cache || cached({ }); - function manage ( ) { - } - - function init ( ) { - rows = view.find('.reticle'); - if (rows.length > 0) { - } else { - var item = make({ }); - pools.push(item); - } - view.on('refocus', '.reticle', on_refocus); - return manage; - } - - function make (data) { - var item = templates.find('.reticle').clone(true); - var pool = templates.find('.pool').clone(true); - var end = data.end || Date.create('now').format(Date.ISO8601_DATETIME); - var begin = data.begin || Date.create(end).rewind({weeks: 6}).format(Date.ISO8601_DATETIME); - view.find('.ranges').append(item); - view.find('.observations').append(pool); - var control = slippy(item.find('.timeline'), - { controls: item.find('.controls') - , begin: begin - , end: end - } ); - var reticle = {dom: item, control: control}; - var color = colorize(pools.length); - var lense = ranger(pool, {color: color, begin: begin, end: end, cache: cache}); - var display = { dom: pool, control: lense }; - reticle.dom.find('.timeline').css('border', '1px solid ' + color); - display.dom.css('border-color', color); - reticle.dom.find("span, :input").css('color', color); - // reticle.dom.find(".x.axis line").('styl', color); - var axis = d3.select(reticle.dom.get(0)).selectAll('.x.axis'); - axis.selectAll('line').style('stroke', color); - axis.selectAll('path').style('stroke', color); - axis.selectAll('text').style('color', color); - return { reticle: reticle, display: display, color: color }; - } - - function on_refocus (ev, range) { - var target = $(ev.target); - var pool = pools.filter(function (pool) { - var timeline = pool.reticle.dom.find('.timeline'); - return timeline.is(target); - }).pop( ); - if (pool) { - pool.display.control.setRange(range[0], range[1]); - } - } - - function add_new ( ) { - var item = make({ }); - pools.push(item); - } - - manage.add_new = add_new; - - return init( ); -} - -function pager (opts) { - var query = { }; - var url = opts.url || '/api/v1/entries.json?find[type]=sgv&find[sgv][$gt]=39&count=500000&'; - query.begin = opts.begin; - query.end = opts.end; - var payload = [ ]; - var days = { }; - var cache = opts.cache; - var DATE_FMT = "{yyyy}-{MM}-{dd}"; - - var bisect = d3.bisector(function (d) { return Date.create(d.dateString); }); - function page ( ) { - } - - function refresh (start, end) { - // console.log("PAYLOAD?", payload); - var q = { - start: Date.create(Date.create(start).format(DATE_FMT)) - , end: Date.create(Date.create(end).format(DATE_FMT)) - }; - query.begin = start; - query.end = end; - var range = d3.time.days(q.start, q.end); - days = { }; - console.log('QUERY FOR', range.length, 'days', q, query); - iter_query(range); - return; - if (payload && payload.length > 0) { - console.log("NUM DAYS", range.length); - // TODO: soft update, only get deltas against the edges of the - // cursor. - // start.isBefore - // start.isBetween - // start.isAfter - // end.isBefore - // end.isBetween - // end.isAfter - var holding = { - begin: Date.create(payload[0].dateString) - , last: Date.create(payload.slice(-1).pop( ).dateString) - } - console.log("BISECT LEFT start", bisect.left(payload, { dateString: start })); - console.log("BISECT LEFT end", end, bisect.right(payload, { dateString: end })); - do_query(start, end, first_page); - } else { - do_query(start, end, first_page); - } - query.begin = start; - query.end = end; - } - - function param_string (begin, end) { - return [ - "find[dateString][$gte]=" + Date.create(begin).format(DATE_FMT) - , "find[dateString][$lte]=" + Date.create(end).format(DATE_FMT) - ].join('&') - } - - function iter (prev, current, index, tail) { - } - - function iter_query (range) { - payload = [ ]; - range.forEach(function (day, i) { - var start = day; - var end = d3.time.day.offset(start, 1); - var data = cache.within(start, end); - if (data.length < 10) { - do_query(start, end, function _iter_ (resp) { - days[Date.create(day).format(DATE_FMT)] = true; - collate(resp); - }); - } else { - days[Date.create(day).format(DATE_FMT)] = true; - payload = payload.concat(data); - if (Object.keys(days).length >= range.length) { - do_payload( ); - } - } - }); - - } - - function accrue (begin, end, cb) { - var q = { - start: Date.create(Date.create(start).format(DATE_FMT)) - , end: Date.create(Date.create(end).format(DATE_FMT)) - }; - var range = d3.time.days(q.start, q.end); - if (range.length > 3) { - var half = range.length / 2; - var head = range.slice(0, half); - var tail = range.slice(half); - // head.reduce(iter, { }); - // tail.reduce(iter, { }); - } - } - - function collate (resp) { - console.log('payload', payload.length, 'resp', resp.length); - payload = payload.concat(resp); - cache.add(resp); - payload.sort(cmp_dateString); - var range = d3.time.days(query.start, query.end); - if (Object.keys(days).length >= range.length) { - do_payload( ); - } - } - - function cmp_dateString (a, b) { - return a.dateString > b.dateString; - } - - function do_query (begin, end, cb) { - var range = d3.time.days(Date.create(begin), Date.create(end)); - var fetch = url + param_string(begin, end); - console.log('QUERY FOR', range.length, 'days', query, fetch); - $.getJSON(fetch, cb); - } - - function first_page (resp) { - // console.log('resp', resp); - payload = resp; - do_payload( ); - } - - function do_payload ( ) { - if (opts.callback && opts.callback.call) { - opts.callback(payload); - } else { - // console.log(payload); - } - } - - function init ( ) { - if (query.begin && query.end) { - refresh(query.begin, query.end); - // do_query(query.begin, query.end, first_page); - } - page( ); - return page; - } - - page.refresh = refresh; - - return init( ); -} - -function time_in_range (data, opts) { - var range = { - high: 180 - , low: 80 - }; - - function sgv (d) { return d.sgv; } - function is_clean (d) { return sgv(d) > 39; } - function is_in_range (d) { return sgv(d) >= range.low && sgv(d) <= range.high; } - function is_high (d) { return sgv(d) > range.high; } - function is_low (d) { return sgv(d) < range.low; } - var results = [ ]; - var days = d3.nest( ) - .key(function (d) { - return Date.create(d.dateString).format('{yyyy}-{MM}-{dd}') - } ) - .rollup(function (leaves) { - var clean = leaves.filter(is_clean); - var nominal = clean.filter(is_in_range); - var highs = clean.filter(is_high); - var lows = clean.filter(is_low); - return { - length: clean.length - , color: opts.color || '#eee' - , target: nominal.length / clean.length * 100 - , highs: highs.length / clean.length * 100 - , lows: lows.length / clean.length * 100 - , mean: d3.mean(clean, sgv) - , median: d3.median(clean, sgv) - }; - } ) - .entries(data); - ; - return days; -} - -function ranger (dom, opts) { - var scales = { x: { }, y: { } }; - var dimensions = {height: null, width: null }; - var margin = {top: 20, right: 50, bottom: 20, left: 50}; - var xAxis, yAxis; - var dom_width, dom_height; - var width, height; - var root = { }; - var dots = { }; - var chart = { }; - - function my ( ) { - // dots = chart.selectAll('circle') - // dots.enter( ) - // .append("circle") - // console.log('data', my.data); - var selection = dots.selectAll('.dots').data(my.data || [ ]); - // console.log('dots', dots, selection); - selection.enter( ).append('circle').attr('class', 'dots'); - selection.exit( ).remove( ); - selection.call(render_circles) - // .exit( ).remove( ); - } - - function make_x_axis ( ) { - return d3.svg.axis( ) - .scale(scales.x) - ; - } - - function make_y_axis ( ) { - return d3.svg.axis() - .scale(scales.y) - ; - } - - function gridlines (selection) { - selection.selectAll('.x.gridlines') - // .attr("transform", "translate(0," + height + ")") - .attr("transform", "translate(" + margin.left + "," + height + ")") - // .attr("transform", "translate(" + margin.left + ", " + (margin.top) + ")") - .call(make_x_axis( ) - .tickSize(-height, 0, 0) - .tickFormat("") - ) - - selection.selectAll('.y.gridlines') - .attr("transform", "translate(" + margin.left + ", " + (margin.top) + ")") - .call(make_y_axis( ) - .tickSize(-width , 0, 0) - .tickValues([40, 80, 120, 180, 240, 300, 400]) - .tickFormat("") - .orient("left") - // .ticks(6) - ) - - } - function render_circles (dots) { - dots - .transition( ) - .attr("r", 5) - .attr("title", function (d) { return d.key; }) - .attr("fill", function (d) { return d.values.color; }) - .attr("cx", function (d) { return scales.x(d.values.target); }) - .attr("cy", function (d) { return scales.y(d.values.mean); }) - return dots; - } - - function render (selection) { - console.log('selection'); - } - - my.setRange = function _setRange (begin, end) { - adjuster(begin, end); - } - - function adjust_range (begin, end) { - my.page.refresh(begin, end); - } - - var adjuster = _.debounce(adjust_range, 1000); - - function on_data (payload) { - var days = time_in_range(payload, opts); - my.data = days; - if (dots && dots.selectAll) { - my( ); - } - // console.log('got days', days); - } - - function init ( ) { - my.page = pager({begin: opts.begin, end: opts.end, callback: on_data, cache: opts.cache}); - get_dimensions( ); - - scales.x = d3.scale.linear( ) - .domain([0, 100]) - .range([0, width]) - ; - - scales.y = d3.scale.log( ) - .domain( [40, 400] ) - .rangeRound( [height - (margin.top + margin.bottom), 1] ) - .base(12) - ; - - - // Axis - xAxis = make_x_axis( ) - .ticks(10) - .tickFormat(function(d) { return parseInt(d, 10) + "%"; }) - .orient('bottom') - ; - - - yAxis = make_y_axis( ) - .tickValues([40, 60, 70, 80, 120, 160, 180, 200, 220, 260, 300, 350, 400]) - .tickFormat(d3.format("d")) - .tickSize(6, 3, 1) - .orient('left') - ; - - root = d3.select(dom.get(0)).append('svg') - .attr('class', 'ranger') - .attr('height', dom_height) - .attr('width', dom_width) - ; - - chart = root.append('g') - .attr("transform", "translate(" + 0 + ", " + (margin.top) + ")") - .attr('class', 'ranger-chart') - ; - - chart.append('g').attr('class', 'x gridlines') - .attr("transform", "translate(" + margin.left + ", " + (margin.top) + ")") - ; - chart.append('g').attr('class', 'y gridlines') - .attr("transform", "translate(" + margin.left + ", " + (margin.top) + ")") - ; - dots = chart.append("g") - .attr("transform", "translate(" + margin.left + ", " + (margin.top) + ")") - .attr("class", "scatter") - ; - chart.append("g") - .attr("transform", "translate(" + margin.left + ", " + (height - margin.top) + ")") - .attr("class", "x axis") - .call(xAxis) - ; - chart.append("g") - .attr("transform", "translate(" + margin.left + ", " + (margin.top) + ")") - // .attr("transform", "translate(" + dom_width + ", " + (0) + ")") - .attr("class", "y axis") - .call(yAxis) - ; - // dots = chart.selectAll(".dot"); - $(window).on('resize', resize); - adjust_frames( ); - return my; - } - - function resize (ev) { - adjust_frames(ev); - my( ); - } - function adjust_frames (ev) { - get_dimensions( ); - root - .attr('class', 'ranger') - .attr('height', dom_height) - .attr('width', dom_width) - ; - chart - .attr("transform", "translate(" + 0 + ", " + (margin.top) + ")") - .attr('class', 'ranger-chart') - ; - scales.x - // .range([0, width]) - .range([0, width]) - ; - scales.y - .rangeRound( [height - (margin.top + margin.bottom), 1] ) - ; - - chart.selectAll('.x.axis').call(xAxis); - chart.selectAll('.y.axis').call(yAxis); - chart.call(gridlines) - - } - - function get_dimensions( ) { - dom_width = dom.width( ); - margin = {top: 20, right: 50, bottom: 20, left: 50}; - width = dom_width - margin.left - margin.right; - dom_height = dom.height( ) - margin.top; - height = dom_height - margin.top - margin.bottom; - } - - return init( ); -} diff --git a/tests/api.entries.test.js b/tests/api.entries.test.js index dd3e1eb2cec..ba61a2d0a21 100644 --- a/tests/api.entries.test.js +++ b/tests/api.entries.test.js @@ -2,7 +2,7 @@ var request = require('supertest'); var load = require('./fixtures/load'); -var bootevent = require('../lib/bootevent'); +var bootevent = require('../lib/server/bootevent'); var language = require('../lib/language')(); require('should'); @@ -20,7 +20,7 @@ describe('Entries REST api', function ( ) { var self = this; bootevent(env, language).boot(function booted (ctx) { self.app.use('/', entries(self.app, self.wares, ctx)); - self.archive = require('../lib/entries')(env, ctx); + self.archive = require('../lib/server/entries')(env, ctx); var creating = load('json'); creating.push({type: 'sgv', sgv: 100, date: Date.now()}); diff --git a/tests/api.status.test.js b/tests/api.status.test.js index 1da9f793a98..51730a6f078 100644 --- a/tests/api.status.test.js +++ b/tests/api.status.test.js @@ -16,7 +16,7 @@ describe('Status REST api', function ( ) { this.app = require('express')( ); this.app.enable('api'); var self = this; - require('../lib/bootevent')(env, language).boot(function booted (ctx) { + require('../lib/server/bootevent')(env, language).boot(function booted (ctx) { self.app.use('/api', api(env, ctx)); done(); }); diff --git a/tests/api.treatments.test.js b/tests/api.treatments.test.js index 34600b66cb0..6d0d5deb933 100644 --- a/tests/api.treatments.test.js +++ b/tests/api.treatments.test.js @@ -18,7 +18,7 @@ describe('Treatment API', function ( ) { this.wares = require('../lib/middleware/')(self.env); self.app = require('express')(); self.app.enable('api'); - require('../lib/bootevent')(self.env, language).boot(function booted(ctx) { + require('../lib/server/bootevent')(self.env, language).boot(function booted(ctx) { self.ctx = ctx; self.ctx.ddata = require('../lib/data/ddata')(); self.app.use('/api', api(self.env, ctx)); diff --git a/tests/api.unauthorized.test.js b/tests/api.unauthorized.test.js index 23ff9c165c0..8c804c4244f 100644 --- a/tests/api.unauthorized.test.js +++ b/tests/api.unauthorized.test.js @@ -20,9 +20,9 @@ describe('authed REST api', function ( ) { this.app.enable('api'); var self = this; self.known_key = known; - require('../lib/bootevent')(env, language).boot(function booted (ctx) { + require('../lib/server/bootevent')(env, language).boot(function booted (ctx) { self.app.use('/', entries(self.app, self.wares, ctx)); - self.archive = require('../lib/entries')(env, ctx); + self.archive = require('../lib/server/entries')(env, ctx); var creating = load('json'); // creating.push({type: 'sgv', sgv: 100, date: Date.now()}); diff --git a/tests/api.verifyauth.test.js b/tests/api.verifyauth.test.js index 6a7514a8349..a9fd681da7b 100644 --- a/tests/api.verifyauth.test.js +++ b/tests/api.verifyauth.test.js @@ -15,7 +15,7 @@ describe('Verifyauth REST api', function ( ) { this.wares = require('../lib/middleware/')(self.env); self.app = require('express')( ); self.app.enable('api'); - require('../lib/bootevent')(self.env, language).boot(function booted (ctx) { + require('../lib/server/bootevent')(self.env, language).boot(function booted (ctx) { self.app.use('/api', api(self.env, ctx)); done(); }); diff --git a/tests/mqtt.test.js b/tests/mqtt.test.js index 25d2a60614b..0790c49a1bb 100644 --- a/tests/mqtt.test.js +++ b/tests/mqtt.test.js @@ -25,7 +25,7 @@ describe('mqtt', function ( ) { self.results.write(data); setTimeout(fn, 5); } - self.mqtt = require('../lib/mqtt')(self.env, {entries: { persist: outputs, create: written }, devicestatus: { create: written } }); + self.mqtt = require('../lib/server/mqtt')(self.env, {entries: { persist: outputs, create: written }, devicestatus: { create: written } }); }); after(function () { diff --git a/tests/pebble.test.js b/tests/pebble.test.js index d26e5e64e77..e6e683f78a6 100644 --- a/tests/pebble.test.js +++ b/tests/pebble.test.js @@ -84,9 +84,9 @@ ctx.ddata.treatments = updateMills([ ctx.ddata.devicestatus = [{uploader: {battery: 100}}]; -var bootevent = require('../lib/bootevent'); +var bootevent = require('../lib/server/bootevent'); describe('Pebble Endpoint', function ( ) { - var pebble = require('../lib/pebble'); + var pebble = require('../lib/server/pebble'); before(function (done) { var env = require('../env')( ); env.settings.authDefaultRoles = 'readable'; @@ -221,7 +221,7 @@ describe('Pebble Endpoint', function ( ) { }); describe('Pebble Endpoint with Raw and IOB and COB', function ( ) { - var pebbleRaw = require('../lib/pebble'); + var pebbleRaw = require('../lib/server/pebble'); before(function (done) { var env = require('../env')( ); env.settings.enable = ['rawbg', 'iob', 'cob']; diff --git a/tests/pushnotify.test.js b/tests/pushnotify.test.js index dc0bc9151eb..01a3d385f2b 100644 --- a/tests/pushnotify.test.js +++ b/tests/pushnotify.test.js @@ -29,7 +29,7 @@ describe('pushnotify', function ( ) { } }; - ctx.pushnotify = require('../lib/pushnotify')(env, ctx); + ctx.pushnotify = require('../lib/server/pushnotify')(env, ctx); ctx.pushnotify.emitNotification(notify); @@ -61,7 +61,7 @@ describe('pushnotify', function ( ) { } }; - ctx.pushnotify = require('../lib/pushnotify')(env, ctx); + ctx.pushnotify = require('../lib/server/pushnotify')(env, ctx); ctx.pushnotify.emitNotification(notify); @@ -97,7 +97,7 @@ describe('pushnotify', function ( ) { } }; - ctx.pushnotify = require('../lib/pushnotify')(env, ctx); + ctx.pushnotify = require('../lib/server/pushnotify')(env, ctx); //first send the warning ctx.pushnotify.emitNotification(notify); diff --git a/tests/security.test.js b/tests/security.test.js index 80959cfeed3..6b612f1bc6e 100644 --- a/tests/security.test.js +++ b/tests/security.test.js @@ -10,7 +10,7 @@ describe('API_SECRET', function ( ) { var scope = this; function setup_app (env, fn) { - require('../lib/bootevent')(env, language).boot(function booted (ctx) { + require('../lib/server/bootevent')(env, language).boot(function booted (ctx) { ctx.app = api(env, ctx); scope.app = ctx.app; scope.entries = ctx.entries; diff --git a/tests/verifyauth.test.js b/tests/verifyauth.test.js index 871dd56f176..cac53090adf 100644 --- a/tests/verifyauth.test.js +++ b/tests/verifyauth.test.js @@ -8,7 +8,7 @@ describe('verifyauth', function ( ) { var scope = this; function setup_app (env, fn) { - require('../lib/bootevent')(env, language).boot(function booted (ctx) { + require('../lib/server/bootevent')(env, language).boot(function booted (ctx) { ctx.app = api(env, ctx); scope.app = ctx.app; fn(ctx); diff --git a/views/index.html b/views/index.html index fec1c6f0f7e..4ffd784cbd1 100644 --- a/views/index.html +++ b/views/index.html @@ -236,7 +236,7 @@
-
Show Raw BG Data
+
Show Raw BG Data
@@ -275,6 +275,7 @@

Release Notes
+ Check for Updates
Open Source
Nightscout Info
CGM in the Cloud
diff --git a/views/reportindex.html b/views/reportindex.html index 6236cf51078..47f1e808cda 100644 --- a/views/reportindex.html +++ b/views/reportindex.html @@ -100,11 +100,12 @@

Nightscout reporting Order: - + +   - - + + diff --git a/webpack.config.js b/webpack.config.js index b08f3aa6deb..fd5b9beaac4 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -21,11 +21,7 @@ if (process.env.NODE_ENV !== 'development') { pluginArray.push(uglify); -} - -if (process.env.NODE_ENV === 'development') { - - +/* console.log('Development environment detected, enabling Bundle Analyzer'); var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; @@ -61,6 +57,7 @@ if (process.env.NODE_ENV === 'development') { // Log level. Can be 'info', 'warn', 'error' or 'silent'. logLevel: 'info' })); +*/ }