From b41a9841071cd5d53a847e516ba2da35d712050c Mon Sep 17 00:00:00 2001 From: Alejandro Martinez Date: Wed, 29 Jul 2015 20:00:37 -0300 Subject: [PATCH 1/3] Some love for Session RPE and new metadata fields Added RPE to metadata.xml to allow data entry in the Workout tab and PMC (Session RPE) to charts.xml Added Equipment to Workout tab Added GOVSS and SwimScore to Metric tab, to allow metric override --- src/xml/charts.xml | 1 + src/xml/metadata.xml | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/xml/charts.xml b/src/xml/charts.xml index 22b989ae9..3b680bdf0 100644 --- a/src/xml/charts.xml +++ b/src/xml/charts.xml @@ -4,6 +4,7 @@ "AAAAFgBQAE0AQwAgACgAUwBrAGkAYgBhACkAAAAIADIAMAAwADkAJX0TAAAAAP8AJX6JAAAAAP8AAAABAAH///////////////8AAAANAAAABAAAAAIAAAAAEgBzAGsAaQBiAGEAXwBzAHQAcwAAAC4AUwBrAGkAYgBhACAAUwBoAG8AcgB0ACAAVABlAHIAbQAgAFMAdAByAGUAcwBzAAAALgBTAGsAaQBiAGEAIABTAGgAbwByAHQAIABUAGUAcgBtACAAUwB0AHIAZQBzAHMAAAAMAFMAdAByAGUAcwBzAAAAAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAfyr8IRwk//////////8B/////wAA//8AAAAAAAA/8AAAAAAAAAAAAAAB//8AAAAAAAAAAAAAAAAAAAAAAgAADhD/////AAAACv////8AAAAAAAAAAAwAMgAgAFAAYQByAG0AAAAAAAAD5wAADhAAAAAAAP////8AAAACAAAAABIAcwBrAGkAYgBhAF8AbAB0AHMAAAAsAFMAawBpAGIAYQAgAEwAbwBuAGcAIABUAGUAcgBtACAAUwB0AHIAZQBzAHMAAAAsAFMAawBpAGIAYQAgAEwAbwBuAGcAIABUAGUAcgBtACAAUwB0AHIAZQBzAHMAAAAMAFMAdAByAGUAcwBzAAAAAAABAAAAAAAAAAAAAAAAAQAAAFgAAAADAAAASgAAABsAAAAU//////////8B//8AAP////8AAAAAAAA/8AAAAAAAAAAAAAAB//8AAAAAAAAAAAAAAAAAAAAAAgAADhD/////AAAACgAAAAAAAAAAAAAAAAwAMgAgAFAAYQByAG0AAAAAAAAD5wAADhAAAAAAAP////8AAAACAAAAABAAcwBrAGkAYgBhAF8AcwBiAAAAKABTAGsAaQBiAGEAIABTAHQAcgBlAHMAcwAgAEIAYQBsAGEAbgBjAGUAAAAoAFMAawBpAGIAYQAgAFMAdAByAGUAcwBzACAAQgBhAGwAYQBuAGMAZQAAAAwAUwB0AHIAZQBzAHMAAAAAAAAAAAAAwI84AAAAAAAB////wP///8D////AAAB//wAAAAD//////////wH///////9/fwAAAAAAAD/wAAAAAAAAAAAAAAH//wAAAAAAAAAAAAAAAAAAAAACAAAOEP////8AAAAK/////wAAAAABAAAADAAyACAAUABhAHIAbQAAAAAAAAPnAAAOEAAAAAAA/////wAAAAcAAAAAIABzAGsAaQBiAGEAXwBiAGkAawBlAF8AcwBjAG8AcgBlAAAAFABCAGkAawBlAFMAYwBvAHIAZSEiAAAABABSAFIAAAAMAFMAdAByAGUAcwBzAAAAAAADAAAAAAAAAAAAAAAAARe5uNBh3x5OF7m40AAAAAEXubjQ//////////8B//9VVf//AAAAAAAAAAA/8AAAAAAAAAAAAAAB//8AAAAAAAAAAAAAAAABAAAD5wAADhAAAAAmAHMAawBpAGIAYQBfAGIAaQBrAGUAXwBzAGMAbwByAGUAXwByAHIAAAAKAAAAAAAAAAAAAAAADAAyACAAUABhAHIAbQAAAAAAAAAAAAAOEAAAAAADAAAAAAAAAAAAAg==" "AAAAHABQAE0AQwAgACgAVAByAGkAUwBjAG8AcgBlACkAAAAeANoAbAB0AGkAbQBvAHMAIAAzACAAbQBlAHMAZQBzACV9EwAAAAD/ACV+iQAAAAD/AAAAAQAB////////////////AAAADQAAAAQAAAAHAAAAABAAdAByAGkAcwBjAG8AcgBlAAAAEABUAHIAaQBTAGMAbwByAGUAAAAGAEEAVABMAAAAEABUAHIAaQBTAGMAbwByAGUAAAAAAAEAAAAAAAAAAAAAAAABFWyo+GHfHk4VbKj4AAAAARVsqPj//////////wH/////AAD//wAAAAAAAD/wAAAAAAAAAAAAAAH//wAAAAAAAAAAAAAAAAAAAAPnAAAOEAAAABgAdAByAGkAcwBjAG8AcgBlAF8AbAB0AHMAAAAKAAAAAAAAAAAAAAAADAAyACAAUABhAHIAbQAAAAAAAAPnAAAOEAAAAAAA/////wAAAAcAAAAAEAB0AHIAaQBzAGMAbwByAGUAAAAQAFQAcgBpAFMAYwBvAHIAZQAAAAYAQwBUAEwAAAAQAFQAcgBpAFMAYwBvAHIAZQAAAAAAAQAAAAAAAAAAAAAAAAEVbKj4Yd8eThVsqPgAAAABFWyo+P//////////Af//VVUAAP//AAAAAAAAP/AAAAAAAAAAAAAAAf//AAAAAAAAAAAAAAAAAAAAA+cAAA4QAAAAGAB0AHIAaQBzAGMAbwByAGUAXwBzAHQAcwAAAAoAAAAAAAAAAAAAAAAMADIAIABQAGEAcgBtAAAAAAAAA+cAAA4QAAAAAAH/////AAAABwAAAAAQAHQAcgBpAHMAYwBvAHIAZQAAABAAVAByAGkAUwBjAG8AcgBlAAAABgBUAFMAQgAAABAAVAByAGkAUwBjAG8AcgBlAAAAAAAAAAAAAAAAAAAAAAAAARVsqPhh3x5OFWyo+AAAAAEVbKj4//////////8B////////f38AAAAAAAA/8AAAAAAAAAAAAAAB//8AAAAAAAAAAAAAAAAAAAAAAAAADhAAAAAWAHQAcgBpAHMAYwBvAHIAZQBfAHMAYgAAAAoAAAAAAAAAAAEAAAAMADIAIABQAGEAcgBtAAAAAAAAA+cAAA4QAAAAAAL/////AAAABwAAAAAQAHQAcgBpAHMAYwBvAHIAZQAAABAAVAByAGkAUwBjAG8AcgBlAAAABABSAFIAAAAQAFQAcgBpAFMAYwBvAHIAZQAAAAAAAwAAAAAAAAAAAAAAAAEVbKj4Yd8eThVsqPgAAAABFWyo+P//////////Af//VVX//wAAAAAAAAAAP/AAAAAAAAAAAAAAAf//AAAAAAAAAAAAAAAAAQAAA+cAAA4QAAAAFgB0AHIAaQBzAGMAbwByAGUAXwByAHIAAAAKAAAAAAAAAAAAAAAADAAyACAAUABhAHIAbQAAAAAAAAAAAAAOEAAAAAAD/////wAAAAAAAw==" "AAAAFgBQAE0AQwAgACgAVABSAEkATQBQACkAAAAIADIAMAAwADkAJX0TAAAAAP8AJX6JAAAAAP8AAAABAAH///////////////8AAAANAAAAAwAAAAIAAAAAEgB0AHIAaQBtAHAAXwBzAHQAcwAAAC4AVABSAEkATQBQACAAUwBoAG8AcgB0ACAAVABlAHIAbQAgAFMAdAByAGUAcwBzAAAALgBUAFIASQBNAFAAIABTAGgAbwByAHQAIABUAGUAcgBtACAAUwB0AHIAZQBzAHMAAAAMAFMAdAByAGUAcwBzAAAAAAABAAAAAAAAAAAAAAAAAQAAAAEAAAABBa2QAAAAf/9fv6lw//////////8B/////8TE//8AAAAAAAA/8AAAAAAAAAAAAAAB//8AAAAAAAAAAAAAAAAAAAAAAgAADhD/////AAAACv////8AAAAAAAAAAAwAMgAgAFAAYQByAG0AAAAAAAAD5wAADhAAAAAAAP////8AAAACAAAAABIAdAByAGkAbQBwAF8AbAB0AHMAAAAsAFQAUgBJAE0AUAAgAEwAbwBuAGcAIABUAGUAcgBtACAAUwB0AHIAZQBzAHMAAAAsAFQAUgBJAE0AUAAgAEwAbwBuAGcAIABUAGUAcgBtACAAUwB0AHIAZQBzAHMAAAAMAFMAdAByAGUAcwBzAAAAAAABAAAAAAAAAAAAAAAAAQAAf/8AAH//X7/SwAAAf/9fv84w//////////8B//+qqv////8AAAAAAAA/8AAAAAAAAAAAAAAB//8AAAAAAAAAAAAAAAAAAAAAAgAADhD/////AAAACgAAAAAAAAAAAAAAAAwAMgAgAFAAYQByAG0AAAAAAAAD5wAADhAAAAAAAP////8AAAACAAAAABAAcwBrAGkAYgBhAF8AcwBiAAAAKABTAGsAaQBiAGEAIABTAHQAcgBlAHMAcwAgAEIAYQBsAGEAbgBjAGUAAAAoAFMAawBpAGIAYQAgAFMAdAByAGUAcwBzACAAQgBhAGwAYQBuAGMAZQAAAAwAUwB0AHIAZQBzAHMAAAAAAAMAAAAAwI84AAAAAAAB////wP///8D////AAAB//wAAAAD//////////wH///////+srAAAAAAAAD/wAAAAAAAAAAAAAAH//wAAAAAAAAAAAAAAAAAAAAACAAAOEP////8A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" diff --git a/src/xml/metadata.xml b/src/xml/metadata.xml index df37b579e..6532d6f18 100644 --- a/src/xml/metadata.xml +++ b/src/xml/metadata.xml @@ -81,6 +81,20 @@ "" 0 + + "Workout" + "Equipment" + 2 + "" + 0 + + + "Workout" + "RPE" + 4 + "" + 0 + "Notes" "Notes" @@ -200,6 +214,20 @@ "" 0 + + "Metric" + "GOVSS" + 4 + "" + 0 + + + "Metric" + "SwimScore" + 4 + "" + 0 + "Metric" "xPower" From f70ab87a36a8933edd2c442f6300322fc9584a71 Mon Sep 17 00:00:00 2001 From: Alejandro Martinez Date: Wed, 29 Jul 2015 20:12:12 -0300 Subject: [PATCH 2/3] Added copyrigth notice for SwimScore --- src/AboutDialog.cpp | 2 +- src/RideSummaryWindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index 34aed301a..138549d8d 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -75,7 +75,7 @@ AboutPage::AboutPage(Context *context) : context(context) "

