diff --git a/src/translations/gc_fr.qm b/src/translations/gc_fr.qm
index 35c090f38..a686021f7 100644
Binary files a/src/translations/gc_fr.qm and b/src/translations/gc_fr.qm differ
diff --git a/src/translations/gc_fr.ts b/src/translations/gc_fr.ts
index 7fa00e637..75c850a19 100644
--- a/src/translations/gc_fr.ts
+++ b/src/translations/gc_fr.ts
@@ -51,59 +51,115 @@
     </message>
 </context>
 <context>
-    <name>AllPlot</name>
+    <name>Aerolab</name>
     <message>
-        <location filename="../AllPlot.cpp" line="216"/>
-        <source>Power</source>
-        <translation>Puissance</translation>
+        <location filename="../Aerolab.cpp" line="70"/>
+        <source>V-Elevation</source>
+        <translation>V-Ascensionnelle</translation>
     </message>
     <message>
-        <location filename="../AllPlot.cpp" line="221"/>
-        <source>Heart Rate</source>
-        <translation>Fréquence cardiaque</translation>
+        <location filename="../Aerolab.cpp" line="75"/>
+        <source>Elevation</source>
+        <translation>Dénivellation</translation>
     </message>
     <message>
-        <location filename="../AllPlot.cpp" line="227"/>
-        <source>Speed</source>
-        <translation>Vitesse</translation>
-    </message>
-    <message>
-        <location filename="../AllPlot.cpp" line="233"/>
-        <source>Cadence</source>
-        <translation>Cadence</translation>
-    </message>
-    <message>
-        <location filename="../AllPlot.cpp" line="239"/>
-        <source>Altitude</source>
-        <translation>Altitude</translation>
-    </message>
-    <message>
-        <location filename="../AllPlot.cpp" line="491"/>
-        <source>KPH</source>
-        <translation>km/h</translation>
-    </message>
-    <message>
-        <location filename="../AllPlot.cpp" line="491"/>
-        <source>MPH</source>
-        <translation>m/h</translation>
-    </message>
-    <message>
-        <location filename="../AllPlot.cpp" line="497"/>
-        <source>Meters</source>
-        <translation>Mètres</translation>
-    </message>
-    <message>
-        <location filename="../AllPlot.cpp" line="497"/>
-        <source>Feet</source>
-        <translation>Pieds</translation>
-    </message>
-    <message>
-        <location filename="../AllPlot.cpp" line="516"/>
+        <location filename="../Aerolab.cpp" line="281"/>
         <source>Distance </source>
         <translation>Distance </translation>
     </message>
     <message>
-        <location filename="../AllPlot.cpp" line="518"/>
+        <location filename="../Aerolab.cpp" line="283"/>
+        <source>Time (minutes)</source>
+        <translation>Temps (minutes)</translation>
+    </message>
+</context>
+<context>
+    <name>AerolabWindow</name>
+    <message>
+        <location filename="../AerolabWindow.cpp" line="44"/>
+        <source>Crr</source>
+        <translation>Crr</translation>
+    </message>
+    <message>
+        <location filename="../AerolabWindow.cpp" line="63"/>
+        <source>CdA</source>
+        <translation>CdA</translation>
+    </message>
+    <message>
+        <location filename="../AerolabWindow.cpp" line="82"/>
+        <source>Eta</source>
+        <translation>Eta</translation>
+    </message>
+    <message>
+        <location filename="../AerolabWindow.cpp" line="110"/>
+        <source>Total Mass (kg)</source>
+        <translation>Masse toral (kg)</translation>
+    </message>
+    <message>
+        <location filename="../AerolabWindow.cpp" line="129"/>
+        <source>Rho (kg/m^3)</source>
+        <translation>Rho (kg/m^3)</translation>
+    </message>
+    <message>
+        <location filename="../AerolabWindow.cpp" line="148"/>
+        <source>Eoffset (m)</source>
+        <translation>Alt offset (m)</translation>
+    </message>
+</context>
+<context>
+    <name>AllPlot</name>
+    <message>
+        <location filename="../AllPlot.cpp" line="227"/>
+        <source>Power</source>
+        <translation>Puissance</translation>
+    </message>
+    <message>
+        <location filename="../AllPlot.cpp" line="232"/>
+        <source>Heart Rate</source>
+        <translation>Fréquence cardiaque</translation>
+    </message>
+    <message>
+        <location filename="../AllPlot.cpp" line="238"/>
+        <source>Speed</source>
+        <translation>Vitesse</translation>
+    </message>
+    <message>
+        <location filename="../AllPlot.cpp" line="244"/>
+        <source>Cadence</source>
+        <translation>Cadence</translation>
+    </message>
+    <message>
+        <location filename="../AllPlot.cpp" line="250"/>
+        <source>Altitude</source>
+        <translation>Altitude</translation>
+    </message>
+    <message>
+        <location filename="../AllPlot.cpp" line="515"/>
+        <source>KPH</source>
+        <translation>km/h</translation>
+    </message>
+    <message>
+        <location filename="../AllPlot.cpp" line="515"/>
+        <source>MPH</source>
+        <translation>m/h</translation>
+    </message>
+    <message>
+        <location filename="../AllPlot.cpp" line="524"/>
+        <source>Meters</source>
+        <translation>Mètres</translation>
+    </message>
+    <message>
+        <location filename="../AllPlot.cpp" line="524"/>
+        <source>Feet</source>
+        <translation>Pieds</translation>
+    </message>
+    <message>
+        <location filename="../AllPlot.cpp" line="550"/>
+        <source>Distance </source>
+        <translation>Distance </translation>
+    </message>
+    <message>
+        <location filename="../AllPlot.cpp" line="552"/>
         <source>Time (minutes)</source>
         <translation>Temps (minutes)</translation>
     </message>
@@ -111,62 +167,67 @@
 <context>
     <name>AllPlotWindow</name>
     <message>
-        <location filename="../AllPlotWindow.cpp" line="41"/>
+        <location filename="../AllPlotWindow.cpp" line="45"/>
         <source>Show:</source>
         <translation>Montre:</translation>
     </message>
     <message>
-        <location filename="../AllPlotWindow.cpp" line="44"/>
+        <location filename="../AllPlotWindow.cpp" line="48"/>
+        <source>Stacked view</source>
+        <translation>Vue en piles</translation>
+    </message>
+    <message>
+        <location filename="../AllPlotWindow.cpp" line="75"/>
         <source>Grid</source>
         <translation>Grille</translation>
     </message>
     <message>
-        <location filename="../AllPlotWindow.cpp" line="48"/>
+        <location filename="../AllPlotWindow.cpp" line="79"/>
         <source>Heart Rate</source>
         <translation>Fréquence cardiaque</translation>
     </message>
     <message>
-        <location filename="../AllPlotWindow.cpp" line="52"/>
+        <location filename="../AllPlotWindow.cpp" line="83"/>
         <source>Speed</source>
         <translation>Vitesse</translation>
     </message>
     <message>
-        <location filename="../AllPlotWindow.cpp" line="56"/>
+        <location filename="../AllPlotWindow.cpp" line="87"/>
         <source>Cadence</source>
         <translation>Cadence</translation>
     </message>
     <message>
-        <location filename="../AllPlotWindow.cpp" line="60"/>
+        <location filename="../AllPlotWindow.cpp" line="91"/>
         <source>Altitude</source>
         <translation>Altitude</translation>
     </message>
     <message>
-        <location filename="../AllPlotWindow.cpp" line="65"/>
+        <location filename="../AllPlotWindow.cpp" line="96"/>
         <source>Power + shade</source>
         <translation>Puissance + zones</translation>
     </message>
     <message>
-        <location filename="../AllPlotWindow.cpp" line="66"/>
+        <location filename="../AllPlotWindow.cpp" line="97"/>
         <source>Power - shade</source>
         <translation>Puissance - zones</translation>
     </message>
     <message>
-        <location filename="../AllPlotWindow.cpp" line="67"/>
+        <location filename="../AllPlotWindow.cpp" line="98"/>
         <source>No Power</source>
         <translation>Sans puissance</translation>
     </message>
     <message>
-        <location filename="../AllPlotWindow.cpp" line="72"/>
+        <location filename="../AllPlotWindow.cpp" line="103"/>
         <source>X Axis Shows Time</source>
         <translation>En fonction du temps</translation>
     </message>
     <message>
-        <location filename="../AllPlotWindow.cpp" line="73"/>
+        <location filename="../AllPlotWindow.cpp" line="104"/>
         <source>X Axis Shows Distance</source>
         <translation>En fonction de la distance</translation>
     </message>
     <message>
-        <location filename="../AllPlotWindow.cpp" line="76"/>
+        <location filename="../AllPlotWindow.cpp" line="107"/>
         <source>Smoothing (secs)</source>
         <translation>Lissage (secs)</translation>
     </message>
@@ -174,7 +235,7 @@
 <context>
     <name>AvgCadence</name>
     <message>
-        <location filename="../BasicRideMetrics.cpp" line="281"/>
+        <location filename="../BasicRideMetrics.cpp" line="297"/>
         <source>Average Cadence</source>
         <translation>Cadence moyenne</translation>
     </message>
@@ -182,7 +243,7 @@
 <context>
     <name>AvgHeartRate</name>
     <message>
-        <location filename="../BasicRideMetrics.cpp" line="258"/>
+        <location filename="../BasicRideMetrics.cpp" line="272"/>
         <source>Average Heart Rate</source>
         <translation>Pulsations moyennes</translation>
     </message>
