Merge branch 'develop' into feature/log_to_file
This commit is contained in:
commit
8fa7fdd18b
|
@ -9,8 +9,8 @@ android {
|
|||
|
||||
defaultConfig {
|
||||
applicationId "org.moire.ultrasonic"
|
||||
versionCode 79
|
||||
versionName "2.12.0"
|
||||
versionCode 80
|
||||
versionName "2.13.0"
|
||||
|
||||
minSdkVersion versions.minSdk
|
||||
targetSdkVersion versions.targetSdk
|
||||
|
@ -47,6 +47,7 @@ android {
|
|||
|
||||
lintOptions {
|
||||
baselineFile file("lint-baseline.xml")
|
||||
warning 'MissingTranslation'
|
||||
abortOnError true
|
||||
}
|
||||
}
|
||||
|
|
|
@ -251,7 +251,7 @@
|
|||
<string name="settings.preload_3">3 canciónes</string>
|
||||
<string name="settings.preload_5">5 canciónes</string>
|
||||
<string name="settings.preload_unlimited">Ilimitado</string>
|
||||
<string name="settings.playback.resume_play_on_headphones_plug.title">Reanudación de la inserción de auriculares</string>
|
||||
<string name="settings.playback.resume_play_on_headphones_plug.title">Reanudar al insertar los auriculares</string>
|
||||
<string name="settings.playback.resume_play_on_headphones_plug.summary">La aplicación reanudará la reproducción en pausa al insertar los auriculares en el dispositivo.</string>
|
||||
<string name="settings.screen_lit_summary">Mantener la pantalla encendida mientras descarga mejora la velocidad de la misma.</string>
|
||||
<string name="settings.screen_lit_title">Mantener la pantalla encendida</string>
|
||||
|
|
Loading…
Reference in New Issue