Merge branch 'master' into develop

This commit is contained in:
jannis 2020-01-08 16:14:06 +01:00
commit d6dc49ae84
6 changed files with 331 additions and 0 deletions

View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de>
~
~ This file is part of FitoTrack
~
~ FitoTrack is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ FitoTrack is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<color name="colorPrimary">#FB8C00</color>
<color name="colorPrimaryDark">#EF6C00</color>
<color name="colorPrimaryRunning">#43A047</color>
<color name="colorPrimaryDarkRunning">#2E7D32</color>
<color name="colorPrimaryBicycling">#523220</color>
<color name="colorPrimaryDarkBicycling">#462A1D</color>
<color name="colorAccent">#4CAF50</color>
<color name="colorAccentDark">#2E7D32</color>
<color name="colorPrimaryHiking">#009688</color>
<color name="colorPrimaryDarkHiking">#007267</color>
<color name="textLighterBlack">#C8000000</color>
<color name="textColorLight">#C8414141</color>
</resources>

View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de>
~
~ This file is part of FitoTrack
~
~ FitoTrack is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ FitoTrack is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<string-array name="pref_map_layers">
<item>Mapnik\nMapa OSM predeterminado</item>
<item>Humanitarian\nMapa limpio pero a veces no disponible</item>
<item>Outdoors\nAcceso limitado</item>
<item>Cyclemap\nAcceso limitado</item>
</string-array>
<string-array name="pref_map_layers_values">
<item>osm.mapnik</item>
<item>osm.humanitarian</item>
<item>thunderforest.outdoors</item>
<item>thunderforest.cycle</item>
</string-array>
</resources>

View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de>
~
~ This file is part of FitoTrack
~
~ FitoTrack is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ FitoTrack is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<string-array name="osm_track_visibility">
<item>Identificable</item>
<item>Rastreable</item>
<item>Privado</item>
</string-array>
</resources>

View File

@ -0,0 +1,129 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de>
~
~ This file is part of FitoTrack
~
~ FitoTrack is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ FitoTrack is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<string name="app_name">FitoTrack</string>
<string name="workout_add">Agregar</string>
<string name="stop">Detener</string>
<string name="delete">Borrar</string>
<string name="exporting">Exportar</string>
<string name="error">Error</string>
<string name="errorGpxExportFailed">La exportación GPX ha fallado.</string>
<string name="errorExportFailed">La exportación de datos ha fallado.</string>
<string name="errorImportFailed">La importación de datos ha fallado.</string>
<string name="shareFile">Compartir archivo</string>
<string name="initialising">Inicializando</string>
<string name="preferences">Preferencias</string>
<string name="workouts">Entrenamientos</string>
<string name="locationData">Datos de localización</string>
<string name="converting">Convertir</string>
<string name="finished">Terminado</string>
<string name="loadingFile">Cargando archivo</string>
<string name="chooseBackupFile">Elegir archivo de respaldo</string>
<string name="importBackupMessage">ADVERTENCIA: Se borrarán todos sus datos existentes en la aplicación. Si no desea perderlos, primero haga otra copia de seguridad. ¿Estás seguro de que quieres restaurar esta copia de seguridad?</string>
<string name="restore">Restaurar</string>
<string name="backup">Respaldo</string>
<string name="pref_ringtone_silent">Silencio</string>
<string name="setPreferencesTitle">Establecer preferencias</string>
<string name="setPreferencesMessage">Puede configurar su sistema de unidad preferido y su peso en la configuración.</string>
<string name="workoutTime">Hora</string>
<string name="workoutDate">Fecha</string>
<string name="workoutDuration">Duración</string>
<string name="workoutPauseDuration">Pausa Duración</string>
<string name="workoutStartTime">Hora de inicio</string>
<string name="workoutEndTime">Hora de fin</string>
<string name="workoutDistance">Distancia</string>
<string name="workoutPace">Ritmo</string>
<string name="workoutRoute">Ruta</string>
<string name="workoutSpeed">Velocidad</string>
<string name="workoutAvgSpeed">Velocidad promedio</string>
<string name="workoutTopSpeed">Velocidad máxima</string>
<string name="workoutBurnedEnergy">Energía quemada</string>
<string name="workoutTotalEnergy">Energía total</string>
<string name="workoutEnergyConsumption">Consumo de energía</string>
<string name="uploading">Subiendo</string>
<string name="enterVerificationCode">Introduzca el código de verificación</string>
<string name="authenticationFailed">Error de autenticación</string>
<string name="upload">Subir</string>
<string name="uploadSuccessful">Subida exitosa</string>
<string name="uploadFailed">Fallo en la subida</string>
<string name="workoutAscent">Ascenso</string>
<string name="workoutDescent">Descenso</string>
<string name="height">Altura</string>
<string name="workoutTypeRunning">Correr</string>
<string name="workoutTypeWalking">Caminar</string>
<string name="workoutTypeJogging">Trotar</string>
<string name="workoutTypeCycling">Ciclismo</string>
<string name="workoutTypeHiking">Senderismo</string>
<string name="workoutTypeUnknown">Desconocido</string>
<string name="recordWorkout">Grabar entrenamiento</string>
<string name="noGpsTitle">GPS deshabilitado</string>
<string name="noGpsMessage">Por favor, habilite el GPS para hacer un seguimiento de su entrenamiento.</string>
<string name="enable">Activar</string>
<string name="comment">Comentario</string>
<string name="enterComment">Ingrese comentario</string>
<string name="okay">Si</string>
<string name="stopRecordingQuestion">¿Detener grabación?</string>
<string name="stopRecordingQuestionMessage">¿Realmente quieres parar la grabación?</string>
<!-- leave the underscore because "continue" is a java command -->
<string name="continue_">Continuar</string>
<string name="deleteWorkout">Borrar Entrenamiento</string>
<string name="deleteWorkoutMessage">¿Realmente quieres borrar el entrenamiento?</string>
<string name="trackerRunning">El rastreador está funcionando</string>
<string name="trackerRunningMessage">Tu entrenamiento está siendo grabado</string>
<string name="trackingInfo">Información de seguimiento</string>
<string name="trackingInfoDescription">Información sobre el rastreador en ejecución</string>
<string name="cancel">Cancelar</string>
<string name="exportAsGpxFile">Exportar como archivo GPX</string>
<string name="pref_weight">Su peso</string>
<string name="pref_weight_summary">Su peso es necesario para calcular las calorías quemadas</string>
<string name="pref_unit_system">Sistema preferido de unidades</string>
<string name="settings">Ajustes</string>
<string name="exportData">Datos de exportación</string>
<string name="exportDataSummary">Esto toma una copia de seguridad de todas sus preferencias y datos de entrenamiento</string>
<string name="importBackup">Importar copia de seguridad</string>
<string name="importBackupSummary">Restaurar una copia de seguridad</string>
<string name="gps">GPS</string>
<string name="data">Datos</string>
<string name="mapStyle">Estilo de mapa</string>
<string name="waiting_gps">Esperando GPS</string>
<string name="actionUploadToOSM">Subir a OSM</string>
<string name="cut">Corte los primeros/últimos 300 metros</string>
<string name="trackVisibilityPref">Visibilidad de la pista</string>
<string name="description">Descripción</string>
</resources>