@@ -190,7 +251,7 @@
 <context>
     <name>AvgPower</name>
     <message>
-        <location filename="../BasicRideMetrics.cpp" line="235"/>
+        <location filename="../BasicRideMetrics.cpp" line="247"/>
         <source>Average Power</source>
         <translation>Puissance moyenne</translation>
     </message>
@@ -198,7 +259,7 @@
 <context>
     <name>AvgSpeed</name>
     <message>
-        <location filename="../BasicRideMetrics.cpp" line="201"/>
+        <location filename="../BasicRideMetrics.cpp" line="211"/>
         <source>Average Speed</source>
         <translation>Vitesse Moyenne</translation>
     </message>
@@ -236,22 +297,22 @@
         <translation>&amp;Ajouter un intervale</translation>
     </message>
     <message>
-        <location filename="../BestIntervalDialog.cpp" line="119"/>
+        <location filename="../BestIntervalDialog.cpp" line="148"/>
         <source>Select Ride</source>
         <translation>Sélectionner une sortie</translation>
     </message>
     <message>
-        <location filename="../BestIntervalDialog.cpp" line="119"/>
+        <location filename="../BestIntervalDialog.cpp" line="148"/>
         <source>No ride selected!</source>
         <translation>Pas de sortie sélectionnée</translation>
     </message>
     <message>
-        <location filename="../BestIntervalDialog.cpp" line="129"/>
+        <location filename="../BestIntervalDialog.cpp" line="158"/>
         <source>Bad Interval Length</source>
         <translation>Mauvaise longueur d&apos;intervalle</translation>
     </message>
     <message>
-        <location filename="../BestIntervalDialog.cpp" line="130"/>
+        <location filename="../BestIntervalDialog.cpp" line="159"/>
         <source>Interval length must be greater than zero!</source>
         <translation>La longueur de l&apos;intervalle doit être plus grande que zero !</translation>
     </message>
@@ -259,7 +320,7 @@
 <context>
     <name>BikeScore</name>
     <message>
-        <location filename="../BikeScore.cpp" line="144"/>
+        <location filename="../BikeScore.cpp" line="189"/>
         <source>BikeScore&amp;#8482;</source>
         <translation>BikeScore&amp;#8482;</translation>
     </message>
@@ -271,6 +332,60 @@
         <translation type="obsolete">Impossible d&apos;ouvrir la base de données</translation>
     </message>
 </context>
+<context>
+    <name>ChartManagerDialog</name>
+    <message>
+        <location filename="../LTMSettings.cpp" line="96"/>
+        <source>Manage Charts</source>
+        <translation>Gérer les graphiques</translation>
+    </message>
+    <message>
+        <location filename="../LTMSettings.cpp" line="100"/>
+        <source>Import...</source>
+        <translation>Importer...</translation>
+    </message>
+    <message>
+        <location filename="../LTMSettings.cpp" line="101"/>
+        <source>Export...</source>
+        <translation>Exporter...</translation>
+    </message>
+    <message>
+        <location filename="../LTMSettings.cpp" line="102"/>
+        <source>Move up</source>
+        <translation>Vers le haut</translation>
+    </message>
+    <message>
+        <location filename="../LTMSettings.cpp" line="103"/>
+        <source>Move down</source>
+        <translation>Vers le bas</translation>
+    </message>
+    <message>
+        <location filename="../LTMSettings.cpp" line="104"/>
+        <source>Rename</source>
+        <translation>Renommer</translation>
+    </message>
+    <message>
+        <location filename="../LTMSettings.cpp" line="105"/>
+        <source>Delete</source>
+        <translation>Effacer</translation>
+    </message>
+    <message>
+        <location filename="../LTMSettings.cpp" line="133"/>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
+    <message>
+        <location filename="../LTMSettings.cpp" line="134"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Annuler</translation>
+    </message>
+    <message>
+        <location filename="../LTMSettings.cpp" line="177"/>
+        <location filename="../LTMSettings.cpp" line="219"/>
+        <source>Chart File (*.xml)</source>
+        <translation>Fichier de graphiques (*.xml)</translation>
+    </message>
+</context>
 <context>
     <name>ChooseCyclistDialog</name>
     <message>
@@ -352,49 +467,49 @@
         <translation>Appareils</translation>
     </message>
     <message>
-        <location filename="../ConfigDialog.cpp" line="171"/>
+        <location filename="../ConfigDialog.cpp" line="172"/>
         <source>Short Term Stress</source>
         <translation>Charge à court terme (STS)</translation>
     </message>
     <message>
-        <location filename="../ConfigDialog.cpp" line="172"/>
+        <location filename="../ConfigDialog.cpp" line="173"/>
         <source>STS</source>
         <translation>STS</translation>
     </message>
     <message>
-        <location filename="../ConfigDialog.cpp" line="173"/>
+        <location filename="../ConfigDialog.cpp" line="174"/>
         <source>Long Term Stress</source>
         <translation>Charge à long terme (LTS)</translation>
     </message>
     <message>
-        <location filename="../ConfigDialog.cpp" line="174"/>
+        <location filename="../ConfigDialog.cpp" line="175"/>
         <source>LTS</source>
         <translation>LTS</translation>
     </message>
     <message>
-        <location filename="../ConfigDialog.cpp" line="175"/>
+        <location filename="../ConfigDialog.cpp" line="176"/>
         <source>Stress Balance</source>
         <translation>Equilibre de charge SB</translation>
     </message>
     <message>
-        <location filename="../ConfigDialog.cpp" line="176"/>
+        <location filename="../ConfigDialog.cpp" line="177"/>
         <source>SB</source>
         <translation>SB</translation>
     </message>
     <message>
-        <location filename="../ConfigDialog.cpp" line="182"/>
+        <location filename="../ConfigDialog.cpp" line="183"/>
         <source>Invalid CP</source>
         <translation>Puissance critique invalide</translation>
     </message>
     <message>
-        <location filename="../ConfigDialog.cpp" line="255"/>
+        <location filename="../ConfigDialog.cpp" line="256"/>
         <source>Are you sure you want to delete the zone range
 from %1 to %2?
 (%3 range will extend to this date range):</source>
         <translation>Etes-vous certain de vouloir supprimer la période du %1 au %2 ? (La période %3 sera étendue sur ces dates)</translation>
     </message>
     <message>
-        <location filename="../ConfigDialog.cpp" line="262"/>
+        <location filename="../ConfigDialog.cpp" line="263"/>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
@@ -492,7 +607,7 @@ from %1 to %2?
         <translation>Parcourir</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="307"/>
+        <location filename="../Pages.cpp" line="312"/>
         <source>Select Workout Library</source>
         <translation>Choisir une bibliothèque d&apos;exercices</translation>
     </message>
@@ -640,6 +755,11 @@ Ceci peut prendre un certain temps.</translation>
 </context>
 <context>
     <name>CyclistPage</name>
+    <message>
+        <location filename="../Pages.cpp" line="211"/>
+        <source>Show Stress Balance Today</source>
+        <translation>Montrer l&apos;indice de fatigue aujourd&apos;hui</translation>
+    </message>
     <message>
         <location filename="../Pages.cpp" line="176"/>
         <source>Cyclist Options</source>
@@ -676,17 +796,17 @@ Ceci peut prendre un certain temps.</translation>
         <translation>Gestionnaire de performance</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="211"/>
+        <location filename="../Pages.cpp" line="214"/>
         <source>Starting LTS</source>
         <translation>Valeur LTS initiale</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="212"/>
+        <location filename="../Pages.cpp" line="215"/>
         <source>STS average (days)</source>
         <translation>STS moyen (par jour)</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="213"/>
+        <location filename="../Pages.cpp" line="216"/>
         <source>LTS average (days)</source>
         <translation>LTS moyen (par jours)</translation>
     </message>
@@ -694,17 +814,27 @@ Ceci peut prendre un certain temps.</translation>
 <context>
     <name>DBAccess</name>
     <message>
-        <location filename="../DBAccess.cpp" line="54"/>
+        <location filename="../DBAccess.cpp" line="64"/>
         <source>Cannot open database</source>
         <translation>Impossible d&apos;ouvrir la base de données</translation>
     </message>
     <message>
-        <location filename="../DBAccess.cpp" line="55"/>
+        <location filename="../DBAccess.cpp" line="65"/>
+        <source>Unable to establish a database connection.
+This feature requires SQLite support. Please read the Qt SQL driver documentation for information how to build it.
+
+Click Cancel to exit.</source>
+        <translation>Impossible d&apos;établir le connection avec la base de données.
+Cette fonctionnalité requiert SQLite. Veuillez lire la documentation sur le driver Qt SQL et les instructions pour le construire.
+
+Choisir Annuler pour sortir.</translation>
+    </message>
+    <message>
         <source>Unable to establish a database connection.
 This example needs SQLite support. Please read the Qt SQL driver documentation for information how to build it.
 
 Click Cancel to exit.</source>
-        <translation>Impossible d&apos;établir la connection avec la base de données.
+        <translation type="obsolete">Impossible d&apos;établir la connection avec la base de données.
 Cet exemple nécessite le support SQLite. Lisez SVP la documentation &quot;QT SQL driver&quot; pour plus d&apos;informations sur son utilisation.
 
 Choisir Annuler pour sortir.</translation>
