From e2e74c001448468d88de232770d7238fd25b9af6 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sat, 7 Dec 2019 12:42:27 +0100 Subject: [PATCH 1/5] New Crowdin translations (#2242) * New translations strings.xml (Dutch) * New translations strings.xml (Czech) * New translations strings.xml (Afrikaans) * New translations strings.xml (Russian) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Romanian) * New translations strings.xml (Slovak) * New translations strings.xml (Portuguese) * New translations strings.xml (Spanish) * New translations strings.xml (Swedish) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Polish) * New translations strings.xml (Bulgarian) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Croatian) * New translations strings.xml (Czech) * New translations strings.xml (Dutch) * New translations strings.xml (Finnish) * New translations strings.xml (French) * New translations strings.xml (Lithuanian) * New translations strings.xml (German) * New translations strings.xml (Greek) * New translations strings.xml (Hebrew) * New translations strings.xml (Irish) * New translations strings.xml (Italian) * New translations strings.xml (Japanese) * New translations strings.xml (Korean) * New translations strings.xml (Turkish) * New translations strings.xml (Portuguese) * New translations strings.xml (Slovak) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese) * New translations strings.xml (Italian) * New translations strings.xml (Italian) * New translations strings.xml (Italian) * New translations strings.xml (Portuguese) * New translations strings.xml (Russian) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (Slovak) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Bulgarian) --- app/src/main/res/values-bg-rBG/strings.xml | 1 + app/src/main/res/values-cs-rCZ/strings.xml | 1 + app/src/main/res/values-de-rDE/strings.xml | 5 ++-- app/src/main/res/values-fr-rFR/strings.xml | 23 ++++++++++++++++ app/src/main/res/values-it-rIT/strings.xml | 1 + app/src/main/res/values-nl-rNL/strings.xml | 15 +++++++++++ app/src/main/res/values-pt-rBR/strings.xml | 29 +++++++++++++++++++++ app/src/main/res/values-pt-rPT/strings.xml | 3 +++ app/src/main/res/values-sk-rSK/strings.xml | 1 + wear/src/main/res/values-af-rZA/strings.xml | 3 +++ wear/src/main/res/values-bg-rBG/strings.xml | 3 +++ wear/src/main/res/values-cs-rCZ/strings.xml | 3 +++ wear/src/main/res/values-de-rDE/strings.xml | 17 ++++++++++++ wear/src/main/res/values-el-rGR/strings.xml | 3 +++ wear/src/main/res/values-es-rES/strings.xml | 3 +++ wear/src/main/res/values-fi-rFI/strings.xml | 3 +++ wear/src/main/res/values-fr-rFR/strings.xml | 17 ++++++++++++ wear/src/main/res/values-ga-rIE/strings.xml | 3 +++ wear/src/main/res/values-hr-rHR/strings.xml | 3 +++ wear/src/main/res/values-it-rIT/strings.xml | 17 ++++++++++++ wear/src/main/res/values-iw-rIL/strings.xml | 3 +++ wear/src/main/res/values-ja-rJP/strings.xml | 3 +++ wear/src/main/res/values-ko-rKR/strings.xml | 3 +++ wear/src/main/res/values-lt-rLT/strings.xml | 3 +++ wear/src/main/res/values-nl-rNL/strings.xml | 3 +++ wear/src/main/res/values-pl-rPL/strings.xml | 3 +++ wear/src/main/res/values-pt-rBR/strings.xml | 3 +++ wear/src/main/res/values-pt-rPT/strings.xml | 17 ++++++++++++ wear/src/main/res/values-ro-rRO/strings.xml | 3 +++ wear/src/main/res/values-ru-rRU/strings.xml | 17 ++++++++++++ wear/src/main/res/values-sk-rSK/strings.xml | 17 ++++++++++++ wear/src/main/res/values-sv-rSE/strings.xml | 3 +++ wear/src/main/res/values-tr-rTR/strings.xml | 3 +++ wear/src/main/res/values-zh-rCN/strings.xml | 3 +++ 34 files changed, 236 insertions(+), 2 deletions(-) create mode 100644 wear/src/main/res/values-af-rZA/strings.xml create mode 100644 wear/src/main/res/values-bg-rBG/strings.xml create mode 100644 wear/src/main/res/values-cs-rCZ/strings.xml create mode 100644 wear/src/main/res/values-de-rDE/strings.xml create mode 100644 wear/src/main/res/values-el-rGR/strings.xml create mode 100644 wear/src/main/res/values-es-rES/strings.xml create mode 100644 wear/src/main/res/values-fi-rFI/strings.xml create mode 100644 wear/src/main/res/values-fr-rFR/strings.xml create mode 100644 wear/src/main/res/values-ga-rIE/strings.xml create mode 100644 wear/src/main/res/values-hr-rHR/strings.xml create mode 100644 wear/src/main/res/values-it-rIT/strings.xml create mode 100644 wear/src/main/res/values-iw-rIL/strings.xml create mode 100644 wear/src/main/res/values-ja-rJP/strings.xml create mode 100644 wear/src/main/res/values-ko-rKR/strings.xml create mode 100644 wear/src/main/res/values-lt-rLT/strings.xml create mode 100644 wear/src/main/res/values-nl-rNL/strings.xml create mode 100644 wear/src/main/res/values-pl-rPL/strings.xml create mode 100644 wear/src/main/res/values-pt-rBR/strings.xml create mode 100644 wear/src/main/res/values-pt-rPT/strings.xml create mode 100644 wear/src/main/res/values-ro-rRO/strings.xml create mode 100644 wear/src/main/res/values-ru-rRU/strings.xml create mode 100644 wear/src/main/res/values-sk-rSK/strings.xml create mode 100644 wear/src/main/res/values-sv-rSE/strings.xml create mode 100644 wear/src/main/res/values-tr-rTR/strings.xml create mode 100644 wear/src/main/res/values-zh-rCN/strings.xml diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index edbbe5e92b..e5a2de462c 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -1417,4 +1417,5 @@ Името на профила съдържа точка.\nТова не се поддържа от НС.\nПрофилът не е качен в НС. Ниската граница на диапазона (графика) Високата граница на диапазона (графика) + Подреди diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index bf45a700ac..552e93c864 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -1417,4 +1417,5 @@ Název profilu obsahuje tečky.\nToto není v NS podporováno.\nProfil není přenesen do NS. Spodní hodnota oblasti v rozsahu (pouze zobrazování) Horní hodnota oblasti v rozsahu (pouze zobrazování) + Změna pořadí diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index d223e1092e..d0c2373c22 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -1400,8 +1400,8 @@ Unerwartetes Verhalten. %1$dg Ein Aus - Löschen abgeschlossen - Löschen gestartet + Ziel erneut öffnen + Ziel neu starten Zeiterkennung Möchtest Du den Start der Ziele zurücksetzen? Du verlierst Deine Fortschritte. Keine Pumpe ausgewählt @@ -1418,4 +1418,5 @@ Unerwartetes Verhalten. Profilname enthält Punkte.\nDies wird von NS nicht unterstützt.\nProfil wird nicht zu NS hochgeladen. Unterer Wert des Zielbereichs (nur Anzeige) Oberer Wert des Zielbereichs (nur Anzeige) + Umsortieren diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 1d322049f8..03e4fbc029 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -377,8 +377,11 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Bouton 1 Bouton 2 Bouton 3 + Unités : + Unités mg/dl mmol/l + DAI Fourchette cible : Fourchette de visualisation Les repères hauts et bas sur les graphiques pour l\'aperçu et la montre @@ -1390,10 +1393,30 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S %1$d%% Assistant Bolus min + Nom du profil : + Sélectionné : + Unités + Voulez-vous changer de profil et annuler les modifications faites dans le profil actuel ? %1$dg On Off Suppression terminée Suppression démarrée + Détection de temps Voulez-vous réinitialiser le début de l\'objectif ? Vous risquez de perdre vos progrès. + Aucune pompe sélectionnée + Sélectionnez les unités dans lesquelles vous souhaitez afficher les valeurs + Remonter les modifications de profil local dans NS + DAI + G/I + SI + CIBLE + Dupliquer + Sauver ou réinitialiser les modifications actuelles en premier + Supprimer le profil actuel ? + Créer un nouveau profil local à partir de ce changement de profil ? + Le nom du profil contient des points.\nCe n\'est pas pris en charge par NS.\nLe profil n\'est pas remonté dans NS. + Valeur inférieure dans la plage (affichage uniquement) + Valeur supérieure dans la plage (affichage uniquement) + Réordonner diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index d352436aa5..0b4e15fff8 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -1417,4 +1417,5 @@ Il nome profilo contiene dei punti.\nQuesto non è supportato da NS.\nIl profilo non viene caricato in NS. Valore più basso per l\'intervallo di visualizzazione dell\'area \"in range\" Valore più alto per l\'intervallo di visualizzazione dell\'area \"in range\" + Riordina diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml index 09f55f1b94..9885866f31 100644 --- a/app/src/main/res/values-nl-rNL/strings.xml +++ b/app/src/main/res/values-nl-rNL/strings.xml @@ -376,8 +376,11 @@ Knop 1 Knop 2 Knop 3 + Eenheden: + Eenheden mg/dl mmol/l + DIA Streefdoel: Bereik voor visualisatie Hoge en lage grens voor grafieken op het Overzicht en op Wear @@ -1389,6 +1392,9 @@ %1$d%% Bolus wizard min + Profielnaam: + Geselecteerd: + Eenheden %1$dg Aan Uit @@ -1396,4 +1402,13 @@ Wissen gestart Tijd detectie Wil je dit leerdoel opnieuw starten? Je kunt je voortgang verliezen. + Geen pomp geselecteerd + Selecteer eenheden waarin je waarden wilt weergeven + Upload lokale profielwijzigingen naar NS + DIA + KH ratio + ISF + Dupliceren + Huidige profiel verwijderen? + Sorteren diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index c38bb1a3a9..9e7fbc3c9b 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -265,6 +265,9 @@ Bolus %1$.2fU entregue com sucesso Vão ser administradas %1$.2fU Bólus %1$.2fU enviado com êxito + Alvo %1$s para %2$d minutos + Alvo %1$s para %2$d minutos definido com sucesso + Alvo Temp cancelado com êxito Administrando %1$.2fU Permitir comandos remotos via SMS Dedo @@ -324,10 +327,13 @@ Para começar a basal %1$.2fU/h durante%2$d min responda com o código %3$s Para mudar o perfil para %1$s %2$d%% responda com o código %3$s Para começar o bólus estendido %1$.2fU/h para %2$d min responda com o código %3$s + Para inserir %1$dg em %2$s responda com código %3$s Para começar a basal %1$d% U/h durante %2$d min responda com o código %3$s Para suspender o loop por %1$d minutos resposta com código %2$s Basal temporária %1$.2fU/h para %2$d min iniciada com êxito Bólus estendido %1$.2fU/h para %2$d min iniciado com êxito + Hidratos %1$dg inseridos com sucesso + Introdução de %1$dg de hidratos falhou Basal temporária %1$d% U/h durante%2$d min iniciada com êxito Falha ao iniciar basal temp Falha ao iniciar o bolus estendido @@ -361,8 +367,11 @@ Botão 1 Botão 2 Botão 3 + Unidades: + Unidades mg/dL mmol/L + DIA Intervalo Alvo: Intervalo para visualização Marca alta e baixa para as cartas em Visão geral e Smartwatch @@ -1374,7 +1383,27 @@ %1$d%% Assistente de Bólus min + Nome do Perfil: + Seleccionado: + Unidades + Deseja mudar de perfil e descartar as alterações feitas no perfil actual? %1$dg Ligado Desligado + Limpar terminado + Limpar iniciado + Detecção de tempo + Nenhuma bomba seleccionada + Seleccione as unidades em que deseja exibir os valores + Carregar as alterações do perfil local para NS + DIA + IC + FSI + ALV + Clone + Guardar ou repor as alterações actuais primeiro + Eliminar perfil actual? + Criar novo perfil local a partir desta troca de perfil? + Nome do perfil contém pontos.\nIsso não é suportado pelo NS.\nPerfil não é enviado para o NS. + Reordenar diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index a066ebb901..43dc0aeda8 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -260,6 +260,7 @@ Número de telefones permitidos +XXXXXXXXXX;+YYYYYYYYYY Para dar bolus %1$.2fU responder com código %2$s + Para cancelar Alvo Temp responda com o código %1$s Para enviar calibração %1$.2f responder com código %2$s Bólus falhado Bólus %1$.2fU enviado com êxito @@ -1401,7 +1402,9 @@ FSI ALV Clone + Guardar ou repor as alterações actuais primeiro Eliminar perfil actual? Criar novo perfil local a partir desta troca de perfil? Nome do perfil contém pontos.\nIsso não é suportado pelo NS.\nPerfil não é enviado para o NS. + Reordenar diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index a31af19919..6535d69a69 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -1417,4 +1417,5 @@ Názov profilu obsahuje bodky.\nToto nie je podporované v NS.\nProfil nebude prenesený do NS. Spodná hodnota v oblasti cieľového rozsahu (iba zobrazovanie) Horná hodnota v oblasti cieľového rozsahu (iba zobrazovanie) + Zmena poradia diff --git a/wear/src/main/res/values-af-rZA/strings.xml b/wear/src/main/res/values-af-rZA/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-af-rZA/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-bg-rBG/strings.xml b/wear/src/main/res/values-bg-rBG/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-bg-rBG/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-cs-rCZ/strings.xml b/wear/src/main/res/values-cs-rCZ/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-cs-rCZ/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-de-rDE/strings.xml b/wear/src/main/res/values-de-rDE/strings.xml new file mode 100644 index 0000000000..cf37395175 --- /dev/null +++ b/wear/src/main/res/values-de-rDE/strings.xml @@ -0,0 +1,17 @@ + + + + AAPS + AAPS + AAPS + AAPS(groß) + AAPS(GroßerGraph) + AAPS(KeinGraph) + AAPS(Kreis) + Keine Daten! + Veraltete Daten! + Seit %1$s + Synchronisiere mit AAPS! + Keine Daten seit %1$s! Prüfe, ob AAPS auf dem Smartphone Daten an die Uhr sendet. + AAPS Daten sind %1$s alt! Prüfe Deinen Sensor, xDrip+, NS, AAPS Einstellungen etc! + diff --git a/wear/src/main/res/values-el-rGR/strings.xml b/wear/src/main/res/values-el-rGR/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-el-rGR/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-es-rES/strings.xml b/wear/src/main/res/values-es-rES/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-es-rES/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-fi-rFI/strings.xml b/wear/src/main/res/values-fi-rFI/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-fi-rFI/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-fr-rFR/strings.xml b/wear/src/main/res/values-fr-rFR/strings.xml new file mode 100644 index 0000000000..e945cb7037 --- /dev/null +++ b/wear/src/main/res/values-fr-rFR/strings.xml @@ -0,0 +1,17 @@ + + + + AAPS + AAPS + AAPS + AAPS(Large) + AAPS(GrandGraph) + AAPS(SansGraph) + AAPS(Cercle) + Pas de données ! + Données anciennes! + Depuis %1$s + Synchro avec AAPS ! + Aucune donnée deçues depuis %1$s! Vérifez sur le téléphone si AAPS envoie les données à la montre + Données AAPS anciennes de %1$s ! Vérifiez votre capteur, les configurations xDrip+, NS, AAPS ou autre ! + diff --git a/wear/src/main/res/values-ga-rIE/strings.xml b/wear/src/main/res/values-ga-rIE/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-ga-rIE/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-hr-rHR/strings.xml b/wear/src/main/res/values-hr-rHR/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-hr-rHR/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-it-rIT/strings.xml b/wear/src/main/res/values-it-rIT/strings.xml new file mode 100644 index 0000000000..cf82f35552 --- /dev/null +++ b/wear/src/main/res/values-it-rIT/strings.xml @@ -0,0 +1,17 @@ + + + + AAPS + AAPS + AAPS + AAPS(Largo) + AAPS(GrandeGrafico) + AAPS(NoGrafico) + AAPS(Cerchio) + Nessun dato! + Dati vecchi! + Da %1$s + Sincro con AAPS! + Nessun dato ricevuto da %1$s! Controlla se AAPS sul telefono invia i dati allo smartwatch + I dati di AAPS sono vecchi di %1$s ! Controlla il tuo sensore, xDrip+, NS, la configurazione di AAPS o altro! + diff --git a/wear/src/main/res/values-iw-rIL/strings.xml b/wear/src/main/res/values-iw-rIL/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-iw-rIL/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-ja-rJP/strings.xml b/wear/src/main/res/values-ja-rJP/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-ja-rJP/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-ko-rKR/strings.xml b/wear/src/main/res/values-ko-rKR/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-ko-rKR/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-lt-rLT/strings.xml b/wear/src/main/res/values-lt-rLT/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-lt-rLT/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-nl-rNL/strings.xml b/wear/src/main/res/values-nl-rNL/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-nl-rNL/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-pl-rPL/strings.xml b/wear/src/main/res/values-pl-rPL/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-pl-rPL/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-pt-rBR/strings.xml b/wear/src/main/res/values-pt-rBR/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-pt-rBR/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-pt-rPT/strings.xml b/wear/src/main/res/values-pt-rPT/strings.xml new file mode 100644 index 0000000000..4659b21c65 --- /dev/null +++ b/wear/src/main/res/values-pt-rPT/strings.xml @@ -0,0 +1,17 @@ + + + + AAPS + AAPS + AAPS + AAPS(Grande) + AAPS(GrafGrande) + AAPS(SemGraf) + AAPS(Círculo) + Sem dados! + Dados antigos! + Desde %1$s + Sincronizar com AAPS! + Nenhum dado recebido desde %1$s! Confira se o AAPS no telefone envia dados para o relógio + Dados AAPS são %1$s antigos! Verifique sensor, xDrip+, NS, configuração AAPS ou outra! + diff --git a/wear/src/main/res/values-ro-rRO/strings.xml b/wear/src/main/res/values-ro-rRO/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-ro-rRO/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-ru-rRU/strings.xml b/wear/src/main/res/values-ru-rRU/strings.xml new file mode 100644 index 0000000000..a19423e485 --- /dev/null +++ b/wear/src/main/res/values-ru-rRU/strings.xml @@ -0,0 +1,17 @@ + + + + AAPS + AAPS + AAPS + AAPS (Большой) + AAPS (Крупный график) + AAPS (Без графика) + AAPS (круглый) + Данные не поступают! + Старые данные! + Длится с: %1$s + Синхронизация с ААПС! + Нет данных начиная с %1$s! Убедитесь, что AAPS на телефоне отправляет данные на часы + Старые данные AAPS от %1$s! Проверьте сенсор, xDrip +, NS, конфигурацию AAPS, другое! + diff --git a/wear/src/main/res/values-sk-rSK/strings.xml b/wear/src/main/res/values-sk-rSK/strings.xml new file mode 100644 index 0000000000..40d4118d95 --- /dev/null +++ b/wear/src/main/res/values-sk-rSK/strings.xml @@ -0,0 +1,17 @@ + + + + AAPS + AAPS + AAPS + AAPS(Veľké) + AAPS(VeľkýGraf) + AAPS(ŽiadnyGraf) + AAPS(Kruh) + Žiadne dáta! + Zastaralé dáta! + Od %1$s + Synchronizácia s AAPS! + Žiadne dáta od %1$s! Skontroluj, či AAPS na telefóne posiela dáta na hodinky + AAPS dáta sú %1$s staré! Skontroluj tvoj senzor, xDrip+, NS, AAPS nastavenia atď.! + diff --git a/wear/src/main/res/values-sv-rSE/strings.xml b/wear/src/main/res/values-sv-rSE/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-sv-rSE/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-tr-rTR/strings.xml b/wear/src/main/res/values-tr-rTR/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-tr-rTR/strings.xml @@ -0,0 +1,3 @@ + + + diff --git a/wear/src/main/res/values-zh-rCN/strings.xml b/wear/src/main/res/values-zh-rCN/strings.xml new file mode 100644 index 0000000000..70489fbc5e --- /dev/null +++ b/wear/src/main/res/values-zh-rCN/strings.xml @@ -0,0 +1,3 @@ + + + From 517b9a9fa7a64e0f2270271ff2e41860d678a392 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sat, 7 Dec 2019 18:14:32 +0100 Subject: [PATCH 2/5] Handle NS TempTarget sync properly --- .../info/nightscout/androidaps/db/DatabaseHelper.java | 5 +++-- .../androidaps/plugins/general/nsclient/NSUpload.java | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java index d8926fc4c1..92081c1872 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java +++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java @@ -3,6 +3,7 @@ package info.nightscout.androidaps.db; import android.content.Context; import android.database.DatabaseUtils; import android.database.sqlite.SQLiteDatabase; + import androidx.annotation.Nullable; import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper; @@ -772,8 +773,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { TempTarget tempTarget = new TempTarget() .date(trJson.getLong("mills")) .duration(JsonHelper.safeGetInt(trJson, "duration")) - .low(Profile.toMgdl(trJson.getDouble("targetBottom"), units)) - .high(Profile.toMgdl(trJson.getDouble("targetTop"), units)) + .low(Profile.toMgdl(JsonHelper.safeGetDouble(trJson, "targetBottom"), units)) + .high(Profile.toMgdl(JsonHelper.safeGetDouble(trJson, "targetTop"), units)) .reason(JsonHelper.safeGetString(trJson, "reason", "")) ._id(trJson.getString("_id")) .source(Source.NIGHTSCOUT); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java index 582eedb0e7..49e33c8215 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java @@ -315,11 +315,13 @@ public class NSUpload { JSONObject data = new JSONObject(); data.put("eventType", CareportalEvent.TEMPORARYTARGET); data.put("duration", tempTarget.durationInMinutes); - data.put("reason", tempTarget.reason); - data.put("targetBottom", Profile.fromMgdlToUnits(tempTarget.low, ProfileFunctions.getSystemUnits())); - data.put("targetTop", Profile.fromMgdlToUnits(tempTarget.high, ProfileFunctions.getSystemUnits())); + if (tempTarget.low > 0) { + data.put("reason", tempTarget.reason); + data.put("targetBottom", Profile.fromMgdlToUnits(tempTarget.low, ProfileFunctions.getSystemUnits())); + data.put("targetTop", Profile.fromMgdlToUnits(tempTarget.high, ProfileFunctions.getSystemUnits())); + data.put("units", ProfileFunctions.getSystemUnits()); + } data.put("created_at", DateUtil.toISOString(tempTarget.date)); - data.put("units", ProfileFunctions.getSystemUnits()); data.put("enteredBy", MainApp.gs(R.string.app_name)); uploadCareportalEntryToNS(data); } catch (JSONException e) { From 8124c0ae4dc0d2c58434acb6c0b1e047843b4586 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sat, 7 Dec 2019 19:15:26 +0100 Subject: [PATCH 3/5] RC warnings --- .../versionChecker/VersionCheckerPlugin.kt | 25 +++++++++++++++---- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt index ee267c689e..f63b2b19fa 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt @@ -1,5 +1,6 @@ package info.nightscout.androidaps.plugins.constraints.versionChecker +import info.nightscout.androidaps.BuildConfig import info.nightscout.androidaps.MainApp import info.nightscout.androidaps.R import info.nightscout.androidaps.interfaces.* @@ -8,6 +9,7 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotifi import info.nightscout.androidaps.plugins.general.overview.notifications.Notification import info.nightscout.androidaps.utils.SP import java.util.concurrent.TimeUnit +import kotlin.math.roundToInt /** * Usually we would have a class here. @@ -22,6 +24,15 @@ object VersionCheckerPlugin : PluginBase(PluginDescription() .showInList(false) .pluginName(R.string.versionChecker)), ConstraintsInterface { + override fun onStart() { + super.onStart() + if (BuildConfig.VERSION_NAME.contains("RC", ignoreCase = false)) { + GRACE_PERIOD_WARNING = TimeUnit.DAYS.toMillis(0) + GRACE_PERIOD_OLD = TimeUnit.DAYS.toMillis(7) + GRACE_PERIOD_VERY_OLD = TimeUnit.DAYS.toMillis(14) + } + } + override fun isClosedLoopAllowed(value: Constraint): Constraint { checkWarning() triggerCheckVersion() @@ -45,7 +56,11 @@ object VersionCheckerPlugin : PluginBase(PluginDescription() SP.putLong(R.string.key_last_versionchecker_plugin_warning, now) //notify - val message = MainApp.gs(R.string.new_version_warning, Math.round((now - SP.getLong(R.string.key_last_time_this_version_detected, now)) / TimeUnit.DAYS.toMillis(1).toDouble())) + val message = MainApp.gs(R.string.new_version_warning, + ((now - SP.getLong(R.string.key_last_time_this_version_detected, now)) / TimeUnit.DAYS.toMillis(1).toDouble()).roundToInt(), + (GRACE_PERIOD_OLD / TimeUnit.DAYS.toMillis(1).toDouble()).roundToInt(), + (GRACE_PERIOD_VERY_OLD / TimeUnit.DAYS.toMillis(1).toDouble()).roundToInt() + ) val notification = Notification(Notification.OLDVERSION, message, Notification.NORMAL) RxBus.send(EventNewNotification(notification)) } @@ -65,9 +80,9 @@ object VersionCheckerPlugin : PluginBase(PluginDescription() return now > SP.getLong(R.string.key_last_time_this_version_detected, 0) + gracePeriod } - val WARN_EVERY = TimeUnit.DAYS.toMillis(1) - val GRACE_PERIOD_WARNING = TimeUnit.DAYS.toMillis(30) - val GRACE_PERIOD_OLD = TimeUnit.DAYS.toMillis(60) - val GRACE_PERIOD_VERY_OLD = TimeUnit.DAYS.toMillis(90) + private val WARN_EVERY = TimeUnit.DAYS.toMillis(1) + private var GRACE_PERIOD_WARNING = TimeUnit.DAYS.toMillis(30) + private var GRACE_PERIOD_OLD = TimeUnit.DAYS.toMillis(60) + private var GRACE_PERIOD_VERY_OLD = TimeUnit.DAYS.toMillis(90) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0bb46b85fb..69264a5cdf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1380,7 +1380,7 @@ old version very old version - New version for at least %1$d days available! Fallback to LGS after 60 days, loop will be disabled after 90 days + New version for at least %1$d days available! Fallback to LGS after %2$d days, loop will be disabled after %3$d days 2h %1$.2fU From 0c19a4081ffc10e076761cdccfa81e66e76a53dd Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sat, 7 Dec 2019 19:18:52 +0100 Subject: [PATCH 4/5] ignoreCase = true --- .../plugins/constraints/versionChecker/VersionCheckerPlugin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt index f63b2b19fa..5f643b1963 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt @@ -26,7 +26,7 @@ object VersionCheckerPlugin : PluginBase(PluginDescription() override fun onStart() { super.onStart() - if (BuildConfig.VERSION_NAME.contains("RC", ignoreCase = false)) { + if (BuildConfig.VERSION_NAME.contains("RC", ignoreCase = true)) { GRACE_PERIOD_WARNING = TimeUnit.DAYS.toMillis(0) GRACE_PERIOD_OLD = TimeUnit.DAYS.toMillis(7) GRACE_PERIOD_VERY_OLD = TimeUnit.DAYS.toMillis(14) From 00702ae9246ef607dd1e2b36842cde67f970270f Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Sat, 7 Dec 2019 20:02:10 +0100 Subject: [PATCH 5/5] rc version refactor --- .../versionChecker/VersionCheckerPlugin.kt | 62 ++++++++++--------- build.gradle | 2 +- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt index 5f643b1963..8ec716a872 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt @@ -3,7 +3,11 @@ package info.nightscout.androidaps.plugins.constraints.versionChecker import info.nightscout.androidaps.BuildConfig import info.nightscout.androidaps.MainApp import info.nightscout.androidaps.R -import info.nightscout.androidaps.interfaces.* +import info.nightscout.androidaps.interfaces.Constraint +import info.nightscout.androidaps.interfaces.ConstraintsInterface +import info.nightscout.androidaps.interfaces.PluginBase +import info.nightscout.androidaps.interfaces.PluginDescription +import info.nightscout.androidaps.interfaces.PluginType import info.nightscout.androidaps.plugins.bus.RxBus import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification import info.nightscout.androidaps.plugins.general.overview.notifications.Notification @@ -18,25 +22,23 @@ import kotlin.math.roundToInt * */ object VersionCheckerPlugin : PluginBase(PluginDescription() - .mainType(PluginType.CONSTRAINTS) - .neverVisible(true) - .alwaysEnabled(true) - .showInList(false) - .pluginName(R.string.versionChecker)), ConstraintsInterface { + .mainType(PluginType.CONSTRAINTS) + .neverVisible(true) + .alwaysEnabled(true) + .showInList(false) + .pluginName(R.string.versionChecker)), ConstraintsInterface { - override fun onStart() { - super.onStart() - if (BuildConfig.VERSION_NAME.contains("RC", ignoreCase = true)) { - GRACE_PERIOD_WARNING = TimeUnit.DAYS.toMillis(0) - GRACE_PERIOD_OLD = TimeUnit.DAYS.toMillis(7) - GRACE_PERIOD_VERY_OLD = TimeUnit.DAYS.toMillis(14) + private val gracePeriod: GracePeriod + get() = if ((BuildConfig.VERSION_NAME.contains("RC", ignoreCase = true))) { + GracePeriod.RC + } else { + GracePeriod.RELEASE } - } override fun isClosedLoopAllowed(value: Constraint): Constraint { checkWarning() triggerCheckVersion() - return if (isOldVersion(GRACE_PERIOD_VERY_OLD)) + return if (isOldVersion(gracePeriod.veryOld.daysToMillis())) value.set(false, MainApp.gs(R.string.very_old_version), this) else value @@ -44,22 +46,22 @@ object VersionCheckerPlugin : PluginBase(PluginDescription() private fun checkWarning() { val now = System.currentTimeMillis() - + if (!SP.contains(R.string.key_last_versionchecker_plugin_warning)) { SP.putLong(R.string.key_last_versionchecker_plugin_warning, now) return } - if (isOldVersion(GRACE_PERIOD_WARNING) && shouldWarnAgain(now)) { + if (isOldVersion(gracePeriod.warning.daysToMillis()) && shouldWarnAgain(now)) { // store last notification time SP.putLong(R.string.key_last_versionchecker_plugin_warning, now) //notify val message = MainApp.gs(R.string.new_version_warning, - ((now - SP.getLong(R.string.key_last_time_this_version_detected, now)) / TimeUnit.DAYS.toMillis(1).toDouble()).roundToInt(), - (GRACE_PERIOD_OLD / TimeUnit.DAYS.toMillis(1).toDouble()).roundToInt(), - (GRACE_PERIOD_VERY_OLD / TimeUnit.DAYS.toMillis(1).toDouble()).roundToInt() + ((now - SP.getLong(R.string.key_last_time_this_version_detected, now)) / 1L.daysToMillis().toDouble()).roundToInt(), + gracePeriod.old, + gracePeriod.veryOld ) val notification = Notification(Notification.OLDVERSION, message, Notification.NORMAL) RxBus.send(EventNewNotification(notification)) @@ -67,22 +69,26 @@ object VersionCheckerPlugin : PluginBase(PluginDescription() } private fun shouldWarnAgain(now: Long) = - now > SP.getLong(R.string.key_last_versionchecker_plugin_warning, 0) + WARN_EVERY + now > SP.getLong(R.string.key_last_versionchecker_plugin_warning, 0) + WARN_EVERY override fun applyMaxIOBConstraints(maxIob: Constraint): Constraint = - if (isOldVersion(GRACE_PERIOD_OLD)) - maxIob.set(0.toDouble(), MainApp.gs(R.string.old_version), this) - else - maxIob + if (isOldVersion(gracePeriod.old.daysToMillis())) + maxIob.set(0.toDouble(), MainApp.gs(R.string.old_version), this) + else + maxIob private fun isOldVersion(gracePeriod: Long): Boolean { val now = System.currentTimeMillis() - return now > SP.getLong(R.string.key_last_time_this_version_detected, 0) + gracePeriod + return now > SP.getLong(R.string.key_last_time_this_version_detected, 0) + gracePeriod } private val WARN_EVERY = TimeUnit.DAYS.toMillis(1) - private var GRACE_PERIOD_WARNING = TimeUnit.DAYS.toMillis(30) - private var GRACE_PERIOD_OLD = TimeUnit.DAYS.toMillis(60) - private var GRACE_PERIOD_VERY_OLD = TimeUnit.DAYS.toMillis(90) } + +enum class GracePeriod(val warning: Long, val old: Long, val veryOld: Long) { + RELEASE(30, 60, 90), + RC(0, 7, 14) +} + +private fun Long.daysToMillis() = TimeUnit.DAYS.toMillis(this) \ No newline at end of file diff --git a/build.gradle b/build.gradle index d10498081c..3327014f1f 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { maven { url 'https://maven.fabric.io/public' } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.android.tools.build:gradle:3.5.3' classpath 'com.google.gms:google-services:4.3.3' classpath 'io.fabric.tools:gradle:1.31.2'