Trademarks used with permission
" "TSS, NP, IF courtesy of " "Peaksware LLC.
" - "BikeScore, xPower courtesy of " + "BikeScore, xPower, SwimScore courtesy of " "Physfarm Training Systems.
" "Virtual Speed courtesy of Tom Compton " "AnalyticCycling.
" diff --git a/src/RideSummaryWindow.cpp b/src/RideSummaryWindow.cpp index e947e71b8..57cb9aefd 100644 --- a/src/RideSummaryWindow.cpp +++ b/src/RideSummaryWindow.cpp @@ -1402,7 +1402,7 @@ RideSummaryWindow::htmlSummary() // The extra

works around a bug in QT 4.3.1, // which will otherwise put the following above the
. - summary += tr("
BikeScore is a trademark of Dr. Philip " + summary += tr("
BikeScore and SwimScore are trademarks of Dr. Philip " "Friere Skiba, PhysFarm Training Systems LLC"); summary += tr("
FTP, TSS, NP and IF are trademarks of Peaksware LLC
"); From 2f6b4afa2f2aa7bc2467b4ac05c6619eb8ad2ff0 Mon Sep 17 00:00:00 2001 From: Alejandro Martinez Date: Wed, 29 Jul 2015 20:19:07 -0300 Subject: [PATCH 3/3] Updated Spanish Translation --- src/translations/gc_es.ts | 276 +++++++++++++++++++------------------- 1 file changed, 140 insertions(+), 136 deletions(-) diff --git a/src/translations/gc_es.ts b/src/translations/gc_es.ts index 99c319e7a..e14e3db1f 100644 --- a/src/translations/gc_es.ts +++ b/src/translations/gc_es.ts @@ -74,9 +74,13 @@ <center><img src=":images/gc.png" height=80><h2>GoldenCheetah</h2>Programa de Análisis de Potencia en Ciclismo<br>para Linux, Mac, y Windows<p>GoldenCheetah está licenciado bajo la<br><a href="http://www.gnu.org/copyleft/gpl.html">Licencia Pública General GNU</a>.<p>el código fuente se puede obtener desde<br><a href="http://goldencheetah.org/">http://goldencheetah.org/</a>.<p>Los archivos de actividades y otros datos se almacenan en<br><a href="%1">%2</a><p>Marcas registradas utilizadas con autorización<br>TSS, NP, IF cortesía de <a href="http://www.peaksware.com">Peaksware LLC</a>.<br>BikeScore, xPower courtesía de <a href="http://www.physfarm.com">Physfarm Training Systems</a>.<br>Virtual Speed courtesía de Tom Compton <a href="http://www.analyticcycling.com">Analytic Cycling</a>.</center> - <center><img src=":images/gc.png" height=80><h2>GoldenCheetah</h2>Cycling Power Analysis Software<br>for Linux, Mac, and Windows<p>GoldenCheetah is licensed under the<br><a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.<p>Source code can be obtained from<br><a href="http://goldencheetah.org/">http://goldencheetah.org/</a>.<p>Activity files and other data are stored in<br><a href="%1">%2</a><p>Trademarks used with permission<br>TSS, NP, IF courtesy of <a href="http://www.peaksware.com">Peaksware LLC</a>.<br>BikeScore, xPower courtesy of <a href="http://www.physfarm.com">Physfarm Training Systems</a>.<br>Virtual Speed courtesy of Tom Compton <a href="http://www.analyticcycling.com">AnalyticCycling</a>.<br></center> - <center><img src=":images/gc.png" height=80><h2>GoldenCheetah</h2>Programa de Análisis de Potencia en Ciclismo<br>para Linux, Mac, y Windows<p>GoldenCheetah está licenciado bajo la<br><a href="http://www.gnu.org/copyleft/gpl.html">Licencia Pública General GNU</a>.<p>el código fuente se puede obtener desde<br><a href="http://goldencheetah.org/">http://goldencheetah.org/</a>.<p>Los archivos de actividades y otros datos se almacenan en<br><a href="%1">%2</a><p>Marcas registradas utilizadas con autorización<br>TSS, NP, IF cortesía de <a href="http://www.peaksware.com">Peaksware LLC</a>.<br>BikeScore, xPower courtesía de <a href="http://www.physfarm.com">Physfarm Training Systems</a>.<br>Virtual Speed courtesía de Tom Compton <a href="http://www.analyticcycling.com">Analytic Cycling</a>.</center> + <center><img src=":images/gc.png" height=80><h2>GoldenCheetah</h2>Programa de Análisis de Potencia en Ciclismo<br>para Linux, Mac, y Windows<p>GoldenCheetah está licenciado bajo la<br><a href="http://www.gnu.org/copyleft/gpl.html">Licencia Pública General GNU</a>.<p>el código fuente se puede obtener desde<br><a href="http://goldencheetah.org/">http://goldencheetah.org/</a>.<p>Los archivos de actividades y otros datos se almacenan en<br><a href="%1">%2</a><p>Marcas registradas utilizadas con autorización<br>TSS, NP, IF cortesía de <a href="http://www.peaksware.com">Peaksware LLC</a>.<br>BikeScore, xPower courtesía de <a href="http://www.physfarm.com">Physfarm Training Systems</a>.<br>Virtual Speed courtesía de Tom Compton <a href="http://www.analyticcycling.com">Analytic Cycling</a>.</center> + + + + <center><img src=":images/gc.png" height=80><h2>GoldenCheetah</h2>Cycling Power Analysis Software<br>for Linux, Mac, and Windows<p>GoldenCheetah is licensed under the<br><a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.<p>Source code can be obtained from<br><a href="http://goldencheetah.org/">http://goldencheetah.org/</a>.<p>Activity files and other data are stored in<br><a href="%1">%2</a><p>Trademarks used with permission<br>TSS, NP, IF courtesy of <a href="http://www.peaksware.com">Peaksware LLC</a>.<br>BikeScore, xPower, SwimScore courtesy of <a href="http://www.physfarm.com">Physfarm Training Systems</a>.<br>Virtual Speed courtesy of Tom Compton <a href="http://www.analyticcycling.com">AnalyticCycling</a>.<br></center> + <center><img src=":images/gc.png" height=80><h2>GoldenCheetah</h2>Programa de Análisis de Potencia en Ciclismo<br>para Linux, Mac, y Windows<p>GoldenCheetah está licenciado bajo la<br><a href="http://www.gnu.org/copyleft/gpl.html">Licencia Pública General GNU</a>.<p>el código fuente se puede obtener desde<br><a href="http://goldencheetah.org/">http://goldencheetah.org/</a>.<p>Los archivos de actividades y otros datos se almacenan en<br><a href="%1">%2</a><p>Marcas registradas utilizadas con autorización<br>TSS, NP, IF cortesía de <a href="http://www.peaksware.com">Peaksware LLC</a>.<br>BikeScore, xPower, SwimScore cortesía de <a href="http://www.physfarm.com">Physfarm Training Systems</a>.<br>Virtual Speed cortesía de Tom Compton <a href="http://www.analyticcycling.com">Analytic Cycling</a>.</center> @@ -7890,7 +7894,7 @@ Ajuste de Par - define un valor fijo en libras por pulgada o newton por metro pa segundos - + You entered '%1' which is not an expected value. El valor ingresado '%1' no es válido. @@ -9043,7 +9047,7 @@ Ajuste de Par - define un valor fijo en libras por pulgada o newton por metro pa GcWindowDialog - + Chart Setup Configuración de Gráfico @@ -9056,12 +9060,12 @@ Ajuste de Par - define un valor fijo en libras por pulgada o newton por metro pa Factor de Ancho - + Cancel Cancelar - + OK OK @@ -10512,33 +10516,33 @@ Ajuste de Par - define un valor fijo en libras por pulgada o newton por metro pa Agregar Cuadro.. - + Are you sure you want to remove the chart? Confirma elminación del gráfico? - + Remove Eliminar - + Stress Estrés - + Scatter Dispersión - - + + HrPw - + Activity Log Registro de Actividades @@ -10548,177 +10552,177 @@ Ajuste de Par - define un valor fijo en libras por pulgada o newton por metro pa Título - + Problem Saving Chart Bar Layout Problemas Guardando Diseño de Gráfico de Barras - + File: %1 cannot be opened for 'Writing'. Please check file properties. Archivo: %1 no se puede abrir para 'Escritura'. Verifique las propiedades del archivo. - + Ride Log Registro de Actividades - + Aerobic Power Potencia Aeróbica - + Anaerobic Power Potencia Anaeróbica - + Cadence Cadencia - + Calendar Calendario - + CP PC - + Details Detalles - + Distance Distancia - + Edit Editar - + Elapsed Time Tiempo Transcurrido - + Heartrate Frec. Cardíaca - + Lap Vuelta - + Map Mapa - + Performance Gráfico de Curvas - + PMC - + Power Potencia - + QA - + Ride Gráfico - + Speed Velocidad - + Summary Resúmen - + Target Power Potencia Objectivo - + Time and Distance Tiempo y Distancia - + Time In Zone Tiempo por Zonas - + W' In Zone W' En Zona - + Sustained In Zone Sostenido en Zona - + Training Mix Mezcla de Entrenamiento - + Navigator Registro de Actividades - + W/kg Vatios/kg - + Workout Entrenamiento - + Tracker Seguimiento - + CP History Histórico PC - + Library Biblioteca - + CV VC @@ -12466,16 +12470,12 @@ Ajuste de Par - define un valor fijo en libras por pulgada o newton por metro pa Mejores %1 - - trend - tendencia + tendencia - - Outliers - Atípicos + Atípicos @@ -12721,196 +12721,196 @@ Ajuste de Par - define un valor fijo en libras por pulgada o newton por metro pa Resúmen - - - + + + Add season Agregar Rango de Fechas - - + + Edit season Editar Rango de Fechas - - + + Delete season Eliminar Rango de Fechas - - - - + + + + Add Event Agregar Evento - - + + Edit details Editar detalles - - + + Delete event Eliminar Evento - - + + Add event Agregar Evento - + Workout Code|Sport Código Entrenamiento|Deporte - - - + + + (blank) (blanco) - + Manage Filters Administrar Filtros - + Delete Filter%1 Borrar Filtro %1 - + Edit Season Editar Temporada - + You can only edit user defined seasons. Please select a season you have created for editing. Solo se pueden editar temporadas definidas por el usuario. Elija una de ellas para edición. - + Delete Season Eliminar Temporada - + You can only delete user defined seasons. Please select a season you have created for deletion. Solo se pueden eliminar temporadas definidas por el usuario. Elija una de ellas para eliminar. - - + + You can only add events to user defined seasons. Please select a season you have created before adding an event. Solo es posible agregar eventos a rangos de fechas definidos por el usuario, por favor seleccione un rango de fechas que haya creado previamente para agregar un evento. - + Totals Totales - + Averages Promedios - + Maximums Máximos - + Metrics Métricas - + ^(Average|Max) ( Media| Máx) - + seconds segundos - + Add Chart Agregar Gráfico - + Edit Chart Editar Gráfico - + Delete Chart Eliminar Gráfico - + Delete Selected Charts Eliminar Gráficos Seleccionados - + Export Chart Exportar Gráfico - + Export Selected Charts Exportar Gráficos Seleccionados - + Import Charts Importar Gráficos - + Reset to default Restablecer Gráficos por defecto - + Export Charts Exportar Gráficos - - + + Chart File (*.xml) Archivo de Gráfico (*.xml) - + Entry Error Error de Ingreso - + Selected file (%1) does not exist El archivo seleccionado (%1) no existe - + You are about to reset the chart sidebar to the default setup Está por reconfigurar la barra lateral de gráficos a su estado por defecto - + Do you want to continue? ¿Desea continuar? @@ -14335,8 +14335,8 @@ Saltando archivo... &Nuevo... - - + + Ctrl+N Ctrl+N @@ -14683,23 +14683,23 @@ Saltando archivo... Borrar intervalo seleccionado - + Select Activity Elegir Actividad - - + + No activity selected! No hay actividad seleccionada! - + Export Activity Exportar Actividad - + Export Failed Falló la Exportación @@ -14708,13 +14708,13 @@ Saltando archivo... Error al exportar actividad, verifique los permisos - - + + No activity selected No hay actividad seleccionada - + Current activity contains no data to split La actividad seleccionada no tiene datos para dividir @@ -15014,7 +15014,7 @@ PC del Atleta en %3 vatios %1 Gráficos Importados - + Current activity contains no data to merge La actividad seleccionada no tiene datos para combinar @@ -15039,13 +15039,13 @@ PC del Atleta en %3 vatios La actividad seleccionada no tiene datos para combinar - - + + &New Athlete... &Nuevo Atleta... - + Refresh in Progress Actualización en Curso @@ -15083,7 +15083,7 @@ PC del Atleta en %3 vatios - + Delete Activity Eliminar Actividad @@ -15103,20 +15103,20 @@ PC del Atleta en %3 vatios Combinar actividades... - + Failed to export activity, please check permissions Error al exportar actividad, verifique los permisos - + There is no currently selected activity to save. No hay actividad seleccionada para guardar. - - - - + + + + Split Activity Dividir Actividad @@ -15197,13 +15197,13 @@ PC del Atleta en %3 vatios El archivo %1 no se puede abrir para escritura - - + + Import from File Importar de Archivo - + No Activity To Save No hay actividad para Guardar @@ -15212,22 +15212,22 @@ PC del Atleta en %3 vatios No hay actividad seleccionada para guardar. - + Are you sure you want to delete the activity: Confirma que quiere eliminar la actividad: - + Export Metrics Exportar Métricas - + Comma Separated Variables (*.csv) Variables Separada por Comas (*.csv) - + Workout Directory Invalid Directorio de Entrenamientos Inválido @@ -15332,7 +15332,7 @@ PC del ciclista %3 vatios Confirma que quiere eliminar la actividad: - + Delete Eliminar @@ -22053,12 +22053,12 @@ Saltando archivo... RideMetadata - + Problem Saving Meta Data Problemas Guardando Meta Datos - + File: %1 cannot be opened for 'Writing'. Please check file properties. Archivo: %1 no se puede abrir para 'Escritura'. Verifique las propiedades del archivo. @@ -22247,6 +22247,11 @@ Saltando archivo... dd MMM yyyy + + + <br>BikeScore and SwimScore are trademarks of Dr. Philip Friere Skiba, PhysFarm Training Systems LLC + <br>BikeScore y SwimScore son marcas registradas del Dr. Philip Friere Skiba, PhysFarm Training Systems LLC + @@ -22454,7 +22459,6 @@ Saltando archivo... entrenamientos de natación - <br>BikeScore is a trademark of Dr. Philip Friere Skiba, PhysFarm Training Systems LLC <br>BikeScore es una marca registrada del Dr. Philip Friere Skiba, PhysFarm Training Systems LLC