@@ -746,42 +876,42 @@ Choisir Annuler pour sortir.</translation>
 <context>
     <name>DevicePage</name>
     <message>
-        <location filename="../Pages.cpp" line="395"/>
+        <location filename="../Pages.cpp" line="400"/>
         <source>Device Name</source>
         <translation>Nom de l&apos;appareil</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="398"/>
+        <location filename="../Pages.cpp" line="403"/>
         <source>Device Type</source>
         <translation>Type de l&apos;appareil</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="409"/>
+        <location filename="../Pages.cpp" line="414"/>
         <source>Device Port</source>
         <translation>Port de l&apos;appareil</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="414"/>
+        <location filename="../Pages.cpp" line="419"/>
         <source>Device Profile</source>
         <translation>Profile de l&apos;appareil</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="421"/>
+        <location filename="../Pages.cpp" line="426"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="422"/>
+        <location filename="../Pages.cpp" line="427"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="423"/>
+        <location filename="../Pages.cpp" line="428"/>
         <source>Pair</source>
         <translation>Coupler</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="443"/>
+        <location filename="../Pages.cpp" line="448"/>
         <source>Device Configuration</source>
         <translation>Configuration de l&apos;appareil</translation>
     </message>
@@ -800,27 +930,32 @@ Choisir Annuler pour sortir.</translation>
     </message>
     <message>
         <location filename="../DownloadRideDialog.cpp" line="52"/>
+        <source>&amp;Erase Ride(s)</source>
+        <translation>&amp;Effacer les sorties</translation>
+    </message>
+    <message>
+        <location filename="../DownloadRideDialog.cpp" line="53"/>
         <source>&amp;Rescan</source>
         <translation>&amp;Rechercher</translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="53"/>
-        <location filename="../DownloadRideDialog.cpp" line="174"/>
+        <location filename="../DownloadRideDialog.cpp" line="54"/>
+        <location filename="../DownloadRideDialog.cpp" line="181"/>
         <source>&amp;Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="65"/>
+        <location filename="../DownloadRideDialog.cpp" line="68"/>
         <source>Select port:</source>
         <translation>Sélectionner le port :</translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="67"/>
+        <location filename="../DownloadRideDialog.cpp" line="70"/>
         <source>Select device type:</source>
         <translation>Sélectionner le type d&apos;appareil :</translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="80"/>
+        <location filename="../DownloadRideDialog.cpp" line="83"/>
         <source>No devices found.  Make sure the device
 unit is plugged into the computer,
 then click &quot;Rescan&quot; to check again.</source>
@@ -830,85 +965,167 @@ ordinateur, puis choisir &quot;Rechercher&quot;
 pour vérifier une nouvelle fois.</translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="154"/>
+        <location filename="../DownloadRideDialog.cpp" line="161"/>
         <source>Download canceled</source>
         <translation>Téléchargement annulé</translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="155"/>
+        <location filename="../DownloadRideDialog.cpp" line="162"/>
         <source>Cancel clicked by user.</source>
         <translation>Annuler par l&apos;utilisateur.</translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="159"/>
+        <location filename="../DownloadRideDialog.cpp" line="166"/>
         <source>Download failed</source>
         <translation>Echec du téléchargement</translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="170"/>
+        <location filename="../DownloadRideDialog.cpp" line="177"/>
         <source>Ride Already Downloaded</source>
         <translation>Sortie déjé téléchargée</translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="171"/>
+        <location filename="../DownloadRideDialog.cpp" line="178"/>
         <source>This ride appears to have already </source>
         <translation>Cette sortie semble avoir déjà été </translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="172"/>
+        <location filename="../DownloadRideDialog.cpp" line="179"/>
         <source>been downloaded.  Do you want to </source>
         <translation>téléchargée. Voulez-vous </translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="173"/>
+        <location filename="../DownloadRideDialog.cpp" line="180"/>
         <source>overwrite the previous download?</source>
         <translation>écraser la précédente sortie ?</translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="174"/>
+        <location filename="../DownloadRideDialog.cpp" line="181"/>
         <source>&amp;Overwrite</source>
         <translation>Ecraser</translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="186"/>
-        <location filename="../DownloadRideDialog.cpp" line="197"/>
+        <location filename="../DownloadRideDialog.cpp" line="193"/>
+        <location filename="../DownloadRideDialog.cpp" line="204"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="187"/>
+        <location filename="../DownloadRideDialog.cpp" line="194"/>
         <source>Failed to remove existing file </source>
         <translation>Impossible de supprimer le fichier existant</translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="198"/>
+        <location filename="../DownloadRideDialog.cpp" line="205"/>
         <source>Failed to rename </source>
         <translation>Impossible de renommer </translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="198"/>
+        <location filename="../DownloadRideDialog.cpp" line="205"/>
         <source> to </source>
         <translation> en </translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="205"/>
+        <location filename="../DownloadRideDialog.cpp" line="212"/>
         <source>Success</source>
         <translation>Succès</translation>
     </message>
     <message>
-        <location filename="../DownloadRideDialog.cpp" line="205"/>
+        <location filename="../DownloadRideDialog.cpp" line="212"/>
         <source>Download complete.</source>
         <translation>Téléchargement accompli.</translation>
     </message>
 </context>
+<context>
+    <name>EditChartDialog</name>
+    <message>
+        <location filename="../LTMSettings.cpp" line="36"/>
+        <source>Enter Chart Name</source>
+        <translation>Entrez le nom du graphique</translation>
+    </message>
+    <message>
+        <location filename="../LTMSettings.cpp" line="50"/>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
+    <message>
+        <location filename="../LTMSettings.cpp" line="51"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>EditMetricDetailDialog</name>
+    <message>
+        <location filename="../LTMTool.cpp" line="679"/>
+        <source>Settings</source>
+        <translation>Préférences</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="777"/>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="778"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Annuler</translation>
+    </message>
+</context>
+<context>
+    <name>EditSeasonDialog</name>
+    <message>
+        <location filename="../Season.cpp" line="77"/>
+        <source>Edit Date Range</source>
+        <translation>Editer la plage de données</translation>
+    </message>
+    <message>
+        <location filename="../Season.cpp" line="116"/>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
+    <message>
+        <location filename="../Season.cpp" line="117"/>
+        <source>&amp;Cancel</source>
+        <translation>&amp;annuler</translation>
+    </message>
+</context>
 <context>
     <name>ElevationGain</name>
     <message>
-        <location filename="../BasicRideMetrics.cpp" line="125"/>
+        <location filename="../BasicRideMetrics.cpp" line="131"/>
         <source>Elevation Gain</source>
         <translation>Dénivelé</translation>
     </message>
 </context>
+<context>
+    <name>GoogleMapControl</name>
+    <message>
+        <location filename="../GoogleMapControl.cpp" line="262"/>
+        <source>No GPS Data Present</source>
+        <translation>Pas de donnée GPD</translation>
+    </message>
+    <message>
+        <location filename="../GoogleMapControl.cpp" line="438"/>
+        <source>KPH</source>
+        <translation>km/h</translation>
+    </message>
+    <message>
+        <location filename="../GoogleMapControl.cpp" line="438"/>
+        <source>MPH</source>
+        <translation>m/h</translation>
+    </message>
+    <message>
+        <location filename="../GoogleMapControl.cpp" line="448"/>
+        <source>Meters</source>
+        <translation>Mètres</translation>
+    </message>
+    <message>
+        <location filename="../GoogleMapControl.cpp" line="448"/>
+        <source>Feet</source>
+        <translation>Pieds</translation>
+    </message>
+</context>
 <context>
     <name>HistogramWindow</name>
     <message>
@@ -965,37 +1182,139 @@ pour vérifier une nouvelle fois.</translation>
 <context>
     <name>IntervalMetricsPage</name>
     <message>
-        <location filename="../Pages.cpp" line="729"/>
+        <location filename="../Pages.cpp" line="734"/>
         <source>Available Metrics</source>
         <translation>Métriques disponibles</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="734"/>
+        <location filename="../Pages.cpp" line="739"/>
         <source>Selected Metrics</source>
         <translation>Métriques sélectionnés</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="766"/>
-        <location filename="../Pages.cpp" line="776"/>
+        <location filename="../Pages.cpp" line="771"/>
+        <location filename="../Pages.cpp" line="781"/>
         <source>&amp;#8482;</source>
         <translation>&amp;#8482;</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="766"/>
-        <location filename="../Pages.cpp" line="776"/>
+        <location filename="../Pages.cpp" line="771"/>
+        <location filename="../Pages.cpp" line="781"/>
         <source> (TM)</source>
         <translation> (TM)</translation>
     </message>
 </context>