View File

@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de>
~
~ This file is part of FitoTrack
~
~ FitoTrack is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ FitoTrack is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<style name="AppThemeNoActionbar" parent="android:Theme.Material.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="android:colorPrimary">@color/colorPrimary</item>
<item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="android:colorAccent">@color/colorAccent</item>
</style>
<!-- Base application theme. -->
<style name="AppTheme" parent="android:Theme.Material.Light.DarkActionBar">
<!-- Custom<color name="colorPrimaryBicycling">#523220</color>
<color name="colorPrimaryDarkBicycling">#462A1D</color>ize your theme here. -->
<item name="android:colorPrimary">@color/colorPrimary</item>
<item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="android:colorAccent">@color/colorAccent</item>
</style>
<!-- Base application theme. -->
<style name="Running" parent="AppTheme">
<!-- Customize your theme here. -->
<item name="android:colorPrimary">@color/colorPrimaryRunning</item>
<item name="android:colorPrimaryDark">@color/colorPrimaryDarkRunning</item>
</style>
<!-- Base application theme. -->
<style name="Bicycling" parent="AppTheme">
<!-- Customize your theme here. -->
<item name="android:colorPrimary">@color/colorPrimaryBicycling</item>
<item name="android:colorPrimaryDark">@color/colorPrimaryDarkBicycling</item>
</style>
<!-- Base application theme. -->
<style name="Hiking" parent="AppTheme">
<!-- Customize your theme here. -->
<item name="android:colorPrimary">@color/colorPrimaryHiking</item>
<item name="android:colorPrimaryDark">@color/colorPrimaryDarkHiking</item>
</style>
</resources>

View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de>
~
~ This file is part of FitoTrack
~
~ FitoTrack is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ FitoTrack is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<string-array name="pref_unit_systems">
<item>Métrico</item>
<item>Métrico con m/s</item>
<item>Imperial</item>
<item>Imperial con metros</item>
</string-array>
<string-array name="pref_unit_system_values">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
</string-array>
</resources>