diff --git a/app/build.gradle b/app/build.gradle index c186b2db55..f2577912d3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,7 +109,7 @@ android { defaultConfig { multiDexEnabled true versionCode 1500 - version "3.0.0.2-dev-i" + version "3.0.0.2-dev-j" buildConfigField "String", "VERSION", '"' + version + '"' buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"' buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"' diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt index cb86f279a6..7d97f489d5 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt @@ -65,9 +65,11 @@ class LoopFragment : DaggerFragment() { override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { super.onCreateOptionsMenu(menu, inflater) - menu.removeItem(ID_MENU_RUN) - menu.add(Menu.FIRST, ID_MENU_RUN, 0, rh.gs(R.string.openapsma_run)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) - menu.setGroupDividerEnabled(true) + if (isResumed) { + menu.removeItem(ID_MENU_RUN) + menu.add(Menu.FIRST, ID_MENU_RUN, 0, rh.gs(R.string.openapsma_run)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) + menu.setGroupDividerEnabled(true) + } } override fun onOptionsItemSelected(item: MenuItem): Boolean = diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt index 045e147e2b..1f70a2cfc0 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt @@ -28,7 +28,6 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProv import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.receivers.ReceiverStatusStore import info.nightscout.androidaps.utils.* -import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.androidaps.utils.wizard.BolusWizard import info.nightscout.androidaps.utils.wizard.QuickWizard @@ -46,7 +45,6 @@ import java.util.concurrent.TimeUnit import java.util.stream.Collectors import javax.inject.Inject import javax.inject.Singleton -import kotlin.collections.ArrayList import kotlin.math.abs import kotlin.math.min @@ -89,6 +87,7 @@ class DataHandlerMobile @Inject constructor( .observeOn(aapsSchedulers.io) .subscribe({ aapsLogger.debug(LTag.WEAR, "Pong received from ${it.sourceNodeId}") + fabricPrivacy.logCustom("WearOS_${it.apiLevel}") }, fabricPrivacy::logException) disposable += rxBus .toObservable(EventData.CancelBolus::class.java) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt index 3bc626cd22..ed1ac23bdb 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt @@ -20,6 +20,7 @@ import info.nightscout.androidaps.plugins.general.wear.events.EventWearUpdateGui import info.nightscout.androidaps.receivers.ReceiverStatusStore import info.nightscout.androidaps.utils.DefaultValueHelper import info.nightscout.androidaps.interfaces.ResourceHelper +import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.androidaps.utils.wizard.QuickWizard import info.nightscout.shared.logging.AAPSLogger @@ -35,6 +36,7 @@ import javax.inject.Inject class DataLayerListenerServiceMobile : WearableListenerService() { @Inject lateinit var aapsLogger: AAPSLogger + @Inject lateinit var fabricPrivacy: FabricPrivacy @Inject lateinit var profileFunction: ProfileFunction @Inject lateinit var iobCobCalculator: IobCobCalculator @Inject lateinit var rh: ResourceHelper @@ -125,17 +127,21 @@ class DataLayerListenerServiceMobile : WearableListenerService() { private var transcriptionNodeId: String? = null private fun updateTranscriptionCapability() { - val capabilityInfo: CapabilityInfo = Tasks.await( - capabilityClient.getCapability(WEAR_CAPABILITY, CapabilityClient.FILTER_REACHABLE) - ) - aapsLogger.debug(LTag.WEAR, "Nodes: ${capabilityInfo.nodes.joinToString(", ") { it.displayName + "(" + it.id + ")" }}") - val bestNode = pickBestNodeId(capabilityInfo.nodes) - transcriptionNodeId = bestNode?.id - wearPlugin.connectedDevice = bestNode?.displayName ?: "---" - rxBus.send(EventWearUpdateGui()) - aapsLogger.debug(LTag.WEAR, "Selected node: ${bestNode?.displayName} $transcriptionNodeId") - rxBus.send(EventMobileToWear(EventData.ActionPing(System.currentTimeMillis()))) - rxBus.send(EventData.ActionResendData("WatchUpdaterService")) + try { + val capabilityInfo: CapabilityInfo = Tasks.await( + capabilityClient.getCapability(WEAR_CAPABILITY, CapabilityClient.FILTER_REACHABLE) + ) + aapsLogger.debug(LTag.WEAR, "Nodes: ${capabilityInfo.nodes.joinToString(", ") { it.displayName + "(" + it.id + ")" }}") + val bestNode = pickBestNodeId(capabilityInfo.nodes) + transcriptionNodeId = bestNode?.id + wearPlugin.connectedDevice = bestNode?.displayName ?: "---" + rxBus.send(EventWearUpdateGui()) + aapsLogger.debug(LTag.WEAR, "Selected node: ${bestNode?.displayName} $transcriptionNodeId") + rxBus.send(EventMobileToWear(EventData.ActionPing(System.currentTimeMillis()))) + rxBus.send(EventData.ActionResendData("WatchUpdaterService")) + } catch (e: Exception) { + fabricPrivacy.logCustom("WearOS_unsupported") + } } // Find a nearby node or pick one arbitrarily diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml index 9948295c75..2553267026 100644 --- a/app/src/main/res/values-af-rZA/strings.xml +++ b/app/src/main/res/values-af-rZA/strings.xml @@ -342,7 +342,6 @@ En Pr Vet - ]]> Opdrag word nou uitgevoer Gemiste BG lesings Gebruik stelsel kennisgewings vir waarskuwings en kennisgewings diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index d198529b77..5a65298bee 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -459,7 +459,6 @@ Ен Бел. Маз. - ]]> Командата се изпълнява в момента Липсват данни за КЗ Използвай системни известия за аларми и съобщения diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index c51143c834..84a3263b48 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -468,7 +468,6 @@ En Pr Tuk - ]]> Příkaz je právě prováděn Chybějící glykémie Používat systémové notifikace pro výstrahy a oznámení @@ -1009,5 +1008,18 @@ Skrýt záznamy smyčky AndroidAPS widget Konfigurovat průhlednost + Stav smyčky + QR kód pro nastavení jednorázového hesla + otevřít nastavení + nastavit upozornění na sacharidy + Vše + Telefon + Hodinky + pouze na hodinkách + pouze na telefonu + úchyt pro přetažení + GlucoRx Aidex + Aidex + Přijímat hodnoty glykémie ze senzoru GlucoRx Aidex. diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml index 18ef72f6fe..4b84b79e76 100644 --- a/app/src/main/res/values-da-rDK/strings.xml +++ b/app/src/main/res/values-da-rDK/strings.xml @@ -461,7 +461,6 @@ En Pr Fedt - ]]> Kommando udføres lige nu Manglende BS målinger Brug systemnotifikationer til advarsler og notifikationer diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 215df7e508..14e6c8e010 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -463,7 +463,6 @@ En Prot Ft - ]]> Befehl wird zurzeit ausgeführt BZ-Werte fehlen Benutze Systemmeldungen für Alarme und Meldungen diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml index 71ae357b84..cae1b48447 100644 --- a/app/src/main/res/values-el-rGR/strings.xml +++ b/app/src/main/res/values-el-rGR/strings.xml @@ -344,7 +344,6 @@ Ενέργεια Πρωτεΐνες Λίπος - ]]> Η εντολή εκτελείται τώρα Χαμένες μετρήσεις BG Χρησιμοποιήστε ειδοποιήσεις συστήματος για ειδοποιήσεις και συναγερμούς diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 925d5506b9..a242dc47d1 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -92,7 +92,7 @@ Utiliza esta opción para activar la integración del lazo en AndroidAPS APS Tras procesar las restricciones - Basal temporal en la bomba + Basal temporal establecida por la bomba NO APS Seleccionado o resultado entregado Seguridad El complemento está deshabilitado @@ -238,7 +238,7 @@ Botón 3 Unidades: Unidades - Duración de la insulina activa + DIA Rango de visualización Establece los rangos de glucosa objetivos (hiper e hipo) en la pantalla inicio de AAPS y en la esfera del reloj Valor de hipoglucemia @@ -468,7 +468,6 @@ En Pr Grasa - ]]> Orden se esta efectuando en este momento Faltan lecturas de glucosa Usa las notificaciones del sistema para las alarmas y las notificaciones @@ -734,7 +733,7 @@ Recibir los valores de glucosa de la aplicación Dexcom \'Build Your Own Device\' COB vs IOB Restricción de bolo aplicada: %1$.2f U a %2$.2f U - ! Se ha detectado una absorción lenta de carbohidratos: %2$d%% de tiempo. Compruebe de nuevo su cálculo. Los COB se pueden sobrestimar, por lo que se podría administrar más insulina de la cuenta]]> + ¡Se ha detectado una absorción lenta de carbohidratos: %2$d%% de tiempo. Comprueba de nuevo el cálculo. Los COB se pueden sobrestimar, por lo que se podría administrar más insulina de la cuenta!]]> Administrar esta parte del resultado del asistente de bolos [%] El asistente de bolos realiza el cálculo, pero solo se entrega esta parte de la insulina calculada. Útil con el algoritmo SMB. Silenciar diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index a246826e62..84d3437c53 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -469,7 +469,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S En Protéines Gras (Lipides) - ]]> Commande exécutée à l\'instant Valeurs de glycémie manquantes Utiliser les notifications système pour les alertes et notifications @@ -1009,6 +1008,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Masquer les entrées de la boucle Widget AndroidAPS Configurer l’opacité + État de la boucle Code QR pour configurer un mot de passe à usage unique ouvrir les paramètres définir l\'alarme du minuteur de glucides diff --git a/app/src/main/res/values-it-rIT/exam.xml b/app/src/main/res/values-it-rIT/exam.xml index cc7912713e..3f3d10cbfa 100644 --- a/app/src/main/res/values-it-rIT/exam.xml +++ b/app/src/main/res/values-it-rIT/exam.xml @@ -104,9 +104,11 @@ Dove puoi cercare aiuto con AndroidAPS? Puoi chiedere consiglio nel gruppo Facebook degli utenti AndroidAPS. Dovresti leggere (e rileggere) la documentazione di AndroidAPS. + Puoi chiedere consigli e segnalare problemi tecnici nel Discord di AndroidAPS. Dovresti chiedere al tuo endocrinologo/centro diabetologico. https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting https://www.facebook.com/groups/aapsitalia/ + https://discord.gg/4fQUWHZ4Mw Plugin insulina Quale insulina dovresti usare con il plugin Ultra-Rapid Oref? Fiasp® diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index f7c9916352..9a44906ddc 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -161,6 +161,7 @@ Contratto di licenza per l\'utente NON DEVE ESSERE USATO PER PRENDERE DECISIONI MEDICHE. NON ESISTE ALCUNA GARANZIA PER IL PROGRAMMA, NELLA MISURA CONSENTITA DALLA LEGGE APPLICABILE. TRANNE QUANDO DIVERSAMENTE INDICATO PER ISCRITTO, I DETENTORI DEL COPYRIGHT E/O ALTRE PARTI FORNISCONO IL PROGRAMMA \"COSÌ COM\'È\" SENZA GARANZIA DI ALCUN TIPO, ESPLICITA O IMPLICITA, INCLUSE, MA NON LIMITATAMENTE A, GARANZIE IMPLICITE DI COMMERCIABILITÀ E IDONEITÀ PER UN SCOPO PARTICOLARE. L\'INTERO RISCHIO RIGUARDO LA QUALITÀ E LE PRESTAZIONI DEL PROGRAMMA È TUO. SE IL PROGRAMMA DOVESSE RISULTARE DIFETTOSO, TI ASSUMI IL COSTO DI TUTTE LE NECESSARIE MANUTENZIONI, RIPARAZIONI O CORREZIONI. COMPRENDO E ACCETTO + Salva Ricarica profilo Comunicazioni SMS Numeri di telefono consentiti @@ -266,6 +267,7 @@ CONF LOOP OAPS + ISFDIN PL HOME MICROV @@ -432,6 +434,8 @@ Abilita trasmissioni locali OpenAPS SMB ISF Dinamico + %% fattore di regolazione ISF dinamico + Fattore di regolazione per ISF dinamico. Imposta più del 100%% per correzioni più aggressive, meno del 100%% per correzioni meno aggressive. Abilita UAM Abilita SMB Usa super-micro-boli al posto della basale temporanea per un\'azione più veloce @@ -464,7 +468,6 @@ Enr Prt Grs - ]]> Il comando sarà eseguito ora Letture BG mancanti Usa le notifiche di sistema per gli avvisi @@ -500,6 +503,7 @@ Solo negativo Calcolo COB Calcolo target temporaneo + Calcolo percentuale Loop abilitato APS selezionato NSClient ha l\'autorizzazione di scrittura @@ -662,6 +666,8 @@ Rimuovi gli eventi \"AndroidAPS avviato\" Mostra invalidato Nascondi invalidato + Rimuovi elementi + Ordina elementi Trovate impostazioni memorizzate Attenzione: se attivi e connetti un micro, AndroidAPS copierà le impostazioni della basale dal profilo al micro, sovrascrivendo la velocità basale esistente memorizzata sul micro. Assicurati di avere la giusta impostazione della basale in AndroidAPS. Se non sei sicuro o non vuoi sovrascrivere le impostazioni della basale sul micro, premi annulla e ripeti il processo in un altro momento. Dati trattamento incompleti @@ -808,6 +814,7 @@ Su ogni telefono follower installa una app autenticatore che supporta i token RFC 6238 TOTP. App gratuite popolari sono:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator Resettando l\'autenticatore rendi non validi tutti gli autenticatori già forniti. Dovrai configurarli di nuovo! Predizioni + Trattamenti Pendenza deviazione Autorizzazione fallita Insulina assoluta @@ -877,6 +884,8 @@ Accetta cambi profilo inseriti tramite NS o NSClient Ricevi eventi APS offline Accetta eventi APS offline inseriti tramite NS o NSClient + Ricevi TBR e EB + Accetta TBR e EB inseriti attraverso altra istanza Ricevi insulina Accetta insulina inserita tramite NS o NSClient (non viene erogata, solo calcolata per IOB) Ricevi CHO @@ -899,40 +908,117 @@ Errori Rallenta caricamenti Stato dati BG + Rimuovi letture BG + Età cannula + età micro a patch + Micro a patch Dati ricalcolati usati BG troppo vicino:\n%1$s\n%2$s Identificazione (email, nick Discord o FB, etc) Identificazione non impostata in modalità dev dialogo glicemia corrente + risultato corretto con % + risultato corretto con unità Non disponibile alto in range basso + discesa rapida + discesa + discesa lenta stabile + salita lenta + salita + salita rapida + nessuno sconosciuto grafico qualità glicemia ricalcolato + doppi caricamenti insulina glicemia + obsoleto + imposta promemoria + aggiungi nuovo profilo + clona profilo corrente + elimina profilo corrente + aggiungi nuovo alla lista + Scegli tema scuro, chiaro o segui quello del sistema + Schema colori app + Tema scuro + Tema chiaro + Usa tema dispositivo + Preset sconosciuto target temporaneo: %1$s + Cancellare i target temporanei in esecuzione? + Differenti unità usate su smartwatch e telefono! + Nessuno target temporaneo - cancellare i target temporanei in esecuzione? + Min-BG fuori range! + Max-BG fuori range! + Temptarget:\nMin: %1$s\nMax: %2$s\nDurata: %3$s + Temptarget:\nTarget: %1$s\nDurata: %2$s + Temptarget:\Motivo: %1$s\nTarget: %2$s\nDurata: %3$s + QuickWizard: %1$s\nInsulina: %2$.2fU\nCHO: %3$dg + Calc. Wizard:\nInsulina: %1$.2fU\nCHO: %2$dg + Mostra voce sul dispositivo: + Il calcolo rapido selezionato non è più disponibile, aggiorna il riquadro + Nessun recente valore BG su cui basare il calcolo! + Nessun profilo attivo! + Valore COB sconosciuto! Lettura BG mancante o recente riavvio dell\'app? + Violazione vincolo CHO! + Calc (IC: %2$.1f, ISF: %2$.1f) da:\" CHO: %1$.2fU COB: %1$.0fg %2$.2fU BG: %1$.2fU IOB da basale: %1$.2fU IOB da bolo: %1$.2fU Superbolo: %1$.2fU + Trend di 15\': %1$.2fU Percentuale: %1$.2fU x %2$d%% ≈ %3$.2fU + Violazione vincolo insulina!\nImpossibile erogare %1$.2fU TempT: %1$s %1$s a %2$s Nessun micro disponibile! + Comando sconosciuto: Percentuale + Predefinito applicazione + Mostra record non validi/rimossi + Nascondi record non validi/rimossi + Seleziona profilo da modificare + Aggiorna da Nightscout Rimuovi elementi selezionati Seleziona per la rimozione Modifiche al profilo + Target Temporanei + CHO e boli + Sicuro di voler rimuovere %1$d elementi + Nessun record disponibile Nascondi loop Mostra loop + %1$d selezionati + Ordina + Finestra di dialogo cancellata + Sotto + In range + Sopra + Mostra record di loop + Nascondi record di loop + Widget di AndroidAPS + Configura opacità + Codice QR per configurare OTP + apri impostazioni + imposta allarme timer CHO + Tutto + Telefono + Smartwatch + solo su smartwatch + solo su telefono + trascina e rilascia + GlucoRx Aidex + GlucoRx Aidex + Ricevi valori glicemia da CGM GlucoRx Aidex. diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml index b9c7abc81e..d65365c1dd 100644 --- a/app/src/main/res/values-iw-rIL/strings.xml +++ b/app/src/main/res/values-iw-rIL/strings.xml @@ -468,7 +468,6 @@ אנרגיה חלבון שומן - ]]> הפקודה מבוצעת כעת לא התקבלו קריאות סוכר שימוש בהודעות מערכת עבור התראות ודיווחים diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index a5b8482013..2769f33425 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -455,7 +455,6 @@ En 단백질 지방 - ]]> 명령을 지금 실행합니다. 혈당 읽기가 누락되었습니다. 경고와 알림시 시스템 알림 사용하기 diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml index e7d1a2d921..b27e259936 100644 --- a/app/src/main/res/values-lt-rLT/strings.xml +++ b/app/src/main/res/values-lt-rLT/strings.xml @@ -461,7 +461,6 @@ Energ. vertė Balt. Rieb - ]]> Komanda vykdoma Negauti KG duomenys Naudoti sistemos perspėjimus aliarmams ir įspėjimams diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml index 4270d74c71..2f69fb4097 100644 --- a/app/src/main/res/values-nl-rNL/strings.xml +++ b/app/src/main/res/values-nl-rNL/strings.xml @@ -468,7 +468,6 @@ En Prot Vet - ]]> Opdracht is nu uitgevoerd Geen BG metingen Gebruik systeem notificaties voor waarschuwingen en notificaties diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index 3caa1545d2..a2256b58a5 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -468,7 +468,6 @@ En Pr Fett - ]]> Kommandoen utføres akkurat nå Mangler BS målinger Bruk systemvarslinger for alarmer og varslinger @@ -815,6 +814,7 @@ I hver følger telefon installerer du en Authenticator-app som støtter RFC 6238 TOTP token. Populære gratis apper er:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator Ved å tilbakestille authenticator vil du gjøre alle lagrede autentiseringer ugyldige. Du må sette alle opp på nytt igjen! Prognoser + Behandlinger Avvikskurve Autentisering feilet Absolutt insulinmengde @@ -995,6 +995,7 @@ Temp Target Karbohydrater og bolus Er du sikker på at du vil fjerne %1$d elementer + Ingen registreringer tilgjengelig Skjul loop Vis loop %1$d valgt @@ -1007,5 +1008,17 @@ Skjul loop registreringer AndroidAPS widget Konfigurer gjennomsiktighet + QR-kode for oppsett av engangspassord + åpne innstillinger + angi karbo nedtellings alarm + Alle + Telefon + Klokke + kun på klokke + kun på telefon + dra og slipp håndtering + GlucoRx Aidex + Aidex + Motta BS verdier fra GlucoRx Aidex CGM. diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index 68bf670c6b..94e30a36ac 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -461,7 +461,6 @@ En Bi Tł - ]]> Polecenie jest teraz wykonywane Pominięte odczyty BG Użyj powiadomień systemowych dla alertów i powiadomień diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index ba0b545001..da48354f2c 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -443,7 +443,6 @@ En Pr Gor - ]]> Comando será executado agora Leituras Glic. perdidas Usar as notificações do sistema para alertas e notificações diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index a1e126e4f7..84f547b344 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -461,7 +461,6 @@ En Pr Gor - ]]> Comando será executado agora Leituras Glicose perdidas Utilizar as notificações do sistema para alertas e notificações diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml index 736ff96705..10ac220e8d 100644 --- a/app/src/main/res/values-ro-rRO/strings.xml +++ b/app/src/main/res/values-ro-rRO/strings.xml @@ -461,7 +461,6 @@ En Pr Grăsime - ]]> Se execută comanda chiar acum Lipsesc date glicemie Se folosesc notificările sistemului pentru alerte și notificări diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index fd4fbc4824..d9ae69092f 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -468,7 +468,6 @@ Энергия Белки Жиры - ]]> Команда выполняется Пропущенные данные СК Использовать системные уведомления для предупреждений и уведомлений diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index 635fff7de7..3b24667687 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -468,7 +468,6 @@ En Pr Tuk - ]]> Príkaz sa práve vykonáva Chýbajúce hodnoty glykémie Používať systémové notifikácie pre výstrahy a oznámenia diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 851bc8a92f..2165ba8f02 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -465,7 +465,6 @@ Eversense-appen. En Pr Fett - ]]> Kommando körs just nu BG-värden saknas Systemaviseringar för larm & info diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 684d8e4d67..90c04c1df8 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -469,7 +469,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d En Pr Yağ - ]]> Komut şu anda çalıştırıldı Kaçırılan KŞ Okumaları Uyarılar ve bildirimler için sistem bildirimlerini kullan @@ -1010,5 +1009,18 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d Döngü kayıtlarını gizle AndroidAPS widget Şeffaflığı yapılandır + Döngü durumu + Tek kullanımlık şifre kurulumu için QR Kodu + ayarları aç + karbonhidrat zamanlayıcı alarmı kur + Tümü + Telefon + Saat + sadece saatte + sadece telefonda + sürükle ve bırak kolu + GlucoRx Aidex + Aidex + GlucoRx Aidex CGMS\'den KŞ değerleri alır. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 5c70a1f17a..3680097dc0 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -468,7 +468,6 @@ En 蛋白质 脂肪 - ]]> 现在命令被执行了 血糖读数丢失 对警报和通知使用系统通知音 diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt index 0ab10c0cba..12a1f1a7ce 100644 --- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt +++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt @@ -21,6 +21,7 @@ import info.nightscout.androidaps.automation.databinding.AutomationFragmentBindi import info.nightscout.androidaps.database.entities.UserEntry.Action import info.nightscout.androidaps.database.entities.UserEntry.Sources import info.nightscout.androidaps.extensions.toVisibility +import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.bus.RxBus import info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog @@ -34,7 +35,6 @@ import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.dragHelpers.ItemTouchHelperAdapter import info.nightscout.androidaps.utils.dragHelpers.OnStartDragListener import info.nightscout.androidaps.utils.dragHelpers.SimpleItemTouchHelperCallback -import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign @@ -50,6 +50,13 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener { @Inject lateinit var injector: HasAndroidInjector @Inject lateinit var uel: UserEntryLogger + companion object { + + const val ID_MENU_ADD = 3 + const val ID_MENU_RUN = 4 + const val ID_MENU_EDIT_MOVE = 5 + } + private var disposable: CompositeDisposable = CompositeDisposable() private lateinit var eventListAdapter: EventListAdapter private lateinit var actionHelper: ActionModeHelper @@ -59,13 +66,14 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener { // This property is only valid between onCreateView and onDestroyView. private val binding get() = _binding!! + @SuppressLint("NotifyDataSetChanged") override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { _binding = AutomationFragmentBinding.inflate(inflater, container, false) actionHelper = ActionModeHelper(rh, activity) actionHelper.setUpdateListHandler { binding.eventListView.adapter?.notifyDataSetChanged() } actionHelper.setOnRemoveHandler { removeSelected(it) } actionHelper.enableSort = true - setHasOptionsMenu(actionHelper.inMenu) + setHasOptionsMenu(true) return binding.root } @@ -75,19 +83,45 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener { binding.eventListView.layoutManager = LinearLayoutManager(context) binding.eventListView.adapter = eventListAdapter binding.logView.movementMethod = ScrollingMovementMethod() - binding.fabAddEvent.setOnClickListener { - actionHelper.finish() - val dialog = EditEventDialog() - val args = Bundle() - args.putString("event", AutomationEvent(injector).toJSON()) - args.putInt("position", -1) // New event - dialog.arguments = args - dialog.show(childFragmentManager, "EditEventDialog") - } itemTouchHelper.attachToRecyclerView(binding.eventListView) } + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { + super.onCreateOptionsMenu(menu, inflater) + if (isResumed) { + actionHelper.onCreateOptionsMenu(menu, inflater) + menu.removeItem(ID_MENU_ADD) + menu.removeItem(ID_MENU_RUN) + menu.add(Menu.FIRST, ID_MENU_ADD, 0, rh.gs(R.string.add_automation)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) + menu.add(Menu.FIRST, ID_MENU_RUN, 0, rh.gs(R.string.run_automations)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) + menu.add(Menu.FIRST, ID_MENU_EDIT_MOVE, 0, rh.gs(R.string.remove_sort)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) + menu.setGroupDividerEnabled(true) + } + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean = + if (actionHelper.onOptionsItemSelected(item)) true + else + when (item.itemId) { + ID_MENU_RUN -> { + Thread { automationPlugin.processActions() }.start() + true + } + + ID_MENU_ADD -> { + add() + true + } + + ID_MENU_EDIT_MOVE -> { + actionHelper.startAction() + true + } + + else -> false + } + @SuppressLint("NotifyDataSetChanged") @Synchronized override fun onResume() { @@ -120,14 +154,7 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener { _binding = null } - override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - super.onCreateOptionsMenu(menu, inflater) - actionHelper.onCreateOptionsMenu(menu, inflater) - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean = - actionHelper.onOptionsItemSelected(item) - + @SuppressLint("NotifyDataSetChanged") @Synchronized private fun updateGui() { if (_binding == null) return @@ -173,10 +200,13 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener { override fun onBindViewHolder(holder: ViewHolder, position: Int) { val automation = automationPlugin.at(position) holder.binding.rootLayout.setBackgroundColor( - rh.gac( context, - if (automation.userAction) R.attr.userAction - else if (automation.areActionsValid()) R.attr.validActions - else R.attr.actionsError + rh.gac( + context, + when { + automation.userAction -> R.attr.userAction + automation.areActionsValid() -> R.attr.validActions + else -> R.attr.actionsError + } ) ) holder.binding.eventTitle.text = automation.title @@ -280,4 +310,13 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener { } } + private fun add() { + actionHelper.finish() + EditEventDialog().also { + it.arguments = Bundle().apply { + putString("event", AutomationEvent(injector).toJSON()) + putInt("position", -1) // New event + } + }.show(childFragmentManager, "EditEventDialog") + } } diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt index f9dbd66fda..22abb1b54e 100644 --- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt +++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt @@ -24,7 +24,6 @@ import info.nightscout.androidaps.services.LocationServiceHelper import info.nightscout.androidaps.utils.DateUtil import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.T -import info.nightscout.androidaps.interfaces.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.logging.AAPSLogger import info.nightscout.shared.logging.LTag @@ -180,8 +179,7 @@ class AutomationPlugin @Inject constructor( automationEvents.add(AutomationEvent(injector).fromJSON(event, 0)) } - @Synchronized - private fun processActions() { + @Synchronized internal fun processActions() { var commonEventsEnabled = true if (loop.isSuspended || !(loop as PluginBase).isEnabled()) { aapsLogger.debug(LTag.AUTOMATION, "Loop deactivated") diff --git a/automation/src/main/res/layout/automation_fragment.xml b/automation/src/main/res/layout/automation_fragment.xml index 15865e86f8..e75a042bef 100644 --- a/automation/src/main/res/layout/automation_fragment.xml +++ b/automation/src/main/res/layout/automation_fragment.xml @@ -21,18 +21,4 @@ android:scrollbars = "vertical" android:layout_alignParentBottom="true" /> - - diff --git a/automation/src/main/res/values-it-rIT/strings.xml b/automation/src/main/res/values-it-rIT/strings.xml index 2ff0e7466f..01f8733efa 100644 --- a/automation/src/main/res/values-it-rIT/strings.xml +++ b/automation/src/main/res/values-it-rIT/strings.xml @@ -81,6 +81,7 @@ WiFi SSID %1$s %2$s Autosens %1$s %2$s %% Autosens % + Asuto sens %3$s %1$s %2$s Differenza BG Differenza BG [%1$s] @@ -112,4 +113,11 @@ Evento di automazione Riordina Azione utente + Rimuovi automazione + Ordina automazione + Rimuovi elementi selezionati + %1$d selezionato + Sicuro di voler eliminare %1$d elementi + Ordina + Automazione sistema diff --git a/automation/src/main/res/values/strings.xml b/automation/src/main/res/values/strings.xml index 2e0bb7de7d..30ca8cf431 100644 --- a/automation/src/main/res/values/strings.xml +++ b/automation/src/main/res/values/strings.xml @@ -123,5 +123,8 @@ Are you sure you want to remove %1$d items Sort System automation + Run automations + Add rule + Remove/sort \ No newline at end of file diff --git a/combo/src/main/res/values-it-rIT/strings.xml b/combo/src/main/res/values-it-rIT/strings.xml index 1014de72a9..92c1dbb36c 100644 --- a/combo/src/main/res/values-it-rIT/strings.xml +++ b/combo/src/main/res/values-it-rIT/strings.xml @@ -51,6 +51,10 @@ Conteggio TBR Bolo stoppato Stop del bolo in corso + Conta degli errori comunicazione + Mostra conta degli errori di comunicazione + Mostra la conta degli errori quando si comunica con Ruffy. Nella maggior parte dei casi, un numero più alto di 0 denota problemi di comunicazione con Ruffy (potrebbe essere necessario riavviare). Mai + In caso di errore Sempre diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt index 20d93069a3..1f51c797ac 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt +++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt @@ -271,7 +271,7 @@ class PumpSyncImplementation @Inject constructor( .blockingGet() .also { result -> result.inserted.forEach { aapsLogger.debug(LTag.DATABASE, "Inserted TemporaryBasal $it") } - result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated ${it.first} TemporaryBasal ${it.second}") } + result.updated.forEach { aapsLogger.debug(LTag.DATABASE, "Updated TemporaryBasal \n${it.first}\n${it.second}") } return result.inserted.size > 0 } } diff --git a/core/src/main/res/values-af-rZA/strings.xml b/core/src/main/res/values-af-rZA/strings.xml index 34d95c1905..e16a8775f0 100644 --- a/core/src/main/res/values-af-rZA/strings.xml +++ b/core/src/main/res/values-af-rZA/strings.xml @@ -29,7 +29,6 @@ - @@ -61,4 +60,5 @@ %1$.2f beperk tot %2$.2f + diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml index 23ea721d80..9eada62db6 100644 --- a/core/src/main/res/values-bg-rBG/strings.xml +++ b/core/src/main/res/values-bg-rBG/strings.xml @@ -125,24 +125,6 @@ Bluetooth не е включен. Локацията не е включена За да работи откриването на нови устройсва чрез Bluetooth, трябва да включите локацията. AAPS не проследява вашето местоположение и ще можете да я изключите след успешното свързване. - - преди %1$d мин - преди %1$.1fч - ч. - дни - часа - секунда - минута - час - ден - седмица - секунди - минути - часове - дни - седмици - мин. - д Грешна парола Паролите не съвпадат @@ -303,6 +285,7 @@ %1$.2f ограничен до %2$.2f SMS + %1$d дeн %1$d дни diff --git a/core/src/main/res/values-ca-rES/strings.xml b/core/src/main/res/values-ca-rES/strings.xml index 514a7b44f4..16ce76713d 100644 --- a/core/src/main/res/values-ca-rES/strings.xml +++ b/core/src/main/res/values-ca-rES/strings.xml @@ -5,7 +5,6 @@ - @@ -67,4 +66,5 @@ %1$.2f limitat a %2$.2f »%1$s« supera els límits + diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml index 2c7041a249..b968a94c54 100644 --- a/core/src/main/res/values-cs-rCZ/strings.xml +++ b/core/src/main/res/values-cs-rCZ/strings.xml @@ -42,6 +42,7 @@ Sacharidy Chybný profil !!! ŽÁDNÝ PROFIL NENASTAVEN + ]]> Datum Jednotky Doba působnosti inzulínu @@ -132,33 +133,6 @@ Bluetooth není povoleno. Zjišťování polohy není povoleno Pro vyhledání Bluetooth zařízení na novějších telefonech musí být povoleno zjišťování polohy. AAPS vás nesleduje a po provedení párování můžete tuto volbu opět zakázat. - - před %1$d min - před %1$d minutamí - před %1$.1f h - Před %1$.1f dny - Před %1$.0f dny - za %1$.0f dní - za %1$.0f dní - h - dnů - hodin - sekunda - minuta - hodina - den - týden - sekund - minut - hodin - dní - týdnů - m - d - Později během dneška - Zítra - Dnes - Včera Chybné heslo Nesprávný PIN @@ -465,6 +439,53 @@ Odebrat položky Seřadit položky Odebrat vybrané položky + soubor + uživatel + + Autotune + Pomoc s možnými úpravami profilu (citlivost, sacharidový poměr a bazální dávky) + AT + Nastavení Autotune + Přepnutí profilu z Automatizace + Pokud je tato volba povolena, Autotune po výpočtu automaticky aktualizuje a přepne na vstupní profil zadaný v pravidlu automatizace. + Započítávat UAM jako bazál + Povolte pouze v případě, že jste důsledně zadávali všechny přijaté sacharidy. S touto možností bude náhlý vzestup detekovaný funkcí Autotune použit pro doporučení změn bazálu. + Počet dní s daty + Použít průměrný výsledek v cirkadiánním IC/ISF + Autotune nebude ladit cirkadiánní rozložení, tato možnost použije pouze průměrné hodnoty IC a ISF na váš cirkadiánní vstupní profil + Zahrnout další informace o protokolu pro ladění + Zapněte, pouze pokud je to požadováno vývojářem, aby bylo možné odeslat další logy pro ladění pluginu Autotune + Výchozí počet dní, ze kterých mají být data zpracována Autotune (až xx) + Vyladěno + Profil : + Ladit dní: + Poslední spuštění : + Varování : + Vyberte profil pro ladění + Autotune funguje pouze s jedinou hodnotou IC, váš profil má %1$d hodnot. Průměrná hodnota je %2$.2fg/U + Autotune funguje pouze s jedinou hodnotou ISF, váš profil má %1$d hodnot. Průměrná hodnota je %2$.1f%3$s/U + Chyba vstupních dat, zkuste snížit počet dní + Autotune spuštěno, prosím buďte trpěliví + Před použitím výsledky pečlivě zkontrolujte! + Částečný výsledek - vyladěn den %1$d / %2$d + Výsledek: %1$s + Parametr + % + Chybí + Profil Autotune %1$s + Spustit Autotune + Zkontrolovat vstupní profil + Porovnat profily + Kopírovat do místního profilu + Aktualizovat vstupní profil + Vrátit vstupní profil + Vytvořit z tohoto Autotune profilu nový místní profi? + Aktualizovat profil %1$s pomocí profilu Autotune? + Vrátit profil %1$s na vstupní profil? + Neplatný profil + Autotune spuštěno bez přepnutí profilu + Autotune spuštěno, a profil automaticky přepnut + Chyba při posledním spuštění Autotune %1$d den %1$d dnů diff --git a/core/src/main/res/values-da-rDK/strings.xml b/core/src/main/res/values-da-rDK/strings.xml index 9e897b123c..2336188d6b 100644 --- a/core/src/main/res/values-da-rDK/strings.xml +++ b/core/src/main/res/values-da-rDK/strings.xml @@ -130,24 +130,6 @@ Bluetooth er deaktiveret. Lokation er deaktiveret Placeringen skal være aktiveret, hvis Bluetooth-opdagelsen skal fungere på nyere enheder. AAPS sporer ikke din placering, og det kan deaktiveres efter parring er lykkedes. - - %1$d min. siden - %1$.1f t siden - t - dage - timer - sekund - minut - time - dag - uge - sekunder - minutter - timer - dage - uger - min - d Forkert kodeord Kodeordene stemmer ikke overens @@ -441,6 +423,7 @@ Bolus OK Pumpe parret Insight Opdater-knap + %1$d dag %1$d dage diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml index 441dae4755..0c2664a530 100644 --- a/core/src/main/res/values-de-rDE/strings.xml +++ b/core/src/main/res/values-de-rDE/strings.xml @@ -132,25 +132,6 @@ Bluetooth nicht aktiviert. Standortdienst ist nicht aktiviert Auf neueren Geräten muss für die Bluetooth-Erkennung der Standortdienst aktiviert sein. AAPS speichert keine Standortdaten und der Dienst kann nach erfolgreichem Pairing wieder deaktiviert werden. - - vor %1$d Min. - vor %1$d Minuten - vor %1$.1f Stunde - h - Tage - Stunden - Sekunde - Minute - Stunde - Tag - Woche - Sekunden - Minuten - Stunden - Tage - Wochen - min - d Falsches Passwort Die Passwörter stimmen nicht überein. @@ -447,6 +428,7 @@ Insight Refresh Button abnehmend %1$s mit %2$s zunehmend %1$s mit %2$s + %1$d Tag %1$d Tage diff --git a/core/src/main/res/values-el-rGR/strings.xml b/core/src/main/res/values-el-rGR/strings.xml index c7511b2bba..730d941711 100644 --- a/core/src/main/res/values-el-rGR/strings.xml +++ b/core/src/main/res/values-el-rGR/strings.xml @@ -28,7 +28,6 @@ - @@ -61,4 +60,5 @@ Το %1$.2f περιορίζεται σε %2$.2f + diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml index e0398bf635..4b8bc5b5c5 100644 --- a/core/src/main/res/values-es-rES/strings.xml +++ b/core/src/main/res/values-es-rES/strings.xml @@ -42,6 +42,7 @@ Carbohidratos [g] Perfil inválido !!! NINGÚN PERFIL ACTIVO + ]]> Fecha Unidades DIA (Duración Insulina Activa) @@ -49,7 +50,7 @@ ISF (Factor Sensibilidad Insulina) Dosis Basal Objetivo - Duración de la acción de la insulina + Duración de la insulina activa Ratio de insulina/carbohidratos Factor de sensibilidad a la insulina Tasa Basal @@ -132,33 +133,6 @@ Bluetooth no activado. Ubicación no habilitada Para activar la visibilidad Bluetooth en nuevos dispositivos, la ubicación debe estar habilitada. AAPS no hace un seguimiento de su ubicación y se puede desactivar después de realizar la vinculación. - - hace %1$d m - Hace %1$d minutos - hace %1$.1f h - Hace %1$.1f día - Hace %1$.0f días - en %1$.0f días - en %1$.0f días - h - días - horas - segundo - minuto - hora - día - semana - segundos - minutos - horas - días - semanas - m - d - Más tarde hoy - Mañana - Hoy - Ayer Contraseña incorrecta Pin erróneo @@ -467,6 +441,33 @@ Eliminar los elementos seleccionados Archivo Usuario + + Autotune + Ayuda a realizar ajustes en el perfil (ISF, ratio de carbohidratos y tasas basales) + AT + Ajustes de Autotune + Automatización de cambio de perfil + Categorizar UAM como basal + Número de días de datos + Incluir más información de registro para depuración + Activar sólo si es solicitado por los desarrolladores, para enviar más registros y así ayudar a depurar el plugin Autotune + Número predeterminado de días de datos a procesar por Autotune (hasta xx) + Ajustado + Perfil : + Días de ajuste: + Última ejecución : + Advertencia : + Selecciona el perfil para a ajustar + Parámetro + % + Perfil de Autotune %1$s + Ejecutar Autotune + Comprobar el perfil de entrada + Comparar perfiles + Copiar al perfil local + Actualizar perfil de entrada + Revertir perfil de entrada + Perfil inválido %1$d día %1$d días diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml index a2d5353efd..c7bec5ee4c 100644 --- a/core/src/main/res/values-fr-rFR/strings.xml +++ b/core/src/main/res/values-fr-rFR/strings.xml @@ -42,6 +42,7 @@ Glucides Profil incorrect !!! PAS DE PROFIL SELECTIONNÉ + ]]> Date Unités DAI @@ -132,33 +133,6 @@ Bluetooth désactivé. Localisation désactivée La localisation doit être activée sur les nouveaux appareils pour que la recherche Bluetooth fonctionne. AAPS n\'enregistre pas votre localisation et la localisation peut être désactivée après l\'appairage. - - il y a %1$d m - Il y a %1$d minutes - il y a %1$.1f h - Il y a %1$.1f jours - Il y a %1$.0f jours - en %1$.0f jours - en %1$.0f jours - h - jours - heures - seconde - minute - heure - jour - semaine - secondes - minutes - heures - jours - semaines - m - j - Plus tard aujourd\'hui - Demain - Aujourd’hui - Hier Mot de passe incorrect Code PIN incorrect @@ -467,6 +441,51 @@ Supprimer les éléments sélectionnés fichier utilisateur + + Autotune + Aide pour ajuster le profil (SI, rapport G/I et débits de basal) + AT + Paramètres Autotune + Changement de profil avec l\'Automatisation + Si activé, Autotune mettra à jour automatiquement à jour le profil sélectionné et activera le profil calculé effectué à partir d\'une règle d\'automatisation. + Catégoriser UAM en tant que Basal + Activer uniquement si vous avez correctement saisi tous les glucides consommés, avec cette option, des hausses soudaines vues par Autotune seront utilisées pour modifier les débits de basal. + Nombre de jours de données + Appliquer le résultat G/I et SI moyen sur le profil circadien + Autotune ne réglera pas les variations circadiennes, cette option ne fait que appliquer le réglage moyen du G/I et de la SI à votre profil d\'entrée circadien + Inclure plus d\'informations de log pour le débogage + A n\'activer que sur demande du développeur pour envoyer plus d\'informations dans les fichiers log pour aider à déboguer le plugin Autotune + Nombre de jours de données par défaut à traiter par Autotune (jusqu\'à 30) + Tuned + Profil : + Nb jours : + Dernière exécution : + Avertissement : + Sélectionnez le profil à optimiser + Autotune ne fonctionne qu\'avec une seule valeur G/I, votre profil a %1$d valeurs. La valeur moyenne est de %2$.2f g/U + Autotune ne calcule qu\'une seule valeur de SI, votre profil a %1$d valeurs. La valeur moyenne est de %2$.1f %3$s/U + Erreur dans les données d\'entrée, essayez de relancer le calcul ou réduire le nombre de jours + Le calcul Autotune a commencé, veuillez patienter + Vérifiez attentivement les résultats avant de les utiliser! + Résultat partiel jour %1$d / %2$d calculé + Résultat: %1$s + Param + % + Manquant + Profil Autotune %1$s + Lancer Autotune + Vérifier profil d\'entrée + Comparer les profils + Copier vers Profil Local + Mettre à jour profil d\'entrée + Réinitialisé profil d\'entrée + Créer un nouveau profil local à partir de ce profil Autotune ? + Mettre à jour le profil %1$s avec le profil Autotune ? + Annuler la mise à jour du profil %1$s et remettre le profil d\'entrée ? + Profil invalide + Autotune exécuté sans changement de profil + Autotune exécuté et le profil automatiquement activé + Erreur lors de la dernière exécution d\'Autotune %1$d jour %1$d jours diff --git a/core/src/main/res/values-ga-rIE/strings.xml b/core/src/main/res/values-ga-rIE/strings.xml index eb109b8e4c..57edab2df3 100644 --- a/core/src/main/res/values-ga-rIE/strings.xml +++ b/core/src/main/res/values-ga-rIE/strings.xml @@ -63,24 +63,6 @@ Ceart go leor Cuir ar ceal - - %1$d nóim ó shin - %1$.1f u ó shin - u - lá - uair - soicind - nóiméad - uair - lá - seachtain - soicind - nóiméad - uair - lá - seachtaine - n - lá /A @@ -132,4 +114,5 @@ + diff --git a/core/src/main/res/values-hr-rHR/strings.xml b/core/src/main/res/values-hr-rHR/strings.xml index 9e5015b7af..6f676893c7 100644 --- a/core/src/main/res/values-hr-rHR/strings.xml +++ b/core/src/main/res/values-hr-rHR/strings.xml @@ -5,7 +5,6 @@ - @@ -26,4 +25,5 @@ + diff --git a/core/src/main/res/values-hu-rHU/strings.xml b/core/src/main/res/values-hu-rHU/strings.xml index e17fccd255..cb08528112 100644 --- a/core/src/main/res/values-hu-rHU/strings.xml +++ b/core/src/main/res/values-hu-rHU/strings.xml @@ -6,7 +6,6 @@ - @@ -27,4 +26,5 @@ + diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml index f2d74ba615..5ac31e2345 100644 --- a/core/src/main/res/values-it-rIT/strings.xml +++ b/core/src/main/res/values-it-rIT/strings.xml @@ -49,7 +49,11 @@ ISF Basale Target + Durata dell’azione dell’insulina + Rapporto Insulina-Carboidrati (I:C) + Fattore di sensibilità insulinica (ISF) Velocità basale + Target glicemia Inizializzazione... Numero seriale Batteria @@ -107,6 +111,7 @@ Note Rimuovi Aggiungi nuovo + Aggiungi nuovo sopra I dati arrivano da un micro differente. Cambia il driver del micro per resettarne lo stato. Limitazione max velocità basale a %1$.2f U/h a causa di: %2$s @@ -127,27 +132,11 @@ Bluetooth non abilitato. La localizzazione non è abilitata Affinché la ricerca bluetooth funzioni sui dispositivi più recenti, la localizzazione deve essere abilitata, ma può essere disabilitata dopo l\'associazione. AAPS non tiene traccia della tua posizione. - - %1$d m fa - %1$.1f h fa - h - giorni - ore - secondo - minuto - ora - giorno - settimana - secondi - minuti - ore - giorni - settimane - m - d Password errata + PIN errato Le password non coincidono + I PIN non coincidono Valori basali non allineati alle ore: %1$s Valore basale sostituito dal minimo valore supportato: %1$s @@ -367,6 +356,7 @@ RESET STAT ELIMINA LOG ELIMINA TRATTAMENTI FUTURI + Elimina trattamenti futuri ESPORTA IMPOSTAZIONI IMPORTA IMPOSTAZIONI RESETTA DATABASE @@ -438,6 +428,19 @@ Bolo OK Micro associato Tasto aggiornamento Insight + decremento %1$s di %2$s + incremento %1$s di %2$s + %1$.0f%% + Basale + % basale + %1$d selezionato + Ordina + Rimuovi elementi + Ordina elementi + Rimuovi elementi selezionati + file + utente + %1$d giorno %1$d giorni diff --git a/core/src/main/res/values-iw-rIL/strings.xml b/core/src/main/res/values-iw-rIL/strings.xml index 4389e729a8..e425d38e2a 100644 --- a/core/src/main/res/values-iw-rIL/strings.xml +++ b/core/src/main/res/values-iw-rIL/strings.xml @@ -132,33 +132,6 @@ בלוטות\' כבוי. המיקום אינו מופעל בכדי שסריקת בלוטות\' תעבוד יש לאפשר את שירות המיקום. AAPS לא עוקב אחר המיקום שלכם וניתן להפסיק את השירות לאחר סיום הצימוד. - - לפני %1$d דקות - לפני %1$d דקות - לפני %1$.1f שעות - לפני %1$.1f ימים - לפני %1$.0f ימים - בעוד %1$.0f ימים - בעוד %1$.0f ימים - ש\' - ימים - שעות - שניה - דקה - שעה - יום - שבוע - שניות - דקות - שעות - ימים - שבועות - דק\' - י\' - מאוחר יותר היום - מחר - היום - אתמול סיסמה שגויה קוד PIN שגוי @@ -463,6 +436,7 @@ פריטים שהוסרו מיין פריטים הסר פריטים נבחרים + %1$d יום %1$d ימים diff --git a/core/src/main/res/values-ko-rKR/strings.xml b/core/src/main/res/values-ko-rKR/strings.xml index f7fd643bd8..59b3617bea 100644 --- a/core/src/main/res/values-ko-rKR/strings.xml +++ b/core/src/main/res/values-ko-rKR/strings.xml @@ -124,24 +124,6 @@ 블루투스가 활성화되지 않았습니다. 위치가 활성화되지 않았습니다. 최신 스마트폰에서 블루투스 검색이 작동하려면 위치가 활성화되어 있어야합니다. AAPS는 당신의 위치를 추적하지 않으며 페어링에 성공한 후 비활성화 할 수 있습니다. - - %1$d 분 전 - %1$.1f 시간 전 - 시간 - 일 - 시간 - 초 - 분 - 시 - 일 - 주 - 초 - 분 - 시 - 일 - 주 - 분 - 일 잘못된 비밀번호 비밀번호가 일치하지 않습니다. @@ -394,6 +376,7 @@ »%1$s« %2$.2f이 \'고정된 한계값\'을 벗어났습니다. Basal 값 + %1$d 일 diff --git a/core/src/main/res/values-lt-rLT/strings.xml b/core/src/main/res/values-lt-rLT/strings.xml index e25d385143..976c5a496f 100644 --- a/core/src/main/res/values-lt-rLT/strings.xml +++ b/core/src/main/res/values-lt-rLT/strings.xml @@ -125,24 +125,6 @@ Bluetooth neįjungta. Vietovės nustatymas neįjungtas Vietos nustatymo paslauga turi būti įjungta, kad Bluetooth aptikimas veiktų naujesniuose įrenginiuose. AAPS neseka Jūsų lokacijos, o vietos nustatymo paslauga gali būti išjungta po sėkmingo įrenginių suporavimo. - - prieš %1$d min - Prieš %1$.1f val. - val - d. - val. - sek. - min. - val. - d. - savaitė - sekundės - min. - val. - d. - savaičių - min. - d Neteisingas slaptažodis Slaptažodžiai nesutampa @@ -436,6 +418,7 @@ Bolusas OK Pompa suporuota Insight Mygtukas Naujinti + %1$d d. %1$d d. diff --git a/core/src/main/res/values-nl-rNL/strings.xml b/core/src/main/res/values-nl-rNL/strings.xml index 81fcc60673..7b4757d83d 100644 --- a/core/src/main/res/values-nl-rNL/strings.xml +++ b/core/src/main/res/values-nl-rNL/strings.xml @@ -132,33 +132,6 @@ Bluetooth niet ingeschakeld. Locatie is niet ingeschakeld Om Bluetooth discovery met nieuwere apparaten te laten werken moet locatie worden ingeschakeld. AAPS volgt je locatie niet en locatie kan ook weer worden uitgeschakeld nadat het koppelen is gelukt. - - %1$d m geleden - %1$d minuten geleden - %1$.1f u geleden - %1$.1f dagen geleden - %1$.0f dagen geleden - over %1$.0f dagen - over %1$.0f dagen - u - dagen - uren - seconde - minuut - uur - dag - week - seconden - minuten - uren - dagen - weken - m - d - Later Vandaag - Morgen - Vandaag - Gisteren Verkeerd wachtwoord Onjuiste PIN-code @@ -465,6 +438,7 @@ Items verwijderen Sorteer items Verwijder geselecteerde items + %1$d dag %1$d dagen diff --git a/core/src/main/res/values-no-rNO/strings.xml b/core/src/main/res/values-no-rNO/strings.xml index 37828eed67..a33dc1c80e 100644 --- a/core/src/main/res/values-no-rNO/strings.xml +++ b/core/src/main/res/values-no-rNO/strings.xml @@ -132,33 +132,6 @@ Bluetooth er ikke aktivert. Stedstjeneste er ikke aktivert Bluetooth søk på nye mobiler virker bare når posisjonstjeneste er aktivert. AAPS lagrer ikke dine posisjonsdata og den kan derfor slås av etter vellykket sammenkobling. - - %1$d min siden - %1$d minutter siden - %1$.1f timer siden - %1$.1f dager siden - %1$.0f dager siden - om %1$.0f dager - om %1$.0f dager - t - dager - timer - sekund - minutt - time - dag - uke - sekunder - minutter - timer - dager - uker - m - d - Senere i dag - I morgen - Idag - I går Feil passord Feil PIN-kode @@ -465,6 +438,9 @@ Slett elementer Sorter elementer Slett valgte elementer + fil + bruker + %1$d dag %1$d dager diff --git a/core/src/main/res/values-pl-rPL/strings.xml b/core/src/main/res/values-pl-rPL/strings.xml index c2243a7383..76332f8fbf 100644 --- a/core/src/main/res/values-pl-rPL/strings.xml +++ b/core/src/main/res/values-pl-rPL/strings.xml @@ -125,24 +125,6 @@ Bluetooth nie jest włączony. Lokalizacja nie jest włączona Aby uruchomić odnajdywanie Bluetooth na nowszych urządzeniach, lokalizacja musi być uruchomiona. AAPS nie śledzi twojej lokalizacji więc po udanym parowaniu urządzenia Bluetooth można wyłączyć lokalizację. - - %1$d min temu - %1$.1f godz. temu - h - dni - godzin - sekunda - minuta - godzina - dzień - tydzień - sekund - minut - godzin - dni - tygodni - m - d Złe hasło Hasła się nie zgadzają @@ -436,6 +418,7 @@ Bolus OK Pompa sparowana Przycisk Odświeżania Insight + %1$d dzień %1$d dni diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml index cdfc589640..3bb5957eb4 100644 --- a/core/src/main/res/values-pt-rBR/strings.xml +++ b/core/src/main/res/values-pt-rBR/strings.xml @@ -102,21 +102,6 @@ Bluetooth não está ativado. Localização Não Está Ativada Para que a procura de Bluetooth funcione em aparelhos mais recentes, a localização tem que ser activada. A app não rastreia a sua localização e pode ser desativada depois de um emparelhamento bem sucedido. - - h - dias - horas - segundo - minuto - hora - dia - semana - segundos - minutos - horas - dias - semanas - m As passwords não coincidem @@ -239,6 +224,7 @@ %1$.2f limitado a %2$.2f + %1$d dia %1$d dias diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml index 5cffe1850e..ffbe00bc75 100644 --- a/core/src/main/res/values-pt-rPT/strings.xml +++ b/core/src/main/res/values-pt-rPT/strings.xml @@ -123,24 +123,6 @@ Bluetooth não está activado. Localização Não Está Activa Para a Pesquisa Bluetooth funcionar em dispositivos mais recentes, a localização deve ser activada. AAPS não acompanha a sua localização e pode ser desactivada após o emparelhamento bem-sucedido. - - %1$d m atrás - %1$.1f h atrás - h - dias - horas - segundo - minuto - hora - dia - semana - segundos - minutos - horas - dias - semanas - m - d Palavra-passe incorreta Palavras-passe não correspondem @@ -355,6 +337,7 @@ %1$.2f limitado a %2$.2f »%1$s« está fora dos limites máximos + %1$d dia %1$d dias diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/src/main/res/values-ro-rRO/strings.xml index 60314aae80..1ef70c3e8f 100644 --- a/core/src/main/res/values-ro-rRO/strings.xml +++ b/core/src/main/res/values-ro-rRO/strings.xml @@ -125,24 +125,6 @@ Bluetooth-ul este dezactivat. Localizarea este dezactivată Pentru a putea căuta dispozitive Bluetooth noi, trebuie să activați localizarea. AAPS nu folosește datele dumneavoastră de localizare și acestea pot fi dezactivate după stabilirea conexiunii cu pompa. - - %1$d min în urmă - %1$.1f ore în urmă - h - zile - ore - secundă - minut - oră - zi - săptămână - secunde - minute - ore - zile - săptămâni - min - z Parola greșită Parolele nu corespund @@ -437,6 +419,7 @@ Bolus OK Pompă împerecheată Buton Reîmprospătare Insight + %1$d zi %1$d zile diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/src/main/res/values-ru-rRU/strings.xml index 127932c2d6..20f5a3db8f 100644 --- a/core/src/main/res/values-ru-rRU/strings.xml +++ b/core/src/main/res/values-ru-rRU/strings.xml @@ -132,33 +132,6 @@ Bluetooth не включен. Геолокация не включена Для обнаружения Bluetooth на новых устройствах необходимо включить геолокацию. AAPS не отслеживает ваше местоположение и может быть отключен после успешного сопряжения. - - %1$d мин. назад - %1$d минут назад - %1$.1fч. назад - %1$s дн назад - %1$s дн назад - через %1$.0f дн - через %1$.0f дн - ч - дн - час - сек - мин - час - дн - нед - сек - мин - час - дн - нед - мин - дн - Позднее сегодня - Завтра - Cегодня - Вчера Неверный пароль Неверный PIN-код @@ -465,6 +438,7 @@ Удалить элементы Сортировать элементы Удалить выбранные элементы + %1$d день %1$d дня diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml index b241cfb743..1da97fc68c 100644 --- a/core/src/main/res/values-sk-rSK/strings.xml +++ b/core/src/main/res/values-sk-rSK/strings.xml @@ -132,33 +132,6 @@ Bluetooth nie je aktivovaný. Poloha nie je aktivovaná Pre vyhľadanie Bluetooth zariadení na novších telefónoch musí byť povolené zisťovanie polohy. AAPS vás nesleduje a po úspešnom spárovaní môžete túto voľbu opäť zakázať. - - pred %1$d min - pred %1$d minútami - pred %1$.1f h - Pred %1$.1f dňami - Pred %1$.0f dňami - za %1$.0f dní - za %1$.0f dní - h - dní - hodín - sekunda - minúta - hodina - deň - týždeň - sekúnd - minút - hodín - dní - týždňov - m - d - Neskôr počas dňa - Zajtra - Dnes - včera Nesprávne heslo Nesprávny PIN @@ -467,6 +440,7 @@ Odstrániť vybrané položky súbor používateľ + %1$d deň %1$d dní diff --git a/core/src/main/res/values-sv-rSE/strings.xml b/core/src/main/res/values-sv-rSE/strings.xml index 1b0c1ff8c9..eb3759fb8d 100644 --- a/core/src/main/res/values-sv-rSE/strings.xml +++ b/core/src/main/res/values-sv-rSE/strings.xml @@ -131,25 +131,6 @@ Bluetooth är avstängt. Platsdata är inte aktiverat För att Bluetooth ska fungera med nyare enheter, måste platsdata vara aktiverat. AAPS sparar inte din plats och det kan stängas av efter att enheten har parkopplats. - - %1$dm sedan - %1$d minuter sedan - %1$.1f tim sedan - h - dagar - timmar - sekund - minut - timme - dag - vecka - sekunder - minuter - timmar - dagar - veckor - m - d Fel lösenord Lösenorden stämmer inte överens @@ -445,6 +426,7 @@ Uppdat. knapp för Insight minska %1$s med %2$s öka %1$s med %2$s + %1$d dag %1$d dagar diff --git a/core/src/main/res/values-tr-rTR/strings.xml b/core/src/main/res/values-tr-rTR/strings.xml index 1f2d882edc..28f2b1e5d5 100644 --- a/core/src/main/res/values-tr-rTR/strings.xml +++ b/core/src/main/res/values-tr-rTR/strings.xml @@ -42,6 +42,7 @@ Karbonhidrat Geçersiz profil!!! PROFİL AYARLANMADI + ]]> Tarih Birim İES @@ -132,33 +133,6 @@ Bluetooth etkin değil. Konum Etkin Değil Bluetooth cihaz bulmanın daha yeni cihazlarda çalışması için konum etkinleştirilmelidir. AAPS konumunuzu izlemez ve eşleştirme başarılı olduktan sonra devre dışı bırakılabilir. - - %1$d dak önce - %1$d dakika önce - %1$.1f s önce - %1$.1f gün önce - %1$.0f gün önce - %1$.0f gün içinde - %1$.0f gün içinde - s - gün - saat - saniye - dakika - saat - gün - hafta - saniye - dakika - saat - gün - hafta - dk - g - Bugünden sonra - Yarın - Bugün - Dün Hatalı parola Yanlış PIN @@ -465,6 +439,50 @@ Öğeleri kaldır Öğeleri Sırala Seçilen öğeleri kaldır + dosya + kullanıcı + + Otoayar + Potansiyel profil ayarlamaları için yardım (İDF, karbonhidrat ve bazal oranları) + AT + OtoAyar ayarları + Otomasyon Profil değişimi + UAM\'yi bazal olarak sınıflandır + Yalnızca yenen tüm karbonhidratları güvenilir bir şekilde girdiyseniz etkinleştirin, bu seçenekle OtoAyar tarafından görülen ani artışlar bazal oranda değişiklik önermek için kullanılacaktır. + Veri gün sayısı + Sirkadiyen IC/İDF ortalama sonucunu uygula + OtoAyar sirkadiyen varyasyonları ayarlamaz, bu seçenek sirkadiyen giriş profilinize yalnızca IC ve İDF\'nün ortalama ayarını uygular + Hata ayıklama için daha fazla günlük bilgisi ekleyin + OtoAyar eklentisinde hata ayıklamaya yardımcı olmak için yalnızca geliştirici tarafından daha fazla günlük bilgisi göndermesi istenirse açın + OtoAyar tarafından işlenecek varsayılan veri gün sayısı (en fazla xx) + Ayarlandı + Profil : + Ayar günleri: + Son Çalıştırma : + Uyarı : + Ayarlanacak profili seçin + Giriş verilerinde hata, gün sayısını azaltmaya çalışın + OtoAyar hesaplaması başladı, lütfen sabırlı olun + Kullanmadan önce sonuçları dikkatlice kontrol edin! + Kısmi sonuç günü %1$d / %2$d ayarlandı + Sonuç: %1$s + Parametre + % + Eksik + OtoAyar profili %1$s + Otoayar\'ı Çalıştır + Giriş profilini kontrol edin + Profilleri karşılaştırın + Yerel profile kopyala + Giriş profilini güncelle + Giriş profilini geri al + Bu OtoAyar Profilinden yeni bir yerel profil oluşturulsun mu? + OtoAyar Profili ile %1$s profili güncellensin mi? + Giriş Profili ile %1$s profili geri alınsın mı? + Profil geçersiz + OtoAyar profil değiştirme olmadan çalıştırıldı + OtoAyar çalıştırıldı ve profil otomatik olarak değiştirildi + Son OtoAyar çalışması sırasında hata oluştu %1$d gün %1$d gün diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml index ac87eda1cb..d0f3e1844a 100644 --- a/core/src/main/res/values-zh-rCN/strings.xml +++ b/core/src/main/res/values-zh-rCN/strings.xml @@ -132,33 +132,6 @@ 蓝牙未启用 未启用位置 为了蓝牙能发现新的设备，手机定位功能必须启用， AAPS 不会追踪你的位置，你可以在配对成功后禁用定位。 - - %1$d 分钟前 - %1$d 分钟前 - %1$.1f 小时前 - %1$.1f 天前 - %1$.0f 天前 - 在 %1$.0f 天内 - 在 %1$.0f 天内 - h - 天 - 小时 - 秒 - 分钟 - 小时 - 天 - 周 - 秒 - 分钟 - 小时 - 天 - 周 - m - d - 今天稍后 - 明天 - 今天 - 昨天 密码错误 PIN 码错误 @@ -467,6 +440,7 @@ 删除选中项 文件 用户 + %1$d　天 diff --git a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpTemporaryBasalTransaction.kt b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpTemporaryBasalTransaction.kt index 50b14f195d..cee4092633 100644 --- a/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpTemporaryBasalTransaction.kt +++ b/database/src/main/java/info/nightscout/androidaps/database/transactions/SyncPumpTemporaryBasalTransaction.kt @@ -24,20 +24,22 @@ class SyncPumpTemporaryBasalTransaction( existing.duration != temporaryBasal.duration && existing.interfaceIDs.endId == null || existing.type != type ?: existing.type ) { + val old = existing.copy() existing.timestamp = temporaryBasal.timestamp existing.rate = temporaryBasal.rate existing.duration = temporaryBasal.duration existing.type = type ?: existing.type database.temporaryBasalDao.updateExistingEntry(existing) - result.updated.add(Pair(Reason.EXISTING_ID, existing)) + result.updated.add(Pair(old, existing)) } } else { val running = database.temporaryBasalDao.getTemporaryBasalActiveAt(temporaryBasal.timestamp).blockingGet() if (running != null) { + val old = running.copy() running.end = temporaryBasal.timestamp running.interfaceIDs.endId = temporaryBasal.interfaceIDs.pumpId database.temporaryBasalDao.updateExistingEntry(running) - result.updated.add(Pair(Reason.ACTIVE, running)) + result.updated.add(Pair(old, running)) } database.temporaryBasalDao.insertNewEntry(temporaryBasal) result.inserted.add(temporaryBasal) @@ -45,12 +47,9 @@ class SyncPumpTemporaryBasalTransaction( return result } - enum class Reason { - EXISTING_ID, ACTIVE - } class TransactionResult { val inserted = mutableListOf() - val updated = mutableListOf>() + val updated = mutableListOf>() } } \ No newline at end of file diff --git a/diaconn/src/main/res/values-cs-rCZ/strings.xml b/diaconn/src/main/res/values-cs-rCZ/strings.xml index f4dac8ace7..ee2b284ab0 100644 --- a/diaconn/src/main/res/values-cs-rCZ/strings.xml +++ b/diaconn/src/main/res/values-cs-rCZ/strings.xml @@ -152,4 +152,6 @@ LGS status je vypnutý, OFF příkaz je odmítnut. Spuštění dočasného bazálu je odmítnuto, pokud je již spuštěn jiný Zastavení dočasného bazálu je odmítnuto, pokud žádný není spuštěn + Odeslat protokoly pumpy do Diaconn Cloudu. + Synchronizace do Diaconn cloudu diff --git a/diaconn/src/main/res/values-es-rES/strings.xml b/diaconn/src/main/res/values-es-rES/strings.xml index 6069f0c047..044cdcc8cf 100644 --- a/diaconn/src/main/res/values-es-rES/strings.xml +++ b/diaconn/src/main/res/values-es-rES/strings.xml @@ -152,4 +152,6 @@ El estado de suspensión por glucosa baja está desactivado (LGS). Se rechaza el comando de desactivación. El inicio de una basal temporal es rechazado cuando se está ejecutando una basal temporal La parada de una basal tempora es rechazada cuando una basal temporal no está ejecutándose + Enviar los registros de la bomba a la nube de Diaconn. + Sincronización con la nube de Diaconn diff --git a/diaconn/src/main/res/values-fr-rFR/strings.xml b/diaconn/src/main/res/values-fr-rFR/strings.xml index 6786619d6b..6783b5ee87 100644 --- a/diaconn/src/main/res/values-fr-rFR/strings.xml +++ b/diaconn/src/main/res/values-fr-rFR/strings.xml @@ -152,4 +152,6 @@ Mode AGB désactivé, la commande d\'arrêt est refusée. Début de basal temp. rejeté quand une basal temp. est en cours d\'exécution Arrêt de basal temp. rejeté quand une basal temp. n\'est pas en cours d\'exécution + Envoyer les logs sur le Cloud Diaconn. + Synchro Diaconn Cloud diff --git a/diaconn/src/main/res/values-ko-rKR/strings.xml b/diaconn/src/main/res/values-ko-rKR/strings.xml index f17e4a3c77..29cb87c694 100644 --- a/diaconn/src/main/res/values-ko-rKR/strings.xml +++ b/diaconn/src/main/res/values-ko-rKR/strings.xml @@ -89,8 +89,6 @@ 바늘 교체 로그 동기화 시 케어포털 \"위치 교체\" 정보 자동 업로드 로그 동기화 시 케어포털 \"베터리 교체\" 정보 자동 업로드 - 펌프 로그정보를 \"디아콘 클라우드\"로 자동 업로드 - 디아콘 클라우드 전송 베터리 교체 로그 동기화 진행 중 인슐린 부족 경고 diff --git a/diaconn/src/main/res/values-tr-rTR/strings.xml b/diaconn/src/main/res/values-tr-rTR/strings.xml index f34e1d868b..da13b5c304 100644 --- a/diaconn/src/main/res/values-tr-rTR/strings.xml +++ b/diaconn/src/main/res/values-tr-rTR/strings.xml @@ -152,4 +152,6 @@ LGS durumu KAPALI, KAPAT komutu reddedildi. Geçici bazal çalışırken Geçici bazal başlatma reddedilir Geçici bazal çalışmıyorken Geçici bazal durdurma reddedilir + Pompa günlüklerini Diaconn Bulut Deposuna gönderin. + Diaconn Bulut Senkronizasyonu diff --git a/medtronic/src/main/res/values-cs-rCZ/strings.xml b/medtronic/src/main/res/values-cs-rCZ/strings.xml index dc0682b0d7..6b6c28893f 100644 --- a/medtronic/src/main/res/values-cs-rCZ/strings.xml +++ b/medtronic/src/main/res/values-cs-rCZ/strings.xml @@ -91,4 +91,6 @@ Je-li povoleno, zastaví dočasný bazál před koncem každé hodiny. To může u některých pump pomoci zastavit pípání/vibrace v celou hodinu. %1$.1f U/h (%2$d min zbývá) Byla zjištěna neplatná data historie pumpy. Otevřete nový problém a poskytněte logy. + Statistiky RL + Typ: diff --git a/medtronic/src/main/res/values-it-rIT/strings.xml b/medtronic/src/main/res/values-it-rIT/strings.xml index 17ee55f191..b8517dabd2 100644 --- a/medtronic/src/main/res/values-it-rIT/strings.xml +++ b/medtronic/src/main/res/values-it-rIT/strings.xml @@ -91,4 +91,6 @@ Se abilitato, cancellerà una basale temporanea prima della fine di ogni ora. Questo metodo può aiutare a fermare alcuni micro dall\'emettere un suono/vibrare allo scoccare dell\'ora. %1$.1f U/h (%2$d min rimanenti/e) Rilevati dati non validi dallo storico del micro. Apri una segnalazione e fornisci i log. + Statistiche RL + Tipo: diff --git a/medtronic/src/main/res/values-no-rNO/strings.xml b/medtronic/src/main/res/values-no-rNO/strings.xml index 848e17f9b7..a2ab2a52a4 100644 --- a/medtronic/src/main/res/values-no-rNO/strings.xml +++ b/medtronic/src/main/res/values-no-rNO/strings.xml @@ -91,4 +91,6 @@ Hvis aktivert så vil den stoppe en temp basal rett før hver hele time for å stoppe noen pumpers varsler/vibreringer på hver hele time. %1$.1f E/t (%2$d min gjenstår) Ugyldige data for pumpehistorikken er oppdaget. Rapporter hendelsen til APPS og legg ved logg. + RL statistikk + Type: diff --git a/medtronic/src/main/res/values-tr-rTR/strings.xml b/medtronic/src/main/res/values-tr-rTR/strings.xml index ca7dab62f0..1f3ab7a93c 100644 --- a/medtronic/src/main/res/values-tr-rTR/strings.xml +++ b/medtronic/src/main/res/values-tr-rTR/strings.xml @@ -91,4 +91,6 @@ Etkinleştirilirse, her saatin sonunda geçici bazali iptal eder. Bu yöntem, bazı pompaların saatte bip sesini/titremesini durdurmaya yardımcı olabilir. %1$.1f Ü/sa (%2$d dk. kaldı) Geçersiz pompa geçmişi verisi tespit edildi. Yeni hata bildirim konusu açın ve günlükleri gönderin. + RL İstatistikleri + Tip: diff --git a/omnipod-common/src/main/res/values-iw-rIL/strings.xml b/omnipod-common/src/main/res/values-iw-rIL/strings.xml index 9c9dee9cff..513ef4e8a5 100644 --- a/omnipod-common/src/main/res/values-iw-rIL/strings.xml +++ b/omnipod-common/src/main/res/values-iw-rIL/strings.xml @@ -112,9 +112,9 @@ התראות צפצופי אימות התראות - התראת צליל של בזאלי זמני לא ברור מאופשרת - התראת צליל של SMB לא ברור מאופשרת - התראת צליל של בולוס לא ברור מאופשרת + התראת צליל של בזאלי זמני לא ודאי מאופשרת + התראת צליל של SMB לא ודאי מאופשרת + התראת צליל של בולוס לא ודאי מאופשרת אין פוד פעיל התקנה בביצוע (ממתין להפעלת הפוד) @@ -147,7 +147,7 @@ קרא יומן פעימות הגדר בזאלי זמני מזויף כי הפוד מושהה בטל בזאלי זמני מזויף שנוצר מפני שהפוד הושהה - פיצול הבזאלי הזמני עקב כשל לא ברור בביטול + פיצול הבזאלי הזמני עקב כשל לא ודאי בביטול הגדרות צפצוף השמע צפצוף ניסיון diff --git a/omnipod-eros/src/main/res/values-iw-rIL/strings.xml b/omnipod-eros/src/main/res/values-iw-rIL/strings.xml index fae72b2ff2..7bcaecbe2e 100644 --- a/omnipod-eros/src/main/res/values-iw-rIL/strings.xml +++ b/omnipod-eros/src/main/res/values-iw-rIL/strings.xml @@ -12,7 +12,7 @@ ריילילינק התראת צליל של בזאלי זמני לא ברור מאופשרת התראת צליל של SMB לא ברור מאופשרת - התראת צליל של בולוס לא ברור מאופשרת + התראת צליל של בולוס לא ודאי מאופשרת היסטוריית הפוד תיאור @@ -68,5 +68,5 @@ מלאו פוד חדש עם מספיק אינסולין לשלושה ימים.\n\nהקשיבו לשני צפצופים מהפוד במהלך המילוי. הם מציינים שהכמות המינימלית של 80 יחידות הוכנסה. הקפידו לרוקן לחלוטין את מזרק המילוי, גם לאחר שמיעת שני הצפצופים.\n\nלאחר מילוי הפוד, יש ללחוץ הבא.\n\nהערה: נא לא להסיר עדיין את מכסה המחט.\n הערה: נא להניח את הריילילינק במצב עומד ובמרחק סנטימטרים בודדים מהפוד. מנסה לצמד את הפוד החדש ולאתחלו.\n\nכאשר תהליך האתחול יושלם, ניתן ללחוץ על הבא.\n\nשימו לב: נא למקם את הריילילינק במצב אנכי ולמקם את הפוד מספר סנטימטרים ממנו. - לא בטוח + לא וודאי diff --git a/shared/src/main/java/info/nightscout/shared/weardata/EventData.kt b/shared/src/main/java/info/nightscout/shared/weardata/EventData.kt index 45db4cd8fc..f570743aa6 100644 --- a/shared/src/main/java/info/nightscout/shared/weardata/EventData.kt +++ b/shared/src/main/java/info/nightscout/shared/weardata/EventData.kt @@ -19,7 +19,7 @@ sealed class EventData : Event() { // Mobile <- Wear @Serializable - data class ActionPong(val timeStamp: Long) : EventData() + data class ActionPong(val timeStamp: Long, val apiLevel: Int) : EventData() @Serializable data class Error(val timeStamp: Long) : EventData() // ignored diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml index 59c5068de6..b0e760781a 100644 --- a/wear/src/main/AndroidManifest.xml +++ b/wear/src/main/AndroidManifest.xml @@ -29,9 +29,9 @@ + android:permission="android.permission.BIND_WALLPAPER"> @@ -51,9 +51,9 @@ + android:permission="android.permission.BIND_WALLPAPER"> @@ -73,9 +73,9 @@ + android:permission="android.permission.BIND_WALLPAPER"> @@ -98,9 +98,9 @@ + android:permission="android.permission.BIND_WALLPAPER"> @@ -123,9 +123,9 @@ + android:permission="android.permission.BIND_WALLPAPER"> @@ -148,9 +148,9 @@ + android:permission="android.permission.BIND_WALLPAPER"> @@ -173,9 +173,9 @@ + android:permission="android.permission.BIND_WALLPAPER"> @@ -197,9 +197,9 @@ + android:permission="android.permission.BIND_WALLPAPER"> @@ -219,9 +219,9 @@ + android:permission="android.permission.BIND_WALLPAPER"> @@ -241,7 +241,8 @@ - @@ -549,45 +550,55 @@ - + diff --git a/wear/src/main/java/info/nightscout/androidaps/comm/DataHandlerWear.kt b/wear/src/main/java/info/nightscout/androidaps/comm/DataHandlerWear.kt index af9967f71a..f816358b71 100644 --- a/wear/src/main/java/info/nightscout/androidaps/comm/DataHandlerWear.kt +++ b/wear/src/main/java/info/nightscout/androidaps/comm/DataHandlerWear.kt @@ -57,7 +57,7 @@ class DataHandlerWear @Inject constructor( .observeOn(aapsSchedulers.io) .subscribe { aapsLogger.debug(LTag.WEAR, "Ping received from ${it.sourceNodeId}") - rxBus.send(EventWearToMobile(EventData.ActionPong(System.currentTimeMillis()))) + rxBus.send(EventWearToMobile(EventData.ActionPong(System.currentTimeMillis(), Build.VERSION.SDK_INT))) } disposable += rxBus .toObservable(EventData.ConfirmAction::class.java) @@ -115,7 +115,6 @@ class DataHandlerWear @Inject constructor( .subscribe { aapsLogger.debug(LTag.WEAR, "Bolus progress received from ${it.sourceNodeId}") handleBolusProgress(it) - rxBus.send(EventWearToMobile(EventData.ActionPong(System.currentTimeMillis()))) } disposable += rxBus .toObservable(EventData.Status::class.java) diff --git a/wear/src/main/res/values-bg-rBG/strings.xml b/wear/src/main/res/values-bg-rBG/strings.xml index 5343d8b32c..4466e15ac7 100644 --- a/wear/src/main/res/values-bg-rBG/strings.xml +++ b/wear/src/main/res/values-bg-rBG/strings.xml @@ -2,15 +2,6 @@ AAPS AAPS - AAPS - AAPS(голям) - AAPS(Графика) - AAPS(без рафика) - AAPS(Кръгъл) - AAPSv2 - AAPS(Самолет) - AAPS(Steampunk) - AAPS (DigitalStyle) Няма данни! Стари данни! От %1$s @@ -59,7 +50,6 @@ Допълнителни действия при почукване Unicode кодиране Версия: - Настройки на Watchface Погледнете в конфигурацията, моля. Врем цел Болус @@ -81,7 +71,6 @@ СПРИ БОЛУС Помпа Режим на APS - Loop - CPP TDD ВХ IOB diff --git a/wear/src/main/res/values-cs-rCZ/strings.xml b/wear/src/main/res/values-cs-rCZ/strings.xml index 388921e75c..f792859d43 100644 --- a/wear/src/main/res/values-cs-rCZ/strings.xml +++ b/wear/src/main/res/values-cs-rCZ/strings.xml @@ -2,15 +2,15 @@ AAPS AAPS - AAPS - AAPS(velké) - AAPS(VelkýGraf) - AAPS(BezGrafu) - APS(Kruh) - AAPSv2 - AAPS (Cockpit) - AAPS (Steampunk) - AAPS (DigitalStyle) + AAPS + AAPS(velký) + AAPS(VelkýGraf) + AAPS(BezGrafu) + AAPS(Kruhový) + AAPS(v2) + AAPS(Kokpit) + AAPS (Steampunk) + AAPS (DigitalStyle) AAPS(Akce) AAPS(Doč. cíl) AAPS(Rychlý bolus) @@ -64,7 +64,7 @@ Akce po klepnutí na komplikaci Znaky Unicode v komplikacích Verze: - další nastavení Watchface + Další nastavení ciferníku Podívejte se na konfiguraci hodinek prosím. Dočasný cíl Kalkulačka @@ -90,7 +90,7 @@ Požadován kalkulátor Požadováno plnění Požadovány sacharidy - Požadován profil + Požadováno přepnutí profilu Cíl Nízký Vysoký @@ -112,7 +112,7 @@ ZRUŠIT BOLUS Pumpa Smyčka - CPP + Přepnutí profilu TDD Sacharidy IOB diff --git a/wear/src/main/res/values-da-rDK/strings.xml b/wear/src/main/res/values-da-rDK/strings.xml index 048c025c20..675ce0b8c7 100644 --- a/wear/src/main/res/values-da-rDK/strings.xml +++ b/wear/src/main/res/values-da-rDK/strings.xml @@ -2,15 +2,6 @@ AAPS AAPS - AAPS - AAPS (Stor) - AAPS(StorGraf) - AAPS(IngenGraf) - AAPS(Cirkel) - AAPSv2 - AAPS(Cockpit) - AAPS(Steampunk) - AAPS (Digitalstil) Ingen data! Gammel data! Siden %1$s @@ -59,7 +50,6 @@ Complication handling ved tryk Unicode i komplikationer Version: - flere Watchface indstillinger Se venligst på Watchface-konfigurationen. MidlertidigMål Bolus @@ -81,7 +71,6 @@ ANNULLER BOLUS Pumpe Loop - CPP TDD Kulhydrat IOB diff --git a/wear/src/main/res/values-de-rDE/strings.xml b/wear/src/main/res/values-de-rDE/strings.xml index 577597b0cc..b606b31916 100644 --- a/wear/src/main/res/values-de-rDE/strings.xml +++ b/wear/src/main/res/values-de-rDE/strings.xml @@ -2,15 +2,6 @@ AAPS AAPS - AAPS - AAPS(groß) - AAPS(GroßerGraph) - AAPS(KeinGraph) - AAPS(Kreis) - AAPSv2 - AAPS(Cockpit) - AAPS(Steampunk) - AAPS(DigitalStyle) Keine Daten! Veraltete Daten! Seit %1$s @@ -59,7 +50,6 @@ Tipp Komplikation Unicode in Komplikationen Version: - weitere Watchface Einstellungen Schaue Dir bitte die Watchface-Konfiguration an. Temp. Ziel Bolus @@ -81,7 +71,6 @@ Bolus löschen Pumpe Loop - CPP TDD KH IOB diff --git a/wear/src/main/res/values-es-rES/strings.xml b/wear/src/main/res/values-es-rES/strings.xml index a17e2affc6..bbd8afaa5b 100644 --- a/wear/src/main/res/values-es-rES/strings.xml +++ b/wear/src/main/res/values-es-rES/strings.xml @@ -2,15 +2,15 @@ AAPS AAPS - AAPS - AAPS (Grande) - AAPS (Aumentado) - AAPS (SinGráfico) - AAPS (Círculo) - AAPSv2 - AAPS (Cockpit) - AAPS (Steampunk) - AAPS (Digital) + AAPS + AAPS (Grande) + AAPS (Aumentado) + AAPS (SinGráfico) + AAPS (Círculo) + AAPS(v2) + AAPS(Cockpit) + AAPS(Steampunk) + AAPS (Digital) AAPS(Acciones) AAPS(Objetivo Temporal) AAPS(Asistente Rápido) @@ -90,7 +90,7 @@ Calculadora Solicitada Llenado Solicitado Carbohidratos Solicitados - CPP Solicitado + Solicitado cambio de perfil Objetivo Bajo Alto @@ -112,7 +112,7 @@ CANCELAR BOLO Bomba Lazo - CPP + Cambio de perfil TDD Carbohidratos IOB diff --git a/wear/src/main/res/values-fr-rFR/strings.xml b/wear/src/main/res/values-fr-rFR/strings.xml index 6609f34091..b4501502bf 100644 --- a/wear/src/main/res/values-fr-rFR/strings.xml +++ b/wear/src/main/res/values-fr-rFR/strings.xml @@ -2,15 +2,15 @@ AAPS AAPS - AAPS - AAPS (Large) - AAPS (GrandGraph) - AAPS (SansGraph) - AAPS (Cercle) - AAPSv2 - AAPS (Cockpit) - AAPS (Steampunk) - AAPS (Digital) + AAPS + AAPS (Large) + AAPS (GrandGraph) + AAPS (SansGraph) + AAPS (Cercle) + AAPS (v2) + AAPS (Cockpit) + AAPS (Steampunk) + AAPS (Digital) AAPS (Actions) AAPS(Cible Temp) AAPS(Assistant rapide) @@ -90,7 +90,7 @@ Calcul demandé Remplissage demandé Glucides requis - Profil demandé + Changement de profil demandé Cible Bas Élevé @@ -112,7 +112,7 @@ ANNULER BOLUS Pompe Boucle - Profil + Changement de profil DTI GA IA diff --git a/wear/src/main/res/values-it-rIT/strings.xml b/wear/src/main/res/values-it-rIT/strings.xml index f0003adf4d..f4a184765a 100644 --- a/wear/src/main/res/values-it-rIT/strings.xml +++ b/wear/src/main/res/values-it-rIT/strings.xml @@ -2,15 +2,9 @@ AAPS AAPS - AAPS - AAPS(Large) - AAPS(BigChart) - AAPS(NoChart) - AAPS(Circle) - AAPSv2 - AAPS(Cockpit) - AAPS(Steampunk) - AAPS(DigitalStyle) + AAPS(azioni) + AAPS(Temp Target) + AAPS(Quick Wizard) No dati! Dati vecchi! Da %1$s @@ -54,17 +48,22 @@ Ring History Light Ring History Animazioni + Calcolatrice in menu Carica in Menu Target singolo + Calcolatore percentuale Complication Tap Action Unicode in Complications Versione: - più impostazioni watchface Controlla configurazione watchface. TempT Calcolatore + Calc Trattamento + Tratt Bolo + CHO + CHO estesi Impostazioni Stato Re-Sincronizza @@ -74,11 +73,18 @@ Menu XL Durata + Target temporaneo richiesto + Calcolatore rapido richiesto + Trattamento richiesto Bolo richiesto + Calcolo richiesto + Riempimento richiesto + CHO richiesti Target Basso Alto CHO + CHO estesi Percentuale Avvio [min] Durata [h] @@ -95,7 +101,6 @@ CANCELLA BOLO Micro Loop - CPP TDD CHO IOB @@ -142,5 +147,13 @@ Durante la ricarica Modalità Always On Always On e Ricarica + Pasto + Ipoglicemia + Attività fisica Manuale + Annulla + Nessuno + Nessuna configurazione disponibile + Controlli smartwatch disabilitati + Nessun dato disponibile diff --git a/wear/src/main/res/values-iw-rIL/strings.xml b/wear/src/main/res/values-iw-rIL/strings.xml index 7b655ca523..6d90e98e4e 100644 --- a/wear/src/main/res/values-iw-rIL/strings.xml +++ b/wear/src/main/res/values-iw-rIL/strings.xml @@ -2,15 +2,6 @@ AAPS AAPS - AAPS - AAPS (גדול) - AAPS (תרשים גדול) - AAPS (ללא תרשים) - AAPS (עיגול) - AAPSv2 - AAPS (קוקפיט) - AAPS (סטימפאנק) - AAPS (דיגיטלי) AAPS (פעולות) AAPS (מטרה זמנית) AAPS (אשף מהיר) @@ -64,7 +55,6 @@ פעולת הקשה על סיבוך יוניקוד בסיבוכים גירסה: - עוד הגדרות פני שעון עיינו בהגדרות פני השעון בבקשה. מטרה זמנית מחשבון @@ -111,7 +101,6 @@ ביטול בולוס משאבה לולאה - CPP סה\"כ מינון אינסולין יומי TDD פחמימות כמות אינסולין פעילה diff --git a/wear/src/main/res/values-ko-rKR/strings.xml b/wear/src/main/res/values-ko-rKR/strings.xml index 5549a643b4..7213f06b72 100644 --- a/wear/src/main/res/values-ko-rKR/strings.xml +++ b/wear/src/main/res/values-ko-rKR/strings.xml @@ -2,15 +2,6 @@ AAPS AAPS - AAPS - AAPS(대) - AAPS(큰차트) - AAPS(차트없음) - AAPS(원형) - AAPSv2 - AAPS(조종석) - AAPS(스팀펑크) - AAPS(디지털방식) 데이터없음! 오래된 데이터! %1$s 이후 @@ -59,7 +50,6 @@ 컴플리케이션 탭 동작 컴플리케이션에서 유니코드 사용 버전: - 더 다양한 워치페이스 설정 워치페이스 설정을 확인하십시오. 임시목표 Bolus @@ -81,7 +71,6 @@ BOLUS 취소 펌프 Loop - CPP TDD Carb IOB diff --git a/wear/src/main/res/values-lt-rLT/strings.xml b/wear/src/main/res/values-lt-rLT/strings.xml index cce52f97ff..90ac439999 100644 --- a/wear/src/main/res/values-lt-rLT/strings.xml +++ b/wear/src/main/res/values-lt-rLT/strings.xml @@ -2,15 +2,6 @@ AAPS AAPS - AAPS - AAPS(Didelis) - AAPS(DidelisGrafikas) - AAPS(BeGrafiko) - AAPS(Apvalus) - AAPSv2 - AAPS(Cockpit) - AAPS(Steampunk) - AAPS(DigitalStyle) Nėra duomenų! Seni duomenys! Nuo %1$s @@ -59,7 +50,6 @@ Elementų skirtuko veiksmai Unikodas elementuose Versija: - Daugiau laikrodžio ekrano nustatymų Prašom žiūrėti Watchface konfigūraciją. LaikinasTikslas Bolusas @@ -81,7 +71,6 @@ ATŠAUKTI BOLUSĄ Pompa Ciklas - CPP (Procentinis dienos profilis) BPD AV AIO diff --git a/wear/src/main/res/values-nl-rNL/strings.xml b/wear/src/main/res/values-nl-rNL/strings.xml index ab83e31ebc..56deef316c 100644 --- a/wear/src/main/res/values-nl-rNL/strings.xml +++ b/wear/src/main/res/values-nl-rNL/strings.xml @@ -2,15 +2,6 @@ AAPS AAPS - AAPS - AAPS(Groot) - AAPS(GroteGrafiek) - AAPS(GeenGrafiek) - AAPS(Cirkel) - AAPSv2 - AAPS(Cockpit) - AAPS(Steampunk) - AAPS (DigitalStyle) AAPS(Acties) AAPS(Tijdelijk Streefdoel) AAPS(Quick Wizard) @@ -64,7 +55,6 @@ Complicatie tik voor actie Unicode in complicaties Versie: - meer Watchface instellingen Kijk naar de Watchface configuratie, alsjeblieft. TijdStreefd Calculator @@ -90,7 +80,6 @@ Berekening aangevraagd Vullen aangevraagd Koolhydraten aangevraagd - CPP aangevraagd Doel Laag Hoog @@ -112,7 +101,6 @@ BOLUS ANNULEREN Pomp Loop - CPP TDD Khd IOB diff --git a/wear/src/main/res/values-no-rNO/strings.xml b/wear/src/main/res/values-no-rNO/strings.xml index bdda34d28a..c2d0f8bf94 100644 --- a/wear/src/main/res/values-no-rNO/strings.xml +++ b/wear/src/main/res/values-no-rNO/strings.xml @@ -2,15 +2,6 @@ AAPS AAPS - AAPS - AAPS (Large) - AAPS (BigChart) - AAPS (NoChart) - AAPS (Circle) - AAPSv2 - AAPS(Cockpit) - AAPS(Steampunk) - AAPS(DigitalStyle) AAPS(Actions) AAPS(Temp Target) AAPS(Quick Wizard) @@ -64,7 +55,6 @@ Komplikasjon trykk handling Unicode ikomplikasjoner Versjon: - flere urskive innstillinger Vennligst sjekk urskive innstillinger. TempT Kalkulator @@ -90,7 +80,6 @@ Beregning forespurt Fylling forespurt Karbo forespurt - CPP forespurt Mål Lav Høy @@ -112,7 +101,6 @@ AVBRYT BOLUS Pumpe Loop - CPP TDD Karbo IOB diff --git a/wear/src/main/res/values-pl-rPL/strings.xml b/wear/src/main/res/values-pl-rPL/strings.xml index bcf10c8b33..783756a43b 100644 --- a/wear/src/main/res/values-pl-rPL/strings.xml +++ b/wear/src/main/res/values-pl-rPL/strings.xml @@ -2,15 +2,6 @@ AAPS AAPS - AAPS - AAPS(Duży) - AAPS(DużyWykres) - AAPS(BezWykresu) - AAPS(Koło) - AAPSv2 - AAPS(Kokpit) - AAPS(Steampunk) - AAPS(StylCyfrowy) Brak danych! Stare dane! Od %1$s @@ -59,7 +50,6 @@ Akcja po kliknięciu komplikacji Unicode w Komplikacjach Wersja: - więcej ustawień zegarka Proszę, zajrzyj do konfiguracji zegarka. CelTymcz. Kalkulator @@ -92,7 +82,6 @@ ANULUJ BOLUS Pompa Pętla - CPP TDD Węgl. IOB diff --git a/wear/src/main/res/values-pt-rBR/strings.xml b/wear/src/main/res/values-pt-rBR/strings.xml index d57abf2a8c..f8e40b796e 100644 --- a/wear/src/main/res/values-pt-rBR/strings.xml +++ b/wear/src/main/res/values-pt-rBR/strings.xml @@ -2,14 +2,6 @@ AAPS AAPS - AAPS - AAPS(Grande) - AAPS(GrafGrande) - AAPS(SemGraf) - AAPS(Círculo) - AAPSv2 - AAPS(Cockpit) - AAPS(Steampunk) Sem dados! Dados antigos! Desde %1$s @@ -74,7 +66,6 @@ alteração turno Bomba Loop - CPP TDD Hidratos IOB diff --git a/wear/src/main/res/values-pt-rPT/strings.xml b/wear/src/main/res/values-pt-rPT/strings.xml index 5d10f2aba4..ce0b60d8bf 100644 --- a/wear/src/main/res/values-pt-rPT/strings.xml +++ b/wear/src/main/res/values-pt-rPT/strings.xml @@ -2,15 +2,6 @@ AAPS AAPS - AAPS - AAPS(Grande) - AAPS(GrafGrande) - AAPS(SemGraf) - AAPS(Círculo) - AAPSv2 - AAPS(Cockpit) - AAPS(Steampunk) - AAPS(DigitalStyle) Sem dados! Dados antigos! Desde %1$s @@ -59,7 +50,6 @@ Complicação de Toque Unicode em Complicações Versão: - mais definições do Mostrador Verifique a configuração do mostrador, por favor. AlvoT Bólus @@ -81,7 +71,6 @@ CANCELAR BÓLUS Bomba Loop - CPP TDI Hidratos IA diff --git a/wear/src/main/res/values-ro-rRO/strings.xml b/wear/src/main/res/values-ro-rRO/strings.xml index 6ec5eb2dfb..5b4c8a8ea5 100644 --- a/wear/src/main/res/values-ro-rRO/strings.xml +++ b/wear/src/main/res/values-ro-rRO/strings.xml @@ -2,15 +2,6 @@ AAPS AAPS - AAPS - AAPS(Mare) - AAPS(GraficMare) - AAPS(FărăGrafic) - AAPS(Cerc) - AAPSv2 - AAPS(Panou) - AAPS (Steampunk) - AAPS (DigitalStyle) Nu există date! Date vechi! De acum %1$s @@ -59,7 +50,6 @@ Acţiuni pentru complicaţii Unicode în complicații Versiune: - mai multe setări Watchface Uitaţi-vă în configurarea Watchface, vă rugăm. ŢintăTemporară Bolus @@ -81,7 +71,6 @@ ANULARE BOLUS Pompă Buclă - CPP TDD Carbohidrați IOB diff --git a/wear/src/main/res/values-ru-rRU/strings.xml b/wear/src/main/res/values-ru-rRU/strings.xml index 879fa2f70d..cf45f1a812 100644 --- a/wear/src/main/res/values-ru-rRU/strings.xml +++ b/wear/src/main/res/values-ru-rRU/strings.xml @@ -2,15 +2,6 @@ AAPS AAPS - AAPS - AAPS (Большой) - AAPS (Крупный график) - AAPS (Без графика) - AAPS (круглый) - AAPSv2 - AAPS (кабина пилота) - AAPS (Стимпанк) - AAPS (DigitalStyle) AAPS (Действия) AAPS(ВремЦель) AAPS(Мастер) @@ -64,7 +55,6 @@ Действия при нажатии кнопки расширений Юникод в репликации Версия: - еще настройки циферблатов Смотрите конфигурацию циферблата. ВремЦ Калькулятор @@ -92,7 +82,6 @@ ОТМЕНИТЬ БОЛЮС Помпа Замкнутый цикл - Суточный профиль в процентах TDD/общая суточная доза Углеводы IOB diff --git a/wear/src/main/res/values-sk-rSK/strings.xml b/wear/src/main/res/values-sk-rSK/strings.xml index 66304f6099..a5591f2f37 100644 --- a/wear/src/main/res/values-sk-rSK/strings.xml +++ b/wear/src/main/res/values-sk-rSK/strings.xml @@ -2,15 +2,6 @@ AAPS AAPS - AAPS - AAPS(Veľké) - AAPS(VeľkýGraf) - AAPS(ŽiadnyGraf) - AAPS(Kruh) - AAPSv2 - AAPS(Cockpit) - AAPS (Steampunk) - AAPS(DigitalStyle) AAPS (Akcie) AAPS(Dočasný cieľ) AAPS(Rýchly bolus) @@ -64,7 +55,6 @@ Zadaj komplikáciu Unicode v komplikáciach Verzia: - ďalšie nastavenia Watchface Pozrite sa prosím do konfigurácie Watchface. TempT Kalkulačka @@ -90,7 +80,6 @@ Požadovaná kalkulačka Požadované plnenie Požadované sacharidy - Požadovaný profil Cieľ Nízka Vysoká @@ -112,7 +101,6 @@ ZRUŠIŤ BOLUS Pumpa Uzavretý okruh - PROFIL TDD Sacharidy IOB diff --git a/wear/src/main/res/values-sv-rSE/strings.xml b/wear/src/main/res/values-sv-rSE/strings.xml index 6d8ec30406..9c1b986798 100644 --- a/wear/src/main/res/values-sv-rSE/strings.xml +++ b/wear/src/main/res/values-sv-rSE/strings.xml @@ -2,15 +2,6 @@ AAPS AAPS - AAPS - AAPS (Large) - AAPS (BigChart) - AAPS (NoChart) - AAPS (Circle) - AAPS v2 - AAPS (Cockpit) - AAPS (Steampunk) - AAPS (DigitalStyle) AAPS(Åtgärder) AAPS(Temp-mål) AAPS(Snabbsteg) @@ -64,7 +55,6 @@ Åtgärd för komplikation \"tryck\" Unicode i komplikationer Version: - fler watchface-inställningar Kontrollera watchface-konfigurationen, tack. Tempmål Kalkylator @@ -88,7 +78,6 @@ Kalkylator begärd Påfyllning begärd Kolhydrater begärda - CPP begärd Mål Låg Hög @@ -109,7 +98,6 @@ AVBRYT BOLUS Pump APS - CPP TDD KH IOB diff --git a/wear/src/main/res/values-tr-rTR/strings.xml b/wear/src/main/res/values-tr-rTR/strings.xml index 2d0b014d4f..29ecdccbb1 100644 --- a/wear/src/main/res/values-tr-rTR/strings.xml +++ b/wear/src/main/res/values-tr-rTR/strings.xml @@ -2,15 +2,15 @@ AAPS AAPS - AAPS - AAPS(Büyük) - AAPS(BüyükGrafik) - AAPS(GrafikYok) - AAPS(Daire) - AAPSv2 - AAPS(Cockpit) - AAPS(Steampunk) - AAPS(DijitalStil) + AAPS + AAPS(Büyük) + AAPS(BüyükGrafik) + AAPS(GrafikYok) + AAPS(Daire) + AAPS (v2) + AAPS(Cockpit) + AAPS (Steampunk) + AAPS(DijitalStil) AAPS(Eylemler) AAPS(Geçici Hedef) AAPS(Hızlı Asistan) @@ -64,7 +64,6 @@ Komplikasyon Dokunma Eylemi Komplikasyonlarda Unicode Versiyon: - daha çok saatarayüz ayarı Lütfen, Saatarayüzü yapılandırmasına bakın. GeçiciH Hesap makinesi @@ -90,7 +89,7 @@ Hesaplama talebi Doldurma talebi Karonhidrat talebi - CPP talebi + Profil Değişimi İstendi Hedef Düşük Yüksek @@ -112,7 +111,7 @@ BOLUS İPTAL ET Pompa Döngü - CPP + Profil değiştir GTD Karb IOB diff --git a/wear/src/main/res/values-zh-rCN/strings.xml b/wear/src/main/res/values-zh-rCN/strings.xml index 0424f9cab2..a7b0cdfd1f 100644 --- a/wear/src/main/res/values-zh-rCN/strings.xml +++ b/wear/src/main/res/values-zh-rCN/strings.xml @@ -2,15 +2,6 @@ AAPS AAPS - AAPS - AAPS(大) - AAPS(大图) - AAPS(无图) - AAPS(圆形) - AAPSv2 - AAPS(驾驶) - AAPS(Steampunk) - AAPS(数字风格) AAPS(操作) AAPS(临时目标) AAPS(快速向导) @@ -64,7 +55,6 @@ 折叠Tap操作 折叠中的代码 版本 - 更多手表表盘设置 请查看手表表盘配置。 临时目标 计算器 @@ -90,7 +80,6 @@ 计算请求 Fill 充盈请求 碳水化合物请求 - CPP请求 目标 低 高 @@ -112,7 +101,6 @@ 取消大剂量 胰岛素泵 闭环 - CPP 日总量 碳水化合物 活性胰岛素