+<context>
+    <name>LTMPlot</name>
+    <message>
+        <location filename="../LTMPlot.cpp" line="647"/>
+        <source>watts</source>
+        <translation>watts</translation>
+    </message>
+</context>
+<context>
+    <name>LTMTool</name>
+    <message>
+        <location filename="../LTMTool.cpp" line="49"/>
+        <source>Date Range</source>
+        <translation>Plage de dates</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="61"/>
+        <source>Metric</source>
+        <translation>Métrique</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="362"/>
+        <source>All Dates</source>
+        <translation>Toutes les dates</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="368"/>
+        <source>This Year</source>
+        <translation>Cette année</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="374"/>
+        <source>This Month</source>
+        <translation>Ce mois</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="380"/>
+        <source>This Week</source>
+        <translation>Cette semaine</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="390"/>
+        <source>Last 7 days</source>
+        <translation>Dernier 7 jours</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="396"/>
+        <source>Last 14 days</source>
+        <translation>Dernier 14 jours</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="402"/>
+        <source>Last 28 days</source>
+        <translation>Dernier 28 jours</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="408"/>
+        <source>Last 3 months</source>
+        <translation>Dernier 3 mois</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="414"/>
+        <source>Last 6 months</source>
+        <translation>Dernier 6 mois</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="420"/>
+        <source>Last 12 months</source>
+        <translation>Dernier 12 mois</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="439"/>
+        <location filename="../LTMTool.cpp" line="447"/>
+        <source>Unknown Metric</source>
+        <translation>Métrique inconnue</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="504"/>
+        <source>Rename range</source>
+        <translation>Renommer la plage</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="505"/>
+        <source>Edit details</source>
+        <translation>Editer les détails</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="506"/>
+        <source>Delete range</source>
+        <translation>Effacer la plage</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="595"/>
+        <source>Pick Color</source>
+        <translation>Choisir une couleur</translation>
+    </message>
+    <message>
+        <location filename="../LTMTool.cpp" line="596"/>
+        <source>Settings</source>
+        <translation>Préférences</translation>
+    </message>
+</context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../MainWindow.cpp" line="83"/>
+        <location filename="../MainWindow.cpp" line="87"/>
         <source>Invalid Ride File Name</source>
         <translation>Nom de fichier invalide</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="84"/>
+        <location filename="../MainWindow.cpp" line="88"/>
         <source>Invalid date/time in filename:
 %1
 Skipping file...</source>
@@ -1003,113 +1322,109 @@ Skipping file...</source>
 Fichier ignoré...</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="114"/>
+        <location filename="../MainWindow.cpp" line="118"/>
         <source>Zones File Error</source>
         <translation>Erreur dans le fichier des zones</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="119"/>
+        <location filename="../MainWindow.cpp" line="123"/>
         <source>Reading Zones File</source>
         <translation>Lecture du fichier des zones</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="149"/>
-        <location filename="../MainWindow.cpp" line="802"/>
+        <location filename="../MainWindow.cpp" line="153"/>
+        <location filename="../MainWindow.cpp" line="824"/>
         <source>All Rides</source>
         <translation>Toutes les sorties</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="164"/>
-        <location filename="../MainWindow.cpp" line="841"/>
+        <location filename="../MainWindow.cpp" line="168"/>
+        <location filename="../MainWindow.cpp" line="863"/>
         <source>Intervals</source>
         <translation>Intervales</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="219"/>
+        <location filename="../MainWindow.cpp" line="223"/>
         <source>Notes:</source>
         <translation>Notes:</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="244"/>
+        <location filename="../MainWindow.cpp" line="248"/>
         <source>Ride Summary</source>
         <translation>Résumé de la sortie</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="248"/>
+        <location filename="../MainWindow.cpp" line="252"/>
         <source>Ride Plot</source>
         <translation>Tracé de la sortie</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="265"/>
         <source>Critical Power Plot</source>
-        <translation>Tracé Puissance critique</translation>
+        <translation type="obsolete">Tracé Puissance critique</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="270"/>
         <source>Histogram Analysis</source>
-        <translation>Analyse par histogramme</translation>
+        <translation type="obsolete">Analyse par histogramme</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="275"/>
         <source>PF/PV Plot</source>
-        <translation>Tracé PF/PV</translation>
+        <translation type="obsolete">Tracé PF/PV</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notes</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="288"/>
+        <location filename="../MainWindow.cpp" line="292"/>
         <source>Weekly Summary</source>
         <translation>Résumé hebdomadaire</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="293"/>
         <source>Performance Manager</source>
-        <translation>Gestionnaire de performance</translation>
+        <translation type="obsolete">Gestionnaire de performance</translation>
     </message>
     <message>
         <source>Realtime</source>
         <translation type="obsolete">Temps réel</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="320"/>
+        <location filename="../MainWindow.cpp" line="342"/>
         <source>&amp;Cyclist</source>
         <translation>&amp;Cycliste</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="321"/>
+        <location filename="../MainWindow.cpp" line="343"/>
         <source>&amp;New...</source>
         <translation>&amp;Nouveau</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="322"/>
+        <location filename="../MainWindow.cpp" line="344"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="323"/>
+        <location filename="../MainWindow.cpp" line="345"/>
         <source>&amp;Open...</source>
         <translation>&amp;Ouvrir</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="324"/>
-        <location filename="../MainWindow.cpp" line="355"/>
+        <location filename="../MainWindow.cpp" line="346"/>
+        <location filename="../MainWindow.cpp" line="377"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="325"/>
+        <location filename="../MainWindow.cpp" line="347"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="326"/>
+        <location filename="../MainWindow.cpp" line="348"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="328"/>
+        <location filename="../MainWindow.cpp" line="350"/>
         <source>&amp;Ride</source>
         <translation>Sortie</translation>
     </message>
@@ -1118,32 +1433,32 @@ Fichier ignoré...</translation>
         <translation type="obsolete">&amp;Sauver la sortie</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="342"/>
+        <location filename="../MainWindow.cpp" line="364"/>
         <source>Ctrl+S</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="329"/>
+        <location filename="../MainWindow.cpp" line="351"/>
         <source>&amp;Download from device...</source>
         <translation>&amp;Télécharder depuis l&apos;appareil...</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="330"/>
+        <location filename="../MainWindow.cpp" line="352"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="336"/>
+        <location filename="../MainWindow.cpp" line="358"/>
         <source>&amp;Export to CSV...</source>
         <translation>&amp;Exporter en CSV...</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="337"/>
+        <location filename="../MainWindow.cpp" line="359"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="338"/>
+        <location filename="../MainWindow.cpp" line="360"/>
         <source>&amp;Export to GC...</source>
         <translation>&amp;Exporter en GC...</translation>
     </message>
@@ -1152,120 +1467,160 @@ Fichier ignoré...</translation>
         <translation type="obsolete">&amp;Importer un fichier...</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="332"/>
+        <location filename="../MainWindow.cpp" line="354"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="348"/>
+        <location filename="../MainWindow.cpp" line="370"/>
         <source>Find &amp;best intervals...</source>
         <translation>&amp;Rechercher les meilleurs intervalles</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="349"/>
+        <location filename="../MainWindow.cpp" line="371"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="350"/>
+        <location filename="../MainWindow.cpp" line="372"/>
         <source>Find power &amp;peaks...</source>
         <translation>Chercher les pics de puissance</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="351"/>
+        <location filename="../MainWindow.cpp" line="373"/>
         <source>Ctrl+P</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="345"/>
+        <location filename="../MainWindow.cpp" line="367"/>
         <source>Split &amp;ride...</source>
         <translation>Diviser une sortie...</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="343"/>
+        <location filename="../MainWindow.cpp" line="365"/>
         <source>D&amp;elete ride...</source>
         <translation>&amp;Effacer une sortie...</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="333"/>
+        <location filename="../MainWindow.cpp" line="355"/>
         <source>&amp;Manual ride entry...</source>
         <translation>Entrer &amp;manuellement une sortie...</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="281"/>
+        <location filename="../MainWindow.cpp" line="269"/>
+        <source>Critical Power</source>
+        <translation>Puissance critique</translation>
+    </message>
+    <message>
+        <location filename="../MainWindow.cpp" line="274"/>
+        <source>Histograms</source>
+        <translation>Histogramme</translation>
+    </message>
+    <message>
+        <location filename="../MainWindow.cpp" line="279"/>
+        <source>PF/PV</source>
+        <translation>FP/VP</translation>
+    </message>
+    <message>
+        <location filename="../MainWindow.cpp" line="285"/>
         <source>3D</source>
         <translation>3D</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="331"/>
+        <location filename="../MainWindow.cpp" line="299"/>
+        <source>Metrics</source>
+        <translation>Métriques</translation>
+    </message>
+    <message>
+        <location filename="../MainWindow.cpp" line="304"/>
+        <source>PM</source>
+        <translation>PM</translation>
+    </message>
+    <message>
+        <location filename="../MainWindow.cpp" line="310"/>
+        <source>Aerolab</source>
+        <translation>Aérolab</translation>
+    </message>
+    <message>
+        <location filename="../MainWindow.cpp" line="315"/>
+        <source>Map</source>
+        <translation>Carte</translation>
+    </message>
+    <message>
+        <location filename="../MainWindow.cpp" line="353"/>
         <source>&amp;Import from file...</source>
         <translation>&amp;Importer des fichiers</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="334"/>
+        <location filename="../MainWindow.cpp" line="356"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="341"/>
+        <location filename="../MainWindow.cpp" line="363"/>
         <source>&amp;Save ride</source>
         <translation>&amp;Sauver une sortie</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="353"/>
+        <location filename="../MainWindow.cpp" line="375"/>
         <source>&amp;Tools</source>
         <translation>Outils</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="354"/>
+        <location filename="../MainWindow.cpp" line="376"/>
         <source>&amp;Options...</source>
         <translation>Options</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="356"/>
+        <location filename="../MainWindow.cpp" line="378"/>
         <source>Critical Power Calculator</source>
         <translation>Estimateur de puissance critique</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="364"/>
