caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

Browse source
This commit is contained in:
Milos Kozak 2022-01-14 13:46:32 +01:00
parent e2bdc34834 92f2b59649
commit cad15dc88f
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/res/values-ca-rES/strings.xml
View file

@ -57,6 +57,7 @@
<string name="treatments_wizard_tt_label">OT</string>
<string name="treatments_wizard_carbs_label">Carbs</string>
<string name="treatments_wizard_correction_label">Corr</string>
<string name="bolus_iob_label">IOB Bolus</string>
<string name="openapsma_run">Executar ara</string>
<string name="vitualpump_label">BOMBA VIRTUAL</string>
<string name="openapsma_lastrun_label">Última execució</string>

2
shared/build.gradle
View file

@ -24,7 +24,7 @@ dependencies {
api "com.google.dagger:dagger-android-support:$dagger_version"
//Logger
api 'org.slf4j:slf4j-api:1.7.32'
api 'org.slf4j:slf4j-api:1.7.33'
api("com.github.tony19:logback-android-classic:1.1.1-6") {
exclude group: "com.google.android", module: "android"
}

8
wear/src/main/res/values-it-rIT/strings.xml
View file

@ -122,8 +122,8 @@
<string name="color_name_white">bianco</string>
<string name="color_name_black">nero</string>
<string name="color_name_multicolor">multicolore</string>
<string name="pref_simplify_ui_charging">Semplifica interfaccia di caricamento</string>
<string name="pref_simplify_ui_charging_sum">Mostra solo tempo e BG durante la carica</string>
<string name="pref_simplify_ui">Semplifica UI</string>
<string name="pref_simplify_ui_sum">Mostra solo tempo e BG</string>
<string name="pref_vibrate_hourly">Vibra a ogni ora</string>
<string name="pref_show_weeknumber">Mostra numero settimana</string>
<string name="digitalstyle_pref_your_style">Il tuo stile:</string>
@ -138,4 +138,8 @@
<string name="bolus_progress_silent_channel_name">Progresso bolo AAPS silenzioso</string>
<string name="bolus_progress_channel_description">Progresso e cancellazione bolo</string>
<string name="bolus_progress_silent_channel_description">Progresso e cancellazione bolo con meno vibrazioni</string>
<string name="simple_ui_off">Off</string>
<string name="simple_ui_charging">Durante la ricarica</string>
<string name="simple_ui_always_on">Modalità Always On</string>
<string name="simple_ui_always_on_charging">Always On e Ricarica</string>
</resources>

8
wear/src/main/res/values-nl-rNL/strings.xml
View file

@ -122,8 +122,8 @@
<string name="color_name_white">wit</string>
<string name="color_name_black">zwart</string>
<string name="color_name_multicolor">multicolor</string>
<string name="pref_simplify_ui_charging">Vereenvoudig weergave tijdens opladen</string>
<string name="pref_simplify_ui_charging_sum">Toon alleen tijd en BG tijdens het opladen</string>
<string name="pref_simplify_ui">Versimpel interface</string>
<string name="pref_simplify_ui_sum">Alleen tijd en BG weergeven</string>
<string name="pref_vibrate_hourly">Tril ieder uur</string>
<string name="pref_show_weeknumber">Weeknummer weergeven</string>
<string name="digitalstyle_pref_your_style">Jouw stijl:</string>
@ -138,4 +138,8 @@
<string name="bolus_progress_silent_channel_name">AAPS Bolus Voortgang Stil</string>
<string name="bolus_progress_channel_description">Bolus voortgang en annuleer</string>
<string name="bolus_progress_silent_channel_description">Bolus voortgang en annuleer met minder trillingen</string>
<string name="simple_ui_off">Uit</string>
<string name="simple_ui_charging">Tijdens Opladen</string>
<string name="simple_ui_always_on">Altijd Aan modus</string>
<string name="simple_ui_always_on_charging">Altijd Aan en Opladen</string>
</resources>