+        <location filename="../MainWindow.cpp" line="385"/>
+        <source>&amp;View</source>
+        <translation>&amp;Voir</translation>
+    </message>
+    <message>
+        <location filename="../MainWindow.cpp" line="401"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="365"/>
+        <location filename="../MainWindow.cpp" line="402"/>
         <source>&amp;About GoldenCheetah</source>
         <translation>A &amp;Propos de GoldenCheetah</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="499"/>
-        <location filename="../MainWindow.cpp" line="1095"/>
+        <location filename="../MainWindow.cpp" line="562"/>
+        <location filename="../MainWindow.cpp" line="1117"/>
         <source>Can&apos;t rename %1 to %2</source>
         <translation>Impossible de renommer %1 en %2</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="570"/>
-        <location filename="../MainWindow.cpp" line="590"/>
+        <location filename="../MainWindow.cpp" line="633"/>
+        <location filename="../MainWindow.cpp" line="653"/>
         <source>Select Ride</source>
         <translation>Sélectionner une sortie</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="570"/>
-        <location filename="../MainWindow.cpp" line="590"/>
+        <location filename="../MainWindow.cpp" line="633"/>
+        <location filename="../MainWindow.cpp" line="653"/>
         <source>No ride selected!</source>
         <translation>Aucune sortie sélectionner</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="575"/>
+        <location filename="../MainWindow.cpp" line="638"/>
         <source>Export GC</source>
         <translation>Exporter GC</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="575"/>
+        <location filename="../MainWindow.cpp" line="638"/>
         <source>GC (*.gc)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="598"/>
+        <location filename="../MainWindow.cpp" line="661"/>
         <source>Metric</source>
         <translation>Métriques</translation>
     </message>
@@ -1274,152 +1629,152 @@ Fichier ignoré...</translation>
         <translation type="obsolete">Impériales</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="598"/>
+        <location filename="../MainWindow.cpp" line="661"/>
         <source>Imperial</source>
         <translation>Impériales</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="601"/>
+        <location filename="../MainWindow.cpp" line="664"/>
         <source>Select Units</source>
         <translation>Sélectionner les unités</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="601"/>
+        <location filename="../MainWindow.cpp" line="664"/>
         <source>Units:</source>
         <translation>Unités</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="607"/>
+        <location filename="../MainWindow.cpp" line="670"/>
         <source>Export CSV</source>
         <translation>Exporter en CSV</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="608"/>
+        <location filename="../MainWindow.cpp" line="671"/>
         <source>Comma-Separated Values (*.csv)</source>
         <translation>CSV (séparateur point-virgule) (*.csv)</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="615"/>
-        <location filename="../MainWindow.cpp" line="821"/>
+        <location filename="../MainWindow.cpp" line="678"/>
+        <location filename="../MainWindow.cpp" line="843"/>
         <source>Split Ride</source>
         <translation>Division de la sortie</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="615"/>
+        <location filename="../MainWindow.cpp" line="678"/>
         <source>The file %1 can&apos;t be opened for writing</source>
         <translation>Impossible de modifier le fichier %1</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="639"/>
+        <location filename="../MainWindow.cpp" line="702"/>
         <source>Import from File</source>
         <translation>Importer un fichier</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="705"/>
+        <location filename="../MainWindow.cpp" line="729"/>
         <source> (%1 watts)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="809"/>
+        <location filename="../MainWindow.cpp" line="831"/>
         <source>Save Changes to Ride</source>
         <translation>Sauver les changements dans la sortie</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="812"/>
+        <location filename="../MainWindow.cpp" line="834"/>
         <source>Delete Ride</source>
         <translation>Effacer la sortie</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="815"/>
+        <location filename="../MainWindow.cpp" line="837"/>
         <source>Find Best Intervals</source>
         <translation>Trouver les meilleurs intervales</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="818"/>
+        <location filename="../MainWindow.cpp" line="840"/>
         <source>Find Power Peaks</source>
         <translation>Trouver les pics de puissance</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="846"/>
+        <location filename="../MainWindow.cpp" line="868"/>
         <source>Rename interval</source>
         <translation>Renommer l&apos;intervale</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="847"/>
+        <location filename="../MainWindow.cpp" line="869"/>
         <source>Delete interval</source>
         <translation>Effacer l&apos;intervale</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="848"/>
+        <location filename="../MainWindow.cpp" line="870"/>
         <source>Zoom to interval</source>
         <translation>Zoomer sur l&apos;intervale</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="849"/>
+        <location filename="../MainWindow.cpp" line="871"/>
         <source>Bring to Front</source>
         <translation>Mettre au premier plan</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="850"/>
+        <location filename="../MainWindow.cpp" line="872"/>
         <source>Send to back</source>
         <translation>Mettre ne arrière-plan</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="986"/>
+        <location filename="../MainWindow.cpp" line="1008"/>
         <source>Computing bike score estimating factors.
 </source>
         <translation>Calcul des facteurs pour l&apos;estimation du BikeScore</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="987"/>
+        <location filename="../MainWindow.cpp" line="1009"/>
         <source>Abort</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1004"/>
+        <location filename="../MainWindow.cpp" line="1026"/>
         <source>Processing %1...</source>
         <translation>Traitement %1...</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1070"/>
+        <location filename="../MainWindow.cpp" line="1092"/>
         <source>Read Error</source>
         <translation>Erreur de lecture</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1071"/>
+        <location filename="../MainWindow.cpp" line="1093"/>
         <source>Can&apos;t read notes file %1</source>
         <translation>Impossible d&apos;accéder au fichier de note %1</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1094"/>
-        <location filename="../MainWindow.cpp" line="1101"/>
+        <location filename="../MainWindow.cpp" line="1116"/>
+        <location filename="../MainWindow.cpp" line="1123"/>
         <source>Write Error</source>
         <translation>Erreur d&apos;écriture</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1102"/>
+        <location filename="../MainWindow.cpp" line="1124"/>
         <source>Can&apos;t write notes file %1</source>
         <translation>Impossible d&apos;enregistrer le fichier de note %1</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1174"/>
+        <location filename="../MainWindow.cpp" line="1196"/>
         <source>CP saved</source>
         <translation>CP sauvée</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1175"/>
+        <location filename="../MainWindow.cpp" line="1197"/>
         <source>Range from %1 to %2
 Rider CP set to %3 watts</source>
         <translation>Période du %1 au %2
 CP du cycliste fixée à %3 watts</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1193"/>
+        <location filename="../MainWindow.cpp" line="1219"/>
         <source>About GoldenCheetah</source>
         <translation>A propos de GoldenCheetah</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1193"/>
+        <location filename="../MainWindow.cpp" line="1219"/>
         <source>&lt;center&gt;&lt;h2&gt;GoldenCheetah&lt;/h2&gt;Cycling Power Analysis Software&lt;br&gt;for Linux, Mac, and Windows&lt;p&gt;Build date: %1 %2&lt;p&gt;Version: %3&lt;p&gt;GoldenCheetah is licensed under the&lt;br&gt;&lt;a href=&quot;http://www.gnu.org/copyleft/gpl.html&quot;&gt;GNU General Public License&lt;/a&gt;.&lt;p&gt;Source code can be obtained from&lt;br&gt;&lt;a href=&quot;http://goldencheetah.org/&quot;&gt;http://goldencheetah.org/&lt;/a&gt;.&lt;p&gt;Ride files and other data are stored in&lt;br&gt;&lt;a href=&quot;%4&quot;&gt;%5&lt;/a&gt;&lt;/center&gt;</source>
         <translation>&lt;center&gt;&lt;h2&gt;GoldenCheetah&lt;/h2&gt;Cycling Power Analysis Software&lt;br&gt;for Linux, Mac, and Windows&lt;p&gt;Build date: %1 %2&lt;p&gt;Version: %3&lt;p&gt;GoldenCheetah is licensed under the&lt;br&gt;&lt;a href=&quot;http://www.gnu.org/copyleft/gpl.html&quot;&gt;GNU General Public License&lt;/a&gt;.&lt;p&gt;Source code can be obtained from&lt;br&gt;&lt;a href=&quot;http://goldencheetah.org/&quot;&gt;http://goldencheetah.org/&lt;/a&gt;.&lt;p&gt;Ride files and other data are stored in&lt;br&gt;&lt;a href=&quot;%4&quot;&gt;%5&lt;/a&gt;&lt;/center&gt;</translation>
     </message>
@@ -1432,12 +1787,12 @@ CP du cycliste fixée à %3 watts</translation>
         <translation type="obsolete">&lt;/i&gt;&lt;p&gt;GoldenCheetah est licenciée sous &lt;a href=&quot;http://www.gnu.org/copyleft/gpl.html&quot;&gt;GNU General Public License&lt;/a&gt;.&lt;p&gt;Le code source peut être optenu sur &lt;a href=&quot;http://goldencheetah.org/&quot;&gt;http://goldencheetah.org/&lt;/a&gt;.&lt;/center&gt;</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1263"/>
+        <location filename="../MainWindow.cpp" line="1287"/>
         <source>Are you sure you want to delete the ride:</source>
         <translation>Etes-vous certain de vouloir supprimer la sortie:</translation>
     </message>
     <message>
-        <location filename="../MainWindow.cpp" line="1265"/>
+        <location filename="../MainWindow.cpp" line="1289"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
@@ -1593,10 +1948,18 @@ CP du cycliste fixée à %3 watts</translation>
         <translation>en</translation>
     </message>
 </context>
+<context>
+    <name>MaxHr</name>
+    <message>
+        <location filename="../BasicRideMetrics.cpp" line="350"/>
+        <source>Max Heartrate</source>
+        <translation>Fréq cardiaque max</translation>
+    </message>
+</context>
 <context>
     <name>MaxPower</name>
     <message>
-        <location filename="../BasicRideMetrics.cpp" line="306"/>
+        <location filename="../BasicRideMetrics.cpp" line="324"/>
         <source>Max Power</source>
         <translation>Puissance max</translation>
     </message>
@@ -1634,104 +1997,118 @@ CP du cycliste fixée à %3 watts</translation>
         <translation>Altitude</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="39"/>
         <source>Pedal Force</source>
-        <translation>Force de pédalage</translation>
+        <translation type="obsolete">Force de pédalage</translation>
+    </message>
+    <message>
+        <location filename="../ModelWindow.cpp" line="39"/>
+        <source>Torque</source>
+        <translation>Couple</translation>
     </message>
     <message>
         <location filename="../ModelWindow.cpp" line="40"/>
+        <source>AEPF</source>
+        <translation>AEPF</translation>
+    </message>
+    <message>
+        <location filename="../ModelWindow.cpp" line="41"/>
+        <source>CPV</source>
+        <translation>CPV</translation>
+    </message>
+    <message>
+        <location filename="../ModelWindow.cpp" line="42"/>
         <source>Time</source>
         <translation>Temps</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="41"/>
+        <location filename="../ModelWindow.cpp" line="43"/>
         <source>Distance</source>
         <translation>Distance</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="62"/>
+        <location filename="../ModelWindow.cpp" line="64"/>
         <source>Analyse</source>
         <translation>Analyse</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="63"/>
+        <location filename="../ModelWindow.cpp" line="65"/>
         <source>X-Axis:</source>
         <translation>Axe X:</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="64"/>
+        <location filename="../ModelWindow.cpp" line="66"/>
         <source>Y-Axis:</source>
         <translation>Axe Y:</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="65"/>
+        <location filename="../ModelWindow.cpp" line="67"/>
         <source>Z-Axis:</source>
         <translation>Axe Z:</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="66"/>
+        <location filename="../ModelWindow.cpp" line="68"/>
         <source>Color:</source>
         <translation>Couleur:</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="67"/>
+        <location filename="../ModelWindow.cpp" line="69"/>
         <source>Bin Width:</source>
         <translation>Largeur de barre</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="80"/>
-        <location filename="../ModelWindow.cpp" line="86"/>
+        <location filename="../ModelWindow.cpp" line="82"/>
+        <location filename="../ModelWindow.cpp" line="88"/>
         <source>Time at X&amp;Y</source>
         <translation>Temps à X&amp;Y</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="85"/>
+        <location filename="../ModelWindow.cpp" line="87"/>
         <source>Power Zone</source>
         <translation>Zone de puissance</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="90"/>
+        <location filename="../ModelWindow.cpp" line="92"/>
         <source>Bar</source>
         <translation>Barre</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="91"/>
+        <location filename="../ModelWindow.cpp" line="93"/>
         <source>Grid</source>
         <translation>Grille</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="92"/>
+        <location filename="../ModelWindow.cpp" line="94"/>
         <source>Surface</source>
         <translation>Surface</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="95"/>
+        <location filename="../ModelWindow.cpp" line="97"/>
         <source>Ignore Zero</source>
         <translation>Ignore les zéros</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="97"/>
+        <location filename="../ModelWindow.cpp" line="99"/>
         <source>Show Grid</source>
         <translation>Montrer la grille</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="99"/>
+        <location filename="../ModelWindow.cpp" line="101"/>
         <source>Frame Intervals</source>
         <translation>Cadre</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="101"/>
+        <location filename="../ModelWindow.cpp" line="103"/>
         <source>Legend</source>
         <translation>Légende</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="114"/>
-        <location filename="../ModelWindow.cpp" line="288"/>
+        <location filename="../ModelWindow.cpp" line="116"/>
+        <location filename="../ModelWindow.cpp" line="296"/>
         <source>Reset View</source>
         <translation>Réinitialiser la vue</translation>
     </message>
     <message>
-        <location filename="../ModelWindow.cpp" line="281"/>
+        <location filename="../ModelWindow.cpp" line="289"/>
         <source>Plot</source>
         <translation>Tracer</translation>
     </message>
@@ -1739,11 +2116,107 @@ CP du cycliste fixée à %3 watts</translation>
 <context>
     <name>NinetyFivePercentHeartRate</name>
     <message>
-        <location filename="../BasicRideMetrics.cpp" line="330"/>
+        <location filename="../BasicRideMetrics.cpp" line="376"/>
         <source>95% Heart Rate</source>
         <translation>95% des pulsations</translation>
     </message>
 </context>
+<context>
+    <name>PeakPower</name>
+    <message>
+        <location filename="../PeakPower.cpp" line="34"/>
+        <source>60 min Peak Power</source>
+        <translation>Pique de puissance sur 60min</translation>
+    </message>
+</context>
+<context>
+    <name>PeakPower10m</name>
+    <message>
+        <location filename="../PeakPower.cpp" line="122"/>
+        <source>10 min Peak Power</source>
+        <translation>Pique de puissance sur 10min</translation>
+    </message>
+</context>
+<context>
+    <name>PeakPower10s</name>
+    <message>
+        <location filename="../PeakPower.cpp" line="74"/>
+        <source>10 sec Peak Power</source>
+        <translation>Pique de puissance sur 10sec</translation>
+    </message>
+</context>
+<context>
+    <name>PeakPower15s</name>
+    <message>
+        <location filename="../PeakPower.cpp" line="82"/>
+        <source>15 sec Peak Power</source>
+        <translation>Pique de puissance sur 15sec</translation>
+    </message>
+</context>
+<context>
+    <name>PeakPower1m</name>
+    <message>
+        <location filename="../PeakPower.cpp" line="106"/>
+        <source>1 min Peak Power</source>
+        <translation>Pique de puissance sur 1min</translation>
+    </message>
+</context>
+<context>
+    <name>PeakPower1s</name>
+    <message>
+        <location filename="../PeakPower.cpp" line="58"/>
+        <source>1 sec Peak Power</source>
+        <translation>Pique de puissance sur 1sec</translation>
+    </message>
+</context>
+<context>
+    <name>PeakPower20m</name>
+    <message>
+        <location filename="../PeakPower.cpp" line="130"/>
+        <source>20 min Peak Power</source>
+        <translation>Pique de puissance sur 20min</translation>
+    </message>
+</context>
+<context>
+    <name>PeakPower20s</name>
+    <message>
+        <location filename="../PeakPower.cpp" line="90"/>
+        <source>20 sec Peak Power</source>
+        <translation>Pique de puissance sur 20sec</translation>
+    </message>
+</context>
+<context>
+    <name>PeakPower30m</name>
+    <message>
+        <location filename="../PeakPower.cpp" line="138"/>
+        <source>30 min Peak Power</source>
+        <translation>Pique de puissance sur 30min</translation>
+    </message>
+</context>
+<context>
+    <name>PeakPower30s</name>
+    <message>
+        <location filename="../PeakPower.cpp" line="98"/>
+        <source>30 sec Peak Power</source>
+        <translation>Pique de puissance sur 30sec</translation>
+    </message>
+</context>
+<context>
+    <name>PeakPower5m</name>
+    <message>
+        <location filename="../PeakPower.cpp" line="114"/>
+        <source>5 min Peak Power</source>
+        <translation>Pique de puissance sur 5min</translation>
+    </message>
+</context>
+<context>
+    <name>PeakPower5s</name>
+    <message>
+        <location filename="../PeakPower.cpp" line="66"/>
+        <source>5 sec Peak Power</source>
+        <translation>Pique de puissance sur 5sec</translation>
+    </message>
+</context>
 <context>
     <name>PerfPlot</name>
     <message>
@@ -1755,22 +2228,27 @@ CP du cycliste fixée à %3 watts</translation>
         <translation type="obsolete">Temps (jours)</translation>
     </message>
     <message>
-        <location filename="../PerfPlot.cpp" line="92"/>
+        <location filename="../PerfPlot.cpp" line="37"/>
+        <source>Performance Manager</source>
+        <translation>Gestionnaire de performance</translation>
+    </message>
+    <message>
+        <location filename="../PerfPlot.cpp" line="93"/>
         <source>Daily</source>
         <translation>Journalier</translation>
     </message>
     <message>
-        <location filename="../PerfPlot.cpp" line="106"/>
+        <location filename="../PerfPlot.cpp" line="107"/>
         <source>Short Term Stress</source>
         <translation>Charge à court terme (STS)</translation>
     </message>
     <message>
-        <location filename="../PerfPlot.cpp" line="119"/>
+        <location filename="../PerfPlot.cpp" line="120"/>
         <source>Long Term Stress</source>
         <translation>Charge à long terme (LTS)</translation>
     </message>
     <message>
-        <location filename="../PerfPlot.cpp" line="132"/>
+        <location filename="../PerfPlot.cpp" line="133"/>
         <source>Stress Balance</source>
         <translation>Equilibre de charge (SB)</translation>
     </message>
@@ -1798,14 +2276,14 @@ CP du cycliste fixée à %3 watts</translation>
         <translation>Utiliser les DanielsPoints</translation>
     </message>
     <message>
-        <location filename="../PerformanceManagerWindow.cpp" line="67"/>
+        <location filename="../PerformanceManagerWindow.cpp" line="74"/>
         <source>to</source>
         <translation>en</translation>
     </message>
     <message>
-        <location filename="../PerformanceManagerWindow.cpp" line="222"/>
-        <location filename="../PerformanceManagerWindow.cpp" line="252"/>
-        <location filename="../PerformanceManagerWindow.cpp" line="254"/>
+        <location filename="../PerformanceManagerWindow.cpp" line="245"/>
+        <location filename="../PerformanceManagerWindow.cpp" line="275"/>
+        <location filename="../PerformanceManagerWindow.cpp" line="277"/>
         <source>MMM d yyyy</source>
         <translation>d MMM yyyy</translation>
     </message>
@@ -1821,7 +2299,7 @@ CP du cycliste fixée à %3 watts</translation>
         <translation type="obsolete">Vitesse circonferentielle de la pédale (m/s)</translation>
     </message>
     <message>
-        <location filename="../PfPvPlot.cpp" line="352"/>
+        <location filename="../PfPvPlot.cpp" line="355"/>
         <source>no cadence</source>
         <translation>Pas de cadence</translation>
     </message>
@@ -1853,6 +2331,11 @@ CP du cycliste fixée à %3 watts</translation>
         <source>Merge intervals</source>
         <translation>Grouper les intervales</translation>
     </message>
+    <message>
+        <location filename="../PfPvWindow.cpp" line="47"/>
+        <source>Frame intervals</source>
+        <translation>Cadrer les intervales</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -1862,10 +2345,15 @@ CP du cycliste fixée à %3 watts</translation>
         <translation>Découplage aérobique</translation>
     </message>
     <message>
-        <location filename="../DanielsPoints.cpp" line="44"/>
+        <location filename="../DanielsPoints.cpp" line="45"/>
         <source>Daniels Points</source>
         <translation>Daniels Points</translation>
     </message>
+    <message>
+        <location filename="../DanielsPoints.cpp" line="121"/>
+        <source>Daniels EqP</source>
+        <translation>Daniels EqP</translation>
+    </message>
     <message>
         <location filename="../ManualRideFile.cpp" line="121"/>
         <source>Unknown ride metric &quot;%1&quot;.</source>
@@ -2010,7 +2498,7 @@ CP du cycliste fixée à %3 watts</translation>
 <context>
     <name>RelativeIntensity</name>
     <message>
-        <location filename="../BikeScore.cpp" line="108"/>
+        <location filename="../BikeScore.cpp" line="151"/>
         <source>Relative Intensity</source>
         <translation>Intensité relative</translation>
     </message>
@@ -2018,9 +2506,9 @@ CP du cycliste fixée à %3 watts</translation>
 <context>
     <name>RideDelegate</name>
     <message>
-        <location filename="../RideImportWizard.cpp" line="812"/>
-        <location filename="../RideImportWizard.cpp" line="849"/>
-        <location filename="../RideImportWizard.cpp" line="865"/>
+        <location filename="../RideImportWizard.cpp" line="815"/>
+        <location filename="../RideImportWizard.cpp" line="852"/>
+        <location filename="../RideImportWizard.cpp" line="868"/>
         <source>dd MMM yyyy</source>
         <translation>dd MMM yyyy</translation>
     </message>
@@ -2084,8 +2572,9 @@ CP du cycliste fixée à %3 watts</translation>
     </message>
     <message>
         <location filename="../RideImportWizard.cpp" line="68"/>
-        <location filename="../RideImportWizard.cpp" line="601"/>
-        <location filename="../RideImportWizard.cpp" line="690"/>
+        <location filename="../RideImportWizard.cpp" line="568"/>
+        <location filename="../RideImportWizard.cpp" line="604"/>
+        <location filename="../RideImportWizard.cpp" line="693"/>
         <source>Abort</source>
         <translation>Interrompre</translation>
     </message>
@@ -2156,12 +2645,12 @@ CP du cycliste fixée à %3 watts</translation>
     </message>
     <message>
         <location filename="../RideImportWizard.cpp" line="263"/>
-        <location filename="../RideImportWizard.cpp" line="351"/>
-        <location filename="../RideImportWizard.cpp" line="415"/>
-        <location filename="../RideImportWizard.cpp" line="580"/>
-        <location filename="../RideImportWizard.cpp" line="619"/>
-        <location filename="../RideImportWizard.cpp" line="695"/>
-        <location filename="../RideImportWizard.cpp" line="718"/>
+        <location filename="../RideImportWizard.cpp" line="354"/>
+        <location filename="../RideImportWizard.cpp" line="418"/>
+        <location filename="../RideImportWizard.cpp" line="583"/>
+        <location filename="../RideImportWizard.cpp" line="622"/>
+        <location filename="../RideImportWizard.cpp" line="698"/>
+        <location filename="../RideImportWizard.cpp" line="721"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
@@ -2171,152 +2660,159 @@ CP du cycliste fixée à %3 watts</translation>
         <translation>Analyse...</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="280"/>
+        <location filename="../RideImportWizard.cpp" line="281"/>
         <source>Validated</source>
         <translation>Validé</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="294"/>
-        <location filename="../RideImportWizard.cpp" line="527"/>
-        <location filename="../RideImportWizard.cpp" line="628"/>
+        <location filename="../RideImportWizard.cpp" line="283"/>
+        <source>Warning - </source>
+        <translation>Attention - </translation>
+    </message>
+    <message>
+        <location filename="../RideImportWizard.cpp" line="297"/>
+        <location filename="../RideImportWizard.cpp" line="530"/>
+        <location filename="../RideImportWizard.cpp" line="631"/>
         <source>dd MMM yyyy</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="295"/>
+        <location filename="../RideImportWizard.cpp" line="298"/>
         <source>hh:mm:ss ap</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="325"/>
+        <location filename="../RideImportWizard.cpp" line="328"/>
         <source>00:00:00</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="333"/>
+        <location filename="../RideImportWizard.cpp" line="336"/>
         <source>Error - </source>
         <translation>Erreur - </translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="333"/>
+        <location filename="../RideImportWizard.cpp" line="283"/>
+        <location filename="../RideImportWizard.cpp" line="336"/>
         <source> </source>
         <translation> </translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="343"/>
+        <location filename="../RideImportWizard.cpp" line="346"/>
         <source>Step 3 of 4: Confirm Date and Time</source>
         <translation>Etape 3 sur 4 : Confirmation de la date et heure</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="373"/>
+        <location filename="../RideImportWizard.cpp" line="376"/>
         <source>Save</source>
         <translation>Sauver</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="481"/>
-        <location filename="../RideImportWizard.cpp" line="531"/>
+        <location filename="../RideImportWizard.cpp" line="484"/>
+        <location filename="../RideImportWizard.cpp" line="534"/>
         <source>hh:mm:ss</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="490"/>
+        <location filename="../RideImportWizard.cpp" line="493"/>
         <source>Invalid Selection</source>
         <translation>Sélection invalide</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="490"/>
+        <location filename="../RideImportWizard.cpp" line="493"/>
         <source>More than 24hrs of rides to fit into a day</source>
         <translation>Plus de 24h de sortie pour une seule journée</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="535"/>
-        <location filename="../RideImportWizard.cpp" line="629"/>
+        <location filename="../RideImportWizard.cpp" line="538"/>
+        <location filename="../RideImportWizard.cpp" line="632"/>
         <source>hh:mm:ss a</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="599"/>
+        <location filename="../RideImportWizard.cpp" line="602"/>
         <source>Step 4 of 4: Save to Library</source>
         <translation>Etape 4 sur 4 : Sauvegarde des sorties</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="621"/>
+        <location filename="../RideImportWizard.cpp" line="624"/>
         <source>Saving...</source>
         <translation>Sauvegarde...</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="644"/>
+        <location filename="../RideImportWizard.cpp" line="647"/>
         <source>Error - Source is Target</source>
         <translation>Erreur - La source est aussi la cible</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="647"/>
+        <location filename="../RideImportWizard.cpp" line="650"/>
         <source>Overwriting file...</source>
         <translation>Remplace le fichier...</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="649"/>
+        <location filename="../RideImportWizard.cpp" line="652"/>
         <source>/</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="649"/>
+        <location filename="../RideImportWizard.cpp" line="652"/>
         <source>.tmp</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="658"/>
+        <location filename="../RideImportWizard.cpp" line="661"/>
         <source>File Overwritten</source>
         <translation>Fichier remplacà</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="661"/>
-        <location filename="../RideImportWizard.cpp" line="663"/>
+        <location filename="../RideImportWizard.cpp" line="664"/>
+        <location filename="../RideImportWizard.cpp" line="666"/>
         <source>Error - overwrite failed</source>
         <translation>Erreur - Echec du remplacement</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="666"/>
+        <location filename="../RideImportWizard.cpp" line="669"/>
         <source>Error - File exists</source>
         <translation>Erreur - Le fichier existe</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="669"/>
+        <location filename="../RideImportWizard.cpp" line="672"/>
         <source>Saving file...</source>
         <translation>Sauvegarde du fichier...</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="672"/>
+        <location filename="../RideImportWizard.cpp" line="675"/>
         <source>File Saved</source>
         <translation>Fichier sauvé</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="678"/>
+        <location filename="../RideImportWizard.cpp" line="681"/>
         <source>Error - copy failed</source>
         <translation>Erreur - La copie a échouée</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="688"/>
+        <location filename="../RideImportWizard.cpp" line="691"/>
         <source>Step 5 of 5: Calculating Critical Powers</source>
         <translation>Etape 5 sur 5 : Calcul des puissances maximales</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="696"/>
+        <location filename="../RideImportWizard.cpp" line="699"/>
         <source>Calculating...</source>
         <translation>Calcul...</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="705"/>
+        <location filename="../RideImportWizard.cpp" line="708"/>
         <source>Completed.</source>
         <translation>Accompli.</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="723"/>
+        <location filename="../RideImportWizard.cpp" line="726"/>
         <source>Import Complete. %1 of %2 successful.</source>
         <translation>Importation terminée. %1 sur %2 avec succès.</translation>
     </message>
     <message>
-        <location filename="../RideImportWizard.cpp" line="728"/>
+        <location filename="../RideImportWizard.cpp" line="573"/>
+        <location filename="../RideImportWizard.cpp" line="731"/>
         <source>Finish</source>
         <translation>Terminé.</translation>
     </message>
@@ -2426,22 +2922,22 @@ CP du cycliste fixée à %3 watts</translation>
         <translation>Type d&apos;appareil: </translation>
     </message>
     <message>
-        <location filename="../RideSummaryWindow.cpp" line="134"/>
+        <location filename="../RideSummaryWindow.cpp" line="135"/>
         <source>^Average </source>
         <translation>^Moyenne </translation>
     </message>
     <message>
-        <location filename="../RideSummaryWindow.cpp" line="162"/>
+        <location filename="../RideSummaryWindow.cpp" line="163"/>
         <source>&lt;h2&gt;Power Zones&lt;/h2&gt;</source>
         <translation>&lt;h2&gt;Zones de Puissance&lt;/h2&gt;</translation>
     </message>
     <message>
-        <location filename="../RideSummaryWindow.cpp" line="175"/>
+        <location filename="../RideSummaryWindow.cpp" line="176"/>
         <source>Intervals</source>
         <translation>Intervales</translation>
     </message>
     <message>
-        <location filename="../RideSummaryWindow.cpp" line="233"/>
+        <location filename="../RideSummaryWindow.cpp" line="236"/>
         <source>&lt;p&gt;&lt;h2&gt;Errors reading file:&lt;/h2&gt;&lt;ul&gt;</source>
         <translation>&lt;p&gt;&lt;h2&gt;Erreurs à la lecture du fichier:&lt;/h2&gt;&lt;ul&gt;</translation>
     </message>
@@ -2475,9 +2971,13 @@ qui ne sont pas sauvés. Ils sont listés ci-dessous.</translation>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
-        <location filename="../SaveDialogs.cpp" line="272"/>
         <source>Always check for unsaved chages on exit</source>
-        <translation>Toujours vérifier les changements avant de quitter</translation>
+        <translation type="obsolete">Toujours vérifier les changements avant de quitter</translation>
+    </message>
+    <message>
+        <location filename="../SaveDialogs.cpp" line="272"/>
+        <source>Always check for unsaved changes on exit</source>
+        <translation>Toujours vérifier les changements non sauvés avant de quitter</translation>
     </message>
 </context>
 <context>
@@ -2554,12 +3054,12 @@ Voulez-vous continuer?
         <translation type="obsolete">Pause : </translation>
     </message>
     <message>
-        <location filename="../SplitRideDialog.cpp" line="157"/>
+        <location filename="../SplitRideDialog.cpp" line="166"/>
         <source>Split Ride</source>
         <translation>Diviser la sortie</translation>
     </message>
     <message>
-        <location filename="../SplitRideDialog.cpp" line="157"/>
+        <location filename="../SplitRideDialog.cpp" line="166"/>
         <source>The file %1 already exists and will not be overwritten</source>
         <translation>Le fichier %1 existe déjà et ne peut pas être écrasé</translation>
     </message>
@@ -2571,26 +3071,23 @@ Voulez-vous continuer?
 <context>
     <name>StressCalculator</name>
     <message>
-        <location filename="../StressCalculator.cpp" line="109"/>
         <source>Computing stress.
 </source>
-        <translation>Analyse de la charge.</translation>
+        <translation type="obsolete">Analyse de la charge.</translation>
     </message>
     <message>
-        <location filename="../StressCalculator.cpp" line="110"/>
         <source>Abort</source>
-        <translation>Interrompre</translation>
+        <translation type="obsolete">Interrompre</translation>
     </message>
     <message>
-        <location filename="../StressCalculator.cpp" line="142"/>
         <source>Processing %1...</source>
-        <translation>Annalyse %1...</translation>
+        <translation type="obsolete">Annalyse %1...</translation>
     </message>
 </context>
 <context>
     <name>TimeRiding</name>
     <message>
-        <location filename="../BasicRideMetrics.cpp" line="58"/>
+        <location filename="../BasicRideMetrics.cpp" line="60"/>
         <source>Time Riding</source>
         <translation>Temps en mouvement</translation>
     </message>
@@ -2631,7 +3128,7 @@ Voulez-vous continuer?
 <context>
     <name>TotalDistance</name>
     <message>
-        <location filename="../BasicRideMetrics.cpp" line="92"/>
+        <location filename="../BasicRideMetrics.cpp" line="96"/>
         <source>Distance</source>
         <translation>Distance</translation>
     </message>
@@ -2639,7 +3136,7 @@ Voulez-vous continuer?
 <context>
     <name>TotalWork</name>
     <message>
-        <location filename="../BasicRideMetrics.cpp" line="168"/>
+        <location filename="../BasicRideMetrics.cpp" line="176"/>
         <source>Work</source>
         <translation>Travail</translation>
     </message>
@@ -2670,6 +3167,14 @@ Voulez-vous continuer?
         <translation>Mode Pente Manuelle</translation>
     </message>
 </context>
+<context>
+    <name>VariabilityIndex</name>
+    <message>
+        <location filename="../BikeScore.cpp" line="111"/>
+        <source>Skiba VI</source>
+        <translation>Skiba VI</translation>
+    </message>
+</context>
 <context>
     <name>ViewSelection</name>
     <message>
@@ -2722,11 +3227,75 @@ Voulez-vous continuer?
 <context>
     <name>XPower</name>
     <message>
-        <location filename="../BikeScore.cpp" line="47"/>
+        <location filename="../BikeScore.cpp" line="48"/>
         <source>xPower</source>
         <translation>xPower</translation>
     </message>
 </context>
+<context>
+    <name>ZoneTime</name>
+    <message>
+        <location filename="../TimeInZone.cpp" line="38"/>
+        <source>Time In Zone</source>
+        <translation>Temps dans la zone</translation>
+    </message>
+</context>
+<context>
+    <name>ZoneTime1</name>
+    <message>
+        <location filename="../TimeInZone.cpp" line="67"/>
+        <source>L1 Time in Zone</source>
+        <translation>Temps dans la zone L1</translation>
+    </message>
+</context>
+<context>
+    <name>ZoneTime2</name>
+    <message>
+        <location filename="../TimeInZone.cpp" line="75"/>
+        <source>L2 Time in Zone</source>
+        <translation>Temps dans la zone L2</translation>
+    </message>
+</context>
+<context>
+    <name>ZoneTime3</name>
+    <message>
+        <location filename="../TimeInZone.cpp" line="83"/>
+        <source>L3 Time in Zone</source>
+        <translation>Temps dans la zone L3</translation>
+    </message>
+</context>
+<context>
+    <name>ZoneTime4</name>
+    <message>
+        <location filename="../TimeInZone.cpp" line="91"/>
+        <source>L4 Time in Zone</source>
+        <translation>Temps dans la zone L4</translation>
+    </message>
+</context>
+<context>
+    <name>ZoneTime5</name>
+    <message>
+        <location filename="../TimeInZone.cpp" line="99"/>
+        <source>L5 Time in Zone</source>
+        <translation>Temps dans la zone L5</translation>
+    </message>
+</context>
+<context>
+    <name>ZoneTime6</name>
+    <message>
+        <location filename="../TimeInZone.cpp" line="107"/>
+        <source>L6 Time in Zone</source>
+        <translation>Temps dans la zone L6</translation>
+    </message>
+</context>
+<context>
+    <name>ZoneTime7</name>
+    <message>
+        <location filename="../TimeInZone.cpp" line="115"/>
+        <source>L7 Time in Zone</source>
+        <translation>Temps dans la zone L7</translation>
+    </message>
+</context>
 <context>
     <name>Zones</name>
     <message>
@@ -2867,22 +3436,22 @@ Voulez-vous continuer?
 <context>
     <name>deviceModel</name>
     <message>
-        <location filename="../Pages.cpp" line="619"/>
+        <location filename="../Pages.cpp" line="624"/>
         <source>Device Name</source>
         <translation>Nom de l&apos;appareil</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="621"/>
+        <location filename="../Pages.cpp" line="626"/>
         <source>Device Type</source>
         <translation>Type de l&apos;appareil</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="623"/>
+        <location filename="../Pages.cpp" line="628"/>
         <source>Port Spec</source>
         <translation>Spécification du port</translation>
     </message>
     <message>
-        <location filename="../Pages.cpp" line="625"/>
+        <location filename="../Pages.cpp" line="630"/>
         <source>Profile</source>
         <translation>Profile</translation>
     </message>